From 2cc54f49c8686585c274fbf6437c3b90aba21b12 Mon Sep 17 00:00:00 2001 From: erikkaashoek Date: Fri, 24 Jul 2020 17:17:26 +0200 Subject: [PATCH] Shift keypad enum;s closer to keypad table to reduce chance of errors --- ui_sa.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ui_sa.c b/ui_sa.c index efe6014..6ba6e08 100644 --- a/ui_sa.c +++ b/ui_sa.c @@ -211,13 +211,6 @@ const uint8_t right_icons [] = _BMP16(0b0000000000000000), }; -enum { - KM_START, KM_STOP, KM_CENTER, KM_SPAN, KM_CW, KM_REFLEVEL, KM_SCALE, KM_ATTENUATION, - KM_ACTUALPOWER, KM_IF, KM_SAMPLETIME, KM_DRIVE, KM_LOWOUTLEVEL, KM_DECAY, KM_NOISE, - KM_10MHZ, KM_REPEAT, KM_OFFSET, KM_TRIGGER, KM_LEVELSWEEP, KM_SWEEP_TIME, KM_OFFSET_DELAY, KM_FAST_SPEEDUP, - KM_NONE // always at enum end -}; - #define KP_X(x) (48*(x) + 2 + (LCD_WIDTH-BUTTON_WIDTH-192)) @@ -407,6 +400,13 @@ static const keypads_t keypads_time[] = { { 0, 0, -1 } }; +enum { + KM_START, KM_STOP, KM_CENTER, KM_SPAN, KM_CW, KM_REFLEVEL, KM_SCALE, KM_ATTENUATION, + KM_ACTUALPOWER, KM_IF, KM_SAMPLETIME, KM_DRIVE, KM_LOWOUTLEVEL, KM_DECAY, KM_NOISE, + KM_10MHZ, KM_REPEAT, KM_OFFSET, KM_TRIGGER, KM_LEVELSWEEP, KM_SWEEP_TIME, KM_OFFSET_DELAY, KM_FAST_SPEEDUP, + KM_NONE // always at enum end +}; + static const struct { const keypads_t *keypad_type; char * name;