Examples adapted for Arduino IDE 1.6.11

panStamp · Aug 18, 2016 · 61c6144 · 61c6144
1 parent 69dceaa
commit 61c6144
Show file tree

Hide file tree

Showing 23 changed files with 161 additions and 48 deletions.
diff --git a/examples/bininps/regtable.ino b/examples/bininps/regtable.ino
@@ -27,6 +27,13 @@
 #include "product.h"
 #include "regtable.h"
 
+/**
+ * Declaration of custom functions
+ */
+const void updtVoltSupply(byte rId);
+const void updtBinInputs(byte rId);
+const void updtCounters(byte rId);
+
 /**
  * Definition of common registers
  */

diff --git a/examples/bininps2/regtable.ino b/examples/bininps2/regtable.ino
@@ -27,6 +27,11 @@
 #include "product.h"
 #include "regtable.h"
 
+/**
+ * Declaration of custom functions
+ */
+const void updtVoltSupply(byte rId);
+
 /**
  * Definition of common registers
  */

diff --git a/examples/binouts/regtable.ino b/examples/binouts/regtable.ino
@@ -28,13 +28,16 @@
 #include "regtable.h"
 
 /**
- * Definition of common registers
+ * Declaration of custom functions
  */
-DEFINE_COMMON_REGISTERS()
-
 const void setBinOutputs(byte rId, byte *states);
 const void setPwmOutputs(byte rId, byte *levels);
 
+/**
+ * Definition of common registers
+ */
+DEFINE_COMMON_REGISTERS()
+
 /*
  * Definition of custom registers
  */

diff --git a/examples/binouts2/regtable.ino b/examples/binouts2/regtable.ino
@@ -27,6 +27,12 @@
 #include "product.h"
 #include "regtable.h"
 
+/**
+ * Declaration of custom functions
+ */
+const void setBinOutput(byte rId, byte *state);
+const void setPwmOutput(byte rId, byte *level);
+
 /**
  * Definition of common registers
  */

diff --git a/examples/bmpsensor/regtable.ino b/examples/bmpsensor/regtable.ino
@@ -27,6 +27,12 @@
 #include "product.h"
 #include "regtable.h"
 
+/**
+ * Declaration of custom functions
+ */
+const void updtVoltSupply(byte rId);
+const void updtSensor(byte rId);
+
 /**
  * Definition of common registers
  */
@@ -36,7 +42,6 @@ DEFINE_COMMON_REGISTERS()
  * Definition of custom registers
  */
 // Voltage supply
-static uint32_t voltageSupply = 3300;
 static uint8_t dtVoltSupply[2];
 REGISTER regVoltSupply(dtVoltSupply, sizeof(dtVoltSupply), &updtVoltSupply, NULL);
 // Sensor value register

diff --git a/examples/co2meter/co2meter.ino b/examples/co2meter/co2meter.ino
@@ -56,6 +56,48 @@ bool zeroCalibrate = false; // If true, start zero calibration
 // Humidity and temperature sensor
 HTU21D htu;
 
+
+/**
+ * readCO2
+ *
+ * Read CO2 level
+ *
+ * @return Current CO2 level
+ */
+uint16_t readCO2(void) 
+{
+ uint8_t co2Buffer[25];
+ uint8_t co2Index = 0;
+ uint8_t  ch;
+ bool start = false, stop = false;
+
+ while(!stop)
+  {
+    if(Serial.available())
+    { 
+      ch = Serial.read();
+      switch (ch)
+      {
+        case 'Z':
+          start = true;
+          break;
+        case 'z':      
+          stop = true;
+          break;
+        default:
+          if (start)
+          {
+            if(ch != 0x20)
+              co2Buffer[co2Index++] = ch;
+          }    
+          break;          
+      }
+    }
+  }
+
+  return (uint16_t) atoi((char*)co2Buffer);
+}
+
 /**
  * zeroCalibration
  * 
@@ -172,43 +214,3 @@ void loop()
   swap.goToSleep();
  }
 
-/**
- * readCO2
- *
- * Read CO2 level
- *
- * @return Current CO2 level
- */
-uint16_t readCO2(void) 
-{
- uint8_t co2Buffer[25];
- uint8_t co2Index = 0;
- uint8_t  ch;
- bool start = false, stop = false;
-
- while(!stop)
-  {
-    if(Serial.available())
-    { 
-      ch = Serial.read();
-      switch (ch)
-      {
-        case 'Z':
-          start = true;
-          break;
-        case 'z':      
-          stop = true;
-          break;
-        default:
-          if (start)
-          {
-            if(ch != 0x20)
-              co2Buffer[co2Index++] = ch;
-          }    
-          break;          
-      }
-    }
-  }
-
-  return (uint16_t) atoi((char*)co2Buffer);
-}
diff --git a/examples/co2meter/regtable.ino b/examples/co2meter/regtable.ino
@@ -27,6 +27,14 @@
 #include "product.h"
 #include "regtable.h"
 
+/**
+ * Declaration of custom functions
+ */
+const void updtVoltSupply(byte rId);
+const void updtCo2Sensor(byte rId);
+const void updtHtuSensor(byte rId);
+const void setCo2Calib(byte rId, byte *calib);
+
 /**
  * Definition of common registers
  */

diff --git a/examples/current-meter/regtable.ino b/examples/current-meter/regtable.ino
@@ -26,6 +26,13 @@
 #include "panstamp.h"
 #include "regtable.h"
 
+/**
+ * Declaration of custom functions
+ */
+const void updtVoltSupply(byte rId);
+const void updtTemperature(byte rId);
+const void updtCurrent(byte rId);
+
 /**
  * Definition of common registers
  */

