From cb9e5fc3612e0625c70c766ad5ed401dccebb017 Mon Sep 17 00:00:00 2001 From: Stefan Sterz Date: Tue, 26 Jan 2016 16:39:58 +0100 Subject: [PATCH] bug fixing --- arduino/src/sketch.ino | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/arduino/src/sketch.ino b/arduino/src/sketch.ino index 35d7887..4062273 100644 --- a/arduino/src/sketch.ino +++ b/arduino/src/sketch.ino @@ -53,18 +53,18 @@ void decodeMessage() { switch (cmd) { //case 80: break; - case 81: setMode(val[0], pin); break; - case 82: digitalW(val[0], pin); break; - case 83: digitalR(pin); break; - case 84: analogW(pin, val) break; - case 85: analogR(pin) break; - case 86: handleRCDecimal(val, pin) break; - case 87: sendRCTristate(val, pin); break; - case 88: irSend(val[0], val[1], lastFourToLong(val)) break; + case 81: setMode(val[0], pin); break; + case 82: digitalW(val[0], pin); break; + case 83: digitalR(pin); break; + case 84: analogW(val, pin); break; + case 85: analogR(pin); break; + case 86: handleRCDecimal(val, pin); break; + case 87: sendRCTristate(val, pin); break; + case 88: irSend(val[0], val[1], lastFourToLong(val)); break; case 89: irrecv.enableIRIn(); irReceive = millis() + 10000; break; - default: break; + default: break; } } else if(cmd == 90) { @@ -117,28 +117,28 @@ void digitalR(int pin) { void analogW(uint8_t val[], int pin) { - if(p == -1) { if(debug) Serial.println("badpin"); return; } - pinMode(p, OUTPUT); - analogWrite(p,firsTwoToInt(val)); + if(pin == -1) { Serial.println("badpin"); return; } + pinMode(pin, OUTPUT); + analogWrite(pin,firsTwoToInt(val)); } void analogR(int pin) { - if(p == -1) { Serial.println("badpin"); return; } - pinMode(p, INPUT); - int rval = analogRead(p); + if(pin == -1) { Serial.println("badpin"); return; } + pinMode(pin, INPUT); + int rval = analogRead(pin); Serial.println(String(pin + "::" + rval)); } void handleRCDecimal(uint8_t val[], int pin) { - if (p == -1) { Serial.println("badpin"); return; } + if (pin == -1) { Serial.println("badpin"); return; } unsigned int length = firsTwoToInt(val); unsigned long value = lastFourToLong(val); RCSwitch rc = RCSwitch(); - rc.enableTransmit(p); + rc.enableTransmit(pin); rc.send(value, length); }