2020.08.21.01

FEATURE_COMMAND_BUTTONS is now called FEATURE_BUTTONS
      Command mode is now broken out into its own feature, FEATURE_COMMAND_MODE

k3ng_keyer/keyer_dependencies.h

@@ -43,3 +43,7 @@
 #if defined(FEATURE_BEACON_SETTING) && !defined(FEATURE_MEMORIES)
   #error "FEATURE_BEACON_SETTING requires FEATURE_MEMORIES and you may also want FEATURE_MEMORY_MACROS"
 #endif
+
+#if defined(FEATURE_COMMAND_MODE) && !defined(FEATURE_BUTTONS)
+  #error "FEATURE_COMMAND_MODE requires FEATURE_BUTTONS"
+#endif

k3ng_keyer/keyer_features_and_options.h

@@ -2,7 +2,8 @@
 // FEATURES add more bytes to the compiled binary, OPTIONS change code behavior
 
 
- #define FEATURE_COMMAND_BUTTONS
+ #define FEATURE_BUTTONS
+ #define FEATURE_COMMAND_MODE
  #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_MEMORY_MACROS

k3ng_keyer/keyer_features_and_options_fk_10.h

@@ -20,7 +20,8 @@
 
 // Contributed by Disneysw
 
-#define FEATURE_COMMAND_BUTTONS
+#define FEATURE_BUTTONS
+#define FEATURE_COMMAND_MODE
 #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_MEMORY_MACROS

k3ng_keyer/keyer_features_and_options_fk_11.h

@@ -3,7 +3,8 @@
 
 // Funtronics FK-11
 
-#define FEATURE_COMMAND_BUTTONS
+#define FEATURE_BUTTONS
+#define FEATURE_COMMAND_MODE
 #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_MEMORY_MACROS

k3ng_keyer/keyer_features_and_options_generic_STM32F103C.h

@@ -9,7 +9,8 @@ Generic STM32F103C "Blue Pill"
 // FEATURES add more bytes to the compiled binary, OPTIONS change code behavior
 
 
-#define FEATURE_COMMAND_BUTTONS
+#define FEATURE_BUTTONS
+#define FEATURE_COMMAND_MODE
 #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_MEMORY_MACROS

k3ng_keyer/keyer_features_and_options_iz3gme.h

@@ -2,7 +2,8 @@
 // FEATURES add more bytes to the compiled binary, OPTIONS change code behavior
 
 
-#define FEATURE_COMMAND_BUTTONS
+#define FEATURE_BUTTONS
+#define FEATURE_COMMAND_MODE
 #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_MEMORY_MACROS

k3ng_keyer/keyer_features_and_options_k5bcq.h

@@ -2,7 +2,8 @@
 // FEATURES add more bytes to the compiled binary, OPTIONS change code behavior
 
 
-#define FEATURE_COMMAND_BUTTONS
+#define FEATURE_BUTTONS
+#define FEATURE_COMMAND_MODE
 #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_MEMORY_MACROS

k3ng_keyer/keyer_features_and_options_maple_mini.h

@@ -16,7 +16,8 @@
 // FEATURES add more bytes to the compiled binary, OPTIONS change code behavior
 
 
-#define FEATURE_COMMAND_BUTTONS
+#define FEATURE_BUTTONS
+#define FEATURE_COMMAND_MODE
 #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_MEMORY_MACROS

k3ng_keyer/keyer_features_and_options_megakeyer.h

@@ -6,7 +6,8 @@
 // FEATURES add more bytes to the compiled binary, OPTIONS change code behavior
 
 
-#define FEATURE_COMMAND_BUTTONS
+#define FEATURE_BUTTONS
+#define FEATURE_COMMAND_MODE
 #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_MEMORY_MACROS

k3ng_keyer/keyer_features_and_options_mortty.h

@@ -2,7 +2,8 @@
 // FEATURES add more bytes to the compiled binary, OPTIONS change code behavior
 
 
-// #define FEATURE_COMMAND_BUTTONS
+// #define FEATURE_BUTTONS
+// #define FEATURE_COMMAND_MODE
 // #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_MEMORY_MACROS

k3ng_keyer/keyer_features_and_options_mortty_regular.h

@@ -2,7 +2,8 @@
 // FEATURES add more bytes to the compiled binary, OPTIONS change code behavior
 
 
