arduino-tx : fixes

This commit is contained in:
Georgi Gerganov
2022-05-15 17:37:47 +03:00
parent 53f4d23768
commit 6e7e842a84
2 changed files with 18 additions and 13 deletions

View File

@@ -6,6 +6,8 @@ const int kPinButton0 = 2;
const int kPinButton1 = 4; const int kPinButton1 = 4;
void setup() { void setup() {
Serial.begin(57600);
pinMode(kPinLed0, OUTPUT); pinMode(kPinLed0, OUTPUT);
pinMode(kPinSpeaker, OUTPUT); pinMode(kPinSpeaker, OUTPUT);
pinMode(kPinButton0, INPUT); pinMode(kPinButton0, INPUT);
@@ -14,42 +16,42 @@ void setup() {
delay(3000); delay(3000);
digitalWrite(kPinLed0, HIGH); 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); digitalWrite(kPinLed0, LOW);
delay(2000); delay(2000);
digitalWrite(kPinLed0, HIGH); digitalWrite(kPinLed0, HIGH);
GGWave::send(kPinSpeaker, "This is a", GGWave::TX_ARDUINO_512_FASTEST); GGWave::send_text(kPinSpeaker, "This is a", GGWave::TX_ARDUINO_512_FASTEST);
GGWave::send(kPinSpeaker, "ggwave demo", GGWave::TX_ARDUINO_512_FASTEST); GGWave::send_text(kPinSpeaker, "ggwave demo", GGWave::TX_ARDUINO_512_FASTEST);
digitalWrite(kPinLed0, LOW); digitalWrite(kPinLed0, LOW);
delay(2000); delay(2000);
digitalWrite(kPinLed0, HIGH); 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); 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); 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); 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); digitalWrite(kPinLed0, LOW);
delay(1000); delay(1000);
digitalWrite(kPinLed0, HIGH); 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); 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); 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); digitalWrite(kPinLed0, LOW);
delay(1000); delay(1000);
digitalWrite(kPinLed0, HIGH); 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); digitalWrite(kPinLed0, LOW);
} }
@@ -58,6 +60,8 @@ int pressed = 0;
bool isDown = false; bool isDown = false;
void loop() { void loop() {
Serial.println("hello");
int but0 = digitalRead(kPinButton0); int but0 = digitalRead(kPinButton0);
int but1 = digitalRead(kPinButton1); int but1 = digitalRead(kPinButton1);
@@ -73,7 +77,7 @@ void loop() {
snprintf(txt, 16, "Pressed: %d", pressed); snprintf(txt, 16, "Pressed: %d", pressed);
digitalWrite(kPinLed0, HIGH); 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); digitalWrite(kPinLed0, LOW);
pressed = 0; pressed = 0;
} }

View File

@@ -910,6 +910,7 @@ void send(uint8_t pin, const uint8_t * data, const Parameters & parameters) {
} }
noTone(pin); noTone(pin);
digitalWrite(pin, LOW);
} }
void send(uint8_t pin, const uint8_t * data, TxProtocolId protocolId = TX_ARDUINO_512_FASTEST) { 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]; char tx[kDataLength_bytes];
memset(tx, 0, sizeof(tx)); memset(tx, 0, sizeof(tx));
strncpy(tx, text, sizeof(tx)); strncpy(tx, text, sizeof(tx));
send(pin, tx, protocolId); send(pin, (uint8_t *) tx, protocolId);
} }
} }