2024.03.15.1354

FEATURE_WINKEY_EMULATION: Changed potentiometer behavior to work correctly with N1MM+ pot settings
master
k3ng 2024-03-15 09:56:12 -04:00
rodzic c54fbdd845
commit 6b9decc013
3 zmienionych plików z 23 dodań i 8 usunięć

Wyświetl plik

@ -1411,6 +1411,9 @@ Recent Update History
2024.02.28.0239 2024.02.28.0239
FEATURE_MORTTY_SPEEDPOT_BOOT_FUNCTION FEATURE_MORTTY_SPEEDPOT_BOOT_FUNCTION
2024.03.15.1354
FEATURE_WINKEY_EMULATION: Changed potentiometer behavior to work correctly with N1MM+ pot settings
qwerty qwerty
Documentation: https://github.com/k3ng/k3ng_cw_keyer/wiki Documentation: https://github.com/k3ng/k3ng_cw_keyer/wiki
@ -5660,15 +5663,26 @@ void check_potentiometer()
debug_serial_port->print(F(" analog read: ")); debug_serial_port->print(F(" analog read: "));
debug_serial_port->println(analogRead(potentiometer)); debug_serial_port->println(analogRead(potentiometer));
#endif #endif
if (keyer_machine_mode == KEYER_COMMAND_MODE) command_speed_set(pot_value_wpm_read);
else speed_set(pot_value_wpm_read);
last_pot_wpm_read = pot_value_wpm_read;
#ifdef FEATURE_WINKEY_EMULATION #ifdef FEATURE_WINKEY_EMULATION
if (keyer_machine_mode == KEYER_COMMAND_MODE) {
command_speed_set(pot_value_wpm_read);
} else {
if (!winkey_host_open){
speed_set(pot_value_wpm_read);
}
}
if ((primary_serial_port_mode == SERIAL_WINKEY_EMULATION) && (winkey_host_open)) { if ((primary_serial_port_mode == SERIAL_WINKEY_EMULATION) && (winkey_host_open)) {
winkey_port_write(((pot_value_wpm_read-pot_wpm_low_value)|128),0); winkey_port_write(((pot_value_wpm_read-pot_wpm_low_value)|128),0);
winkey_last_unbuffered_speed_wpm = configuration.wpm; winkey_last_unbuffered_speed_wpm = configuration.wpm;
}
#else
if (keyer_machine_mode == KEYER_COMMAND_MODE) {
command_speed_set(pot_value_wpm_read);
} else {
speed_set(pot_value_wpm_read);
} }
#endif #endif
last_pot_wpm_read = pot_value_wpm_read;
#ifdef FEATURE_SLEEP #ifdef FEATURE_SLEEP
last_activity_time = millis(); last_activity_time = millis();
#endif //FEATURE_SLEEP #endif //FEATURE_SLEEP
@ -10744,6 +10758,7 @@ void winkey_ptt_times_parm2_command(byte incoming_serial_byte) {
#ifdef FEATURE_WINKEY_EMULATION #ifdef FEATURE_WINKEY_EMULATION
void winkey_set_pot_parm1_command(byte incoming_serial_byte) { void winkey_set_pot_parm1_command(byte incoming_serial_byte) {
pot_wpm_low_value = incoming_serial_byte; pot_wpm_low_value = incoming_serial_byte;
} }

Wyświetl plik

@ -13,16 +13,16 @@
#if defined(TEST_CONFIG_1) #if defined(TEST_CONFIG_1)
#define FEATURE_BUTTONS // #define FEATURE_BUTTONS
#define FEATURE_COMMAND_MODE // #define FEATURE_COMMAND_MODE
// #define FEATURE_COMMAND_LINE_INTERFACE // Command Line Interface functionality #define FEATURE_COMMAND_LINE_INTERFACE // Command Line Interface functionality
// #define FEATURE_MEMORIES // on the Arduino Due, you must have FEATURE_EEPROM_E24C1024 and E24C1024 EEPROM hardware in order to compile this // #define FEATURE_MEMORIES // on the Arduino Due, you must have FEATURE_EEPROM_E24C1024 and E24C1024 EEPROM hardware in order to compile this
// #define FEATURE_MEMORY_MACROS // #define FEATURE_MEMORY_MACROS
#define FEATURE_WINKEY_EMULATION // disabling Automatic Software Reset is highly recommended (see documentation) #define FEATURE_WINKEY_EMULATION // disabling Automatic Software Reset is highly recommended (see documentation)
// #define FEATURE_BEACON // Go into beacon mode if paddle_left pin is LOW at boot up // #define FEATURE_BEACON // Go into beacon mode if paddle_left pin is LOW at boot up
// #define FEATURE_BEACON_SETTING // Go into beacon mode at boot up if EEPROM setting is enabled (\_ CLI Command) // #define FEATURE_BEACON_SETTING // Go into beacon mode at boot up if EEPROM setting is enabled (\_ CLI Command)
// #define FEATURE_TRAINING_COMMAND_LINE_INTERFACE // #define FEATURE_TRAINING_COMMAND_LINE_INTERFACE
// #define FEATURE_POTENTIOMETER // do not enable unless you have a potentiometer connected, otherwise noise will falsely trigger wpm changes #define FEATURE_POTENTIOMETER // do not enable unless you have a potentiometer connected, otherwise noise will falsely trigger wpm changes
// #define FEATURE_SIDETONE_SWITCH // adds switch control for the sidetone output. requires an external toggle switch (assigned to an arduino pin - see keyer_pin_settings.h). // #define FEATURE_SIDETONE_SWITCH // adds switch control for the sidetone output. requires an external toggle switch (assigned to an arduino pin - see keyer_pin_settings.h).
// #define FEATURE_SIDETONE_NEWTONE // Use the NewTone library, ~1k smaller code size than the standard tone library. Uses timer1 (pins 9 or 10) https://bitbucket.org/teckel12/arduino-new-tone/wiki/Home // #define FEATURE_SIDETONE_NEWTONE // Use the NewTone library, ~1k smaller code size than the standard tone library. Uses timer1 (pins 9 or 10) https://bitbucket.org/teckel12/arduino-new-tone/wiki/Home
// #define FEATURE_SERIAL_HELP // #define FEATURE_SERIAL_HELP

Wyświetl plik

@ -17,7 +17,7 @@
#define paddle_left 2 #define paddle_left 2
#define paddle_right 5 #define paddle_right 5
#define sidetone_line 4 #define sidetone_line 4
#define potentiometer A0 #define potentiometer 28 //A0 // Pico test jig: 28 (GP28)
#define ptt_tx_1 13 // PTT ("push to talk") lines #define ptt_tx_1 13 // PTT ("push to talk") lines
//Raspberry Pi Pico Test Jig //Raspberry Pi Pico Test Jig