BRNSystems/brnQuanFW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

struct padding fixed in spectrum

Browse Source
This commit is contained in:
Krzysiek Egzmont
2023-10-04 22:29:26 +02:00
parent 654145bd07
commit 292181a9a6
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/spectrum.c
View File

@@ -62,17 +62,17 @@ const char *modulationTypeOptions[] = {" FM", " AM", "USB"};
const uint8_t modulationTypeTuneSteps[] = {100, 50, 10}; const uint8_t modulationTypeTuneSteps[] = {100, 50, 10};
const uint8_t modTypeReg47Values[] = {1, 7, 5}; const uint8_t modTypeReg47Values[] = {1, 7, 5};
SpectrumSettings settings = {STEPS_64, SpectrumSettings settings = {stepsCount: STEPS_64,
S_STEP_25_0kHz, scanStepIndex: S_STEP_25_0kHz,
80000, frequencyChangeStep: 80000,
3200, scanDelay: 3200,
150, rssiTriggerLevel: 150,
true, backlightState: true,
BK4819_FILTER_BW_WIDE, bw: BK4819_FILTER_BW_WIDE,
BK4819_FILTER_BW_WIDE, listenBw: BK4819_FILTER_BW_WIDE,
false, modulationType: false,
-130, dbMin: -130,
-50}; dbMax: -50};
uint32_t fMeasure = 0; uint32_t fMeasure = 0;
uint32_t currentFreq, tempFreq; uint32_t currentFreq, tempFreq;

14
app/spectrum.h
View File

@@ -122,18 +122,21 @@ typedef enum ScanStep {
} ScanStep; } ScanStep;
typedef struct SpectrumSettings { typedef struct SpectrumSettings {
uint32_t frequencyChangeStep;
StepsCount stepsCount; StepsCount stepsCount;
ScanStep scanStepIndex; ScanStep scanStepIndex;
uint32_t frequencyChangeStep;
uint16_t scanDelay; uint16_t scanDelay;
uint16_t rssiTriggerLevel; uint16_t rssiTriggerLevel;
bool backlightState;
BK4819_FilterBandwidth_t bw; BK4819_FilterBandwidth_t bw;
BK4819_FilterBandwidth_t listenBw; BK4819_FilterBandwidth_t listenBw;
ModulationType modulationType;
int dbMin; int dbMin;
int dbMax; int dbMax;
ModulationType modulationType;
bool backlightState;
uint8_t _pad[2];
} SpectrumSettings; } SpectrumSettings;
typedef struct KeyboardState { typedef struct KeyboardState {
@@ -148,6 +151,7 @@ typedef struct ScanInfo {
uint32_t f, fPeak; uint32_t f, fPeak;
uint16_t scanStep; uint16_t scanStep;
uint8_t measurementsCount; uint8_t measurementsCount;
uint8_t _pad[1];
} ScanInfo; } ScanInfo;
typedef struct RegisterSpec { typedef struct RegisterSpec {
@@ -156,13 +160,15 @@ typedef struct RegisterSpec {
uint8_t offset; uint8_t offset;
uint16_t maxValue; uint16_t maxValue;
uint16_t inc; uint16_t inc;
uint8_t _pad[2];
} RegisterSpec; } RegisterSpec;
typedef struct PeakInfo { typedef struct PeakInfo {
uint16_t t; uint16_t t;
uint16_t rssi; uint16_t rssi;
uint8_t i;
uint32_t f; uint32_t f;
uint8_t i;
uint8_t _pad[3];
} PeakInfo; } PeakInfo;
void APP_RunSpectrum(void); void APP_RunSpectrum(void);