Consolidate open PRs for bugfix release (#741)

This commit is contained in:
Olivier
2017-01-16 20:36:15 +01:00
committed by Henrik Ekblad
parent e66989138b
commit 6bad2c721b
2 changed files with 10 additions and 14 deletions
+2 -2
View File
@@ -84,7 +84,7 @@ void sendPingOrPongResponse( MyMessage msg )
nodeTypeAsCharRepresentation(msg.sender)); nodeTypeAsCharRepresentation(msg.sender));
// Set payload to current time in millis to ensure each message is unique // Set payload to current time in millis to ensure each message is unique
response.set( millis() ); response.set( (uint32_t)millis() );
response.setDestination(msg.sender); response.setDestination(msg.sender);
send(response); send(response);
} }
@@ -92,7 +92,7 @@ void sendPingOrPongResponse( MyMessage msg )
void setNodeId(byte nodeID) void setNodeId(byte nodeID)
{ {
LOG(F("Setting node id to: %i.\n***Please restart the node for changes to take effect.\n"), nodeID); LOG(F("Setting node id to: %i.\n***Please restart the node for changes to take effect.\n"), nodeID);
eeprom_write_byte((uint8_t*)EEPROM_NODE_ID_ADDRESS, (byte)nodeID); hwWriteConfig(EEPROM_NODE_ID_ADDRESS, (byte)nodeID);
} }
const char * msgTypeAsCharRepresentation( mysensor_data mType ) const char * msgTypeAsCharRepresentation( mysensor_data mType )
+6 -10
View File
@@ -12,17 +12,13 @@
"platforms": [ "platforms": [
"atmelavr", "atmelavr",
"atmelsam", "atmelsam",
"espressif" "espressif8266"
], ],
"exclude": [ "export": {
"tests", "exclude": [
"Documentation" "tests",
], "Documentation",
"build": { "Doxyfile"
"srcFilter": [
"+<*.c>",
"+<*.cpp>",
"+<*.h>"
] ]
} }
} }