Skip to content

Commit

Permalink
2024.02.17.1400
Browse files Browse the repository at this point in the history 
      Fixed issues found by swalberg ( e792776#r134909644 ).  Thanks!
  • Loading branch information
@k3ng
k3ng committed Feb 17, 2024
1 parent 94ae5a1 commit 2ac37fb
Show file tree
Hide file tree
Showing 24 changed files with 59 additions and 28 deletions.
15 changes: 11 additions & 4 deletions k3ng_keyer/k3ng_keyer.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings_fk_10.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings_fk_11.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings_generic_STM32F103C.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings_iz3gme.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings_k5bcq.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings_maple_mini.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings_megakeyer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings_mortty.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings_mortty_pico_over_usb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings_mortty_regular.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings_mortty_regular_with_potentiometer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings_mortty_so2r.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings_mortty_so2r_with_potentiometer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings_nanokeyer_rev_b.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings_nanokeyer_rev_d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings_open_interface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings_opencwkeyer_mk2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 4 additions & 2 deletions k3ng_keyer/keyer_settings_test.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings_test_everything.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings_tinykeyer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings_yaacwk.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion k3ng_keyer/keyer_settings_yccc_so2r_mini.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 2ac37fb

Please sign in to comment.