Mercurial > public > ostc4
changeset 507:5e3b830b955f
Added new menu tab into call structure
| author | Ideenmodellierer |
|---|---|
| date | Sun, 30 Aug 2020 17:20:16 +0200 |
| parents | 998529b3e142 |
| children | 21bf40bb8151 |
| files | Discovery/Src/tMenu.c |
| diffstat | 1 files changed, 18 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Discovery/Src/tMenu.c Sun Aug 30 17:19:23 2020 +0200 +++ b/Discovery/Src/tMenu.c Sun Aug 30 17:20:16 2020 +0200 @@ -41,12 +41,14 @@ #include "tMenuEditSetpoint.h" #include "tMenuEditSystem.h" #include "tMenuEditXtra.h" +#include "tMenuEditCustom.h" #include "tMenuGas.h" #include "tMenuHardware.h" #include "tMenuPlanner.h" #include "tMenuSetpoint.h" #include "tMenuSystem.h" #include "tMenuXtra.h" +#include "tMenuCustom.h" /* Private types -------------------------------------------------------------*/ #define MAXPAGES 10 @@ -492,6 +494,7 @@ { tM_add(StMDECO); tM_add(StMHARD); + tM_add(StMCustom); // tM_add(StMSYS); now in both modes } else @@ -542,6 +545,9 @@ id = tMSystem_refresh(0, text, &tabPosition, subtext); tM_build_page(id, text, tabPosition, subtext); + + id = tMCustom_refresh(0, text, &tabPosition, subtext); + tM_build_page(id, text, tabPosition, subtext); } @@ -698,6 +704,11 @@ update_content_actual_page(text, tabPosition, subtext); } break; + case StMCustom: + tMCustom_refresh(line, text, &tabPosition, subtext); + clean_line_actual_page(); + update_content_actual_page(text, tabPosition, subtext); + break; default: break; } @@ -936,6 +947,9 @@ case StMSYS: openEdit_System(line); break; + case StMCustom: + openEdit_Custom(line); + break; default: break; } @@ -1139,8 +1153,8 @@ "", "SYS", "", - "SIM", - "" + "", + "SIM" }; const _Bool spacing[MAXPAGES+1] = @@ -1152,7 +1166,8 @@ 0, // behind DECO1 1, // behind DECO2 0, // behind SYS1 - 1, // behind SYS2 + 0, // behind SYS2 + 1, // behind SYS3 1, // behind SIM 0 };