Merge pull request #5 from EnviroDIY/develop

Re-did enumerations

Author: SRGDamia1

examples/GetValues/GetValues.ino

@@ -23,7 +23,7 @@ For testing individual functions in KellerModbus library
 // ---------------------------------------------------------------------------
 
 // Define the sensor type
-kellerModel model = KellerAcculevel;
+kellerModel model = Acculevel_kellerModel;
 
 // Define the sensor's modbus address
 byte modbusAddress = 0x01;  // The sensor's modbus address, or SlaveID

library.json

@@ -1,6 +1,6 @@
 {
   "name": "KellerModbus",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "keywords": "Keller, Modbus, communication, bus, sensor, water level, pressure",
   "description": "Arduino library for communication with Keller pressure and water level sensors via Modbus.",
   "repository":

library.properties

@@ -1,5 +1,5 @@
 name=KellerModbus
-version=0.2.0
+version=0.2.1
 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

@@ -95,7 +95,7 @@ bool keller::getValues(float &valueP1, float &valueTOB1)
 
     switch(_model)
     {
-        case KellerNanolevel:  // This gets two values, but as seperate messages
+        case Nanolevel_kellerModel:  // This gets two values, but as seperate messages
         {
             if (modbus.getRegisters(0x03, 0x0002, 2))
             {

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
 {
-    KellerAcculevel = 0,
-    KellerNanolevel = 1,
+    Acculevel_kellerModel = 0,
+    Nanolevel_kellerModel = 1,
     OTHER   // Use if the sensor model is another model.
 } kellerModel;