Skip to content

Commit 666823d

Browse files
author
ScrapComputing
committed
Fix bug that would not write preset frequency tuning to flash
Thanks @IgorGIV13 for bug reporting and testing!
1 parent 0010584 commit 666823d

2 files changed

Lines changed: 7 additions & 29 deletions

File tree

firmware/src/CommonLogic.cpp

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,18 @@
66
void CommonLogic::setMode(Mode NewMode) {
77
setModeInit(NewMode);
88

9-
BeforeMaxMHz = Presets.getMaxMHz();
10-
BeforePeriod = Presets.getPeriod();
11-
BeforeActualKHz = Presets.getActualKHz();
12-
BeforeDeleted = Presets.isDeleted();
13-
149
CurrMode = NewMode;
1510
DBG_PRINT(std::cout << getModeStr(CurrMode) << "\n";)
1611
}
1712

1813
void CommonLogic::tryWritePresetsToFlash() {
19-
if (Presets.getActualKHz() != BeforeActualKHz ||
20-
Presets.getPeriod() != BeforePeriod ||
21-
Presets.getMaxMHz() != BeforeMaxMHz ||
22-
Presets.isDeleted() != BeforeDeleted) {
23-
DBG_PRINT(std::cout << "WriteToFlash:\n";)
24-
DBG_PRINT(std::cout << " Before After\n";)
25-
DBG_PRINT(std::cout << "ActualKHz: " << BeforeActualKHz << " "
26-
<< Presets.getActualKHz() << "\n";)
27-
DBG_PRINT(std::cout << "Period: " << BeforePeriod << " "
28-
<< Presets.getPeriod() << "\n";)
29-
DBG_PRINT(std::cout << "MaxMHz: " << BeforeMaxMHz << " "
30-
<< Presets.getMaxMHz() << "\n";)
31-
DBG_PRINT(std::cout << "Deleted: " << BeforeDeleted << " "
32-
<< Presets.isDeleted() << "\n";)
33-
Presets.writeToFlash(Flash);
34-
} else {
35-
DBG_PRINT(
36-
std::cout << "Not writing to flash (no change in KHz/Period/MaxMHz)\n";)
37-
}
14+
DBG_PRINT(std::cout << "WriteToFlash:\n";)
15+
DBG_PRINT(std::cout << " Before After\n";)
16+
DBG_PRINT(std::cout << "ActualKHz: " << Presets.getActualKHz() << "\n";)
17+
DBG_PRINT(std::cout << "Period: " << Presets.getPeriod() << "\n";)
18+
DBG_PRINT(std::cout << "MaxMHz: " << Presets.getMaxMHz() << "\n";)
19+
DBG_PRINT(std::cout << "Deleted: " << Presets.isDeleted() << "\n";)
20+
Presets.writeToFlash(Flash);
3821
}
3922

4023
void CommonLogic::printTxtAndSleep(const char *Str) {

firmware/src/CommonLogic.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,6 @@ class CommonLogic {
7979
static constexpr const char *MsgNo = " no";
8080

8181
protected:
82-
int BeforeMaxMHz = 0;
83-
int BeforeActualKHz = 0;
84-
int BeforePeriod = 0;
85-
bool BeforeDeleted = false;
86-
8782
std::vector<Button</*OffVal=*/true, ButtonDebounceSz, ButtonLongPressCnt,
8883
ButtonMedReleaseCnt>>
8984
PresetBtns;

0 commit comments

Comments
 (0)