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
+3 -3
View File
@@ -84,7 +84,7 @@ void sendPingOrPongResponse( MyMessage msg )
nodeTypeAsCharRepresentation(msg.sender));
// 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);
send(response);
}
@@ -92,7 +92,7 @@ void sendPingOrPongResponse( MyMessage msg )
void setNodeId(byte 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 )
@@ -103,4 +103,4 @@ const char * msgTypeAsCharRepresentation( mysensor_data mType )
const char * nodeTypeAsCharRepresentation( uint8_t node )
{
return node == YING ? "Ying Node" : "Yang Node";
}
}
+7 -11
View File
@@ -12,17 +12,13 @@
"platforms": [
"atmelavr",
"atmelsam",
"espressif"
"espressif8266"
],
"exclude": [
"tests",
"Documentation"
],
"build": {
"srcFilter": [
"+<*.c>",
"+<*.cpp>",
"+<*.h>"
"export": {
"exclude": [
"tests",
"Documentation",
"Doxyfile"
]
}
}
}