From 84715e31a3f225bc020fb621debea3ad18b7d512 Mon Sep 17 00:00:00 2001 From: John Melton - G0ORX/N6LYT Date: Fri, 23 Dec 2016 08:48:00 +0000 Subject: [PATCH] Internal change for encoder names --- configure.c | 92 +++++---- gpio.c | 582 ++++++++++++++++++++++++++-------------------------- gpio.h | 48 ++--- 3 files changed, 362 insertions(+), 360 deletions(-) diff --git a/configure.c b/configure.c index 89b1ede..c882cd4 100644 --- a/configure.c +++ b/configure.c @@ -74,8 +74,8 @@ void configure_gpio(GtkWidget *parent) { - GtkWidget *b_enable_af_encoder=gtk_check_button_new_with_label("Enable AF"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_af_encoder), ENABLE_AF_ENCODER); + GtkWidget *b_enable_af_encoder=gtk_check_button_new_with_label("Enable E1"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_af_encoder), ENABLE_E1_ENCODER); gtk_widget_show(b_enable_af_encoder); gtk_grid_attach(GTK_GRID(grid),b_enable_af_encoder,0,1,1,1); @@ -84,7 +84,7 @@ void configure_gpio(GtkWidget *parent) { gtk_grid_attach(GTK_GRID(grid),af_a_label,1,1,1,1); GtkWidget *af_a=gtk_spin_button_new_with_range (0.0,100.0,1.0); - gtk_spin_button_set_value (GTK_SPIN_BUTTON(af_a),AF_ENCODER_A); + gtk_spin_button_set_value (GTK_SPIN_BUTTON(af_a),E1_ENCODER_A); gtk_widget_show(af_a); gtk_grid_attach(GTK_GRID(grid),af_a,2,1,1,1); @@ -93,19 +93,19 @@ void configure_gpio(GtkWidget *parent) { gtk_grid_attach(GTK_GRID(grid),af_b_label,3,1,1,1); GtkWidget *af_b=gtk_spin_button_new_with_range (0.0,100.0,1.0); - gtk_spin_button_set_value (GTK_SPIN_BUTTON(af_b),AF_ENCODER_B); + gtk_spin_button_set_value (GTK_SPIN_BUTTON(af_b),E1_ENCODER_B); gtk_widget_show(af_b); gtk_grid_attach(GTK_GRID(grid),af_b,4,1,1,1); GtkWidget *b_enable_af_pullup=gtk_check_button_new_with_label("Enable Pull-up"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_af_pullup), ENABLE_AF_PULLUP); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_af_pullup), ENABLE_E1_PULLUP); gtk_widget_show(b_enable_af_pullup); gtk_grid_attach(GTK_GRID(grid),b_enable_af_pullup,5,1,1,1); GtkWidget *b_enable_rf_encoder=gtk_check_button_new_with_label("Enable RF"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_rf_encoder), ENABLE_RF_ENCODER); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_rf_encoder), ENABLE_E2_ENCODER); gtk_widget_show(b_enable_rf_encoder); gtk_grid_attach(GTK_GRID(grid),b_enable_rf_encoder,0,2,1,1); @@ -114,7 +114,7 @@ void configure_gpio(GtkWidget *parent) { gtk_grid_attach(GTK_GRID(grid),rf_a_label,1,2,1,1); GtkWidget *rf_a=gtk_spin_button_new_with_range (0.0,100.0,1.0); - gtk_spin_button_set_value (GTK_SPIN_BUTTON(rf_a),RF_ENCODER_A); + gtk_spin_button_set_value (GTK_SPIN_BUTTON(rf_a),E2_ENCODER_A); gtk_widget_show(rf_a); gtk_grid_attach(GTK_GRID(grid),rf_a,2,2,1,1); @@ -123,19 +123,19 @@ void configure_gpio(GtkWidget *parent) { gtk_grid_attach(GTK_GRID(grid),rf_b_label,3,2,1,1); GtkWidget *rf_b=gtk_spin_button_new_with_range (0.0,100.0,1.0); - gtk_spin_button_set_value (GTK_SPIN_BUTTON(rf_b),RF_ENCODER_B); + gtk_spin_button_set_value (GTK_SPIN_BUTTON(rf_b),E2_ENCODER_B); gtk_widget_show(rf_b); gtk_grid_attach(GTK_GRID(grid),rf_b,4,2,1,1); GtkWidget *b_enable_rf_pullup=gtk_check_button_new_with_label("Enable Pull-up"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_rf_pullup), ENABLE_RF_PULLUP); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_rf_pullup), ENABLE_E2_PULLUP); gtk_widget_show(b_enable_rf_pullup); gtk_grid_attach(GTK_GRID(grid),b_enable_rf_pullup,5,2,1,1); GtkWidget *b_enable_agc_encoder=gtk_check_button_new_with_label("Enable AGC"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_agc_encoder), ENABLE_AGC_ENCODER); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_agc_encoder), ENABLE_E3_ENCODER); gtk_widget_show(b_enable_agc_encoder); gtk_grid_attach(GTK_GRID(grid),b_enable_agc_encoder,0,3,1,1); @@ -144,7 +144,7 @@ void configure_gpio(GtkWidget *parent) { gtk_grid_attach(GTK_GRID(grid),agc_a_label,1,3,1,1); GtkWidget *agc_a=gtk_spin_button_new_with_range (0.0,100.0,1.0); - gtk_spin_button_set_value (GTK_SPIN_BUTTON(agc_a),AGC_ENCODER_A); + gtk_spin_button_set_value (GTK_SPIN_BUTTON(agc_a),E3_ENCODER_A); gtk_widget_show(agc_a); gtk_grid_attach(GTK_GRID(grid),agc_a,2,3,1,1); @@ -153,19 +153,19 @@ void configure_gpio(GtkWidget *parent) { gtk_grid_attach(GTK_GRID(grid),agc_b_label,3,3,1,1); GtkWidget *agc_b=gtk_spin_button_new_with_range (0.0,100.0,1.0); - gtk_spin_button_set_value (GTK_SPIN_BUTTON(agc_b),AGC_ENCODER_B); + gtk_spin_button_set_value (GTK_SPIN_BUTTON(agc_b),E3_ENCODER_B); gtk_widget_show(agc_b); gtk_grid_attach(GTK_GRID(grid),agc_b,4,3,1,1); GtkWidget *b_enable_agc_pullup=gtk_check_button_new_with_label("Enable Pull-up"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_agc_pullup), ENABLE_AGC_PULLUP); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_agc_pullup), ENABLE_E3_PULLUP); gtk_widget_show(b_enable_agc_pullup); gtk_grid_attach(GTK_GRID(grid),b_enable_agc_pullup,5,3,1,1); GtkWidget *b_enable_band=gtk_check_button_new_with_label("Enable Band"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_band), ENABLE_BAND_BUTTON); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_band), ENABLE_S1_BUTTON); gtk_widget_show(b_enable_band); gtk_grid_attach(GTK_GRID(grid),b_enable_band,0,4,1,1); @@ -174,13 +174,13 @@ void configure_gpio(GtkWidget *parent) { gtk_grid_attach(GTK_GRID(grid),band_label,1,4,1,1); GtkWidget *band=gtk_spin_button_new_with_range (0.0,100.0,1.0); - gtk_spin_button_set_value (GTK_SPIN_BUTTON(band),BAND_BUTTON); + gtk_spin_button_set_value (GTK_SPIN_BUTTON(band),S1_BUTTON); gtk_widget_show(band); gtk_grid_attach(GTK_GRID(grid),band,2,4,1,1); GtkWidget *b_enable_mode=gtk_check_button_new_with_label("Enable Mode"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_mode), ENABLE_MODE_BUTTON); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_mode), ENABLE_S3_BUTTON); gtk_widget_show(b_enable_mode); gtk_grid_attach(GTK_GRID(grid),b_enable_mode,0,5,1,1); @@ -189,13 +189,13 @@ void configure_gpio(GtkWidget *parent) { gtk_grid_attach(GTK_GRID(grid),mode_label,1,5,1,1); GtkWidget *mode=gtk_spin_button_new_with_range (0.0,100.0,1.0); - gtk_spin_button_set_value (GTK_SPIN_BUTTON(mode),MODE_BUTTON); + gtk_spin_button_set_value (GTK_SPIN_BUTTON(mode),S3_BUTTON); gtk_widget_show(mode); gtk_grid_attach(GTK_GRID(grid),mode,2,5,1,1); GtkWidget *b_enable_filter=gtk_check_button_new_with_label("Enable Filter"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_filter), ENABLE_FILTER_BUTTON); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_filter), ENABLE_S4_BUTTON); gtk_widget_show(b_enable_filter); gtk_grid_attach(GTK_GRID(grid),b_enable_filter,0,6,1,1); @@ -204,13 +204,13 @@ void configure_gpio(GtkWidget *parent) { gtk_grid_attach(GTK_GRID(grid),filter_label,1,6,1,1); GtkWidget *filter=gtk_spin_button_new_with_range (0.0,100.0,1.0); - gtk_spin_button_set_value (GTK_SPIN_BUTTON(filter),FILTER_BUTTON); + gtk_spin_button_set_value (GTK_SPIN_BUTTON(filter),S4_BUTTON); gtk_widget_show(filter); gtk_grid_attach(GTK_GRID(grid),filter,2,6,1,1); GtkWidget *b_enable_noise=gtk_check_button_new_with_label("Enable Noise"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_noise), ENABLE_NOISE_BUTTON); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_noise), ENABLE_S5_BUTTON); gtk_widget_show(b_enable_noise); gtk_grid_attach(GTK_GRID(grid),b_enable_noise,0,7,1,1); @@ -219,13 +219,13 @@ void configure_gpio(GtkWidget *parent) { gtk_grid_attach(GTK_GRID(grid),noise_label,1,7,1,1); GtkWidget *noise=gtk_spin_button_new_with_range (0.0,100.0,1.0); - gtk_spin_button_set_value (GTK_SPIN_BUTTON(noise),NOISE_BUTTON); + gtk_spin_button_set_value (GTK_SPIN_BUTTON(noise),S5_BUTTON); gtk_widget_show(noise); gtk_grid_attach(GTK_GRID(grid),noise,2,7,1,1); GtkWidget *b_enable_agc=gtk_check_button_new_with_label("Enable AGC"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_agc), ENABLE_AGC_BUTTON); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_enable_agc), ENABLE_S6_BUTTON); gtk_widget_show(b_enable_agc); gtk_grid_attach(GTK_GRID(grid),b_enable_agc,0,8,1,1); @@ -234,7 +234,7 @@ void configure_gpio(GtkWidget *parent) { gtk_grid_attach(GTK_GRID(grid),agc_label,1,8,1,1); GtkWidget *agc=gtk_spin_button_new_with_range (0.0,100.0,1.0); - gtk_spin_button_set_value (GTK_SPIN_BUTTON(agc),AGC_BUTTON); + gtk_spin_button_set_value (GTK_SPIN_BUTTON(agc),S6_BUTTON); gtk_widget_show(agc); gtk_grid_attach(GTK_GRID(grid),agc,2,8,1,1); @@ -311,28 +311,30 @@ void configure_gpio(GtkWidget *parent) { VFO_ENCODER_A=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(vfo_a)); VFO_ENCODER_B=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(vfo_b)); ENABLE_VFO_PULLUP=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_vfo_pullup))?1:0; - ENABLE_AF_ENCODER=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_af_encoder))?1:0; - AF_ENCODER_A=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(af_a)); - AF_ENCODER_B=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(af_b)); - ENABLE_AF_PULLUP=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_af_pullup))?1:0; - ENABLE_RF_ENCODER=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_rf_encoder))?1:0; - RF_ENCODER_A=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rf_a)); - RF_ENCODER_B=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rf_b)); - ENABLE_RF_PULLUP=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_rf_pullup))?1:0; - ENABLE_AGC_ENCODER=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_agc_encoder))?1:0; - AGC_ENCODER_A=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(agc_a)); - AGC_ENCODER_B=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(agc_b)); - ENABLE_AGC_PULLUP=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_agc_pullup))?1:0; - ENABLE_BAND_BUTTON=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_band))?1:0; - BAND_BUTTON=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(band)); - ENABLE_MODE_BUTTON=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_mode))?1:0; - MODE_BUTTON=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(mode)); - ENABLE_FILTER_BUTTON=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_filter))?1:0; - FILTER_BUTTON=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(filter)); - ENABLE_NOISE_BUTTON=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_noise))?1:0; - NOISE_BUTTON=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(noise)); - ENABLE_AGC_BUTTON=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_agc))?1:0; - AGC_BUTTON=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(agc)); + ENABLE_E1_ENCODER=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_af_encoder))?1:0; + E1_ENCODER_A=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(af_a)); + E1_ENCODER_B=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(af_b)); + ENABLE_E1_PULLUP=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_af_pullup))?1:0; + ENABLE_E2_ENCODER=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_rf_encoder))?1:0; + E2_ENCODER_A=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rf_a)); + E2_ENCODER_B=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rf_b)); + ENABLE_E2_PULLUP=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_rf_pullup))?1:0; + ENABLE_E3_ENCODER=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_agc_encoder))?1:0; + E3_ENCODER_A=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(agc_a)); + E3_ENCODER_B=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(agc_b)); + ENABLE_E3_PULLUP=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_agc_pullup))?1:0; + ENABLE_S1_BUTTON=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_band))?1:0; + S1_BUTTON=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(band)); + ENABLE_S2_BUTTON=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_band))?1:0; + S2_BUTTON=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(band)); + ENABLE_S3_BUTTON=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_mode))?1:0; + S3_BUTTON=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(mode)); + ENABLE_S4_BUTTON=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_filter))?1:0; + S4_BUTTON=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(filter)); + ENABLE_S5_BUTTON=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_noise))?1:0; + S5_BUTTON=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(noise)); + ENABLE_S6_BUTTON=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_agc))?1:0; + S6_BUTTON=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(agc)); ENABLE_MOX_BUTTON=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_mox))?1:0; MOX_BUTTON=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(mox)); ENABLE_FUNCTION_BUTTON=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b_enable_function))?1:0; diff --git a/gpio.c b/gpio.c index f015d96..2dfa86f 100644 --- a/gpio.c +++ b/gpio.c @@ -47,42 +47,42 @@ int VFO_ENCODER_B=18; int VFO_ENCODER_A_PIN=0; int VFO_ENCODER_B_PIN=1; #endif -int ENABLE_AF_ENCODER=1; -int ENABLE_AF_PULLUP=0; -int AF_ENCODER_A=20; -int AF_ENCODER_B=26; +int ENABLE_E1_ENCODER=1; +int ENABLE_E1_PULLUP=0; +int E1_ENCODER_A=20; +int E1_ENCODER_B=26; #ifdef sx1509 -int AF_FUNCTION=25; +int E1_FUNCTION=25; #else -int AF_FUNCTION=2; //RRK, was 25 now taken by waveshare LCD TS, disable i2c +int E1_FUNCTION=2; //RRK, was 25 now taken by waveshare LCD TS, disable i2c int LOCK_BUTTON=2; //temporarily in flux upstream #endif -int ENABLE_RF_ENCODER=1; -int ENABLE_RF_PULLUP=0; -int RF_ENCODER_A=16; -int RF_ENCODER_B=19; -int RF_FUNCTION=8; -int ENABLE_AGC_ENCODER=1; -int ENABLE_AGC_PULLUP=0; -int AGC_ENCODER_A=4; -int AGC_ENCODER_B=21; +int ENABLE_E2_ENCODER=1; +int ENABLE_E2_PULLUP=0; +int E2_ENCODER_A=16; +int E2_ENCODER_B=19; +int E2_FUNCTION=8; +int ENABLE_E3_ENCODER=1; +int ENABLE_E3_PULLUP=0; +int E3_ENCODER_A=4; +int E3_ENCODER_B=21; #if defined sx1509 -int AGC_FUNCTION=7; +int E3_FUNCTION=7; #else -int AGC_FUNCTION=3; //RRK, was 7 now taken by waveshare LCD TS, disable i2c +int E3_FUNCTION=3; //RRK, was 7 now taken by waveshare LCD TS, disable i2c #endif -int ENABLE_BAND_BUTTON=1; -int BAND_BUTTON=13; -int ENABLE_BANDSTACK_BUTTON=1; -int BANDSTACK_BUTTON=12; -int ENABLE_MODE_BUTTON=1; -int MODE_BUTTON=6; -int ENABLE_FILTER_BUTTON=1; -int FILTER_BUTTON=5; -int ENABLE_NOISE_BUTTON=1; -int NOISE_BUTTON=24; -int ENABLE_AGC_BUTTON=1; -int AGC_BUTTON=23; +int ENABLE_S1_BUTTON=1; +int S1_BUTTON=13; +int ENABLE_S2_BUTTON=1; +int S2_BUTTON=12; +int ENABLE_S3_BUTTON=1; +int S3_BUTTON=6; +int ENABLE_S4_BUTTON=1; +int S4_BUTTON=5; +int ENABLE_S5_BUTTON=1; +int S5_BUTTON=24; +int ENABLE_S6_BUTTON=1; +int S6_BUTTON=23; int ENABLE_MOX_BUTTON=1; int MOX_BUTTON=27; int ENABLE_FUNCTION_BUTTON=1; @@ -110,15 +110,15 @@ SX1509 Breakout ------ Odroid ------------ Component 3 --------------------------------- S6 FN x1 (row 4) 4 --------------------------------- VFO_ENCODER_A 5 --------------------------------- VFO_ENCODER_B - 6 --------------------------------- AF_ENCODER_A - 7 --------------------------------- AF_ENCODER_B + 6 --------------------------------- E1_ENCODER_A + 7 --------------------------------- E1_ENCODER_B 8 --------------------------------- TN S2 S4 S6 (col 1) 9 --------------------------------- S1 S3 S5 FN (col 2) 10 -------------------------------- E1 E2 E3 x1 (col 3) - 11 -------------------------------- RF_ENCODER_A - 12 -------------------------------- RF_ENCODER_B - 13 -------------------------------- AGC_ENCODER_A - 14 -------------------------------- AGC_ENCODER_B + 11 -------------------------------- E2_ENCODER_A + 12 -------------------------------- E2_ENCODER_B + 13 -------------------------------- E3_ENCODER_A + 14 -------------------------------- E3_ENCODER_B 15 -------------------------------- spare_gpio Alternate to allow 5 extra buttons @@ -129,16 +129,16 @@ Alternate to allow 5 extra buttons 3 --------------------------------- S6 x3 E3 FN (row 4) 4 --------------------------------- VFO_ENCODER_A 5 --------------------------------- VFO_ENCODER_B - 6 --------------------------------- AF_ENCODER_A - 7 --------------------------------- AF_ENCODER_B + 6 --------------------------------- E1_ENCODER_A + 7 --------------------------------- E1_ENCODER_B 8 --------------------------------- TN S2 S4 S6 (col 1) 9 --------------------------------- S1 S3 S5 x3 (col 2) 10 -------------------------------- x1 E1 E2 E3 (col 3) 11 -------------------------------- x2 x4 x5 FN (col 4) - 12 -------------------------------- RF_ENCODER_A - 13 -------------------------------- RF_ENCODER_B - 14 -------------------------------- AGC_ENCODER_A - 15 -------------------------------- AGC_ENCODER_B + 12 -------------------------------- E2_ENCODER_A + 13 -------------------------------- E2_ENCODER_B + 14 -------------------------------- E3_ENCODER_A + 15 -------------------------------- E3_ENCODER_B x1-x5 (spare buttons) @@ -152,12 +152,12 @@ int SX1509_INT_PIN=0; #endif static volatile int vfoEncoderPos; -static volatile int afEncoderPos; -static volatile int afFunction; -static volatile int rfEncoderPos; -static volatile int rfFunction; -static volatile int agcEncoderPos; -static volatile int agcFunction; +static volatile int e1EncoderPos; +static volatile int e1Function; +static volatile int e2EncoderPos; +static volatile int e2Function; +static volatile int e3EncoderPos; +static volatile int e3Function; static volatile int function_state; static volatile int band_state; static volatile int bandstack_state; @@ -171,10 +171,10 @@ static volatile int lock_state; static void* rotary_encoder_thread(void *arg); static pthread_t rotary_encoder_thread_id; static int previous_function_button=0; -static int af_function=0; -static int previous_af_function=0; -static int rf_function=0; -static int previous_rf_function=0; +static int e1_function=0; +static int previous_e1_function=0; +static int e2_function=0; +static int previous_e2_function=0; static int band_button=0; static int previous_band_button=0; static int bandstack_button=0; @@ -194,18 +194,18 @@ static int previous_lock_button=0; static int running=1; -static void afFunctionAlert(int gpio, int level, uint32_t tick) { - afFunction=(level==0); +static void e1FunctionAlert(int gpio, int level, uint32_t tick) { + e1Function=(level==0); } -static void agcFunctionAlert(int gpio, int level, uint32_t tick) { +static void e3FunctionAlert(int gpio, int level, uint32_t tick) { if(level==0) { - agcFunction=agcFunction==0?1:0; + e3Function=e3Function==0?1:0; } } -static void rfFunctionAlert(int gpio, int level, uint32_t tick) { - rfFunction=(level==0); +static void e2FunctionAlert(int gpio, int level, uint32_t tick) { + e2Function=(level==0); } static void functionAlert(int gpio, int level, uint32_t tick) { @@ -272,65 +272,65 @@ static void vfoEncoderPulse(int gpio, int level, unsigned int tick) { } } -static void afEncoderPulse(int gpio, int level, uint32_t tick) +static void e1EncoderPulse(int gpio, int level, uint32_t tick) { static int levA=0, levB=0, lastGpio = -1; - if (gpio == AF_ENCODER_A) levA = level; else levB = level; + if (gpio == E1_ENCODER_A) levA = level; else levB = level; if (gpio != lastGpio) /* debounce */ { lastGpio = gpio; - if ((gpio == AF_ENCODER_A) && (level == 0)) + if ((gpio == E1_ENCODER_A) && (level == 0)) { - if (!levB) ++afEncoderPos; + if (!levB) ++e1EncoderPos; } - else if ((gpio == AF_ENCODER_B) && (level == 1)) + else if ((gpio == E1_ENCODER_B) && (level == 1)) { - if (levA) --afEncoderPos; + if (levA) --e1EncoderPos; } } } -static void rfEncoderPulse(int gpio, int level, uint32_t tick) +static void e2EncoderPulse(int gpio, int level, uint32_t tick) { static int levA=0, levB=0, lastGpio = -1; - if (gpio == RF_ENCODER_A) levA = level; else levB = level; + if (gpio == E2_ENCODER_A) levA = level; else levB = level; if (gpio != lastGpio) /* debounce */ { lastGpio = gpio; - if ((gpio == RF_ENCODER_A) && (level == 0)) + if ((gpio == E2_ENCODER_A) && (level == 0)) { - if (!levB) ++rfEncoderPos; + if (!levB) ++e2EncoderPos; } - else if ((gpio == RF_ENCODER_B) && (level == 1)) + else if ((gpio == E2_ENCODER_B) && (level == 1)) { - if (levA) --rfEncoderPos; + if (levA) --e2EncoderPos; } } } -static void agcEncoderPulse(int gpio, int level, uint32_t tick) +static void e3EncoderPulse(int gpio, int level, uint32_t tick) { static int levA=0, levB=0, lastGpio = -1; - if (gpio == AGC_ENCODER_A) levA = level; else levB = level; + if (gpio == E3_ENCODER_A) levA = level; else levB = level; if (gpio != lastGpio) /* debounce */ { lastGpio = gpio; - if ((gpio == AGC_ENCODER_A) && (level == 0)) + if ((gpio == E3_ENCODER_A) && (level == 0)) { - if (!levB) ++agcEncoderPos; + if (!levB) ++e3EncoderPos; } - else if ((gpio == AGC_ENCODER_B) && (level == 1)) + else if ((gpio == E3_ENCODER_B) && (level == 1)) { - if (levA) --agcEncoderPos; + if (levA) --e3EncoderPos; } } } @@ -344,9 +344,9 @@ static void agcEncoderPulse(int gpio, int level, uint32_t tick) // btnMap maps row/column combinations to button states: volatile int *btnArray[BTN_ROWS][BTN_COLS] = { { &mox_state, &band_state, NULL, NULL}, - { &bandstack_state, &mode_state, &afFunction, NULL}, - { &filter_state, &noise_state, &rfFunction, NULL}, - { &agc_state, NULL, &agcFunction, &function_state} + { &bandstack_state, &mode_state, &e1Function, NULL}, + { &filter_state, &noise_state, &e2Function, NULL}, + { &agc_state, NULL, &e3Function, &function_state} }; void sx1509_interrupt(void) { @@ -363,18 +363,18 @@ void sx1509_interrupt(void) { vfoEncoderPulse(VFO_ENCODER_A, SX1509_digitalRead(pSX1509, VFO_ENCODER_A), 0); if (encInterrupt & (1<