fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: replace pow with multiplication in frequency input

This commit is contained in:
Federico Amedeo Izzo 2020-12-31 13:51:27 +01:00
parent 13a8ff9e40
commit fc38fe8ed4
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
openrtx/src/ui.c
View File

@ -65,7 +65,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <math.h>
#include <ui.h> #include <ui.h>
#include <interfaces/rtx.h> #include <interfaces/rtx.h>
#include <interfaces/delays.h> #include <interfaces/delays.h>
@ -548,6 +547,16 @@ bool _kbd_number_pressed(kbd_msg_t msg)
return msg.keys & kbd_num_mask; return msg.keys & kbd_num_mask;
} }
freq_t _ui_freq_add_digit(freq_t freq, uint8_t pos, uint8_t number)
{
freq_t coefficient = 10;
for(uint8_t i=0; i < FREQ_DIGITS - pos; i++)
{
coefficient *= 10;
}
return freq += number * coefficient;
}
void ui_updateFSM(event_t event, bool *sync_rtx) void ui_updateFSM(event_t event, bool *sync_rtx)
{ {
// Check if battery has enough charge to operate // Check if battery has enough charge to operate
@ -598,8 +607,7 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
// Save pressed number to calculare frequency and show in GUI // Save pressed number to calculare frequency and show in GUI
input_number = input_getPressedNumber(msg); input_number = input_getPressedNumber(msg);
// Calculate portion of the new frequency // Calculate portion of the new frequency
new_rx_frequency = input_number * new_rx_frequency = _ui_freq_add_digit(new_rx_frequency, input_position, input_number);
pow(10,(FREQ_DIGITS - input_position + 1));
new_tx_frequency = 0; new_tx_frequency = 0;
} }
break; break;
@ -656,8 +664,7 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
if(input_position == 1) if(input_position == 1)
new_rx_frequency = 0; new_rx_frequency = 0;
// Calculate portion of the new RX frequency // Calculate portion of the new RX frequency
new_rx_frequency += input_number * new_rx_frequency = _ui_freq_add_digit(new_rx_frequency, input_position, input_number);
pow(10,(FREQ_DIGITS - input_position + 1));
if(input_position >= (FREQ_DIGITS)) if(input_position >= (FREQ_DIGITS))
{ {
// Switch to TX input // Switch to TX input
@ -673,8 +680,7 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
if(input_position == 1) if(input_position == 1)
new_tx_frequency = 0; new_tx_frequency = 0;
// Calculate portion of the new TX frequency // Calculate portion of the new TX frequency
new_tx_frequency += input_number * new_tx_frequency = _ui_freq_add_digit(new_tx_frequency, input_position, input_number);
pow(10,(FREQ_DIGITS - input_position + 1));
if(input_position >= (FREQ_DIGITS)) if(input_position >= (FREQ_DIGITS))
{ {
// Save both inserted frequencies // Save both inserted frequencies