-// #define FEATURE_COMMAND_BUTTONS
+// #define FEATURE_BUTTONS
+// #define FEATURE_COMMAND_MODE
 // #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_MEMORY_MACROS

k3ng_keyer/keyer_features_and_options_mortty_regular_with_potentiometer.h

@@ -2,7 +2,8 @@
 // FEATURES add more bytes to the compiled binary, OPTIONS change code behavior
 
 
-// #define FEATURE_COMMAND_BUTTONS
+// #define FEATURE_BUTTONS
+// #define FEATURE_COMMAND_MODE
 // #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_MEMORY_MACROS

k3ng_keyer/keyer_features_and_options_mortty_so2r.h

@@ -2,7 +2,8 @@
 // FEATURES add more bytes to the compiled binary, OPTIONS change code behavior
 
 
-// #define FEATURE_COMMAND_BUTTONS
+// #define FEATURE_BUTTONS
+// #define FEATURE_COMMAND_MODE
 // #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_MEMORY_MACROS

k3ng_keyer/keyer_features_and_options_mortty_so2r_with_potentiometer.h

@@ -2,7 +2,8 @@
 // FEATURES add more bytes to the compiled binary, OPTIONS change code behavior
 
 
-// #define FEATURE_COMMAND_BUTTONS
+// #define FEATURE_BUTTONS
+// #define FEATURE_COMMAND_MODE
 // #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_MEMORY_MACROS

k3ng_keyer/keyer_features_and_options_nanokeyer_rev_b.h

@@ -1,7 +1,8 @@
 // compile time features and options - comment or uncomment to add or delete features
 // FEATURES add more bytes to the compiled binary, OPTIONS change code behavior
 
-#define FEATURE_COMMAND_BUTTONS
+#define FEATURE_BUTTONS
+#define FEATURE_COMMAND_MODE
 //#define FEATURE_COMMAND_LINE_INTERFACE        // (this no longer requires FEATURE_SERIAL)
 #define FEATURE_MEMORIES
 //#define FEATURE_MEMORY_MACROS

k3ng_keyer/keyer_features_and_options_nanokeyer_rev_d.h

@@ -1,7 +1,8 @@
 // compile time features and options - comment or uncomment to add or delete features
 // FEATURES add more bytes to the compiled binary, OPTIONS change code behavior
 
-#define FEATURE_COMMAND_BUTTONS
+#define FEATURE_BUTTONS
+#define FEATURE_COMMAND_MODE
 //#define FEATURE_COMMAND_LINE_INTERFACE        // (this no longer requires FEATURE_SERIAL)
 #define FEATURE_MEMORIES
 //#define FEATURE_MEMORY_MACROS

k3ng_keyer/keyer_features_and_options_open_interface.h

@@ -3,7 +3,8 @@
 // compile time features and options - comment or uncomment to add or delete features
 // FEATURES add more bytes to the compiled binary, OPTIONS change code behavior
 
-#define FEATURE_COMMAND_BUTTONS
+#define FEATURE_BUTTONS
+#define FEATURE_COMMAND_MODE
 #define FEATURE_COMMAND_LINE_INTERFACE        // (this no longer requires FEATURE_SERIAL)
 #define FEATURE_MEMORIES
 #define FEATURE_MEMORY_MACROS

k3ng_keyer/keyer_features_and_options_opencwkeyer_mk2.h

@@ -2,7 +2,8 @@
 // FEATURES add more bytes to the compiled binary, OPTIONS change code behavior
 
 
-#define FEATURE_COMMAND_BUTTONS
+#define FEATURE_BUTTONS
+#define FEATURE_COMMAND_MODE
 // #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_MEMORY_MACROS

k3ng_keyer/keyer_features_and_options_test.h

@@ -13,11 +13,12 @@
 #if defined(TEST_CONFIG_1)
 
 
-#define FEATURE_COMMAND_BUTTONS
+#define FEATURE_BUTTONS
+#define FEATURE_COMMAND_MODE
 #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_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_SETTING        // Go into beacon mode at boot up if EEPROM setting is enabled (\_ CLI Command)
 // #define FEATURE_TRAINING_COMMAND_LINE_INTERFACE

k3ng_keyer/keyer_features_and_options_test_everything.h

@@ -1,7 +1,8 @@
 
 
 
-#define FEATURE_COMMAND_BUTTONS
+#define FEATURE_BUTTONS
+#define FEATURE_COMMAND_MODE
 #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_MEMORY_MACROS

