OTA Bootloader

- including adjustments to  library header files to allow usage across C
(bootloader) and C++ (firmware sketches)
- including definition of new message types for firmware config and
firmware code

libraries/MySensors/MyMessage.h

@@ -12,9 +12,11 @@
 #ifndef MyMessage_h
 #define MyMessage_h
 
-#include <SPI.h>
+#ifdef __cplusplus
+#include <Arduino.h>
 #include <string.h>
 #include <stdint.h>
+#endif
 
 #define PROTOCOL_VERSION 2
 #define MAX_MESSAGE_LENGTH 32
@@ -56,7 +58,8 @@ typedef enum {
 
 // Type of data stream  (for streamed message)
 typedef enum {
-	ST_FIRMWARE, ST_SOUND, ST_IMAGE
+	ST_FIRMWARE_CONFIG_REQUEST, ST_FIRMWARE_CONFIG_RESPONSE, ST_FIRMWARE_REQUEST, ST_FIRMWARE_RESPONSE,
+	ST_SOUND, ST_IMAGE
 } stream;
 
 typedef enum {
@@ -101,7 +104,7 @@ typedef enum {
 #define miSetLength(_length) BF_SET(version_length, _length, 3, 5)
 #define miSetPayloadType(_pt) BF_SET(command_ack_payload, _pt, 4, 4)
 
-
+#ifdef __cplusplus
 class MyMessage
 {
 public:
@@ -144,6 +147,13 @@ public:
 	MyMessage& set(unsigned int value);
 	MyMessage& set(int value);
 
+#else
+
+typedef union {
+struct
+{
+
+#endif
 
 	uint8_t version_length;      // 3 bit - Protocol version
 			                     // 5 bit - Length of payload
@@ -167,6 +177,12 @@ public:
 		int iValue;
 		char data[MAX_PAYLOAD + 1];
 	} __attribute__((packed));
+#ifdef __cplusplus
 } __attribute__((packed));
+#else
+};
+uint8_t array[HEADER_SIZE + MAX_PAYLOAD + 1];	
+} __attribute__((packed)) MyMessage;
+#endif
 
 #endif

libraries/MySensors/MySensor.h

@@ -15,16 +15,19 @@
 #include "Version.h"   // Auto generated by bot
 #include "MyConfig.h"
 #include "MyMessage.h"
-#include <Arduino.h>
 #include <stddef.h>
-#include <SPI.h>
 #include <avr/eeprom.h>
 #include <avr/pgmspace.h>
 #include <avr/wdt.h>
 #include <stdarg.h>
+
+#ifdef __cplusplus
+#include <Arduino.h>
+#include <SPI.h>
 #include "utility/LowPower.h"
 #include "utility/RF24.h"
 #include "utility/RF24_config.h"
+#endif
 
 #ifdef DEBUG
 #define debug(x,...) debugPrint(x, ##__VA_ARGS__)
@@ -47,7 +50,11 @@
 #define EEPROM_DISTANCE_ADDRESS (EEPROM_PARENT_NODE_ID_ADDRESS+1)
 #define EEPROM_ROUTES_ADDRESS (EEPROM_DISTANCE_ADDRESS+1) // Where to start storing routing information in EEPROM. Will allocate 256 bytes.
 #define EEPROM_CONTROLLER_CONFIG_ADDRESS (EEPROM_ROUTES_ADDRESS+256) // Location of controller sent configuration (we allow one payload of config data from controller)
-#define EEPROM_LOCAL_CONFIG_ADDRESS (EEPROM_CONTROLLER_CONFIG_ADDRESS+24) // First free address for sketch static configuration
+#define EEPROM_FIRMWARE_TYPE_ADDRESS (EEPROM_CONTROLLER_CONFIG_ADDRESS+24)
+#define EEPROM_FIRMWARE_VERSION_ADDRESS (EEPROM_FIRMWARE_TYPE_ADDRESS+2)
+#define EEPROM_FIRMWARE_BLOCKS_ADDRESS (EEPROM_FIRMWARE_VERSION_ADDRESS+2)
+#define EEPROM_FIRMWARE_CRC_ADDRESS (EEPROM_FIRMWARE_BLOCKS_ADDRESS+2)
+#define EEPROM_LOCAL_CONFIG_ADDRESS (EEPROM_FIRMWARE_CRC_ADDRESS+2) // First free address for sketch static configuration
 
 // This is the nodeId for sensor net gateway receiver sketch (where all sensors should send their data).
 // This is also act as base value for sensor nodeId
@@ -74,8 +81,7 @@ struct ControllerConfig {
 	uint8_t isMetric;
 };
 
-
-
+#ifdef __cplusplus
 class MySensor : public RF24
 {
   public:
@@ -267,5 +273,6 @@ class MySensor : public RF24
 	void removeChildRoute(uint8_t childId);
 	void internalSleep(int ms);
 };
+#endif
 
 #endif