Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-14 05:38:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

Expand 'mod' to 'modulation' in all instances for consistency

Browse Source
This commit is contained in:
ALEEF02
2023-07-24 18:38:32 -04:00
parent eed85f019c
commit dbb1ab8693
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
applications/external/spectrum_analyzer/spectrum_analyzer.c vendored
View File

@@ -12,7 +12,7 @@
typedef struct { typedef struct {
uint32_t center_freq; uint32_t center_freq;
uint8_t width; uint8_t width;
uint8_t mod; uint8_t modulation;
uint8_t band; uint8_t band;
uint8_t vscroll; uint8_t vscroll;
@@ -152,8 +152,8 @@ static void spectrum_analyzer_render_callback(Canvas* const canvas, void* ctx) {
if(model->mod_change) { if(model->mod_change) {
char temp_mod_str[12]; char temp_mod_str[12];
switch(model->mod) { switch(model->modulation) {
case NARROW_MOD: case NARROW_MODULATION:
strncpy(temp_mod_str, "NARROW", 12); strncpy(temp_mod_str, "NARROW", 12);
break; break;
default: default:
@@ -396,7 +396,7 @@ SpectrumAnalyzer* spectrum_analyzer_alloc() {
model->center_freq = DEFAULT_FREQ; model->center_freq = DEFAULT_FREQ;
model->width = WIDE; model->width = WIDE;
model->mod = DEFAULT_MOD; model->modulation = DEFAULT_MODULATION;
model->band = BAND_400; model->band = BAND_400;
model->vscroll = DEFAULT_VSCROLL; model->vscroll = DEFAULT_VSCROLL;
@@ -560,13 +560,13 @@ int32_t spectrum_analyzer_app(void* p) {
switch(input.key) { switch(input.key) {
case InputKeyOk: case InputKeyOk:
FURI_LOG_D("Spectrum", "InputTypeLong"); FURI_LOG_D("Spectrum", "InputTypeLong");
switch(model->mod) { switch(model->modulation) {
case NARROW_MOD: case NARROW_MODULATION:
model->mod = DEFAULT_MOD; model->modulation = DEFAULT_MODULATION;
break; break;
case DEFAULT_MOD: case DEFAULT_MODULATION:
default: default:
model->mod = NARROW_MOD; model->modulation = NARROW_MODULATION;
break; break;
} }
@@ -578,7 +578,7 @@ int32_t spectrum_analyzer_app(void* p) {
model->mod_change = false; model->mod_change = false;
spectrum_analyzer_worker_set_modulation( spectrum_analyzer_worker_set_modulation(
spectrum_analyzer->worker, spectrum_analyzer->worker,
spectrum_analyzer->model->mod); spectrum_analyzer->model->modulation);
break; break;
} }
break; break;

4
applications/external/spectrum_analyzer/spectrum_analyzer.h vendored
View File

@@ -80,5 +80,5 @@
#define LOWER(a, b, c) ((((a) + (b)) / (c)) * (c)) #define LOWER(a, b, c) ((((a) + (b)) / (c)) * (c))
/* Modulation references */ /* Modulation references */
#define DEFAULT_MOD 0 #define DEFAULT_MODULATION 0
#define NARROW_MOD 1 #define NARROW_MODULATION 1