k3ng_keyer/keyer_features_and_options_tinykeyer.h

@@ -3,7 +3,8 @@
 
 // features & options for TinyKeyer by OK1RR
 
-#define FEATURE_COMMAND_BUTTONS
+#define FEATURE_BUTTONS
+#define FEATURE_COMMAND_MODE
 //#define FEATURE_COMMAND_LINE_INTERFACE        // (this no longer requires FEATURE_SERIAL)
 #define FEATURE_MEMORIES
 //#define FEATURE_MEMORY_MACROS

k3ng_keyer/keyer_features_and_options_yaacwk.h

@@ -5,7 +5,8 @@
 // compile time features and options - comment or uncomment to add or delete features
 // FEATURES add more bytes to the compiled binary, OPTIONS change code behavior
 
-#define FEATURE_COMMAND_BUTTONS
+#define FEATURE_BUTTONS
+#define FEATURE_COMMAND_MODE
 #define FEATURE_COMMAND_LINE_INTERFACE        // (this no longer requires FEATURE_SERIAL)
 #define FEATURE_MEMORIES
 //#define FEATURE_MEMORY_MACROS

k3ng_keyer/keyer_features_and_options_yccc_so2r_mini.h

@@ -8,7 +8,7 @@
 // FEATURES add more bytes to the compiled binary, OPTIONS change code behavior
 
 
-// #define FEATURE_COMMAND_BUTTONS
+// #define FEATURE_BUTTONS
 // #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_MEMORY_MACROS

k3ng_keyer/keyer_pin_settings.h

@@ -23,10 +23,10 @@
 
 #define potentiometer_enable_pin 0  // if defined, the potentiometer will be enabled only when this pin is held low; set to 0 to ignore this pin
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_pin A1
   #define command_mode_active_led 0
