X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=rf433ctl%2Frf433ctl.pde;h=c37778c56a798e2d785376436655c94d3028d995;hb=51b8c0cb530de874de351d6a7d954c21a7644a3e;hp=915f298fc97ff62c601dbc4beea8caececc6215b;hpb=3b2641f41ef464980b5bf32cdf236b9d61d8ab13;p=svn42.git diff --git a/rf433ctl/rf433ctl.pde b/rf433ctl/rf433ctl.pde index 915f298..c37778c 100644 --- a/rf433ctl/rf433ctl.pde +++ b/rf433ctl/rf433ctl.pde @@ -289,6 +289,8 @@ void setup() pinMode(PANIC_BUTTON_PIN, INPUT); // set pin to input digitalWrite(PANIC_BUTTON_PIN, HIGH); // turn on pullup resistors analogWrite(BLUELED_PWM_PIN,0); + + Serial.begin(9600); onewire.reset(); onewire.reset_search(); @@ -296,9 +298,7 @@ void setup() //in case we change temp sensor: if (!dallas_sensors.getAddress(onShieldTemp, 0)) Serial.println("Error: Unable to find address for Device 0"); - dallas_sensors.setResolution(onShieldTemp, 9); - - Serial.begin(9600); + dallas_sensors.setResolution(onShieldTemp, 9); } unsigned int ir_time=IR_SAMPLE_DURATION; @@ -308,8 +308,9 @@ boolean pb_state=0; boolean pb_postth_state=0; unsigned int pb_time=0; -void echoCommand(char command) +void sensorEchoCommand(char command) { + Serial.print("Sensor "); Serial.print(command); Serial.print(": "); } @@ -394,12 +395,12 @@ void loop() send_frame(words[D2_OFF]); else if(command == 'T') { - echoCommand(command); + sensorEchoCommand(command); printTemperature(onShieldTemp); } else if(command == 'P') { - echoCommand(command); + sensorEchoCommand(command); printLightLevel(); } else