Merge branch 'master' into development

Author: henrikekblad

libraries/MySensors/MyMessage.h

@@ -30,7 +30,7 @@ typedef enum {
 	C_REQ = 2,
 	C_INTERNAL = 3,
 	C_STREAM = 4 // For Firmware and other larger chunks of data that need to be divided into pieces.
-} command;
+} mysensor_command;
 
 // Type of sensor data (for set/req/ack messages)
 typedef enum {
@@ -40,33 +40,33 @@ typedef enum {
 	V_HEATER, V_HEATER_SW, V_LIGHT_LEVEL, V_VAR1, V_VAR2, V_VAR3, V_VAR4, V_VAR5,
 	V_UP, V_DOWN, V_STOP, V_IR_SEND, V_IR_RECEIVE, V_FLOW, V_VOLUME, V_LOCK_STATUS,
 	V_DUST_LEVEL, V_VOLTAGE, V_CURRENT
-} data;
+} mysensor_data;
 
 // Type of internal messages (for internal messages)
 typedef enum {
 	I_BATTERY_LEVEL, I_TIME, I_VERSION, I_ID_REQUEST, I_ID_RESPONSE,
 	I_INCLUSION_MODE, I_CONFIG, I_FIND_PARENT, I_FIND_PARENT_RESPONSE,
 	I_LOG_MESSAGE, I_CHILDREN, I_SKETCH_NAME, I_SKETCH_VERSION,
 	I_REBOOT, I_GATEWAY_READY
-} internal;
+} mysensor_internal;
 
 // Type of sensor  (for presentation message)
 typedef enum {
 	S_DOOR, S_MOTION, S_SMOKE, S_LIGHT, S_DIMMER, S_COVER, S_TEMP, S_HUM, S_BARO, S_WIND,
 	S_RAIN, S_UV, S_WEIGHT, S_POWER, S_HEATER, S_DISTANCE, S_LIGHT_LEVEL, S_ARDUINO_NODE,
 	S_ARDUINO_REPEATER_NODE, S_LOCK, S_IR, S_WATER, S_AIR_QUALITY, S_CUSTOM, S_DUST,
 	S_SCENE_CONTROLLER
-} sensor;
+} mysensor_sensor;
 
 // Type of data stream  (for streamed message)
 typedef enum {
 	ST_FIRMWARE_CONFIG_REQUEST, ST_FIRMWARE_CONFIG_RESPONSE, ST_FIRMWARE_REQUEST, ST_FIRMWARE_RESPONSE,
 	ST_SOUND, ST_IMAGE
-} stream;
+} mysensor_stream;
 
 typedef enum {
 	P_STRING, P_BYTE, P_INT16, P_UINT16, P_LONG32, P_ULONG32, P_CUSTOM, P_FLOAT32
-} payload;
+} mysensor_payload;
 
 
 

libraries/MySensors/examples/EnergyMeterPulseSensor/EnergyMeterPulseSensor.ino

@@ -83,6 +83,7 @@ void loop()
   } else if (sendTime && !pcReceived) {
     // No count received. Try requesting it again
     gw.request(CHILD_ID, V_VAR1);
+    lastSend=now;
   }
 
   if (SLEEP_MODE) {

libraries/MySensors/examples/EthernetGateway/EthernetGateway.ino

@@ -14,11 +14,15 @@
  *
  * The GW code is designed for Arduino 328p / 16MHz.  ATmega168 does not have enough memory to run this program.
  * 
- * COMPILING
- * You must make sure to disable DEBUG in Sensor.h before compiling this sketch. Othervise the sketch won't fit in program space when downloading. 
- * For UIPEthernet(ENC28J60) usage: Note that I had to disable UDP and DHCP support in uipethernet-conf.h to reduce space. (which meas you ave to choose a static IP)
- * For WizNET usage: Do *not* install the provided UIPEthernet-library. Remove UIPEthernet-include below and uncomment the Ethernet.h.  
+ * COMPILING ENC28J60
+ * > Use Arduino IDE 1.5.7 (or later) 
+ * > Disable DEBUG in Sensor.h before compiling this sketch. Othervise the sketch will probably not fit in program space when downloading. 
+ * > Remove Ethernet.h include below and inlcude UIPEthernet.h 
+ * COMPILING WizNET (W5100)
+ * > Remove UIPEthernet include below and include Ethernet.h.  
  *
+ * Note that I had to disable UDP and DHCP support in uipethernet-conf.h to reduce space. (which meas you ave to choose a static IP for that module)
+
  * VERA CONFIGURATION:
  * Enter "ip-number:port" in the ip-field of the Arduino GW device. This will temporarily override any serial configuration for the Vera plugin. 
  * E.g. If you want to use the defualt values in this sketch enter: 192.168.178.66:5003
@@ -54,10 +58,10 @@
 
 
 // Use this if you have attached a Ethernet ENC28J60 shields  
-//#include <UIPEthernet.h>  
+#include <UIPEthernet.h>  
 
 // Use this fo WizNET module and Arduino Ethernet Shield 
-#include <Ethernet.h>   
+//#include <Ethernet.h>   
 
 
 #define INCLUSION_MODE_TIME 1 // Number of minutes inclusion mode is enabled
@@ -75,7 +79,7 @@ MySensor gw(RADIO_CE_PIN, RADIO_SPI_SS_PIN);
 
 
 #define IP_PORT 5003        // The port you want to open 
-IPAddress myIp (192, 168, 178, 66);  // Configure your static ip-address here
+IPAddress myIp (192, 168, 178, 66);  // Configure your static ip-address here    COMPILE ERROR HERE? Use Arduino IDE 1.5.7 or later!
 
 // The MAC address can be anything you want but should be unique on your network.
 // Newer boards have a MAC address printed on the underside of the PCB, which you can (optionally) use.

libraries/MySensors/examples/WaterMeterPulseSensor/WaterMeterPulseSensor.ino

@@ -97,9 +97,10 @@ void loop()
       } 
     }
     lastSend = currentTime;
-  } else if (sendTime) {
+  } else if (sendTime && !pcReceived) {
    // No count received. Try requesting it again
     gw.request(CHILD_ID, V_VAR1);
+    lastSend=currentTime;
   }
 
   if (SLEEP_MODE) {

libraries/UIPEthernet/README

@@ -1,4 +1,4 @@
-This is UIPEthernet version 1.01
+This is UIPEthernet version 1.07
 
 An plugin-replacement of the stock Arduino Ethernet library for ENC28J60 shields and breakout boards. Full support for persistent (streaming) TCP-connections and UDP (Client and Server each), ARP, ICMP, DHCP and DNS. 
 Just include 'UIPEthernet.h' instead of 'Ethernet.h' and use all your code written for the stock Arduino Ethernet lib!
@@ -26,7 +26,9 @@ On a Mac, you will want to create a folder named "libraries" in in the "Document
     $ cd ~/Documents/Arduino/libraries
     $ git clone https://github.com/ntruchsess/arduino_uip UIPEthernet
 
-Or you download the zipped version of the library from https://github.com/ntruchsess/arduino_uip/archive/master.zip, create a directory [path to Arduino distribution]\libraries\UIPEthernet and put the contents of the zip-file there.
+Or you download the zipped version of the library from https://github.com/ntruchsess/arduino_uip/releases, and copy the contained directory UIPEthernet to [path to Arduino distribution]\libraries\UIPEthernet.
+
+If you are running Arduino-IDE 1.5.x use release-version 1.57 or checkout branch 'Arduino_1.5.5'
 
 Additional information can be found on the Arduino website: http://www.arduino.cc/en/Hacking/Libraries