-#endif //FEATURE_COMMAND_BUTTONS
+#endif //FEATURE_BUTTONS
 
 /*
 FEATURE_SIDETONE_SWITCH

k3ng_keyer/keyer_pin_settings_fk_10.h

@@ -45,10 +45,10 @@
 
 #define potentiometer_enable_pin 0  // if defined, the potentiometer will be enabled only when this pin is held low; set to 0 to ignore this pin
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_pin A2
   #define command_mode_active_led 0
-#endif //FEATURE_COMMAND_BUTTONS
+#endif //FEATURE_BUTTONS
 
 
 //lcd pins

k3ng_keyer/keyer_pin_settings_fk_11.h

@@ -25,10 +25,10 @@
 
 #define potentiometer_enable_pin 0  // if defined, the potentiometer will be enabled only when this pin is held low; set to 0 to ignore this pin
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_pin A2
   #define command_mode_active_led 0
-#endif //FEATURE_COMMAND_BUTTONS
+#endif //FEATURE_BUTTONS
 
 /*
 FEATURE_SIDETONE_SWITCH

k3ng_keyer/keyer_pin_settings_generic_STM32F103C.h

@@ -29,10 +29,10 @@ GENERIC STM32F103C Blue Pill board
 
 #define potentiometer_enable_pin 0  // if defined, the potentiometer will be enabled only when this pin is held low; set to 0 to ignore this pin
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_pin PA3
   #define command_mode_active_led PC13 //for Generic STM32103C On Board LED
-#endif //FEATURE_COMMAND_BUTTONS
+#endif //FEATURE_BUTTONS
 
 /*
 FEATURE_SIDETONE_SWITCH

k3ng_keyer/keyer_pin_settings_iz3gme.h

@@ -23,10 +23,10 @@
 
 #define potentiometer_enable_pin 0  // if defined, the potentiometer will be enabled only when this pin is held low; set to 0 to ignore this pin
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_pin A6
   #define command_mode_active_led 13
-#endif //FEATURE_COMMAND_BUTTONS
+#endif //FEATURE_BUTTONS
 
 /*
 FEATURE_SIDETONE_SWITCH

k3ng_keyer/keyer_pin_settings_k5bcq.h

@@ -23,10 +23,10 @@
 
 #define potentiometer_enable_pin 0  // if defined, the potentiometer will be enabled only when this pin is held low; set to 0 to ignore this pin
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_pin A1
   #define command_mode_active_led 29
-#endif //FEATURE_COMMAND_BUTTONS
+#endif //FEATURE_BUTTONS
 
 /*
 FEATURE_SIDETONE_SWITCH

k3ng_keyer/keyer_pin_settings_maple_mini.h

@@ -37,10 +37,10 @@ uint8_t sidetone_line = 8;        // sp5iou must be variable declaration instead
 
 #define potentiometer_enable_pin 0  // if defined, the potentiometer will be enabled only when this pin is held low; set to 0 to ignore this pin
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_pin 3
   #define command_mode_active_led PB1
-#endif //FEATURE_COMMAND_BUTTONS
+#endif //FEATURE_BUTTONS
 
 /*
 FEATURE_SIDETONE_SWITCH

k3ng_keyer/keyer_pin_settings_megakeyer.h

@@ -23,10 +23,10 @@
 
 #define potentiometer_enable_pin 0  // if defined, the potentiometer will be enabled only when this pin is held low; set to 0 to ignore this pin
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_pin A3
   #define command_mode_active_led 0
-#endif //FEATURE_COMMAND_BUTTONS
+#endif //FEATURE_BUTTONS
 
 /*
 FEATURE_SIDETONE_SWITCH

k3ng_keyer/keyer_pin_settings_mortty.h

@@ -23,10 +23,10 @@
 
 #define potentiometer_enable_pin 0  // if defined, the potentiometer will be enabled only when this pin is held low; set to 0 to ignore this pin
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_pin A1
   #define command_mode_active_led 0
-#endif //FEATURE_COMMAND_BUTTONS
+#endif //FEATURE_BUTTONS
 
 /*
 FEATURE_SIDETONE_SWITCH

k3ng_keyer/keyer_pin_settings_mortty_regular.h

@@ -23,10 +23,10 @@
 #define potentiometer_enable_pin 0  // if defined, the potentiometer will be enabled only when this pin is held low; set to 0 to ignore this pin
 
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_pin A1
   #define command_mode_active_led 0
-#endif //FEATURE_COMMAND_BUTTONS
+#endif //FEATURE_BUTTONS
 
 /*
 FEATURE_SIDETONE_SWITCH

k3ng_keyer/keyer_pin_settings_mortty_regular_with_potentiometer.h

@@ -23,10 +23,10 @@
 #define potentiometer_enable_pin 0  // if defined, the potentiometer will be enabled only when this pin is held low; set to 0 to ignore this pin
 
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_pin A1
   #define command_mode_active_led 0
-#endif //FEATURE_COMMAND_BUTTONS
+#endif //FEATURE_BUTTONS
 
 /*
 FEATURE_SIDETONE_SWITCH

k3ng_keyer/keyer_pin_settings_mortty_so2r.h

@@ -23,10 +23,10 @@
 #define potentiometer_enable_pin 0  // if defined, the potentiometer will be enabled only when this pin is held low; set to 0 to ignore this pin
 
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_pin A1
   #define command_mode_active_led 0
-#endif //FEATURE_COMMAND_BUTTONS
+#endif //FEATURE_BUTTONS
 
 /*
 FEATURE_SIDETONE_SWITCH

k3ng_keyer/keyer_pin_settings_mortty_so2r_with_potentiometer.h

@@ -23,10 +23,10 @@
 #define potentiometer_enable_pin 0  // if defined, the potentiometer will be enabled only when this pin is held low; set to 0 to ignore this pin
 
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_pin A1
   #define command_mode_active_led 0
-#endif //FEATURE_COMMAND_BUTTONS
+#endif //FEATURE_BUTTONS
 
 /*
 FEATURE_SIDETONE_SWITCH

k3ng_keyer/keyer_pin_settings_open_interface.h

@@ -25,10 +25,10 @@
 
 #define potentiometer_enable_pin 0  // if defined, the potentiometer will be enabled only when this pin is held low; set to 0 to ignore this pin
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
 	#define analog_buttons_pin A1
 	#define command_mode_active_led 0
-#endif //FEATURE_COMMAND_BUTTONS
+#endif //FEATURE_BUTTONS
 
 //lcd pins
 #ifdef FEATURE_LCD_4BIT

k3ng_keyer/keyer_pin_settings_opencwkeyer_mk2.h

@@ -24,10 +24,10 @@
 
 #define potentiometer_enable_pin 0  // if defined, the potentiometer will be enabled only when this pin is held low; set to 0 to ignore this pin
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_pin A1
   #define command_mode_active_led 0
-#endif //FEATURE_COMMAND_BUTTONS
+#endif //FEATURE_BUTTONS
 
 /*
 FEATURE_SIDETONE_SWITCH

k3ng_keyer/keyer_pin_settings_test.h

@@ -36,10 +36,10 @@
 
 #define potentiometer_enable_pin 0  // if defined, the potentiometer will be enabled only when this pin is held low; set to 0 to ignore this pin
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_pin A1
   #define command_mode_active_led 0
-#endif //FEATURE_COMMAND_BUTTONS
+#endif //FEATURE_BUTTONS
 
 
 //lcd pins

k3ng_keyer/keyer_pin_settings_test_everything.h

@@ -50,10 +50,10 @@
 
 #define potentiometer_enable_pin 0  // if defined, the potentiometer will be enabled only when this pin is held low; set to 0 to ignore this pin
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_pin A1
   #define command_mode_active_led 0
-#endif //FEATURE_COMMAND_BUTTONS
+#endif //FEATURE_BUTTONS
 
 
 //lcd pins

k3ng_keyer/keyer_pin_settings_yaacwk.h

@@ -22,10 +22,10 @@
 
 #define potentiometer_enable_pin 0  // if defined, the potentiometer will be enabled only when this pin is held low; set to 0 to ignore this pin
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_pin A1
   #define command_mode_active_led 0
-#endif //FEATURE_COMMAND_BUTTONS
+#endif //FEATURE_BUTTONS
 
 /*
 FEATURE_SIDETONE_SWITCH

k3ng_keyer/keyer_pin_settings_yccc_so2r_mini.h

@@ -38,10 +38,10 @@
 
 #define potentiometer_enable_pin 0  // if defined, the potentiometer will be enabled only when this pin is held low; set to 0 to ignore this pin
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_pin A1
   #define command_mode_active_led 0
-#endif //FEATURE_COMMAND_BUTTONS
+#endif //FEATURE_BUTTONS
 
 /*
 FEATURE_SIDETONE_SWITCH

k3ng_keyer/keyer_settings.h

@@ -67,14 +67,14 @@
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_number_of_buttons 4  // includes the command button (command button + 3 memory buttons = 4)
   #define analog_buttons_r1 10
   #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
   #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
   #define number_of_memories byte(12)

k3ng_keyer/keyer_settings_fk_10.h

@@ -87,14 +87,14 @@
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_number_of_buttons 4
   #define analog_buttons_r1 10
   #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
   #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
   #define number_of_memories byte(12)

k3ng_keyer/keyer_settings_fk_11.h

@@ -69,14 +69,14 @@
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_number_of_buttons 5  // includes the command button (command button + 3 memory buttons = 4)
   #define analog_buttons_r1 10
   #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
   #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
   #define number_of_memories byte(12)

k3ng_keyer/keyer_settings_generic_STM32F103C.h

@@ -73,14 +73,14 @@ GENERIC STM32F103C
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_number_of_buttons 1 // For Keypad only command butrton is neaded 6 //4  // includes the command button (command button + 3 memory buttons = 4) //sp5iou 20180319
   #define analog_buttons_r1 10
   #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
   #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
 //  #define number_of_memories byte(12)

k3ng_keyer/keyer_settings_iz3gme.h

@@ -67,14 +67,14 @@
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_number_of_buttons 5  // includes the command button (command button + 3 memory buttons = 4)
   #define analog_buttons_r1 10
   #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
   #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
   #define number_of_memories byte(12)

k3ng_keyer/keyer_settings_k5bcq.h

@@ -66,14 +66,14 @@
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_number_of_buttons 8  // includes the command button (command button + 3 memory buttons = 4)
   #define analog_buttons_r1 10
   #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
   #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
   #define number_of_memories byte(12)

k3ng_keyer/keyer_settings_maple_mini.h

@@ -79,14 +79,14 @@
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_number_of_buttons 4  // includes the command button (command button + 3 memory buttons = 4)
   #define analog_buttons_r1 10
   #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
   #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
   #define number_of_memories byte(12)

k3ng_keyer/keyer_settings_megakeyer.h

@@ -72,14 +72,14 @@
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_number_of_buttons 4  // includes the command button (command button + 3 memory buttons = 4)
   #define analog_buttons_r1 10
   #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
   #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
   #define number_of_memories byte(12)

k3ng_keyer/keyer_settings_mortty.h

@@ -66,14 +66,14 @@
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_number_of_buttons 4
   #define analog_buttons_r1 10
   #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
   #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
   #define number_of_memories byte(12)

k3ng_keyer/keyer_settings_mortty_regular.h

@@ -66,14 +66,14 @@
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_number_of_buttons 4
   #define analog_buttons_r1 10
   #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
   #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
   #define number_of_memories byte(12)

k3ng_keyer/keyer_settings_mortty_regular_with_potentiometer.h

@@ -66,14 +66,14 @@
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_number_of_buttons 4
   #define analog_buttons_r1 10
   #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
   #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
   #define number_of_memories byte(12)

k3ng_keyer/keyer_settings_mortty_so2r.h

@@ -66,14 +66,14 @@
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_number_of_buttons 4
   #define analog_buttons_r1 10
   #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
   #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
   #define number_of_memories byte(12)

k3ng_keyer/keyer_settings_mortty_so2r_with_potentiometer.h

@@ -66,14 +66,14 @@
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_number_of_buttons 4
   #define analog_buttons_r1 10
   #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
   #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
   #define number_of_memories byte(12)

k3ng_keyer/keyer_settings_nanokeyer_rev_b.h

@@ -66,14 +66,14 @@
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
 #define analog_buttons_number_of_buttons 4
 #define analog_buttons_r1 10
 #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
 #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
 #define number_of_memories byte(3) //12

k3ng_keyer/keyer_settings_nanokeyer_rev_d.h

@@ -66,14 +66,14 @@
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
 #define analog_buttons_number_of_buttons 4
 #define analog_buttons_r1 10
 #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
 #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
 #define number_of_memories byte(12)

k3ng_keyer/keyer_settings_open_interface.h

@@ -68,14 +68,14 @@
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
 #define analog_buttons_number_of_buttons 4
 #define analog_buttons_r1 10
 #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
 #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
 #define number_of_memories byte(12)

k3ng_keyer/keyer_settings_opencwkeyer_mk2.h

@@ -67,14 +67,14 @@
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_number_of_buttons 3  // includes the command button (command button + 3 memory buttons = 4)
   #define analog_buttons_r1 10
   #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
   #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
   #define number_of_memories byte(12)

k3ng_keyer/keyer_settings_test.h

@@ -80,14 +80,14 @@
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_number_of_buttons 4
   #define analog_buttons_r1 10
   #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
   #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
   #define number_of_memories byte(12)
@@ -396,14 +396,14 @@
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_number_of_buttons 4 // includes the command button (command button + 3 memory buttons = 4)
   #define analog_buttons_r1 10
   #define analog_buttons_r2 1.2
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
   #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
   #define number_of_memories byte(12)

k3ng_keyer/keyer_settings_test_everything.h

@@ -77,14 +77,14 @@
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_number_of_buttons 4
   #define analog_buttons_r1 10
   #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
   #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
   #define number_of_memories byte(12)

k3ng_keyer/keyer_settings_tinykeyer.h

@@ -67,14 +67,14 @@
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
 #define analog_buttons_number_of_buttons 1
 #define analog_buttons_r1 10
 #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
 #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
 #define number_of_memories byte(1)

k3ng_keyer/keyer_settings_yaacwk.h

@@ -67,14 +67,14 @@
 #define eeprom_write_time_ms 30000
 
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_number_of_buttons 8
   #define analog_buttons_r1 10
   #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
   #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
   #define number_of_memories byte(12)

k3ng_keyer/keyer_settings_yccc_so2r_mini.h

@@ -67,14 +67,14 @@
 #define serial_program_memory_buffer_size 500
 #define eeprom_write_time_ms 30000
 
-#ifdef FEATURE_COMMAND_BUTTONS
+#ifdef FEATURE_BUTTONS
   #define analog_buttons_number_of_buttons 4
   #define analog_buttons_r1 10
   #define analog_buttons_r2 1
 #endif
 
 
-#if defined(FEATURE_COMMAND_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
+#if defined(FEATURE_BUTTONS) &&  !defined(FEATURE_PS2_KEYBOARD) && !defined(FEATURE_USB_KEYBOARD) && !defined(FEATURE_COMMAND_LINE_INTERFACE) && !defined(FEATURE_WINKEY_EMULATION)
   #define number_of_memories byte(analog_buttons_number_of_buttons-1)
 #else
   #define number_of_memories byte(12)