diff --git a/examples/arduino-tx/arduino-tx.ino b/examples/arduino-tx/arduino-tx.ino index 3545cb4..080631e 100644 --- a/examples/arduino-tx/arduino-tx.ino +++ b/examples/arduino-tx/arduino-tx.ino @@ -6,6 +6,8 @@ const int kPinButton0 = 2; const int kPinButton1 = 4; void setup() { + Serial.begin(57600); + pinMode(kPinLed0, OUTPUT); pinMode(kPinSpeaker, OUTPUT); pinMode(kPinButton0, INPUT); @@ -14,42 +16,42 @@ void setup() { delay(3000); digitalWrite(kPinLed0, HIGH); - GGWave::send(kPinSpeaker, "Hello!", GGWave::TX_ARDUINO_512_FASTEST); + GGWave::send_text(kPinSpeaker, "Hello!", GGWave::TX_ARDUINO_512_FASTEST); digitalWrite(kPinLed0, LOW); delay(2000); digitalWrite(kPinLed0, HIGH); - GGWave::send(kPinSpeaker, "This is a", GGWave::TX_ARDUINO_512_FASTEST); - GGWave::send(kPinSpeaker, "ggwave demo", GGWave::TX_ARDUINO_512_FASTEST); + GGWave::send_text(kPinSpeaker, "This is a", GGWave::TX_ARDUINO_512_FASTEST); + GGWave::send_text(kPinSpeaker, "ggwave demo", GGWave::TX_ARDUINO_512_FASTEST); digitalWrite(kPinLed0, LOW); delay(2000); digitalWrite(kPinLed0, HIGH); - GGWave::send(kPinSpeaker, "The arduino", GGWave::TX_ARDUINO_512_FASTEST); + GGWave::send_text(kPinSpeaker, "The arduino", GGWave::TX_ARDUINO_512_FASTEST); delay(200); - GGWave::send(kPinSpeaker, "transmits data", GGWave::TX_ARDUINO_512_FASTEST); + GGWave::send_text(kPinSpeaker, "transmits data", GGWave::TX_ARDUINO_512_FASTEST); delay(200); - GGWave::send(kPinSpeaker, "using sound", GGWave::TX_ARDUINO_512_FASTEST); + GGWave::send_text(kPinSpeaker, "using sound", GGWave::TX_ARDUINO_512_FASTEST); delay(200); - GGWave::send(kPinSpeaker, "through a buzzer", GGWave::TX_ARDUINO_512_FASTEST); + GGWave::send_text(kPinSpeaker, "through a buzzer", GGWave::TX_ARDUINO_512_FASTEST); digitalWrite(kPinLed0, LOW); delay(1000); digitalWrite(kPinLed0, HIGH); - GGWave::send(kPinSpeaker, "The sound is", GGWave::TX_ARDUINO_512_FASTEST); + GGWave::send_text(kPinSpeaker, "The sound is", GGWave::TX_ARDUINO_512_FASTEST); delay(200); - GGWave::send(kPinSpeaker, "decoded in a", GGWave::TX_ARDUINO_512_FASTEST); + GGWave::send_text(kPinSpeaker, "decoded in a", GGWave::TX_ARDUINO_512_FASTEST); delay(200); - GGWave::send(kPinSpeaker, "web page.", GGWave::TX_ARDUINO_512_FASTEST); + GGWave::send_text(kPinSpeaker, "web page.", GGWave::TX_ARDUINO_512_FASTEST); digitalWrite(kPinLed0, LOW); delay(1000); digitalWrite(kPinLed0, HIGH); - GGWave::send(kPinSpeaker, "Press the button!", GGWave::TX_ARDUINO_512_FASTEST); + GGWave::send_text(kPinSpeaker, "Press the button!", GGWave::TX_ARDUINO_512_FASTEST); digitalWrite(kPinLed0, LOW); } @@ -58,6 +60,8 @@ int pressed = 0; bool isDown = false; void loop() { + Serial.println("hello"); + int but0 = digitalRead(kPinButton0); int but1 = digitalRead(kPinButton1); @@ -73,7 +77,7 @@ void loop() { snprintf(txt, 16, "Pressed: %d", pressed); digitalWrite(kPinLed0, HIGH); - GGWave::send(kPinSpeaker, txt, GGWave::TX_ARDUINO_512_FASTEST); + GGWave::send_text(kPinSpeaker, txt, GGWave::TX_ARDUINO_512_FASTEST); digitalWrite(kPinLed0, LOW); pressed = 0; } diff --git a/examples/arduino-tx/ggwave.h b/examples/arduino-tx/ggwave.h index 2c433ec..f9423e5 100644 --- a/examples/arduino-tx/ggwave.h +++ b/examples/arduino-tx/ggwave.h @@ -910,6 +910,7 @@ void send(uint8_t pin, const uint8_t * data, const Parameters & parameters) { } noTone(pin); + digitalWrite(pin, LOW); } void send(uint8_t pin, const uint8_t * data, TxProtocolId protocolId = TX_ARDUINO_512_FASTEST) { @@ -931,7 +932,7 @@ void send_text(uint8_t pin, const char * text, TxProtocolId protocolId = TX_ARDU char tx[kDataLength_bytes]; memset(tx, 0, sizeof(tx)); strncpy(tx, text, sizeof(tx)); - send(pin, tx, protocolId); + send(pin, (uint8_t *) tx, protocolId); } }