diff --git a/examples/dhtsensor/regtable.ino b/examples/dhtsensor/regtable.ino
@@ -27,6 +27,12 @@
 #include "product.h"
 #include "regtable.h"
 
+/**
+ * Declaration of custom functions
+ */
+const void updtVoltSupply(byte rId);
+const void updtSensor(byte rId);
+
 /**
  * Definition of common registers
  */

diff --git a/examples/htusensor/regtable.ino b/examples/htusensor/regtable.ino
@@ -27,6 +27,12 @@
 #include "product.h"
 #include "regtable.h"
 
+/**
+ * Declaration of custom functions
+ */
+const void updtVoltSupply(byte rId);
+const void updtSensor(byte rId);
+
 /**
  * Definition of common registers
  */

diff --git a/examples/idtag/regtable.ino b/examples/idtag/regtable.ino
@@ -26,6 +26,11 @@
 #include "panstamp.h"
 #include "regtable.h"
 
+/**
+ * Declaration of custom functions
+ */
+const void updtVoltSupply(byte rId);
+
 /**
  * Definition of common registers
  */

diff --git a/examples/mmamotion/regtable.ino b/examples/mmamotion/regtable.ino
@@ -27,6 +27,11 @@
 #include "product.h"
 #include "regtable.h"
 
+/**
+ * Declaration of custom functions
+ */
+const void updtSensor(byte rId);
+
 /**
  * Definition of common registers
  */

diff --git a/examples/nfc/regtable.ino b/examples/nfc/regtable.ino
@@ -27,6 +27,10 @@
 #include "product.h"
 #include "regtable.h"
 
+/**
+ * Declaration of custom functions
+ */
+
 /**
  * Definition of common registers
  */

diff --git a/examples/ntc/regtable.ino b/examples/ntc/regtable.ino
@@ -26,6 +26,12 @@
 #include "panstamp.h"
 #include "regtable.h"
 
+/**
+ * Declaration of custom functions
+ */
+const void updtVoltSupply(byte rId);
+const void updtSensor(byte rId);
+
 /**
  * Definition of common registers
  */

diff --git a/examples/pulsecounter/regtable.ino b/examples/pulsecounter/regtable.ino
@@ -27,6 +27,12 @@
 #include "product.h"
 #include "regtable.h"
 
+/**
+ * Declaration of custom functions
+ */
+const void updtVoltSupply(byte rId);
+const void updtCounter(byte rId);
+
 /**
  * Definition of common registers
  */
@@ -84,7 +90,7 @@ const void updtVoltSupply(byte rId)
  */
 const void updtCounter(byte rId)
 {
-  byte i, j;
+  byte i;
 
   // Update register
   for(i=0 ; i<4 ; i++)

diff --git a/examples/respira/regtable.ino b/examples/respira/regtable.ino
@@ -28,6 +28,13 @@
 #include "regtable.h"
 #include "sensor.h"
 
+/**
+ * Declaration of custom functions
+ */
+const void updtVoltSupply(byte rId);
+const void updtHtSensor(byte rId);
+const void updtAirSensor(byte rId);
+
 /**
  * Definition of common registers
  */

diff --git a/examples/rgbdriver/regtable.ino b/examples/rgbdriver/regtable.ino
@@ -27,13 +27,16 @@
 #include "product.h"
 #include "regtable.h"
 
+/**
+ * Declaration of custom functions
+ */
+const void setRGBlevel(byte rId, byte *levels);
+
 /**
  * Definition of common registers
  */
 DEFINE_COMMON_REGISTERS();
 
-const void setRGBlevel(byte rId, byte *levels);
-
 /*
  * Definition of custom registers
  */

diff --git a/examples/soilmoisture/regtable.ino b/examples/soilmoisture/regtable.ino
@@ -27,6 +27,12 @@
 #include "product.h"
 #include "regtable.h"
 
+/**
+ * Declaration of custom functions
+ */
+const void updtVoltSupply(byte rId);
+const void updtSensor(byte rId);
+
 /**
  * Definition of common registers
  */

diff --git a/examples/temphumpress/regtable.ino b/examples/temphumpress/regtable.ino
@@ -28,6 +28,12 @@
 #include "regtable.h"
 #include "sensor.h"
 
+/**
+ * Declaration of custom functions
+ */
+const void updtVoltSupply(byte rId);
+const void updtSensor(byte rId);
+
 /**
  * Definition of common registers
  */

diff --git a/examples/temphumpress/sensor.h b/examples/temphumpress/sensor.h
@@ -87,5 +87,10 @@
 #define tempSensorOFF();  digitalWrite(PIN_PWRTEMP, LOW);
 #endif
 
+int sensor_ReadTempHum(void);
+int sensor_ReadTemp(void);
+int sensor_ReadTempPress(void);
+void initSensor(void);
+
 #endif
 
diff --git a/examples/temphumpress/temphumpress.ino b/examples/temphumpress/temphumpress.ino
@@ -64,6 +64,7 @@
 
 #include "regtable.h"
 #include "swap.h"
+#include "sensor.h"
 
 /**
  * Uncomment if you are reading Vcc from A7. All battery-boards do this

diff --git a/examples/template/regtable.ino b/examples/template/regtable.ino
@@ -27,6 +27,10 @@
 #include "product.h"
 #include "regtable.h"
 
+/**
+ * Declaration of custom functions
+ */
+
 /**
  * Definition of common registers
  */

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=SWAP
-version=1.0.7
+version=1.0.8
 author=panStamp
 maintainer=panStamp <[email protected]>
 sentence=Simple Wireless Abstract Protocol (SWAP) library for ISM radios