commit 022cbfaa8350dd4923465462cf736928991d11a4 from: Tracey Emery date: Mon Dec 13 16:38:51 2021 UTC get rid of lookup table and got with maths commit - b67817c2ec5bb6b5e1864ee1fbf3f43a3b78dec4 commit + 022cbfaa8350dd4923465462cf736928991d11a4 blob - 8bed6f9c7d7d52b29353a0582433a75792861200 blob + 3280d019551b81c93555b41eaf2938da8c4442ec --- Morse.cpp +++ Morse.cpp @@ -27,6 +27,7 @@ #define D_WPM 15 #define UNIT_T(x) (60.0 / (50.0 * (float)x)) * 1000.0 +#define SINE_W(x) (sin(x) * 127.5 + 127.5) volatile uint8_t gpio_wpm, dac_wpm; @@ -44,12 +45,14 @@ uint8_t gpio_this_index = 0, gpio_next_index = 0; uint8_t gpio_handle_unit, gpio_unit_handled, gpio_bit; uint8_t gpio_digraph = 0, gpio_inited = 0; -uint8_t dac_this_index = 0, dac_next_index = 0, dac_i = 0; +uint8_t dac_this_index = 0, dac_next_index = 0; uint8_t dac_handle_unit, dac_unit_handled, dac_bit; uint8_t dac_digraph = 0, dac_inited = 0, dac_on = 1; uint8_t adc_inited; +float dac_i = 0.0, dac_max = 6.283; + unsigned long gpio_tx_start_millis, gpio_tx_current_millis; unsigned long gpio_handle_unit_millis; @@ -65,7 +68,6 @@ void gpio_handle_units(uint8_t c); void dac_stop(void); void dac_handle_chars(void); void dac_handle_units(uint8_t c); -void dac_write(const char*); Morse::Morse(uint8_t type, uint8_t the_pin) { @@ -260,12 +262,6 @@ gpio_stop(void) // dac functions -void -dac_write(const char *tx) -{ - dacWrite(dac_tx_pin, sine_wav[dac_i]); -} - uint8_t Morse::dac_transmitting(void) { @@ -285,12 +281,11 @@ void Morse::dac_watchdog(void) { if (dac_inited) { - /* dac_handle_chars(); */ if (dac_on) { - dac_i++; - if (dac_i >= strlen(sine_wav)) - dac_i = 0; - dac_write(sine_wav); + dac_i += .125; + if (dac_i >= dac_max) + dac_i = 0.0; + dacWrite(dac_tx_pin, SINE_W(dac_i)); } } } blob - edd62806d366304d6d23dd9f768f783aefaa4b9d (mode 644) blob + /dev/null --- sign_wav.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2021, 2022 Tracey Emery K7TLE - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -const char sine_wav[] PROGMEM = { - 127, 130, 133, 136, 139, 143, 146, 149, 152, 155, 158, 161, 164, 167, - 170, 173, 176, 178, 181, 184, 187, 190, 192, 195, 198, 200, 203, 205, - 208, 210, 212, 215, 217, 219, 221, 223, 225, 227, 229, 231, 233, 234, - 236, 238, 239, 240, 242, 243, 244, 245, 247, 248, 249, 249, 250, 251, - 252, 252, 253, 253, 253, 254, 254, 254, 254, 254, 254, 254, 253, 253, - 253, 252, 252, 251, 250, 249, 249, 248, 247, 245, 244, 243, 242, 240, - 239, 238, 236, 234, 233, 231, 229, 227, 225, 223, 221, 219, 217, 215, - 212, 210, 208, 205, 203, 200, 198, 195, 192, 190, 187, 184, 181, 178, - 176, 173, 170, 167, 164, 161, 158, 155, 152, 149, 146, 143, 139, 136, - 133, 130, 127, 124, 121, 118, 115, 111, 108, 105, 102, 99, 96, 93, 90, - 87, 84, 81, 78, 76, 73, 70, 67, 64, 62, 59, 56, 54, 51, 49, 46, 44, 42, - 39, 37, 35, 33, 31, 29, 27, 25, 23, 21, 20, 18, 16, 15, 14, 12, 11, 10, - 9, 7, 6, 5, 5, 4, 3, 2, 2, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 2, 2, - 3, 4, 5, 5, 6, 7, 9, 10, 11, 12, 14, 15, 16, 18, 20, 21, 23, 25, 27, 29, - 31, 33, 35, 37, 39, 42, 44, 46, 49, 51, 54, 56, 59, 62, 64, 67, 70, 73, - 76, 78, 81, 84, 87, 90, 93, 96, 99, 102, 105, 108, 111, 115, 118, 121, - 124 -};