Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Encoder Sensitivity and Scanner can now store to a preset #91

Merged
merged 2 commits into from
Sep 29, 2024
Merged

Encoder Sensitivity and Scanner can now store to a preset #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72e6f01
Can now set encoder resolution. Suits encoders with twice as many pul…
penfold42 Sep 25, 2024
480d116
Scanner can now store a preset
penfold42 Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 27 additions & 10 deletions ui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,21 @@ void ui::setup_encoder()
gpio_set_function(PIN_AB+1, GPIO_FUNC_PIO1);
uint offset = pio_add_program(pio, &quadrature_encoder_program);
quadrature_encoder_program_init(pio, sm, offset, PIN_AB, 1000);
new_position = (quadrature_encoder_get_count(pio, sm) + 2)/4;
if ((settings[idx_hw_setup] >> flag_encoder_res) & 1) {
new_position = -((quadrature_encoder_get_count(pio, sm) + 1)/2);
} else {
new_position = -((quadrature_encoder_get_count(pio, sm) + 2)/4);
}
old_position = new_position;
}

int32_t ui::get_encoder_change()
{
new_position = -((quadrature_encoder_get_count(pio, sm) + 2)/4);
if ((settings[idx_hw_setup] >> flag_encoder_res) & 1) {
new_position = -((quadrature_encoder_get_count(pio, sm) + 1)/2);
} else {
new_position = -((quadrature_encoder_get_count(pio, sm) + 2)/4);
}
int32_t delta = new_position - old_position;
old_position = new_position;
if((settings[idx_hw_setup] >> flag_reverse_encoder) & 1)
Expand Down Expand Up @@ -2169,7 +2177,7 @@ bool ui::configuration_menu()
break;
}

if(!menu_entry("HW Config", "Display\nTimeout#Regulator\nMode#Reverse\nEncoder#Swap IQ#Gain Cal#Flip OLED#OLED Type#Display\nContrast#USB\nUpload#", &setting)) return 1;
if(!menu_entry("HW Config", "Display\nTimeout#Regulator\nMode#Reverse\nEncoder#Encoder\nResolution#Swap IQ#Gain Cal#Flip OLED#OLED Type#Display\nContrast#USB\nUpload#", &setting)) return 1;
switch(setting)
{
case 0:
Expand All @@ -2192,25 +2200,29 @@ bool ui::configuration_menu()
rx_settings_changed |= bit_entry("Reverse\nEncoder", "Off#On#", flag_reverse_encoder, &settings[idx_hw_setup]);
break;

case 3 :
rx_settings_changed |= bit_entry("Swap IQ", "Off#On#", flag_swap_iq, &settings[idx_hw_setup]);
case 3:
rx_settings_changed |= bit_entry("Encoder\nResolution", "Low#High#", flag_encoder_res, &settings[idx_hw_setup]);
break;

case 4:
rx_settings_changed |= number_entry("Gain Cal", "%idB", 1, 100, 1, &settings[idx_gain_cal]);
rx_settings_changed |= bit_entry("Swap IQ", "Off#On#", flag_swap_iq, &settings[idx_hw_setup]);
break;

case 5:
rx_settings_changed |= number_entry("Gain Cal", "%idB", 1, 100, 1, &settings[idx_gain_cal]);
break;

case 6:
rx_settings_changed |= bit_entry("Flip OLED", "Off#On#", flag_flip_oled, &settings[idx_hw_setup]);
ssd1306_flip(&disp, (settings[idx_hw_setup] >> flag_flip_oled) & 1);
break;

case 6:
case 7:
rx_settings_changed |= bit_entry("OLED Type", "SSD1306#SH1106#", flag_oled_type, &settings[idx_hw_setup]);
ssd1306_type(&disp, (settings[idx_hw_setup] >> flag_oled_type) & 1);
break;

case 7:
case 8:
{
uint32_t val = 0xf^(settings[idx_hw_setup] & mask_display_contrast) >> flag_display_contrast;
rx_settings_changed |= number_entry("Display\nContrast", "%i", 0, 15, 1, &val);
Expand All @@ -2220,7 +2232,7 @@ bool ui::configuration_menu()
}
break;

case 8:
case 9:
setting = 0;
enumerate_entry("USB Upload", "Back#Memory#Firmware#", &setting);
if(setting==1) {
Expand Down Expand Up @@ -2251,7 +2263,7 @@ bool ui::scanner_radio_menu()
if(ev.tag == ev_button_back_press){
break;
}
if(!menu_entry("Radio Menu", "Volume#Mode#AGC Speed#Bandwidth#Squelch#Auto Notch#De-emph.#Frequency\nStep#", &setting))
if(!menu_entry("Radio Menu", "Volume#Mode#AGC Speed#Bandwidth#Squelch#Auto Notch#De-emph.#Frequency\nStep#Store#", &setting))
return rx_settings_changed;

switch(setting)
Expand Down Expand Up @@ -2294,6 +2306,11 @@ bool ui::scanner_radio_menu()
rx_settings_changed |= enumerate_entry("Frequency\nStep", "10Hz#50Hz#100Hz#1kHz#5kHz#9kHz#10kHz#12.5kHz#25kHz#50kHz#100kHz#", &settings[idx_step]);
settings[idx_frequency] -= settings[idx_frequency]%step_sizes[settings[idx_step]];
break;

case 8 :
memory_store();
break;

}
}
return rx_settings_changed;
Expand Down
3 changes: 2 additions & 1 deletion ui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ const uint8_t PIN_DISPLAY_SCL = 19;
#define mask_display_timeout (0x7 << flag_display_timeout)
#define flag_display_contrast 7 // bits 7-10 stored ^0xf so 0000 is full bright
#define mask_display_contrast (0xf << flag_display_contrast)
// #define flag_nextfree 11
#define flag_encoder_res 11
// #define flag_nextfree 12
// 32bit number, 31 is last flag bit

//flags for receiver features idx_rx_features
Expand Down