2024.02.17.1400

Fixed issues found by swalberg ( e79277672f (r134909644) ). Thanks!
2024-02-17 09:34:02 -05:00 · 2024-02-17 09:34:02 -05:00 · 2ac37fb06f
commit 2ac37fb06f
--- a/k3ng_keyer/k3ng_keyer.ino
+++ b/k3ng_keyer/k3ng_keyer.ino
@ -1396,7 +1396,10 @@ Recent Update History
      FEATURE_WINKEY_EMULATION: Now expect three parameters from deprecated Paddle A2D command

    2023.10.28.2304
-      FEATURE_AUDIOPWMSINEWAVE for Raspberry Pi Pico 
+      FEATURE_AUDIOPWMSINEWAVE for Raspberry Pi Pico
+      
+    2024.02.17.1400
+      Fixed issues found by swalberg ( https://github.com/k3ng/k3ng_cw_keyer/commit/e79277672f4c04dfeeef5bfb9c82e384b59f32c4#r134909644 ).  Thanks!

  qwerty

@ -1428,7 +1431,7 @@ If you offer a hardware kit using this software, show your appreciation by sendi
 */


-#define CODE_VERSION "2023.10.28.2304"
+#define CODE_VERSION "2024.02.17.1400"

 #define eeprom_magic_number 41               // you can change this number to have the unit re-initialize EEPROM

@ -12189,11 +12192,15 @@ void service_winkey(byte action) {
            #endif //DEBUG_WINKEY
            winkey_status = WINKEY_NO_COMMAND_IN_PROGRESS;
            break;
-          case 0x09: // get cal
+          case 0x09: // get cal on WK1, unimplemented on WK2, getMajorVersion on WK3
            #ifdef DEBUG_WINKEY
              debug_serial_port->println("service_winkey:ADMIN_CMDgetcal");
            #endif //DEBUG_WINKEY
-            winkey_port_write(WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL,0);
+            #if defined(OPTION_WINKEY_2_SUPPORT)
+              winkey_port_write(WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2, 1); // Docs say this should be 0, but this is a hack for compatibility
+            #else
+              winkey_port_write(WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1, 1);
+            #endif
            winkey_status = WINKEY_NO_COMMAND_IN_PROGRESS;
            break;
          #ifdef OPTION_WINKEY_2_SUPPORT
--- a/k3ng_keyer/keyer_settings.h
+++ b/k3ng_keyer/keyer_settings.h
@ -145,7 +145,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_fk_10.h
+++ b/k3ng_keyer/keyer_settings_fk_10.h
@ -164,7 +164,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_fk_11.h
+++ b/k3ng_keyer/keyer_settings_fk_11.h
@ -145,7 +145,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_generic_STM32F103C.h
+++ b/k3ng_keyer/keyer_settings_generic_STM32F103C.h
@ -151,7 +151,8 @@ GENERIC STM32F103C
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_iz3gme.h
+++ b/k3ng_keyer/keyer_settings_iz3gme.h
@ -143,7 +143,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_k5bcq.h
+++ b/k3ng_keyer/keyer_settings_k5bcq.h
@ -143,7 +143,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_maple_mini.h
+++ b/k3ng_keyer/keyer_settings_maple_mini.h
@ -156,7 +156,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_megakeyer.h
+++ b/k3ng_keyer/keyer_settings_megakeyer.h
@ -148,7 +148,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_mortty.h
+++ b/k3ng_keyer/keyer_settings_mortty.h
@ -143,7 +143,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_mortty_pico_over_usb.h
+++ b/k3ng_keyer/keyer_settings_mortty_pico_over_usb.h
@ -148,7 +148,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_mortty_regular.h
+++ b/k3ng_keyer/keyer_settings_mortty_regular.h
@ -143,7 +143,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_mortty_regular_with_potentiometer.h
+++ b/k3ng_keyer/keyer_settings_mortty_regular_with_potentiometer.h
@ -143,7 +143,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_mortty_so2r.h
+++ b/k3ng_keyer/keyer_settings_mortty_so2r.h
@ -143,7 +143,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_mortty_so2r_with_potentiometer.h
+++ b/k3ng_keyer/keyer_settings_mortty_so2r_with_potentiometer.h
@ -143,7 +143,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_nanokeyer_rev_b.h
+++ b/k3ng_keyer/keyer_settings_nanokeyer_rev_b.h
@ -143,7 +143,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_nanokeyer_rev_d.h
+++ b/k3ng_keyer/keyer_settings_nanokeyer_rev_d.h
@ -143,7 +143,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_open_interface.h
+++ b/k3ng_keyer/keyer_settings_open_interface.h
@ -145,7 +145,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_opencwkeyer_mk2.h
+++ b/k3ng_keyer/keyer_settings_opencwkeyer_mk2.h
@ -143,7 +143,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_test.h
+++ b/k3ng_keyer/keyer_settings_test.h
@ -157,7 +157,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

@ -480,7 +481,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_test_everything.h
+++ b/k3ng_keyer/keyer_settings_test_everything.h
@ -153,7 +153,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_tinykeyer.h
+++ b/k3ng_keyer/keyer_settings_tinykeyer.h
@ -144,7 +144,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_yaacwk.h
+++ b/k3ng_keyer/keyer_settings_yaacwk.h
@ -144,7 +144,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00

--- a/k3ng_keyer/keyer_settings_yccc_so2r_mini.h
+++ b/k3ng_keyer/keyer_settings_yccc_so2r_mini.h
@ -143,7 +143,8 @@
 #define WINKEY_HANG_TIME_1_66 1.66
 #define WINKEY_HANG_TIME_2_0 2.0

-#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL 0x16
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK1 0x0a
+#define WINKEY_RETURN_THIS_FOR_ADMIN_GET_CAL_WK2 0x18
 #define WINKEY_RETURN_THIS_FOR_ADMIN_PADDLE_A2D 0xEE
 #define WINKEY_RETURN_THIS_FOR_ADMIN_SPEED_A2D 0x00