commit f4adaaf6a62d906c54b18627b5c3c29cb6d6c6c8 from: Tracey Emery date: Thu Feb 22 14:38:12 2024 UTC Add new flag to differentiate between a scheduled transmit and when Morse code is actually being sent. This was not a bug, but an oversight in an actual transmission where the PTT was triggered when the scheduled transmit was set. commit - ac3f5f53b3abab7b0b184adab2c4797d71f26c2c commit + f4adaaf6a62d906c54b18627b5c3c29cb6d6c6c8 blob - 6e42b8e17e900891ee26256e60b4604d463ed363 blob + 4480d4292488d6c73e462d12e51334516f64fde2 --- libmorse.cpp +++ libmorse.cpp @@ -53,10 +53,10 @@ static volatile uint64_t dac_pause; static volatile float gpio_unit_t; static volatile float dac_unit_t; -static volatile uint8_t gpio_tx_sending = 0; +static volatile uint8_t gpio_tx_sending = 0, gpio_tx_set = 0; static volatile uint8_t gpio_unit_handled; -static volatile uint8_t dac_tx_sending = 0; +static volatile uint8_t dac_tx_sending = 0, dac_tx_set = 0; static volatile uint8_t dac_unit_handled; static uint8_t ctob(uint8_t); @@ -147,6 +147,12 @@ Morse::gpio_set_transmitting(void) } uint8_t +Morse::gpio_get_transmit_set(void) +{ + return gpio_tx_set; +} + +uint8_t Morse::gpio_get_transmitting(void) { return gpio_tx_sending; @@ -171,7 +177,7 @@ Morse::gpio_tx(const char *morse) malloc(sizeof(struct morse_cb_args *)); gpio_put(gpio_tx_pin, 0); - gpio_tx_sending = 1; + gpio_tx_set = 1; gpio_stop_now = 0; mcb->len = strlen(morse); @@ -198,6 +204,7 @@ gpio_stop(struct morse_cb_args *mcb) { gpio_digraph = 0; gpio_tx_sending = 0; + gpio_tx_set = 0; gpio_this_index = 0; gpio_next_index = 0; free(mcb); @@ -214,6 +221,7 @@ gpio_tx_handled_cb(alarm_id_t id, void *data) if (gpio_stop_now) gpio_stop(mcb); else + gpio_tx_sending = 1; gpio_handle_chars(mcb); return 0; @@ -344,6 +352,12 @@ Morse::dac_set_transmitting(void) } uint8_t +Morse::dac_get_transmit_set(void) +{ + return dac_tx_set; +} + +uint8_t Morse::dac_get_transmitting(void) { return dac_tx_sending; @@ -368,7 +382,7 @@ Morse::dac_tx(const char *morse) malloc(sizeof(struct morse_cb_args *)); pwm_set_enabled(slice, false); - dac_tx_sending = 1; + dac_tx_set = 1; dac_stop_now = 0; mcb->len = strlen(morse); @@ -395,6 +409,7 @@ dac_stop(struct morse_cb_args *mcb) { dac_digraph = 0; dac_tx_sending = 0; + dac_tx_set = 0; dac_this_index = 0; dac_next_index = 0; free(mcb); @@ -411,6 +426,7 @@ dac_tx_handled_cb(alarm_id_t id, void *data) if (dac_stop_now) dac_stop(mcb); else + dac_tx_sending = 1; dac_handle_chars(mcb); return 0; blob - 75473afa70fee53444113e705734af9f957a2fff blob + a40cf10f58ba8a7a24c695bdc4b39cc180a8ff0b --- libmorse.h +++ libmorse.h @@ -28,6 +28,7 @@ Morse Morse(uint8_t type, uint8_t the_pin, unsigned long the_pause, uint8_t the_wpm, uint16_t st_freq); + uint8_t gpio_get_transmit_set(void); uint8_t gpio_get_transmitting(void); void gpio_set_transmitting(void); @@ -36,6 +37,7 @@ Morse void gpio_set_wpm(uint8_t the_wpm); + uint8_t dac_get_transmit_set(void); uint8_t dac_get_transmitting(void); void dac_set_transmitting(void);