Minor cleanup, updated example

Author: SRGDamia1

README.md

@@ -1,10 +1,10 @@
 # KellerModbus
-A library to use an Arduino as a master to control and communicate via modbus with the pressure and water level sensors produced by Keller International & [Keller America](https://www.kelleramerica.com). 
+A library to use an Arduino as a master to control and communicate via modbus with the pressure and water level sensors produced by Keller International & [Keller America](https://www.kelleramerica.com).
 
 This library depends on the [EnviroDIY/SensorModbusMaster](https://github.com/EnviroDIY/SensorModbusMaster) library.
 The [EnviroDIY/ModularSensor](https://github.com/EnviroDIY/ModularSensors) library functions for Keller depend on this library.
 
-The library has been tested to work with a Keller Acculevel, which is a Keller Series 30, Class 5, Group 20 sensor water level transmitter with a software/firmware version of 5.20-12.28 (i.e. made after the 2012 in the 28th week). The library should also work with all Keller sensors of the same Series/Class/Group with the same or a later software version.
+The library has been tested to work with a Keller Nanolevel and a Keller Acculevel, which is a Keller Series 30, Class 5, Group 20 sensor water level transmitter with a software/firmware version of 5.20-12.28 (i.e. made after the 2012 in the 28th week). The library should also work with all Keller sensors of the same Series/Class/Group with the same or a later software version.
 
 ## <a name="functions"></a>Functions
 
@@ -24,7 +24,7 @@ Documentation is licensed as [Creative Commons Attribution-ShareAlike 4.0](https
 [EnviroDIY](http://envirodiy.org/)™ is presented by the Stroud Water Research Center, with contributions from a community of enthusiasts sharing do-it-yourself ideas for environmental science and monitoring.
 
 [Anthony Aufdenakmpe](https://github.com/aufdenkampe) is the primary developer of this library.
-We are grateful for the helpful technical assistance from the staff at [Keller America](https://www.kelleramerica.com). 
+We are grateful for the helpful technical assistance from the staff at [Keller America](https://www.kelleramerica.com).
 
 This library has benefited from the support from the following funders:
 

examples/GetValues/GetValues.ino

@@ -22,6 +22,9 @@ For testing individual functions in KellerModbus library
 //   ie, pin locations, addresses, calibrations and related settings
 // ---------------------------------------------------------------------------
 
+// Define the sensor type
+kellerModel model = KellerAcculevel;
+
 // Define the sensor's modbus address
 byte modbusAddress = 0x01;  // The sensor's modbus address, or SlaveID
 // Keller defines the following:
@@ -72,7 +75,7 @@ void setup()
     modbusSerial.begin(9600);  // The modbus serial stream - Baud rate MUST be 9600.
 
     // Start up the modbus sensor
-    sensor.begin(modbusAddress, &modbusSerial, DEREPin);  // bool begin(byte modbusSlaveID, Stream *stream, int enablePin = -1);
+    sensor.begin(model, modbusAddress, &modbusSerial, DEREPin);
 
     // Turn on debugging
     // sensor.setDebugStream(&Serial);

library.json

@@ -1,6 +1,6 @@
 {
   "name": "KellerModbus",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "keywords": "Keller, Modbus, communication, bus, sensor, water level, pressure",
   "description": "Arduino library for communication with Keller pressure and water level sensors via Modbus.",
   "repository":
@@ -14,6 +14,9 @@
       "name": "Anthony Aufdenkampe",
       "email": "aaufdenkampe@limno.com",
       "maintainer": true
+    },
+    {
+      "name": "Neil Hancock"
     }
   ],
   "license": "BSD-3-Clause",

library.properties

@@ -1,5 +1,5 @@
 name=KellerModbus
-version=0.1.1
+version=0.2.0
 author=Anthony Aufdenkampe <aaufdenkampe@limno.com>
 maintainer=Anthony Aufdenkampe <aaufdenkampe@limno.com>
 sentence=Arduino library for communication with Keller pressure and water level sensors via Modbus.

src/KellerModbus.cpp

@@ -93,28 +93,34 @@ bool keller::getValues(float &valueP1, float &valueTOB1)
     valueP1   = -9999;  // Pressure (bar) for sensor1
     valueTOB1 = -9999;  // Temperature (C) on board sensor 1
 
-    // valueP1 = modbus.float32FromRegister(0x03, 0x0100);
-    // valueTOB1 = modbus.float32FromRegister(0x03, 0x0102);
-    if (Nanolevel_kellerModel == _model ) 
+    switch(_model)
     {
-        // This gets two values, but as seperate messages
-        if (modbus.getRegisters(0x03, 0x0002, 2))
+        case KellerNanolevel:  // This gets two values, but as seperate messages
         {
-            valueP1 = modbus.float32FromFrame(bigEndian, 3);
-            if (modbus.getRegisters(0x03, 0x0006, 2))
+            if (modbus.getRegisters(0x03, 0x0002, 2))
             {
-               valueTOB1 = modbus.float32FromFrame(bigEndian, 3);
-            } else return false;
+                valueP1 = modbus.float32FromFrame(bigEndian, 3);
+                if (modbus.getRegisters(0x03, 0x0006, 2))
+                {
+                   valueTOB1 = modbus.float32FromFrame(bigEndian, 3);
+                   break;
+                }
+                else return false;
+            }
+            else return false;
+        }
+        default:  // for all other sensors get two values in one message
+        {
+            if (modbus.getRegisters(0x03, 0x0100, 4))
+            {
+                valueP1 = modbus.float32FromFrame(bigEndian, 3);
+                valueTOB1 = modbus.float32FromFrame(bigEndian, 7);
+                break;
+            }
+            else return false;
         }
-        else return false;
-    } else // for all other sensors get two values in one message
-    if (modbus.getRegisters(0x03, 0x0100, 4))
-    {
-        valueP1 = modbus.float32FromFrame(bigEndian, 3);
-        valueTOB1 = modbus.float32FromFrame(bigEndian, 7);
     }
-    else return false;
-
+    
     _LastTOB1 = valueTOB1;
     return true;
 }

src/KellerModbus.h

@@ -19,8 +19,8 @@ Tested with Acculevel, Nanolevel
 // NOTE: not presently used but in place for future. See use in https://github.com/EnviroDIY/YosemitechModbus
 typedef enum kellerModel
 {
-    Acculevel = 0,
-    Nanolevel_kellerModel = 1,
+    KellerAcculevel = 0,
+    KellerNanolevel = 1,
     OTHER   // Use if the sensor model is another model.
 } kellerModel;
 
@@ -32,8 +32,8 @@ class keller
     // This function sets up the communication
     // It should be run during the arduino "setup" function.
     // The "stream" device must be initialized prior to running this.
-    bool begin(kellerModel model,byte modbusSlaveID, Stream *stream, int enablePin = -1);
-    bool begin(kellerModel model,byte modbusSlaveID, Stream &stream, int enablePin = -1);
+    bool begin(kellerModel model, byte modbusSlaveID, Stream *stream, int enablePin = -1);
+    bool begin(kellerModel model, byte modbusSlaveID, Stream &stream, int enablePin = -1);
 
     // This gets the modbus slave ID.
     // NOTE: NOT YET WORKING