Merge master into development

This commit is contained in:
Patrick Fallberg
2015-08-15 18:28:22 +02:00
62 changed files with 1032 additions and 224 deletions
+1 -2
View File
@@ -53,7 +53,7 @@
// but now can be used in any sensor node. Also the LEDs can now be
// disabled in the gateway.
//#define WITH_LEDS_BLINKING
// #define WITH_LEDS_BLINKING
// The following setting allows you to inverse the blinking feature WITH_LEDS_BLINKING
// When WITH_LEDS_BLINKING_INVERSE is enabled LEDSs are normally turned on and switches
@@ -103,7 +103,6 @@
// Key to use for HMAC calculation in MySigningAtsha204Soft (32 bytes)
#define MY_HMAC_KEY 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
/**********************************
* NRF24L01 Driver Defaults
***********************************/