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

freq correct unit fix #1029

Merged
merged 2 commits into from
May 21, 2023
Merged

freq correct unit fix #1029

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
ec4b30c
fix units for frequency offset. It was planned to be a uint32_t since…
May 21, 2023
0f0ce98
took the uint32_t limitation for frequency offset in account
May 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions firmware/application/apps/ui_settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,8 @@ SetFrequencyCorrectionView::SetFrequencyCorrectionView(NavigationView& nav) {
button_freq_rx_correction.on_select = [this, &nav](Button& button) {
auto new_view = nav.push<FrequencyKeypadView>(portapack::persistent_memory::config_converter_freq());
new_view->on_changed = [this, &button](rf::Frequency f) {
if (f > 4000000)
f = 4000000;
if (f >= MAX_FREQ_CORRECTION)
f = MAX_FREQ_CORRECTION;
portapack::persistent_memory::set_config_freq_rx_correction(f);
// Retune to take converter change in account
receiver_model.set_tuning_frequency(portapack::persistent_memory::tuned_frequency());
Expand All @@ -411,8 +411,8 @@ SetFrequencyCorrectionView::SetFrequencyCorrectionView(NavigationView& nav) {
button_freq_tx_correction.on_select = [this, &nav](Button& button) {
auto new_view = nav.push<FrequencyKeypadView>(portapack::persistent_memory::config_converter_freq());
new_view->on_changed = [this, &button](rf::Frequency f) {
if (f > 4000000)
f = 4000000;
if (f >= MAX_FREQ_CORRECTION)
f = MAX_FREQ_CORRECTION;
portapack::persistent_memory::set_config_freq_tx_correction(f);
// Retune to take converter change in account
receiver_model.set_tuning_frequency(portapack::persistent_memory::tuned_frequency());
Expand Down
2 changes: 2 additions & 0 deletions firmware/application/apps/ui_settings.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@

namespace ui {

#define MAX_FREQ_CORRECTION 4294967295 // maximum possible for an uint32_t

struct SetDateTimeModel {
uint16_t year;
uint8_t month;
Expand Down
12 changes: 6 additions & 6 deletions firmware/common/portapack_persistent_memory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,9 @@ struct data_t {
int64_t converter_frequency_offset;

// frequency correction
int16_t frequency_rx_correction;
uint32_t frequency_rx_correction;
bool updown_frequency_rx_correction;
int16_t frequency_tx_correction;
uint32_t frequency_tx_correction;
bool updown_frequency_tx_correction;

constexpr data_t()
Expand Down Expand Up @@ -795,16 +795,16 @@ bool config_freq_rx_correction_updown() {
void set_freq_rx_correction_updown(bool v) {
data->updown_frequency_rx_correction = v;
}
int16_t config_freq_tx_correction() {
uint32_t config_freq_tx_correction() {
return data->frequency_tx_correction;
}
int16_t config_freq_rx_correction() {
uint32_t config_freq_rx_correction() {
return data->frequency_rx_correction;
}
void set_config_freq_tx_correction(uint16_t v) {
void set_config_freq_tx_correction(uint32_t v) {
data->frequency_tx_correction = v;
}
void set_config_freq_rx_correction(uint16_t v) {
void set_config_freq_rx_correction(uint32_t v) {
data->frequency_rx_correction = v;
}

Expand Down
8 changes: 4 additions & 4 deletions firmware/common/portapack_persistent_memory.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,10 @@ bool config_freq_tx_correction_updown();
void set_freq_tx_correction_updown(bool v);
bool config_freq_rx_correction_updown();
void set_freq_rx_correction_updown(bool v);
int16_t config_freq_tx_correction();
int16_t config_freq_rx_correction();
void set_config_freq_tx_correction(uint16_t v);
void set_config_freq_rx_correction(uint16_t v);
uint32_t config_freq_tx_correction();
uint32_t config_freq_rx_correction();
void set_config_freq_tx_correction(uint32_t v);
void set_config_freq_rx_correction(uint32_t v);
void set_clock_hidden(bool v);
void set_clock_with_date(bool v);
void set_config_login(bool v);
Expand Down