Skip to content

Commit 66c379b

Browse files
howard0suhoward0su
committed
Move elem and quickpages into Model structure
1 parent 9e18721 commit 66c379b

16 files changed

Lines changed: 101 additions & 110 deletions

‎src/config/model.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ static int layout_ini_handler(void* user, const char* section, const char* name,
408408
int max = PAGE_GetNumPages();
409409
for(i = 0; i < max; i++) {
410410
if(mapstrcasecmp(PAGE_GetName(i), value) == 0) {
411-
m->pagecfg2.quickpage[idx] = i;
411+
m->quickpage[idx] = i;
412412
return 1;
413413
}
414414
}
@@ -423,7 +423,7 @@ static int layout_ini_handler(void* user, const char* section, const char* name,
423423
};
424424
if (! MATCH_SECTION(SECTION_GUI)) {
425425
if(MATCH_SECTION("gui-320x240")
426-
&& (! ELEM_USED(Model.pagecfg2.elem[0]) || seen_res != HIRES))
426+
&& (! ELEM_USED(Model.elem[0]) || seen_res != HIRES))
427427
{
428428
seen_res = LOWRES;
429429
offset_x = (LCD_WIDTH - 320) / 2;
@@ -432,7 +432,7 @@ static int layout_ini_handler(void* user, const char* section, const char* name,
432432
return 1;
433433
} else {
434434
if (seen_res == LOWRES) {
435-
memset(&Model.pagecfg2.elem, 0, sizeof(Model.pagecfg2.elem));
435+
memset(&Model.elem, 0, sizeof(Model.elem));
436436
}
437437
seen_res = HIRES;
438438
}
@@ -441,7 +441,7 @@ static int layout_ini_handler(void* user, const char* section, const char* name,
441441
return 1;
442442
#endif
443443
for (idx = 0; idx < NUM_ELEMS; idx++) {
444-
if (Model.pagecfg2.elem[idx].type == ELEM_NONE)
444+
if (Model.elem[idx].type == ELEM_NONE)
445445
break;
446446
}
447447
if (idx == NUM_ELEMS) {
@@ -468,7 +468,7 @@ static int layout_ini_handler(void* user, const char* section, const char* name,
468468
}
469469

470470
struct elem *cur_elem;
471-
cur_elem = &Model.pagecfg2.elem[idx];
471+
cur_elem = &Model.elem[idx];
472472

473473
memset(cur_elem, 0, sizeof(struct elem));
474474
cur_elem->x = data[0];
@@ -1384,7 +1384,7 @@ u8 CONFIG_WriteModel(u8 model_num) {
13841384
}
13851385
fprintf(fh, "[%s]\n", SECTION_GUI);
13861386
for(idx = 0; idx < NUM_ELEMS; idx++) {
1387-
struct elem *cur_elem = &Model.pagecfg2.elem[idx];
1387+
struct elem *cur_elem = &Model.elem[idx];
13881388
if (cur_elem->type == ELEM_NONE)
13891389
break;
13901390
int src = cur_elem->src;
@@ -1418,8 +1418,8 @@ u8 CONFIG_WriteModel(u8 model_num) {
14181418
}
14191419
}
14201420
for(idx = 0; idx < NUM_QUICKPAGES; idx++) {
1421-
if (WRITE_FULL_MODEL || m->pagecfg2.quickpage[idx]) {
1422-
u8 val = m->pagecfg2.quickpage[idx];
1421+
if (WRITE_FULL_MODEL || m->quickpage[idx]) {
1422+
u8 val = m->quickpage[idx];
14231423
fprintf(fh, "%s%d=%s\n", GUI_QUICKPAGE, idx+1, PAGE_GetName(val));
14241424
}
14251425
}
@@ -1501,7 +1501,7 @@ u8 CONFIG_ReadModel(u8 model_num) {
15011501
if (CONFIG_IniParse(file, ini_handler, &Model)) {
15021502
printf("Failed to parse Model file: %s\n", file);
15031503
}
1504-
if (Model.pagecfg2.elem[0].type == ELEM_NONE)
1504+
if (Model.elem[0].type == ELEM_NONE)
15051505
CONFIG_ReadLayout("layout/default.ini");
15061506
if(! PROTOCOL_HasPowerAmp(Model.protocol))
15071507
Model.tx_power = TXPOWER_150mW;
@@ -1628,7 +1628,7 @@ u8 CONFIG_ReadTemplate(const char *filename) {
16281628
}
16291629

16301630
u8 CONFIG_ReadLayout(const char *filename) {
1631-
memset(&Model.pagecfg2, 0, sizeof(Model.pagecfg2));
1631+
memset(&Model.elem, 0, sizeof(Model.elem));
16321632
if (CONFIG_IniParse(filename, layout_ini_handler, &Model)) {
16331633
printf("Failed to parse Layout file: %s\n", filename);
16341634
return 0;

‎src/config/model.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ struct Model {
6565
struct Mixer mixers[NUM_MIXERS];
6666
struct Limit limits[NUM_OUT_CHANNELS];
6767
struct Timer timer[NUM_TIMERS];
68-
struct PageCfg2 pagecfg2;
68+
struct elem elem[NUM_ELEMS];
69+
u8 quickpage[NUM_QUICKPAGES];
6970
#if HAS_DATALOG
7071
struct datalog datalog;
7172
#endif

‎src/config/pagecfg.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ struct elem {
4141
//#define NUM_BAR_ELEMS 8
4242
//#define NUM_TOGGLE_ELEMS 4
4343

44-
struct PageCfg2 {
45-
struct elem elem[NUM_ELEMS];
46-
u8 quickpage[NUM_QUICKPAGES];
47-
u8 padding_1[3];
48-
};
4944

5045
enum {
5146
ELEM_NONE,

‎src/pages/128x64x1/main_config.c‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ enum {
4141
};
4242
#endif //OVERRIDE_PLACEMENT
4343
static struct layout_page * const lp = &pagemem.u.layout_page;
44-
static struct PageCfg2 * const pc = &Model.pagecfg2;
4544
static struct mainconfig_obj * const gui = &gui_objs.u.mainconfig;
4645
static u16 current_selected = 0;
4746

@@ -77,7 +76,7 @@ static const char *cfglabel_cb(guiObject_t *obj, const void *data)
7776
{
7877
(void)obj;
7978
int i = (long)data;
80-
int type = pc->elem[i].type;
79+
int type = Model.elem[i].type;
8180
int idx = elem_abs_to_rel(i);
8281
const char *str;
8382
switch(type) {
@@ -122,13 +121,13 @@ void newelem_press_cb(guiObject_t *obj, const void *data)
122121
static const char *dlgts1_cb(guiObject_t *obj, int dir, void *data)
123122
{
124123
int idx = (long)data;
125-
if (pc->elem[idx].src == 0 && dir < 0)
126-
pc->elem[idx].src = -1;
127-
if ((s8)pc->elem[idx].src == -1 && dir > 0) {
128-
pc->elem[idx].src = 0;
124+
if (Model.elem[idx].src == 0 && dir < 0)
125+
Model.elem[idx].src = -1;
126+
if ((s8)Model.elem[idx].src == -1 && dir > 0) {
127+
Model.elem[idx].src = 0;
129128
dir = 0;
130129
}
131-
if ((s8)pc->elem[idx].src < 0) {
130+
if ((s8)Model.elem[idx].src < 0) {
132131
GUI_TextSelectEnablePress((guiTextSelect_t *)obj, 1);
133132
//PAGE_MainLayoutExit();
134133
return _tr("Delete");
@@ -205,7 +204,7 @@ void show_config()
205204
{
206205
long count = 0;
207206
for (count = 0; count < NUM_ELEMS; count++) {
208-
if (pc->elem[count].type == ELEM_NONE)
207+
if (Model.elem[count].type == ELEM_NONE)
209208
break;
210209
}
211210
#if HAS_LAYOUT_EDITOR

‎src/pages/128x64x1/main_layout.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#if HAS_LAYOUT_EDITOR
2323

2424
static struct layout_page * const lp = &pagemem.u.layout_page;
25-
static struct PageCfg2 * const pc = &Model.pagecfg2;
2625
static struct mainlayout_obj * const gui = &gui_objs.u.mainlayout;
2726

2827
#define NUMERIC_LABELS

‎src/pages/128x64x1/pages.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,21 +115,21 @@ void PAGE_ChangeQuick(int dir)
115115
{
116116
int quick = 0;
117117
for (int i = 0; i < NUM_QUICKPAGES; i++) {
118-
if(Model.pagecfg2.quickpage[i] && Model.pagecfg2.quickpage[i] == cur_page) {
118+
if(Model.quickpage[i] && Model.quickpage[i] == cur_page) {
119119
quick = i + 1;
120120
break;
121121
}
122122
}
123123
int increment = dir > 0 ? 1 : NUM_QUICKPAGES;
124124
while(1) {
125125
quick = (quick + increment) % 5;
126-
if (quick == 0 || (Model.pagecfg2.quickpage[quick-1] && PAGE_IsValidQuickPage(Model.pagecfg2.quickpage[quick-1])))
126+
if (quick == 0 || (Model.quickpage[quick-1] && PAGE_IsValidQuickPage(Model.quickpage[quick-1])))
127127
break;
128128
}
129129
if (quick == 0) {
130130
PAGE_ChangeByID(PAGEID_MAIN, 0);
131131
} else {
132-
PAGE_ChangeByID(Model.pagecfg2.quickpage[quick-1], 0);
132+
PAGE_ChangeByID(Model.quickpage[quick-1], 0);
133133
}
134134
}
135135
int PAGE_QuickPage(u32 buttons, u8 flags, void *data)

‎src/pages/128x64x1/toggle_select.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ static void show_iconsel_page(int SelectedIcon) {
7777
GUI_RemoveAllObjects();
7878
memset(gui, 0, sizeof(*gui));
7979
current_toggleicon = SelectedIcon;
80-
int toggleinput = MIXER_SRC(Model.pagecfg2.elem[tp->tglidx].src);
80+
int toggleinput = MIXER_SRC(Model.elem[tp->tglidx].src);
8181

8282
//Header
8383
PAGE_ShowHeader(INPUT_SourceNameAbbrevSwitch(tempstring, toggleinput));
@@ -100,9 +100,9 @@ static void show_iconsel_page(int SelectedIcon) {
100100
GUI_CreateLabelBox(&gui->togglelabel[i], LABEL_X, row, LABEL_W, LABEL_H, SelectedIcon == i ? &inverted : &DEFAULT_FONT, NULL, NULL, tglidx[i]);
101101
#ifdef HAS_CHAR_ICONS
102102
GUI_CreateLabelBox(&gui->toggleicon[i], ICON_X, row, ICON_W, LABEL_H, &DEFAULT_FONT, TGLICO_font_cb,
103-
NULL, (void *)(long)Model.pagecfg2.elem[tp->tglidx].extra.ico[i]);
103+
NULL, (void *)(long)Model.elem[tp->tglidx].extra.ico[i]);
104104
#else
105-
struct ImageMap img = TGLICO_GetImage(Model.pagecfg2.elem[tp->tglidx].extra.ico[i]);
105+
struct ImageMap img = TGLICO_GetImage(Model.elem[tp->tglidx].extra.ico[i]);
106106
GUI_CreateImageOffset(&gui->toggleicon[i], ICON_X, row, ICON_W, LABEL_H, img.x_off, img.y_off, img.file,
107107
NULL, //SelectedIcon == 0 ? tglico_reset_cb : tglico_setpos_cb,
108108
(void *)(long)i);
@@ -121,13 +121,13 @@ static void show_iconsel_page(int SelectedIcon) {
121121
void PAGE_ToggleEditInit(int page)
122122
{
123123
tp->tglidx = page;
124-
memcpy(tp->tglicons, Model.pagecfg2.elem[tp->tglidx].extra.ico, sizeof(tp->tglicons));
124+
memcpy(tp->tglicons, Model.elem[tp->tglidx].extra.ico, sizeof(tp->tglicons));
125125
PAGE_SetActionCB(_action_cb);
126126
show_iconsel_page(0);
127127
}
128128

129129
static void navigate_toggleicons(s8 direction) {
130-
int toggleinput = MIXER_SRC(Model.pagecfg2.elem[tp->tglidx].src);
130+
int toggleinput = MIXER_SRC(Model.elem[tp->tglidx].src);
131131
int num_positions = INPUT_NumSwitchPos(toggleinput);
132132
if(num_positions < 2)
133133
num_positions = 2;

‎src/pages/320x240x16/main_layout.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
static struct mainlayout_obj * const gui = &gui_objs.u.mainlayout;
2424
static struct layout_page * const lp = &pagemem.u.layout_page;
25-
static struct PageCfg2 * const pc = &Model.pagecfg2;
2625

2726
static void draw_elements();
2827
static const char *newelem_cb(guiObject_t *obj, int dir, void *data);
@@ -319,7 +318,7 @@ void show_config()
319318
FullRedraw = draw_mode;
320319
}
321320
if(lp->selected_for_move >= 0) {
322-
type = pc->elem[lp->selected_for_move].type;
321+
type = Model.elem[lp->selected_for_move].type;
323322
row_idx = elem_abs_to_rel(lp->selected_for_move);
324323
count = elem_get_count(type);
325324
}

‎src/pages/320x240x16/pages.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ void PAGE_ChangeQuick(int dir)
239239
{
240240
int quick = 0;
241241
for (int i = 0; i < NUM_QUICKPAGES; i++) {
242-
if(Model.pagecfg2.quickpage[i] && Model.pagecfg2.quickpage[i] == cur_page) {
242+
if(Model.quickpage[i] && Model.quickpage[i] == cur_page) {
243243
quick = i+1;
244244
break;
245245
}
@@ -248,15 +248,15 @@ void PAGE_ChangeQuick(int dir)
248248
while(1) {
249249
quick = (quick + increment) % 5;
250250
if (quick == 0
251-
|| (Model.pagecfg2.quickpage[quick-1] && PAGE_IsValidQuickPage(Model.pagecfg2.quickpage[quick-1])))
251+
|| (Model.quickpage[quick-1] && PAGE_IsValidQuickPage(Model.quickpage[quick-1])))
252252
{
253253
break;
254254
}
255255
}
256256
if (quick == 0) {
257257
PAGE_ChangeByID(PAGEID_MAIN, 0);
258258
} else {
259-
PAGE_ChangeByID(Model.pagecfg2.quickpage[quick-1], 0);
259+
PAGE_ChangeByID(Model.quickpage[quick-1], 0);
260260
}
261261
}
262262

@@ -266,7 +266,7 @@ int PAGE_QuickPage(u32 buttons, u8 flags, void *data)
266266
(void)flags;
267267
int i;
268268
for(i = 0; i < NUM_QUICKPAGES; i++)
269-
if(Model.pagecfg2.quickpage[i])
269+
if(Model.quickpage[i])
270270
break;
271271
if(i == NUM_QUICKPAGES)
272272
return 0;

‎src/pages/320x240x16/toggle_select.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ static void show_icons(int SelectedIcon, int idx)
3434
{
3535
int x, y;
3636
struct ImageMap img;
37-
u8 cursel = Model.pagecfg2.elem[tp->tglidx].extra.ico[SelectedIcon];
37+
u8 cursel = Model.elem[tp->tglidx].extra.ico[SelectedIcon];
3838

3939
for(int i = 0; i < NUM_SYMBOL_ELEMS; i++) {
4040
y = 80 + (i / NUM_SYMBOL_COLS) * 40;
@@ -89,7 +89,7 @@ static const char * revert_str_cb(guiObject_t *obj, const void *data)
8989
static void show_iconsel_page(int SelectedIcon)
9090
{
9191
struct ImageMap img;
92-
int toggleinput = MIXER_SRC(Model.pagecfg2.elem[tp->tglidx].src);
92+
int toggleinput = MIXER_SRC(Model.elem[tp->tglidx].src);
9393
PAGE_RemoveAllObjects();
9494
PAGE_ShowHeader(INPUT_SourceNameAbbrevSwitch(tempstring, toggleinput));
9595
GUI_CreateButton(&gui->revert, LCD_WIDTH-96-8, 4, BUTTON_96, revert_str_cb, revert_cb, NULL);
@@ -107,24 +107,24 @@ static void show_iconsel_page(int SelectedIcon)
107107
GUI_CreateRect(&gui->toggleframe, 80+80*SelectedIcon, 39, 77, 33, &outline);
108108

109109
GUI_CreateLabelBox(&gui->switchbox, 4, 47, 70, 22, &NORMALBOX_FONT, NULL, NULL,
110-
INPUT_SourceNameAbbrevSwitch(tempstring, Model.pagecfg2.elem[tp->tglidx].src));
110+
INPUT_SourceNameAbbrevSwitch(tempstring, Model.elem[tp->tglidx].src));
111111

112112
int num_positions = INPUT_NumSwitchPos(toggleinput);
113113
if(num_positions < 2)
114114
num_positions = 2;
115115

116116
GUI_CreateLabelBox(&gui->togglelabel[0], 94, 50, 30, 14, &LABEL_FONT, GUI_Localize, NULL, _tr_noop("Pos 0"));
117-
img = TGLICO_GetImage(Model.pagecfg2.elem[tp->tglidx].extra.ico[0]);
117+
img = TGLICO_GetImage(Model.elem[tp->tglidx].extra.ico[0]);
118118
GUI_CreateImageOffset(&gui->toggleicon[0], 124, 40, TOGGLEICON_WIDTH, TOGGLEICON_HEIGHT, img.x_off, img.y_off, img.file,
119119
SelectedIcon == 0 ? tglico_reset_cb : tglico_setpos_cb, (void *)0L);
120120

121121
GUI_CreateLabelBox(&gui->togglelabel[1], 174, 50, 30, 14, &LABEL_FONT, GUI_Localize, NULL, _tr_noop("Pos 1"));
122-
img = TGLICO_GetImage(Model.pagecfg2.elem[tp->tglidx].extra.ico[1]);
122+
img = TGLICO_GetImage(Model.elem[tp->tglidx].extra.ico[1]);
123123
GUI_CreateImageOffset(&gui->toggleicon[1], 204, 40, TOGGLEICON_WIDTH, TOGGLEICON_HEIGHT, img.x_off, img.y_off, img.file,
124124
SelectedIcon == 1 ? tglico_reset_cb : tglico_setpos_cb, (void *)1L);
125125
if (num_positions == 3) {
126126
GUI_CreateLabelBox(&gui->togglelabel[2], 254, 50, 30, 14, &LABEL_FONT, GUI_Localize, NULL, _tr_noop("Pos 2"));
127-
img = TGLICO_GetImage(Model.pagecfg2.elem[tp->tglidx].extra.ico[2]);
127+
img = TGLICO_GetImage(Model.elem[tp->tglidx].extra.ico[2]);
128128
GUI_CreateImageOffset(&gui->toggleicon[2], 284, 40, TOGGLEICON_WIDTH, TOGGLEICON_HEIGHT, img.x_off, img.y_off, img.file,
129129
SelectedIcon == 2 ? tglico_reset_cb : tglico_setpos_cb, (void *)2L);
130130
}
@@ -137,7 +137,7 @@ static void show_iconsel_page(int SelectedIcon)
137137

138138
void PAGE_ToggleEditInit(int page) {
139139
tp->tglidx = page;
140-
memcpy(tp->tglicons, Model.pagecfg2.elem[tp->tglidx].extra.ico, sizeof(tp->tglicons));
140+
memcpy(tp->tglicons, Model.elem[tp->tglidx].extra.ico, sizeof(tp->tglicons));
141141
show_iconsel_page(0);
142142
}
143143

0 commit comments

Comments
 (0)