MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #96 from tbowmo/master

Browse Source 
updates to mysensorMicro sketch
This commit is contained in:
Henrik Ekblad
2015-03-28 23:45:09 +01:00
parent 00bd605314 843f0183ef
commit d4d5463707
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/examples/MysensorMicro/MysensorMicro.ino
+13 -10
View File
@@ -81,7 +81,7 @@ void setup() {
humiditySensor.begin(); humiditySensor.begin();
gw.sendSketchInfo("EnvironmentSensor", "1.0"); gw.sendSketchInfo("MysensorMicro", "1.0");
gw.present(CHILD_ID_TEMP,S_TEMP); gw.present(CHILD_ID_TEMP,S_TEMP);
gw.present(CHILD_ID_HUM,S_HUM); gw.present(CHILD_ID_HUM,S_HUM);
@@ -205,8 +205,9 @@ void testMode()
digitalWrite(LED_PIN, HIGH); // Turn on LED. digitalWrite(LED_PIN, HIGH); // Turn on LED.
Serial.println(F("Testing peripherals!")); Serial.println(F("Testing peripherals!"));
Serial.flush();
Serial.print(F("-> SI7021 : ")); Serial.print(F("-> SI7021 : "));
delay(100); Serial.flush();
if (humiditySensor.begin()) if (humiditySensor.begin())
{ {
@@ -217,10 +218,10 @@ void testMode()
{ {
Serial.println(F("failed!")); Serial.println(F("failed!"));
} }
delay(100); Serial.flush();
Serial.print(F("-> Flash : ")); Serial.print(F("-> Flash : "));
delay(100); Serial.flush();
if (flash.initialize()) if (flash.initialize())
{ {
Serial.println(F("ok!")); Serial.println(F("ok!"));
@@ -230,15 +231,17 @@ delay(100);
{ {
Serial.println(F("failed!")); Serial.println(F("failed!"));
} }
delay(100); Serial.flush();
Serial.println(F("-> SHA204 : ")); Serial.print(F("-> SHA204 : "));
ret_code = sha204.sha204c_wakeup(rx_buffer); ret_code = sha204.sha204c_wakeup(rx_buffer);
Serial.flush();
if (ret_code != SHA204_SUCCESS) if (ret_code != SHA204_SUCCESS)
{ {
Serial.print(F("Failed to wake device. Response: ")); Serial.println(ret_code, HEX); Serial.print(F("Failed to wake device. Response: ")); Serial.println(ret_code, HEX);
} }
Serial.flush();
if (ret_code == SHA204_SUCCESS) if (ret_code == SHA204_SUCCESS)
{ {
ret_code = sha204.getSerialNumber(rx_buffer); ret_code = sha204.getSerialNumber(rx_buffer);
@@ -248,7 +251,7 @@ delay(100);
} }
else else
{ {
Serial.print(F("Device serial: ")); Serial.print(F("Ok (serial : "));
for (int i=0; i<9; i++) for (int i=0; i<9; i++)
{ {
if (rx_buffer[i] < 0x10) if (rx_buffer[i] < 0x10)
@@ -257,12 +260,12 @@ delay(100);
} }
Serial.print(rx_buffer[i], HEX); Serial.print(rx_buffer[i], HEX);
} }
Serial.println(); Serial.println(")");
tests ++; tests ++;
} }
} }
Serial.flush();
Serial.println(F("Test finished")); Serial.println(F("Test finished"));