Mercurial > public > ostc4
annotate Discovery/Src/tMenu.c @ 881:5b675077ccfb Evo_2_23
Added filtering of ascent speed:
In the previous version the ascent speed was simply calculated based of the last measured pressure values. This may lead to unexpected colorchanges of the depth value. To smooth this behavior a filter has been added which evaluates if a movment direction is valid for a certain period of time. If the condition direction is stable then the ascend speed is provided.
| author | Ideenmodellierer |
|---|---|
| date | Sat, 31 Aug 2024 17:28:37 +0200 |
| parents | af035b883382 |
| children |
| rev | line source |
|---|---|
| 38 | 1 /////////////////////////////////////////////////////////////////////////////// |
| 2 /// -*- coding: UTF-8 -*- | |
| 3 /// | |
| 4 /// \file Discovery/Src/tMenu.c | |
| 5 /// \brief Major menu with extra page 0 for edit functionality since V0.0.2 | |
| 6 /// \author heinrichs weikamp gmbh | |
| 7 /// \date 30-April-2014 | |
| 8 /// | |
| 9 /// \details | |
| 10 /// | |
| 11 /// $Id$ | |
| 12 /////////////////////////////////////////////////////////////////////////////// | |
| 13 /// \par Copyright (c) 2014-2018 Heinrichs Weikamp gmbh | |
| 14 /// | |
| 15 /// This program is free software: you can redistribute it and/or modify | |
| 16 /// it under the terms of the GNU General Public License as published by | |
| 17 /// the Free Software Foundation, either version 3 of the License, or | |
| 18 /// (at your option) any later version. | |
| 19 /// | |
| 20 /// This program is distributed in the hope that it will be useful, | |
| 21 /// but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 22 /// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 23 /// GNU General Public License for more details. | |
| 24 /// | |
| 25 /// You should have received a copy of the GNU General Public License | |
| 26 /// along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 27 ////////////////////////////////////////////////////////////////////////////// | |
| 28 | |
| 29 /* Includes ------------------------------------------------------------------*/ | |
| 30 #include "tMenu.h" | |
| 31 | |
| 32 #include "gfx_fonts.h" | |
| 33 #include "tHome.h" | |
| 34 #include "tMenuDeco.h" | |
| 35 #include "tMenuDecoParameter.h" | |
| 36 #include "tMenuEditDeco.h" | |
| 37 #include "tMenuEditDecoParameter.h" | |
| 38 #include "tMenuEditGasOC.h" | |
| 39 #include "tMenuEditHardware.h" | |
| 40 #include "tMenuEditPlanner.h" | |
| 41 #include "tMenuEditSetpoint.h" | |
| 42 #include "tMenuEditSystem.h" | |
| 43 #include "tMenuEditXtra.h" | |
| 507 | 44 #include "tMenuEditCustom.h" |
| 38 | 45 #include "tMenuGas.h" |
| 46 #include "tMenuHardware.h" | |
| 47 #include "tMenuPlanner.h" | |
| 48 #include "tMenuSetpoint.h" | |
| 49 #include "tMenuSystem.h" | |
| 50 #include "tMenuXtra.h" | |
| 507 | 51 #include "tMenuCustom.h" |
| 38 | 52 |
| 53 /* Private types -------------------------------------------------------------*/ | |
|
521
e221cf762f45
Move Bigfont and motion Ctrl selection menu out of custom view submenu:
Ideenmodellierer
parents:
507
diff
changeset
|
54 #define MAXPAGES 11 |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
55 #define CURSOR_HIGH 25 |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
56 #define TAB_HEADER_HIGH 25 |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
57 #define TAB_BAR_HIGH 5 |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
58 #define MENU_WDW_HIGH 390 |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
59 #define KEY_LABEL_HIGH 25 /* Height of the label used for the the user keys */ |
| 38 | 60 |
| 662 | 61 #define SLOW_UPDATE_CNT 10 /* Some content shall not be update in short intervals => add prescalar */ |
|
811
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
62 #define MAXLINES 6 |
| 662 | 63 |
| 38 | 64 typedef struct |
| 65 { | |
| 66 uint32_t StartAddressForPage[MAXPAGES+1]; | |
| 67 uint8_t lineMemoryForNavigationForPage[MAXPAGES+1]; | |
| 68 uint8_t pageMemoryForNavigation; | |
| 69 uint8_t linesAvailableForPage[MAXPAGES+1]; | |
| 70 uint8_t pagesAvailable; | |
| 71 uint8_t pageCountNumber[MAXPAGES+1]; | |
| 72 uint8_t pageCountTotal; | |
| 73 uint8_t modeFlipPages; | |
|
811
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
74 uint8_t shadowPage[MAXPAGES+1]; /* the page is switched in the context of another page */ |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
75 uint8_t activeShadow; /* Base page which is used for the shadow */ |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
76 uint8_t disableLineMask[MAXPAGES+1]; /* Bitfield used to disable a line. The line is visible but will not be selected by cursor) */ |
| 38 | 77 } SMenuMemory; |
| 78 | |
| 79 /* Exported variables --------------------------------------------------------*/ | |
| 80 | |
| 81 /* Announced Private variables -----------------------------------------------*/ | |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
82 static GFX_DrawCfgScreen tMdesignSolo; |
|
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
83 static GFX_DrawCfgScreen tMdesignCursor; |
| 38 | 84 |
| 85 /* Private variables ---------------------------------------------------------*/ | |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
86 static GFX_DrawCfgWindow tMwindow; |
|
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
87 static GFX_DrawCfgScreen tMscreen; |
| 38 | 88 |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
89 static SMenuMemory menu; |
| 38 | 90 |
| 91 uint8_t actual_menu_content = MENU_UNDEFINED; | |
| 92 | |
|
811
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
93 |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
94 |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
95 |
| 38 | 96 /* Private function prototypes -----------------------------------------------*/ |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
97 static void draw_tMheader(uint8_t page); |
|
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
98 static void draw_tMcursorDesign(void); |
| 38 | 99 |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
100 static void draw_tMdesignSubUnselected(uint32_t *ppDestination); |
|
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
101 static void draw_tMdesignSubSelected(uint32_t *ppDestination); |
|
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
102 static void draw_tMdesignSubSelectedBorder(uint32_t *ppDestination); |
|
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
103 static void tMenu_write(uint8_t page, char *text, char *subtext); |
|
647
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
104 static void nextLine(void); |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
105 static void clean_line_actual_page(void); |
| 38 | 106 void tM_build_pages(void); |
| 107 | |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
108 static void gotoMenuEdit(void); |
| 38 | 109 |
| 110 /* Exported functions --------------------------------------------------------*/ | |
| 111 | |
| 112 GFX_DrawCfgScreen * get_PointerMenuCursorScreen(void) | |
| 113 { | |
| 114 return &tMdesignCursor; | |
| 115 } | |
| 116 | |
| 117 | |
| 118 GFX_DrawCfgScreen * get_PointerMenuCursorDesignSoloScreen(void) | |
| 119 { | |
| 120 return &tMdesignSolo; | |
| 121 } | |
| 122 | |
| 123 | |
| 124 void nextline(char * text, uint8_t *textPointer) | |
| 125 { | |
| 126 text[(*textPointer)++] = '\n'; | |
| 127 text[(*textPointer)++] = '\r'; | |
| 128 text[*textPointer] = 0; | |
| 129 } | |
| 130 | |
| 131 | |
|
816
c4ee952b9425
Fix a bug that disables arbitrary menu lines in dive mode if lines are disabled / inactive in surface mode. (mikeller)
heinrichsweikamp
parents:
815
diff
changeset
|
132 void clearDisabledMenuLines(void) |
|
c4ee952b9425
Fix a bug that disables arbitrary menu lines in dive mode if lines are disabled / inactive in surface mode. (mikeller)
heinrichsweikamp
parents:
815
diff
changeset
|
133 { |
|
c4ee952b9425
Fix a bug that disables arbitrary menu lines in dive mode if lines are disabled / inactive in surface mode. (mikeller)
heinrichsweikamp
parents:
815
diff
changeset
|
134 for(unsigned i = 0; i <= MAXPAGES; i++) { |
|
c4ee952b9425
Fix a bug that disables arbitrary menu lines in dive mode if lines are disabled / inactive in surface mode. (mikeller)
heinrichsweikamp
parents:
815
diff
changeset
|
135 menu.disableLineMask[i] = 0; |
|
c4ee952b9425
Fix a bug that disables arbitrary menu lines in dive mode if lines are disabled / inactive in surface mode. (mikeller)
heinrichsweikamp
parents:
815
diff
changeset
|
136 } |
|
c4ee952b9425
Fix a bug that disables arbitrary menu lines in dive mode if lines are disabled / inactive in surface mode. (mikeller)
heinrichsweikamp
parents:
815
diff
changeset
|
137 } |
|
c4ee952b9425
Fix a bug that disables arbitrary menu lines in dive mode if lines are disabled / inactive in surface mode. (mikeller)
heinrichsweikamp
parents:
815
diff
changeset
|
138 |
|
c4ee952b9425
Fix a bug that disables arbitrary menu lines in dive mode if lines are disabled / inactive in surface mode. (mikeller)
heinrichsweikamp
parents:
815
diff
changeset
|
139 |
| 38 | 140 void tM_init(void) |
| 141 { | |
| 142 uint8_t i; | |
| 143 | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
144 SSettings* pSettings; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
145 pSettings = settingsGetPointer(); |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
146 |
| 38 | 147 tMdesignCursor.FBStartAdress = getFrame(3); |
| 148 tMdesignCursor.ImageHeight = 390; | |
| 149 tMdesignCursor.ImageWidth = 800; | |
| 150 tMdesignCursor.LayerIndex = 0; | |
| 151 | |
| 152 tMdesignSolo.FBStartAdress = getFrame(4); | |
| 153 tMdesignSolo.ImageHeight = 390; | |
| 154 tMdesignSolo.ImageWidth = 800; | |
| 155 tMdesignSolo.LayerIndex = 0; | |
| 156 | |
| 157 menu.pagesAvailable = 0; | |
| 158 menu.pageMemoryForNavigation = 0; | |
| 159 for(i=0;i<=MAXPAGES;i++) | |
| 160 { | |
| 161 menu.lineMemoryForNavigationForPage[i] = 0; | |
| 162 menu.StartAddressForPage[i] = 0; | |
| 163 menu.linesAvailableForPage[i] = 0; | |
|
647
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
164 menu.shadowPage[i] = 0; |
| 38 | 165 } |
| 166 | |
|
816
c4ee952b9425
Fix a bug that disables arbitrary menu lines in dive mode if lines are disabled / inactive in surface mode. (mikeller)
heinrichsweikamp
parents:
815
diff
changeset
|
167 clearDisabledMenuLines(); |
|
c4ee952b9425
Fix a bug that disables arbitrary menu lines in dive mode if lines are disabled / inactive in surface mode. (mikeller)
heinrichsweikamp
parents:
815
diff
changeset
|
168 |
| 38 | 169 tMscreen.FBStartAdress = 0; |
| 170 tMscreen.ImageHeight = 480; | |
| 171 tMscreen.ImageWidth = 800; | |
| 172 tMscreen.LayerIndex = 1; | |
| 173 | |
| 174 draw_tMcursorDesign(); | |
| 175 | |
| 176 tMwindow.Image = &tMscreen; | |
| 177 tMwindow.WindowNumberOfTextLines = 6; | |
| 178 tMwindow.WindowLineSpacing = 65; | |
| 179 tMwindow.WindowTab = 400; | |
| 180 tMwindow.WindowX0 = 20; | |
| 181 tMwindow.WindowX1 = 779; | |
| 182 | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
183 if(!pSettings->FlipDisplay) |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
184 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
185 tMwindow.WindowY0 = 4 + KEY_LABEL_HIGH; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
186 tMwindow.WindowY1 = 390 + KEY_LABEL_HIGH; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
187 } |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
188 else |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
189 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
190 tMwindow.WindowY0 = 480 - MENU_WDW_HIGH - TAB_HEADER_HIGH;// - TAB_BAR_HIGH; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
191 tMwindow.WindowY1 = 480 - TAB_HEADER_HIGH - TAB_BAR_HIGH; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
192 } |
| 38 | 193 actual_menu_content = MENU_UNDEFINED; |
| 194 } | |
| 195 | |
| 196 void tM_refresh(char *text, uint8_t *textPointer, uint8_t line, const char content[6]) | |
| 197 { | |
| 198 for(uint8_t i=0; i<6; i++) | |
| 199 { | |
| 200 if(((line == 0) || (line == i)) && content[i]) | |
| 201 { | |
| 202 text[(*textPointer)++] = content[i]; | |
| 203 } | |
| 204 text[(*textPointer)++] = '\n'; | |
| 205 text[(*textPointer)++] = '\r'; | |
| 206 text[*textPointer] = 0; | |
| 207 } | |
| 208 } | |
| 209 | |
| 210 | |
| 211 void tM_rebuild_pages(void) | |
| 212 { | |
| 213 menu.pagesAvailable = 0; | |
| 214 // menu.pageMemoryForNavigation = 0; | |
| 215 for(int i=0;i<=MAXPAGES;i++) | |
| 216 { | |
| 217 menu.lineMemoryForNavigationForPage[i] = 0; | |
| 218 menu.linesAvailableForPage[i] = 0; | |
| 219 menu.StartAddressForPage[i] = 0; // only with GFX_forceReleaseFramesWithId(5); !!!!! | |
| 220 } | |
| 221 GFX_forceReleaseFramesWithId(5); | |
| 222 tM_build_pages(); | |
| 223 } | |
| 224 | |
| 225 | |
| 226 void tM_rebuild_menu_after_tComm(void) | |
| 227 { | |
| 228 tM_rebuild_pages(); | |
| 229 } | |
| 230 | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
231 void tM_check_content(void) |
| 38 | 232 { |
| 233 uint8_t mode = 0; | |
| 234 | |
| 235 if(stateUsed->mode == MODE_DIVE) | |
| 236 { | |
| 237 if(stateUsed == stateRealGetPointer()) | |
| 238 mode = MENU_DIVE_REAL; | |
| 239 else | |
| 240 mode = MENU_DIVE_SIM; | |
| 241 } | |
| 242 else | |
| 243 mode = MENU_SURFACE; | |
| 244 | |
| 245 if(actual_menu_content != mode) | |
| 246 { | |
| 247 actual_menu_content = mode; | |
| 248 tM_rebuild_pages(); | |
| 249 } | |
| 250 } | |
| 251 | |
|
811
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
252 void disableLine(uint32_t lineId) |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
253 { |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
254 SStateList idList; |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
255 |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
256 get_idSpecificStateList(lineId, &idList); |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
257 |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
258 if((idList.page < MAXPAGES) && (idList.line < MAXLINES)) |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
259 { |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
260 menu.disableLineMask[idList.page] |= (1 << idList.line); |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
261 } |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
262 } |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
263 |
|
850
bc2fcd002fc4
Check line enable/disable state when a new page is selected:
Ideenmodellierer
parents:
824
diff
changeset
|
264 uint8_t getLineMask(uint32_t lineId) |
|
bc2fcd002fc4
Check line enable/disable state when a new page is selected:
Ideenmodellierer
parents:
824
diff
changeset
|
265 { |
|
bc2fcd002fc4
Check line enable/disable state when a new page is selected:
Ideenmodellierer
parents:
824
diff
changeset
|
266 SStateList idList; |
|
bc2fcd002fc4
Check line enable/disable state when a new page is selected:
Ideenmodellierer
parents:
824
diff
changeset
|
267 get_idSpecificStateList(lineId, &idList); |
|
bc2fcd002fc4
Check line enable/disable state when a new page is selected:
Ideenmodellierer
parents:
824
diff
changeset
|
268 return(menu.disableLineMask[idList.page]); |
|
bc2fcd002fc4
Check line enable/disable state when a new page is selected:
Ideenmodellierer
parents:
824
diff
changeset
|
269 } |
|
bc2fcd002fc4
Check line enable/disable state when a new page is selected:
Ideenmodellierer
parents:
824
diff
changeset
|
270 |
|
815
ce8f71217f45
Bugfix CustomView selection during dive mode:
Ideenmodellierer
parents:
811
diff
changeset
|
271 void resetLineMask(uint32_t lineId) |
|
ce8f71217f45
Bugfix CustomView selection during dive mode:
Ideenmodellierer
parents:
811
diff
changeset
|
272 { |
|
ce8f71217f45
Bugfix CustomView selection during dive mode:
Ideenmodellierer
parents:
811
diff
changeset
|
273 SStateList idList; |
|
ce8f71217f45
Bugfix CustomView selection during dive mode:
Ideenmodellierer
parents:
811
diff
changeset
|
274 get_idSpecificStateList(lineId, &idList); |
|
ce8f71217f45
Bugfix CustomView selection during dive mode:
Ideenmodellierer
parents:
811
diff
changeset
|
275 if(idList.page < MAXPAGES) |
|
ce8f71217f45
Bugfix CustomView selection during dive mode:
Ideenmodellierer
parents:
811
diff
changeset
|
276 { |
|
ce8f71217f45
Bugfix CustomView selection during dive mode:
Ideenmodellierer
parents:
811
diff
changeset
|
277 menu.disableLineMask[idList.page] = 0; |
|
ce8f71217f45
Bugfix CustomView selection during dive mode:
Ideenmodellierer
parents:
811
diff
changeset
|
278 } |
|
ce8f71217f45
Bugfix CustomView selection during dive mode:
Ideenmodellierer
parents:
811
diff
changeset
|
279 } |
|
811
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
280 void enableLine(uint32_t lineId) |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
281 { |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
282 SStateList idList; |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
283 |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
284 get_idSpecificStateList(lineId, &idList); |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
285 |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
286 if((idList.page < MAXPAGES) && (idList.line < MAXLINES)) |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
287 { |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
288 menu.disableLineMask[idList.page] &= ~(1 << idList.line); |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
289 } |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
290 } |
| 38 | 291 |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
292 static void clean_line_actual_page(void) |
| 38 | 293 { |
| 294 uint8_t line, page; | |
| 295 | |
| 296 page = menu.pageMemoryForNavigation; | |
| 297 line = menu.lineMemoryForNavigationForPage[page]; | |
|
122
871baf20776b
Take care for display orientation if deleting lines
Ideenmodellierer
parents:
110
diff
changeset
|
298 if(settingsGetPointer()->FlipDisplay) /* Reselect line to be deleted if display is rotated */ |
|
871baf20776b
Take care for display orientation if deleting lines
Ideenmodellierer
parents:
110
diff
changeset
|
299 { |
|
871baf20776b
Take care for display orientation if deleting lines
Ideenmodellierer
parents:
110
diff
changeset
|
300 line = 6 - line + 1; |
|
871baf20776b
Take care for display orientation if deleting lines
Ideenmodellierer
parents:
110
diff
changeset
|
301 } |
| 38 | 302 tMscreen.FBStartAdress = menu.StartAddressForPage[page]; |
| 303 GFX_clean_line(&tMwindow, line); | |
| 304 } | |
| 305 | |
| 306 | |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
307 static void update_content_actual_page(char *text, uint16_t tab, char *subtext) |
| 38 | 308 { |
| 309 uint8_t page; | |
| 310 | |
| 311 page = menu.pageMemoryForNavigation; | |
| 312 | |
| 313 tMscreen.FBStartAdress = menu.StartAddressForPage[page]; | |
| 314 if(tab == 0) | |
| 315 tMwindow.WindowTab = 400; | |
| 316 else | |
| 317 tMwindow.WindowTab = tab; | |
| 318 | |
| 319 tMenu_write(page, text, subtext); | |
| 320 } | |
| 321 | |
| 322 | |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
323 static void update_content_with_new_frame(uint8_t page, char *text, uint16_t tab, char *subtext) |
| 38 | 324 { |
| 325 char localtext[32]; | |
| 326 | |
| 327 uint32_t rememberPage = menu.StartAddressForPage[page]; | |
| 328 menu.StartAddressForPage[page] = getFrame(5); | |
| 329 tMscreen.FBStartAdress = menu.StartAddressForPage[page]; | |
| 330 | |
| 331 if(tab == 0) | |
| 332 tMwindow.WindowTab = 400; | |
| 333 else | |
| 334 tMwindow.WindowTab = tab; | |
| 335 | |
| 336 draw_tMheader(page); | |
| 337 tMenu_write(page, text, subtext); | |
| 338 | |
| 339 localtext[0] = TXT_2BYTE; | |
| 340 localtext[1] = TXT2BYTE_ButtonBack; | |
| 341 localtext[2] = 0; | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
342 write_content_simple(&tMscreen, 0, 800, 480-KEY_LABEL_HIGH, &FontT24,localtext,CLUT_ButtonSurfaceScreen); |
| 38 | 343 |
| 344 localtext[0] = '\001'; | |
| 345 localtext[1] = TXT_2BYTE; | |
| 346 localtext[2] = TXT2BYTE_ButtonEnter; | |
| 347 localtext[3] = 0; | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
348 write_content_simple(&tMscreen, 0, 800, 480-KEY_LABEL_HIGH, &FontT24,localtext,CLUT_ButtonSurfaceScreen); |
| 38 | 349 |
| 350 localtext[0] = '\002'; | |
| 351 localtext[1] = TXT_2BYTE; | |
| 352 localtext[2] = TXT2BYTE_ButtonNext; | |
| 353 localtext[3] = 0; | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
354 write_content_simple(&tMscreen, 0, 800, 480-KEY_LABEL_HIGH, &FontT24,localtext,CLUT_ButtonSurfaceScreen); |
| 38 | 355 |
| 356 // gfx_write_page_number(&tMscreen ,menu.pageCountNumber[page],menu.pageCountTotal,0); | |
| 357 | |
| 358 if(page == menu.pageMemoryForNavigation) | |
| 359 GFX_SetFrameTop(tMscreen.FBStartAdress); | |
| 360 releaseFrame(5,rememberPage); | |
| 361 } | |
| 362 | |
| 363 | |
|
169
842f57bbaaad
Bugfix: highlight the menu underline correctly on selected state
Jan Mulder <jlmulder@xs4all.nl>
parents:
167
diff
changeset
|
364 static void tM_create_pagenumbering(void) |
| 38 | 365 { |
| 366 menu.pageCountTotal = 0; | |
| 367 | |
| 368 for(int i=0;i<=MAXPAGES;i++) | |
| 369 { | |
| 370 if(menu.pageCountNumber[i]) | |
| 371 { | |
| 372 menu.pageCountTotal++; | |
| 373 menu.pageCountNumber[i] = menu.pageCountTotal; | |
| 374 } | |
| 375 } | |
| 376 } | |
| 377 | |
| 378 | |
| 379 | 379 void tM_build_page(uint32_t id, char *text, uint16_t tab, char *subtext) |
| 38 | 380 { |
| 381 uint8_t linesFound; | |
| 382 uint16_t i; | |
| 383 SStateList idList; | |
| 384 uint8_t page; | |
| 385 | |
| 386 char localtext[32]; | |
| 387 | |
| 388 if(menu.pagesAvailable > MAXPAGES) | |
| 389 return; | |
| 390 | |
| 391 get_idSpecificStateList(id, &idList); | |
| 392 | |
| 393 if(idList.base != BaseMenu) | |
| 394 return; | |
| 395 | |
| 396 if(idList.page == 0) | |
| 397 return; | |
| 398 | |
| 399 if(idList.page > MAXPAGES) | |
| 400 return; | |
| 401 | |
| 402 page = idList.page; | |
| 403 | |
|
647
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
404 if((!menu.pageCountNumber[page]) && (!menu.shadowPage[page])) /* shadow pages are not visible on top level */ |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
405 { |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
406 return; |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
407 } |
| 38 | 408 |
|
647
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
409 if(menu.pagesAvailable == 0) |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
410 tM_create_pagenumbering(); |
| 38 | 411 |
| 412 if(*text == 0) | |
| 413 return; | |
| 414 | |
| 415 linesFound = 1; | |
| 416 | |
| 417 if(menu.StartAddressForPage[page]) | |
| 418 releaseFrame(5,menu.StartAddressForPage[page]); | |
| 419 | |
| 420 menu.StartAddressForPage[page] = getFrame(5); | |
| 421 | |
| 422 if(menu.StartAddressForPage[page] == 0) | |
| 423 return; | |
| 424 | |
| 425 i = 0; | |
| 426 while((i < MAX_PAGE_TEXTSIZE) && text[i]) | |
| 427 { | |
| 428 if((text[i] == '\n') && ((i + 2) < MAX_PAGE_TEXTSIZE) && text[i+1] && text[i+2]) | |
| 429 linesFound += 1; | |
| 430 i++; | |
| 431 } | |
| 432 | |
| 433 menu.linesAvailableForPage[page] = linesFound; | |
| 434 menu.pagesAvailable++; /* even if it was used before */ | |
| 435 | |
| 436 tMscreen.FBStartAdress = menu.StartAddressForPage[page]; | |
| 437 if(tab == 0) | |
| 438 tMwindow.WindowTab = 400; | |
| 439 else | |
| 440 tMwindow.WindowTab = tab; | |
| 441 | |
| 442 draw_tMheader(page); | |
| 443 | |
| 444 tMenu_write(page, text, subtext); | |
| 445 | |
| 446 localtext[0] = TXT_2BYTE; | |
| 447 localtext[1] = TXT2BYTE_ButtonBack; | |
| 448 localtext[2] = 0; | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
449 write_content_simple(&tMscreen, 0, 800, 480-KEY_LABEL_HIGH, &FontT24,localtext,CLUT_ButtonSurfaceScreen); |
| 38 | 450 |
| 451 localtext[0] = '\001'; | |
| 452 localtext[1] = TXT_2BYTE; | |
| 453 localtext[2] = TXT2BYTE_ButtonEnter; | |
| 454 localtext[3] = 0; | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
455 write_content_simple(&tMscreen, 0, 800, 480-KEY_LABEL_HIGH, &FontT24,localtext,CLUT_ButtonSurfaceScreen); |
| 38 | 456 |
| 457 localtext[0] = '\002'; | |
| 458 localtext[1] = TXT_2BYTE; | |
| 459 localtext[2] = TXT2BYTE_ButtonNext; | |
| 460 localtext[3] = 0; | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
461 write_content_simple(&tMscreen, 0, 800, 480-KEY_LABEL_HIGH, &FontT24,localtext,CLUT_ButtonSurfaceScreen); |
| 38 | 462 } |
| 463 | |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
464 static void findValidPosition(uint8_t *pageOuput, uint8_t *lineOutput) |
| 38 | 465 { |
|
51
8f8ea3a32e82
Resolved warnings pointing to possible invalid memory access
Ideenmodellierer
parents:
38
diff
changeset
|
466 uint8_t page = 0; |
|
8f8ea3a32e82
Resolved warnings pointing to possible invalid memory access
Ideenmodellierer
parents:
38
diff
changeset
|
467 uint8_t line = 0; |
|
8f8ea3a32e82
Resolved warnings pointing to possible invalid memory access
Ideenmodellierer
parents:
38
diff
changeset
|
468 uint8_t first = 0; |
| 38 | 469 |
| 470 *pageOuput = 0; | |
| 471 *lineOutput = 0; | |
| 472 | |
| 473 /* test */ | |
| 474 if(menu.pagesAvailable == 0) | |
| 475 return; | |
| 476 | |
| 477 for(int i=1;i<=MAXPAGES;i++) | |
| 478 { | |
| 479 if((menu.pageCountNumber[i] != 0) | |
| 480 && (menu.linesAvailableForPage[i] != 0) | |
| 481 && (menu.StartAddressForPage[i] != 0)) | |
| 482 { | |
| 483 first = i; | |
| 484 break; | |
| 485 } | |
| 486 } | |
| 487 | |
| 488 /* select */ | |
| 489 if(menu.pageMemoryForNavigation > MAXPAGES) | |
| 490 menu.pageMemoryForNavigation = first; | |
| 491 | |
| 492 page = menu.pageMemoryForNavigation; | |
| 493 | |
| 494 if(page == 0) | |
| 495 page = first; | |
| 496 | |
|
647
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
497 while((page <= MAXPAGES) && ((menu.linesAvailableForPage[page] == 0) || (menu.StartAddressForPage[page] == 0) || ((menu.pageCountNumber[page] == 0) && !((menu.shadowPage[page]) && (menu.pageMemoryForNavigation == page))))) |
| 38 | 498 page += 1; |
| 499 | |
| 500 if(page > MAXPAGES) | |
| 501 page = first; | |
| 502 | |
| 503 line = menu.lineMemoryForNavigationForPage[page]; | |
| 504 | |
| 505 if(line == 0) | |
| 506 line = 1; | |
| 507 | |
|
815
ce8f71217f45
Bugfix CustomView selection during dive mode:
Ideenmodellierer
parents:
811
diff
changeset
|
508 while(menu.disableLineMask[page] & ( 1 << line)) |
|
811
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
509 { |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
510 line++; |
|
815
ce8f71217f45
Bugfix CustomView selection during dive mode:
Ideenmodellierer
parents:
811
diff
changeset
|
511 if(line > menu.linesAvailableForPage[page]) |
|
ce8f71217f45
Bugfix CustomView selection during dive mode:
Ideenmodellierer
parents:
811
diff
changeset
|
512 { |
|
ce8f71217f45
Bugfix CustomView selection during dive mode:
Ideenmodellierer
parents:
811
diff
changeset
|
513 line = 1; |
|
ce8f71217f45
Bugfix CustomView selection during dive mode:
Ideenmodellierer
parents:
811
diff
changeset
|
514 } |
|
811
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
515 } |
|
4c41d9a18c7f
Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents:
788
diff
changeset
|
516 |
| 38 | 517 if(line > menu.linesAvailableForPage[page]) |
| 518 line = 1; | |
| 519 | |
| 520 *pageOuput = page; | |
| 521 *lineOutput = line; | |
| 522 } | |
| 523 | |
| 524 | |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
525 static void tM_add(uint32_t id) |
| 38 | 526 { |
| 527 SStateList idList; | |
| 528 uint8_t page; | |
| 529 | |
| 530 get_idSpecificStateList(id, &idList); | |
| 531 | |
| 532 page = idList.page; | |
| 533 | |
| 534 if(page > MAXPAGES) | |
| 535 return; | |
| 536 | |
| 537 menu.pageCountNumber[page] = 1; | |
| 538 } | |
| 539 | |
|
647
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
540 static void tM_addShadow(uint32_t id) |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
541 { |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
542 SStateList idList; |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
543 uint8_t page; |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
544 |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
545 get_idSpecificStateList(id, &idList); |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
546 |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
547 page = idList.page; |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
548 |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
549 if(page > MAXPAGES) |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
550 return; |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
551 |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
552 menu.shadowPage[page] = 1; |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
553 } |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
554 |
| 38 | 555 |
| 556 void tM_build_pages(void) | |
| 557 { | |
| 558 char text[MAX_PAGE_TEXTSIZE]; | |
| 559 char subtext[MAX_PAGE_TEXTSIZE]; | |
| 560 uint32_t id; | |
| 561 uint16_t tabPosition; | |
| 562 SSettings *pSettings = settingsGetPointer(); | |
| 563 | |
| 564 menu.pagesAvailable = 0; | |
| 565 for(int i=0;i<=MAXPAGES;i++) | |
| 566 menu.pageCountNumber[i] = 0; | |
| 567 | |
| 568 tabPosition = 400; | |
| 569 *text = 0; | |
| 570 *subtext = 0; | |
| 571 | |
| 572 /* 2015 Feb 02, hw | |
| 573 * max 8 Menu Pages | |
| 574 */ | |
| 575 | |
| 576 | |
| 577 tM_add(StMSYS); //now in both modes | |
| 578 if(actual_menu_content == MENU_SURFACE) | |
| 579 { | |
| 580 tM_add(StMDECO); | |
| 581 tM_add(StMHARD); | |
| 507 | 582 tM_add(StMCustom); |
| 38 | 583 // tM_add(StMSYS); now in both modes |
| 584 } | |
| 585 else | |
| 586 { | |
| 587 tM_add(StMXTRA); | |
| 588 } | |
| 589 if(actual_menu_content == MENU_SURFACE) | |
| 590 { | |
| 591 tM_add(StMPLAN); | |
| 592 } | |
| 593 // if((pSettings->dive_mode != DIVEMODE_Gauge) && (pSettings->dive_mode != DIVEMODE_Apnea)) | |
| 594 // { | |
| 595 tM_add(StMDECOP); | |
| 596 // } | |
|
647
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
597 |
| 662 | 598 if((isLoopMode(pSettings->dive_mode)) || (stateUsed->diveSettings.ccrOption == 1)) |
| 38 | 599 { |
| 600 tM_add(StMCG); | |
|
856
af035b883382
Do not show SP tab if PSCR mode is active:
Ideenmodellierer
parents:
851
diff
changeset
|
601 if((stateUsed->diveSettings.diveMode != DIVEMODE_PSCR) || (actual_menu_content != MENU_SURFACE)) |
|
af035b883382
Do not show SP tab if PSCR mode is active:
Ideenmodellierer
parents:
851
diff
changeset
|
602 { |
|
af035b883382
Do not show SP tab if PSCR mode is active:
Ideenmodellierer
parents:
851
diff
changeset
|
603 tM_add(StMSP); |
|
af035b883382
Do not show SP tab if PSCR mode is active:
Ideenmodellierer
parents:
851
diff
changeset
|
604 } |
|
647
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
605 if (actual_menu_content == MENU_SURFACE) /* StMOG is now accessed using StMCG in CCR mode*/ |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
606 { |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
607 tM_add(StMXTRA); |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
608 tM_addShadow(StMOG); |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
609 } |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
610 else |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
611 { |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
612 tM_add(StMOG); |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
613 } |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
614 } |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
615 else |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
616 { |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
617 tM_add(StMOG); |
| 38 | 618 } |
| 619 | |
| 620 id = tMOG_refresh(0, text, &tabPosition, subtext); | |
| 621 tM_build_page(id, text, tabPosition, subtext); | |
| 622 | |
| 623 id = tMCG_refresh(0, text, &tabPosition, subtext); | |
| 624 tM_build_page(id, text, tabPosition, subtext); | |
| 625 | |
|
788
4abfb8a2a435
Define explicit setpoints for low / high / deco. Add an option to delay the switch to SPlow until all decompression has been cleared. (mikeller)
heinrichsweikamp
parents:
774
diff
changeset
|
626 id = tMSP_refresh(text, &tabPosition, subtext); |
| 38 | 627 tM_build_page(id, text, tabPosition, subtext); |
| 628 | |
| 629 id = tMXtra_refresh(0, text, &tabPosition, subtext); | |
| 630 tM_build_page(id, text, tabPosition, subtext); | |
| 631 | |
| 632 id = tMPlanner_refresh(0, text, &tabPosition, subtext); | |
| 633 tM_build_page(id, text, tabPosition, subtext); | |
| 634 | |
| 635 id = tMDeco_refresh(0, text, &tabPosition, subtext); | |
| 636 tM_build_page(id, text, tabPosition, subtext); | |
| 637 | |
| 638 id = tMDecoParameters_refresh(0, text, &tabPosition, subtext); | |
| 639 tM_build_page(id, text, tabPosition, subtext); | |
| 640 | |
| 641 id = tMPlanner_refresh(0, text, &tabPosition, subtext); | |
| 642 tM_build_page(id, text, tabPosition, subtext); | |
| 643 | |
| 644 id = tMHardware_refresh(0, text, &tabPosition, subtext); | |
| 645 tM_build_page(id, text, tabPosition, subtext); | |
| 646 | |
| 647 id = tMSystem_refresh(0, text, &tabPosition, subtext); | |
| 648 tM_build_page(id, text, tabPosition, subtext); | |
| 507 | 649 |
| 650 id = tMCustom_refresh(0, text, &tabPosition, subtext); | |
| 651 tM_build_page(id, text, tabPosition, subtext); | |
| 38 | 652 } |
| 653 | |
| 654 | |
| 655 void tM_refresh_live_content(void) | |
| 656 { | |
| 662 | 657 static uint8_t slowUpdate = SLOW_UPDATE_CNT; |
|
51
8f8ea3a32e82
Resolved warnings pointing to possible invalid memory access
Ideenmodellierer
parents:
38
diff
changeset
|
658 uint8_t page = 0; |
| 38 | 659 char text[MAX_PAGE_TEXTSIZE]; |
| 660 char subtext[MAX_PAGE_TEXTSIZE]; | |
| 661 uint16_t tabPosition; | |
| 662 | |
| 662 | 663 uint32_t globalState = get_globalState(); |
| 664 | |
| 665 slowUpdate--; | |
| 666 page = menu.pageMemoryForNavigation; | |
| 667 switch(globalState) | |
| 38 | 668 { |
| 662 | 669 case StMSYS: if(actual_menu_content == MENU_SURFACE) |
| 670 { | |
| 671 tMSystem_refresh(0, text, &tabPosition, subtext); | |
| 672 update_content_with_new_frame(page, text, tabPosition, subtext); | |
| 673 } | |
| 674 break; | |
| 675 case StMHARD: tMHardware_refresh(0, text, &tabPosition, subtext); | |
| 676 update_content_with_new_frame(page, text, tabPosition, subtext); | |
| 677 break; | |
| 678 case StMOG: if((actual_menu_content != MENU_SURFACE) && (slowUpdate == 0)) | |
| 679 { | |
| 680 tMOG_refresh(0, text, &tabPosition, subtext); | |
| 681 update_content_with_new_frame(page, text, tabPosition, subtext); | |
| 682 } | |
| 683 break; | |
| 684 case StMCG: if((actual_menu_content != MENU_SURFACE) && (slowUpdate == 0)) | |
| 685 { | |
| 686 tMCG_refresh(0, text, &tabPosition, subtext); | |
| 687 update_content_with_new_frame(page, text, tabPosition, subtext); | |
| 688 } | |
| 689 break; | |
| 690 default: | |
| 691 break; | |
| 38 | 692 } |
| 662 | 693 if(slowUpdate == 0) |
| 38 | 694 { |
| 662 | 695 slowUpdate = SLOW_UPDATE_CNT; |
| 38 | 696 } |
| 697 | |
| 698 tMscreen.FBStartAdress = menu.StartAddressForPage[page]; | |
| 699 tHome_show_lost_connection_count(&tMscreen); | |
| 700 /* | |
| 701 SStateList idList; | |
| 702 if(actual_menu_content == MENU_SURFACE) | |
| 703 { | |
| 704 page = menu.pageMemoryForNavigation; | |
| 705 get_idSpecificStateList(StMSYS, &idList); | |
| 706 if(page == idList.page) | |
| 707 { | |
| 708 tMSystem_refresh(0, text, &tabPosition, subtext); | |
| 709 update_content_with_new_frame(page, text, tabPosition, subtext); | |
| 710 } | |
| 711 } | |
| 712 */ | |
| 713 } | |
| 714 | |
| 715 | |
| 716 /* new frame only! */ | |
| 717 void updateSpecificMenu(uint32_t id) | |
| 718 { | |
| 719 uint8_t page; | |
| 720 SStateList idList; | |
| 721 | |
| 722 char text[MAX_PAGE_TEXTSIZE]; | |
| 723 char subtext[MAX_PAGE_TEXTSIZE]; | |
| 724 uint16_t tabPosition; | |
| 725 | |
| 726 *subtext = 0; | |
| 727 *text = 0; | |
| 728 tabPosition = 400; | |
| 729 | |
| 730 get_idSpecificStateList(id, &idList); | |
| 731 page = idList.page; | |
| 732 | |
| 733 switch(id) | |
| 734 { | |
| 735 case StMOG: | |
| 736 tMOG_refresh(0, text, &tabPosition, subtext); | |
| 737 update_content_with_new_frame(page, text, tabPosition, subtext); | |
| 738 break; | |
| 739 case StMCG: | |
| 740 tMCG_refresh(0, text, &tabPosition, subtext); | |
| 741 update_content_with_new_frame(page, text, tabPosition, subtext); | |
| 742 break; | |
| 743 case StMSP: | |
|
788
4abfb8a2a435
Define explicit setpoints for low / high / deco. Add an option to delay the switch to SPlow until all decompression has been cleared. (mikeller)
heinrichsweikamp
parents:
774
diff
changeset
|
744 tMSP_refresh(text, &tabPosition, subtext); |
| 38 | 745 update_content_with_new_frame(page, text, tabPosition, subtext); |
| 746 break; | |
|
815
ce8f71217f45
Bugfix CustomView selection during dive mode:
Ideenmodellierer
parents:
811
diff
changeset
|
747 case StMSYS: |
|
ce8f71217f45
Bugfix CustomView selection during dive mode:
Ideenmodellierer
parents:
811
diff
changeset
|
748 tMSystem_refresh(0, text, &tabPosition, NULL); |
|
ce8f71217f45
Bugfix CustomView selection during dive mode:
Ideenmodellierer
parents:
811
diff
changeset
|
749 update_content_with_new_frame(page, text, tabPosition, subtext); |
|
ce8f71217f45
Bugfix CustomView selection during dive mode:
Ideenmodellierer
parents:
811
diff
changeset
|
750 break; |
|
ce8f71217f45
Bugfix CustomView selection during dive mode:
Ideenmodellierer
parents:
811
diff
changeset
|
751 |
| 38 | 752 default: |
| 753 break; | |
| 754 } | |
| 755 } | |
| 756 | |
| 757 | |
| 758 void updateMenu(void) | |
| 759 { | |
| 760 uint8_t page, line; | |
| 761 | |
| 762 char text[MAX_PAGE_TEXTSIZE]; | |
| 763 char subtext[MAX_PAGE_TEXTSIZE]; | |
| 764 uint16_t tabPosition; | |
| 765 | |
| 766 *subtext = 0; | |
| 767 *text = 0; | |
| 768 tabPosition = 400; | |
| 769 | |
| 770 page = menu.pageMemoryForNavigation; | |
| 771 line = menu.lineMemoryForNavigationForPage[page]; | |
| 772 | |
| 773 switch(get_globalState()) | |
| 774 { | |
| 775 case StMOG: | |
| 776 tMOG_refresh(0, text, &tabPosition, subtext); | |
| 777 update_content_with_new_frame(page, text, tabPosition, subtext); | |
| 778 break; | |
| 779 case StMCG: | |
| 780 tMCG_refresh(0, text, &tabPosition, subtext); | |
| 781 update_content_with_new_frame(page, text, tabPosition, subtext); | |
| 782 break; | |
| 783 case StMSP: | |
|
788
4abfb8a2a435
Define explicit setpoints for low / high / deco. Add an option to delay the switch to SPlow until all decompression has been cleared. (mikeller)
heinrichsweikamp
parents:
774
diff
changeset
|
784 tMSP_refresh(text, &tabPosition, subtext); |
| 38 | 785 update_content_with_new_frame(page, text, tabPosition, subtext); |
| 786 break; | |
| 787 case StMXTRA: | |
| 788 tMXtra_refresh(0, text, &tabPosition, subtext); | |
| 789 update_content_with_new_frame(page, text, tabPosition, subtext); | |
| 790 break; | |
| 791 case StMDECO: | |
| 792 if((line == 1) || (line == 3)) // dive mode or ppO2 limits (the later for correct MOD in gaslists) | |
| 793 { | |
| 794 tM_rebuild_pages(); | |
| 795 menu.lineMemoryForNavigationForPage[page] = line; // fix 160623 | |
| 796 GFX_SetFrameTop(menu.StartAddressForPage[page]); | |
| 797 } | |
| 798 else | |
| 799 { | |
| 800 tMDeco_refresh(line, text, &tabPosition, subtext); | |
| 801 clean_line_actual_page(); | |
| 802 update_content_actual_page(text, tabPosition, subtext); | |
| 803 } | |
| 804 break; | |
| 805 case StMDECOP: | |
| 806 tMDecoParameters_refresh(line, text, &tabPosition, subtext); | |
| 807 clean_line_actual_page(); | |
| 808 update_content_actual_page(text, tabPosition, subtext); | |
| 809 break; | |
| 810 case StMPLAN: | |
| 811 tMPlanner_refresh(line, text, &tabPosition, subtext); | |
| 812 clean_line_actual_page(); | |
| 813 update_content_actual_page(text, tabPosition, subtext); | |
| 814 break; | |
| 815 case StMHARD: | |
| 816 tMHardware_refresh(line, text, &tabPosition, subtext); | |
| 817 clean_line_actual_page(); | |
| 818 update_content_actual_page(text, tabPosition, subtext); | |
| 819 break; | |
| 820 case StMSYS: | |
| 821 if((line == 2) || (line == 3) || (line == 6)) | |
| 822 { | |
| 823 tM_rebuild_pages(); | |
| 824 menu.lineMemoryForNavigationForPage[page] = line; // fix 160623 | |
| 825 GFX_SetFrameTop(menu.StartAddressForPage[page]); | |
| 826 menu.lineMemoryForNavigationForPage[page] = line; | |
| 827 } | |
| 828 else | |
| 829 { | |
| 830 tMSystem_refresh(line, text, &tabPosition, subtext); | |
| 831 clean_line_actual_page(); | |
| 832 update_content_actual_page(text, tabPosition, subtext); | |
| 833 } | |
| 834 break; | |
| 507 | 835 case StMCustom: |
| 836 tMCustom_refresh(line, text, &tabPosition, subtext); | |
| 837 clean_line_actual_page(); | |
| 838 update_content_actual_page(text, tabPosition, subtext); | |
| 839 break; | |
| 38 | 840 default: |
| 841 break; | |
| 842 } | |
| 843 } | |
| 844 | |
| 845 void openMenu_first_page_with_OC_gas_update(void) | |
| 846 { | |
| 847 menu.pageMemoryForNavigation = 1; | |
| 848 for(int i=0;i<=MAXPAGES;i++) | |
| 849 menu.lineMemoryForNavigationForPage[i] = 0; | |
| 850 | |
| 851 set_globalState(StMOG); | |
| 852 updateMenu(); | |
| 853 openMenu(1); | |
| 854 } | |
| 855 | |
| 856 | |
| 857 void openMenu(uint8_t freshWithFlipPages) | |
| 858 { | |
| 859 uint8_t page, line; | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
860 SSettings* pSettings; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
861 pSettings = settingsGetPointer(); |
| 38 | 862 |
| 863 findValidPosition(&page, &line); | |
| 864 if((page == 0) || (line == 0)) | |
| 865 return; | |
| 866 | |
| 867 menu.pageMemoryForNavigation = page; | |
| 868 /* new test for 3button design */ | |
| 869 if(freshWithFlipPages) | |
| 870 { | |
| 871 menu.lineMemoryForNavigationForPage[page] = 0; | |
| 872 menu.modeFlipPages = 1; | |
| 873 } | |
| 874 else | |
| 875 { | |
| 876 menu.lineMemoryForNavigationForPage[page] = line; | |
| 877 menu.modeFlipPages = 0; | |
| 878 } | |
| 879 | |
| 880 set_globalState_Menu_Page(page); | |
| 881 | |
| 882 | |
| 883 change_CLUT_entry(CLUT_MenuLineSelectedSides, (CLUT_MenuPageGasOC + page - 1)); | |
| 884 change_CLUT_entry(CLUT_MenuLineSelectedSeperator, (CLUT_MenuPageGasOC + page - 1)); | |
| 885 | |
| 886 | |
| 887 if(((page == 6) || (page == 8)) && (menu.pageCountNumber[page-1] == 0)) | |
| 888 { | |
| 889 change_CLUT_entry(CLUT_MenuLineSelectedSides, (CLUT_MenuPageGasOC + page - 2)); | |
| 890 change_CLUT_entry(CLUT_MenuLineSelectedSeperator, (CLUT_MenuPageGasOC + page - 2)); | |
| 891 | |
| 892 } | |
| 893 | |
| 894 GFX_SetFrameTop(menu.StartAddressForPage[page]); | |
| 895 /* new test for 3button design */ | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
896 |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
897 if(!pSettings->FlipDisplay) |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
898 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
899 if(freshWithFlipPages) |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
900 GFX_SetFrameBottom(tMdesignSolo.FBStartAdress, 0, 25, 800, 390); |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
901 else |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
902 GFX_SetFrameBottom((tMdesignCursor.FBStartAdress) + 65*2*(line - 1), 0, 25, 800, 390); |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
903 } |
| 38 | 904 else |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
905 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
906 if(freshWithFlipPages) |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
907 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
908 GFX_SetFrameBottom((tMdesignSolo.FBStartAdress), 0, 480-390-KEY_LABEL_HIGH, 800, 390); //- (25 * 2 * 800), 0, 25, 800, 390); |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
909 } |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
910 else |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
911 GFX_SetFrameBottom((tMdesignCursor.FBStartAdress + (390 - 65 *(line)) *2), 0,480-390-KEY_LABEL_HIGH, 800, 390); //480-390-KEY_LABEL_HIGH + 65*2*(line - 1) |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
912 } |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
913 |
| 38 | 914 } |
| 915 | |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
916 static void block_diluent_handler(_Bool Unblock) |
| 38 | 917 { |
| 918 SStateList list; | |
| 919 static uint8_t linesAvailableForPageDiluent = 0; | |
| 920 get_idSpecificStateList(StMCG, &list); | |
| 921 | |
| 922 if(Unblock && linesAvailableForPageDiluent) | |
| 923 { | |
| 924 menu.linesAvailableForPage[list.page] = linesAvailableForPageDiluent; | |
| 925 } | |
| 926 else | |
| 927 { | |
| 928 linesAvailableForPageDiluent = menu.linesAvailableForPage[list.page]; | |
| 929 menu.linesAvailableForPage[list.page] = 0; | |
| 930 } | |
| 931 } | |
| 932 | |
| 933 void block_diluent_page(void) | |
| 934 { | |
| 935 block_diluent_handler(0); | |
| 936 } | |
| 937 | |
| 938 | |
| 939 void unblock_diluent_page(void) | |
| 940 { | |
| 941 block_diluent_handler(1); | |
| 942 } | |
| 943 | |
|
850
bc2fcd002fc4
Check line enable/disable state when a new page is selected:
Ideenmodellierer
parents:
824
diff
changeset
|
944 static void checkLineStatus() |
|
bc2fcd002fc4
Check line enable/disable state when a new page is selected:
Ideenmodellierer
parents:
824
diff
changeset
|
945 { |
|
bc2fcd002fc4
Check line enable/disable state when a new page is selected:
Ideenmodellierer
parents:
824
diff
changeset
|
946 switch(get_globalState()) |
|
bc2fcd002fc4
Check line enable/disable state when a new page is selected:
Ideenmodellierer
parents:
824
diff
changeset
|
947 { |
| 851 | 948 case StMSYS: tMSystem_checkLineStatus(); |
| 949 break; | |
|
850
bc2fcd002fc4
Check line enable/disable state when a new page is selected:
Ideenmodellierer
parents:
824
diff
changeset
|
950 case StMXTRA: tMXtra_checkLineStatus(); |
|
bc2fcd002fc4
Check line enable/disable state when a new page is selected:
Ideenmodellierer
parents:
824
diff
changeset
|
951 break; |
|
bc2fcd002fc4
Check line enable/disable state when a new page is selected:
Ideenmodellierer
parents:
824
diff
changeset
|
952 default: |
|
bc2fcd002fc4
Check line enable/disable state when a new page is selected:
Ideenmodellierer
parents:
824
diff
changeset
|
953 break; |
|
bc2fcd002fc4
Check line enable/disable state when a new page is selected:
Ideenmodellierer
parents:
824
diff
changeset
|
954 } |
|
bc2fcd002fc4
Check line enable/disable state when a new page is selected:
Ideenmodellierer
parents:
824
diff
changeset
|
955 } |
| 38 | 956 |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
957 static void nextPage(void) |
| 38 | 958 { |
| 959 uint8_t page, line; | |
| 960 | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
961 SSettings* pSettings; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
962 pSettings = settingsGetPointer(); |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
963 |
| 38 | 964 menu.pageMemoryForNavigation += 1; |
| 965 | |
| 966 findValidPosition(&page, &line); | |
| 967 menu.pageMemoryForNavigation = page; | |
| 968 /* new test for 3button design */ | |
| 969 //menu.lineMemoryForNavigationForPage[page] = line; | |
| 970 menu.lineMemoryForNavigationForPage[page] = 0; | |
| 971 menu.modeFlipPages = 1; | |
| 972 | |
| 973 set_globalState_Menu_Page(page); | |
| 974 | |
|
850
bc2fcd002fc4
Check line enable/disable state when a new page is selected:
Ideenmodellierer
parents:
824
diff
changeset
|
975 checkLineStatus(); /* some lines may be enabled / disabled depending on condition occuring outside the page scope => check if update is necessary */ |
|
bc2fcd002fc4
Check line enable/disable state when a new page is selected:
Ideenmodellierer
parents:
824
diff
changeset
|
976 |
| 38 | 977 change_CLUT_entry(CLUT_MenuLineSelectedSides, (CLUT_MenuPageGasOC + page - 1)); |
| 978 change_CLUT_entry(CLUT_MenuLineSelectedSeperator, (CLUT_MenuPageGasOC + page - 1)); | |
| 979 | |
| 980 GFX_SetFrameTop(menu.StartAddressForPage[page]); | |
| 981 /* new test for 3button design */ | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
982 //GFX_SetFrameBottom((.FBStartAdress) + 65*2*(line - 1), 0, 25, 800, 390); |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
983 if(!pSettings->FlipDisplay) |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
984 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
985 GFX_SetFrameBottom(tMdesignSolo.FBStartAdress, 0, 25, 800, 390); |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
986 } |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
987 else |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
988 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
989 GFX_SetFrameBottom(tMdesignSolo.FBStartAdress, 0, 65, 800, 390); |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
990 } |
| 38 | 991 } |
| 992 | |
|
647
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
993 void selectPage(uint32_t selection) |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
994 { |
| 650 | 995 uint8_t page; |
|
647
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
996 SStateList idList; |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
997 |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
998 SSettings* pSettings; |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
999 pSettings = settingsGetPointer(); |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1000 |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1001 // menu.pageMemoryForNavigation = selection; |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1002 |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1003 // findValidPosition(&page, &line); |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1004 if(selection > MAXPAGES) /* selection via structure */ |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1005 { |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1006 get_idSpecificStateList(selection, &idList); |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1007 page = idList.page; |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1008 } |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1009 else |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1010 { |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1011 page = selection; |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1012 } |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1013 |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1014 if(menu.shadowPage[page]) /* backup base page in case a shadow was selected */ |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1015 { |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1016 menu.activeShadow = menu.pageMemoryForNavigation; |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1017 } |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1018 |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1019 menu.pageMemoryForNavigation = page; |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1020 /* new test for 3button design */ |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1021 //menu.lineMemoryForNavigationForPage[page] = line; |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1022 menu.lineMemoryForNavigationForPage[page] = 0; |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1023 menu.modeFlipPages = 1; |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1024 |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1025 set_globalState_Menu_Page(page); |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1026 |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1027 change_CLUT_entry(CLUT_MenuLineSelectedSides, (CLUT_MenuPageGasOC + page - 1)); |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1028 change_CLUT_entry(CLUT_MenuLineSelectedSeperator, (CLUT_MenuPageGasOC + page - 1)); |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1029 |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1030 GFX_SetFrameTop(menu.StartAddressForPage[page]); |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1031 /* new test for 3button design */ |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1032 //GFX_SetFrameBottom((.FBStartAdress) + 65*2*(line - 1), 0, 25, 800, 390); |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1033 if(!pSettings->FlipDisplay) |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1034 { |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1035 GFX_SetFrameBottom(tMdesignSolo.FBStartAdress, 0, 25, 800, 390); |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1036 } |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1037 else |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1038 { |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1039 GFX_SetFrameBottom(tMdesignSolo.FBStartAdress, 0, 65, 800, 390); |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1040 } |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1041 nextLine(); |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1042 } |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1043 |
| 38 | 1044 |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
1045 static void nextLine(void) |
| 38 | 1046 { |
| 1047 uint8_t page, line; | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1048 SSettings* pSettings; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1049 pSettings = settingsGetPointer(); |
| 38 | 1050 |
| 1051 page = menu.pageMemoryForNavigation; | |
| 1052 menu.lineMemoryForNavigationForPage[page] += 1; | |
| 1053 | |
| 1054 findValidPosition(&page, &line); | |
| 1055 menu.lineMemoryForNavigationForPage[page] = line; | |
| 1056 | |
| 1057 /* new test for 3button design */ | |
| 1058 menu.modeFlipPages = 0; | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1059 if(!pSettings->FlipDisplay) |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1060 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1061 GFX_SetFrameBottom((tMdesignCursor.FBStartAdress) + 65*2*(line - 1), 0, 25, 800, 390); |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1062 } |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1063 else |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1064 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1065 GFX_SetFrameBottom((tMdesignCursor.FBStartAdress)+ (390 - 65 *(line)) *2, 0, 480-390-KEY_LABEL_HIGH, 800, 390); |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1066 } |
| 38 | 1067 } |
| 1068 | |
| 1069 | |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
1070 static void stepBackMenu(void) |
| 38 | 1071 { |
|
647
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1072 if(menu.activeShadow) /* restore base page */ |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1073 { |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1074 selectPage(menu.activeShadow); |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1075 menu.activeShadow = 0; |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1076 } |
| 38 | 1077 if(menu.modeFlipPages == 0) |
| 1078 { | |
| 1079 menu.lineMemoryForNavigationForPage[menu.pageMemoryForNavigation] = 0; | |
| 1080 menu.modeFlipPages = 1; | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1081 if(!settingsGetPointer()->FlipDisplay) |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1082 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1083 GFX_SetFrameBottom(tMdesignSolo.FBStartAdress, 0, 25, 800, 390); |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1084 } |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1085 else |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1086 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1087 GFX_SetFrameBottom(tMdesignSolo.FBStartAdress, 0, 480-390-KEY_LABEL_HIGH, 800, 390); |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1088 } |
| 38 | 1089 } |
| 1090 else | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1091 { |
| 38 | 1092 exitMenu(); |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1093 } |
| 38 | 1094 } |
| 1095 | |
| 1096 | |
| 1097 void exitMenu(void) | |
| 1098 { | |
| 1099 set_globalState_tHome(); | |
| 1100 } | |
| 1101 | |
| 1102 | |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
1103 static void stepForwardMenu(void) |
| 38 | 1104 { |
| 1105 if(menu.modeFlipPages == 1) | |
| 1106 { | |
| 1107 nextLine(); | |
| 1108 } | |
| 1109 else | |
| 1110 gotoMenuEdit(); | |
| 1111 } | |
| 1112 | |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
1113 static void gotoMenuEdit(void) |
| 38 | 1114 { |
| 1115 uint8_t line; | |
| 1116 | |
| 1117 line = menu.lineMemoryForNavigationForPage[menu.pageMemoryForNavigation]; | |
| 1118 | |
| 1119 switch(get_globalState()) | |
| 1120 { | |
| 1121 case StMOG: | |
| 1122 openEdit_GasOC(line); | |
| 1123 break; | |
| 1124 case StMCG: | |
| 1125 openEdit_GasCC(line); | |
| 1126 break; | |
| 1127 case StMSP: | |
| 1128 openEdit_Setpoint(line); | |
| 1129 break; | |
| 1130 case StMXTRA: | |
| 1131 openEdit_Xtra(line); | |
| 1132 break; | |
| 1133 case StMDECO: | |
| 1134 openEdit_Deco(line); | |
| 1135 break; | |
| 1136 case StMDECOP: | |
| 1137 openEdit_DecoParameter(line); | |
| 1138 break; | |
| 1139 case StMPLAN: | |
| 1140 openEdit_Planner(line); | |
| 1141 break; | |
| 1142 case StMHARD: | |
| 1143 openEdit_Hardware(line); | |
| 1144 break; | |
| 1145 case StMSYS: | |
| 1146 openEdit_System(line); | |
| 1147 break; | |
| 507 | 1148 case StMCustom: |
| 1149 openEdit_Custom(line); | |
| 1150 break; | |
| 38 | 1151 default: |
| 1152 break; | |
| 1153 } | |
| 1154 } | |
| 1155 | |
| 1156 | |
| 1157 void sendActionToMenu(uint8_t sendAction) | |
| 1158 { | |
| 1159 switch(sendAction) | |
| 1160 { | |
| 1161 case ACTION_BUTTON_ENTER: | |
| 1162 stepForwardMenu(); | |
| 1163 break; | |
| 1164 case ACTION_BUTTON_NEXT: | |
| 1165 if(menu.modeFlipPages) | |
| 1166 nextPage(); | |
| 1167 else | |
| 1168 nextLine(); | |
| 1169 break; | |
| 1170 case ACTION_TIMEOUT: | |
| 1171 case ACTION_MODE_CHANGE: | |
| 1172 case ACTION_BUTTON_BACK: | |
| 1173 /* new test for 3button design */ | |
| 1174 stepBackMenu(); | |
| 1175 break; | |
| 1176 default: | |
| 1177 break; | |
| 1178 case ACTION_IDLE_TICK: | |
| 1179 case ACTION_IDLE_SECOND: | |
| 1180 break; | |
| 1181 } | |
| 1182 /* tMC_OC_Gas(StMOG1, pSettings); */ | |
| 1183 } | |
| 1184 | |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
1185 static void tMenu_write(uint8_t page, char *text, char *subtext) |
| 38 | 1186 { |
| 1187 if(page > MAXPAGES) | |
| 1188 return; | |
| 1189 if(menu.linesAvailableForPage[page] == 0) | |
| 1190 return; | |
| 1191 | |
| 1192 tMscreen.FBStartAdress = menu.StartAddressForPage[page]; | |
| 1193 GFX_write_string(&FontT48, &tMwindow, text,1); | |
| 1194 if((*subtext) && (menu.linesAvailableForPage[page] < 6)) | |
| 1195 { | |
| 1196 GFX_write_string(&FontT42, &tMwindow, subtext, (menu.linesAvailableForPage[page] + 1)); | |
| 1197 } | |
| 1198 } | |
| 1199 | |
| 1200 | |
| 1201 /* Private functions ---------------------------------------------------------*/ | |
| 1202 | |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
1203 static void draw_tMdesignSubUnselected(uint32_t *ppDestination) |
| 38 | 1204 { |
| 1205 union al88_u | |
| 1206 { | |
| 1207 uint8_t al8[2]; | |
| 1208 uint16_t al88; | |
| 1209 }; | |
| 1210 | |
|
130
b7689d9e888a
Minor changes to improved code quality and to eliminate warnings
Ideenmodellierer
parents:
122
diff
changeset
|
1211 uint16_t* prunning = (uint16_t*)*ppDestination; |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1212 |
| 38 | 1213 union al88_u color_seperator; |
| 1214 union al88_u color_unselected; | |
| 1215 int i; | |
| 1216 | |
| 1217 color_seperator.al8[0] = CLUT_MenuLineUnselectedSeperator; | |
| 1218 color_unselected.al8[0] = CLUT_MenuLineUnselected; | |
| 1219 | |
| 1220 color_seperator.al8[1] = 0xFF; | |
| 1221 color_unselected.al8[1] = 0xFF; | |
| 1222 | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1223 *(__IO uint16_t*)prunning++ = color_seperator.al88; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1224 *(__IO uint16_t*)prunning++ = color_seperator.al88; |
| 38 | 1225 |
| 1226 for(i = 61; i > 0; i--) | |
| 1227 { | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1228 *(__IO uint16_t*)prunning++ = color_unselected.al88; |
| 38 | 1229 } |
| 1230 | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1231 *(__IO uint16_t*)prunning++ = color_seperator.al88; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1232 *(__IO uint16_t*)prunning++ = color_seperator.al88; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1233 |
|
130
b7689d9e888a
Minor changes to improved code quality and to eliminate warnings
Ideenmodellierer
parents:
122
diff
changeset
|
1234 *ppDestination = (uint32_t)prunning; |
| 38 | 1235 } |
| 1236 | |
| 1237 | |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
1238 static void draw_tMdesignSubSelected(uint32_t *ppDestination) |
| 38 | 1239 { |
| 1240 union al88_u | |
| 1241 { | |
| 1242 uint8_t al8[2]; | |
| 1243 uint16_t al88; | |
| 1244 }; | |
| 1245 | |
| 1246 union al88_u color_selected; | |
| 1247 union al88_u color_seperator; | |
| 1248 int i; | |
| 1249 | |
| 1250 color_selected.al8[0] = CLUT_MenuLineSelected; | |
| 1251 color_selected.al8[1] = 0xFF; | |
| 1252 | |
| 1253 color_seperator.al8[0] = CLUT_MenuLineSelectedSeperator; | |
| 1254 color_seperator.al8[1] = 0xFF; | |
| 1255 | |
| 1256 *(__IO uint16_t*)*ppDestination = color_seperator.al88; | |
| 1257 *ppDestination += 2; | |
| 1258 *(__IO uint16_t*)*ppDestination = color_seperator.al88; | |
| 1259 *ppDestination += 2; | |
| 1260 | |
| 1261 for(i = 61; i > 0; i--) | |
| 1262 { | |
| 1263 *(__IO uint16_t*)*ppDestination = color_selected.al88; | |
| 1264 *ppDestination += 2; | |
| 1265 } | |
| 1266 | |
| 1267 *(__IO uint16_t*)*ppDestination = color_seperator.al88; | |
| 1268 *ppDestination += 2; | |
| 1269 *(__IO uint16_t*)*ppDestination = color_seperator.al88; | |
| 1270 *ppDestination += 2; | |
| 1271 } | |
| 1272 | |
| 1273 | |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
1274 static void draw_tMdesignSubSelectedBorder(uint32_t *ppDestination) |
| 38 | 1275 { |
| 1276 union al88_u | |
| 1277 { | |
| 1278 uint8_t al8[2]; | |
| 1279 uint16_t al88; | |
| 1280 }; | |
| 1281 | |
| 1282 union al88_u color_selected_sides; | |
| 1283 | |
| 1284 int i; | |
| 1285 | |
| 1286 color_selected_sides.al8[0] = CLUT_MenuLineSelectedSides; | |
| 1287 color_selected_sides.al8[1] = 0xFF; | |
| 1288 | |
| 1289 for(i = 65; i > 0; i--) | |
| 1290 { | |
| 1291 *(__IO uint16_t*)*ppDestination = color_selected_sides.al88; | |
| 1292 *ppDestination += 2; | |
| 1293 } | |
| 1294 } | |
| 1295 | |
| 1296 | |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
1297 static void draw_tMcursorDesign(void) |
| 38 | 1298 { |
| 1299 int i,j; | |
| 1300 uint32_t pDestination; | |
| 1301 | |
| 1302 pDestination = tMdesignCursor.FBStartAdress; | |
| 1303 | |
| 1304 for(j = 801; j > 0; j--) | |
| 1305 { | |
| 1306 for(i = 5; i > 0; i--) | |
| 1307 { | |
| 1308 draw_tMdesignSubUnselected(&pDestination); | |
| 1309 } | |
| 1310 if((j > 787) || (j < 17)) | |
| 1311 draw_tMdesignSubSelectedBorder(&pDestination); | |
| 1312 else | |
| 1313 draw_tMdesignSubSelected(&pDestination); | |
| 1314 } | |
| 1315 | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1316 /* Draw menu background boxes which are visible if nothing is selected */ |
| 38 | 1317 pDestination = tMdesignSolo.FBStartAdress; |
| 1318 | |
| 1319 for(j = 801; j > 0; j--) | |
| 1320 { | |
| 1321 for(i = 6; i > 0; i--) | |
| 1322 { | |
| 1323 draw_tMdesignSubUnselected(&pDestination); | |
| 1324 } | |
| 1325 } | |
| 1326 } | |
| 1327 | |
| 1328 | |
|
167
5e41365ff0d8
cleanup: local data and functions can be static (tMenu)
Jan Mulder <jlmulder@xs4all.nl>
parents:
130
diff
changeset
|
1329 static void draw_tMheader(uint8_t page) |
| 38 | 1330 { |
| 1331 union al88_u | |
| 1332 { | |
| 1333 uint8_t al8[2]; | |
| 1334 uint16_t al88; | |
| 1335 }; | |
| 1336 union al88_u color_top; | |
| 1337 int i,j, k, k4text; | |
| 1338 uint32_t pBackup; | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1339 uint16_t* pDestination; |
| 38 | 1340 uint8_t colorText; |
| 1341 uint16_t positionText; | |
| 1342 uint8_t pageText; | |
| 1343 | |
|
647
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1344 char text8max[MAXPAGES+1][8] = |
| 38 | 1345 { "", |
| 1346 "OC", | |
| 1347 "CC", | |
| 1348 "SP", | |
| 1349 "DATA", | |
| 1350 "DECO", | |
| 1351 "", | |
| 1352 "SYS", | |
| 1353 "", | |
| 507 | 1354 "", |
| 1355 "SIM" | |
| 38 | 1356 }; |
| 1357 | |
|
647
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1358 _Bool spacing[MAXPAGES+1] = |
| 38 | 1359 { 0, |
| 1360 0, // behind OC | |
| 1361 0, // behind CC | |
| 1362 1, // behind SP | |
| 1363 1, // behind DATA | |
| 1364 0, // behind DECO1 | |
| 1365 1, // behind DECO2 | |
| 1366 0, // behind SYS1 | |
| 507 | 1367 0, // behind SYS2 |
| 1368 1, // behind SYS3 | |
| 38 | 1369 1, // behind SIM |
| 1370 0 | |
| 1371 }; | |
| 1372 | |
|
647
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1373 if(actual_menu_content == MENU_SURFACE) |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1374 { |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1375 spacing[3] = 0; /* Display extra menu directly after setpoint */ |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1376 sprintf(text8max[4],"OP"); |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1377 } |
|
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1378 |
| 38 | 1379 pBackup = tMscreen.FBStartAdress; |
| 1380 tMscreen.FBStartAdress = menu.StartAddressForPage[page]; | |
|
130
b7689d9e888a
Minor changes to improved code quality and to eliminate warnings
Ideenmodellierer
parents:
122
diff
changeset
|
1381 pDestination = (uint16_t*) menu.StartAddressForPage[page]; |
| 38 | 1382 positionText = 10; |
| 1383 pageText = page; | |
| 1384 | |
| 1385 gfx_write_page_number(&tMscreen ,menu.pageCountNumber[page],menu.pageCountTotal,0); | |
| 1386 | |
| 1387 while((text8max[pageText][0] == 0) && (pageText > 1)) | |
| 1388 { | |
| 1389 pageText--; | |
| 1390 } | |
| 1391 | |
| 1392 for(k = 1; k <= MAXPAGES; k++) | |
| 1393 { | |
| 1394 if(menu.pageCountNumber[k] != 0) | |
| 1395 { | |
| 1396 k4text = k; // new hw 170522 | |
| 1397 if((text8max[k][0] == 0) && (menu.pageCountNumber[k-1] == 0)) | |
| 1398 k4text = k-1; | |
| 1399 | |
| 1400 color_top.al8[0] = CLUT_MenuPageGasOC + k - 1; | |
|
169
842f57bbaaad
Bugfix: highlight the menu underline correctly on selected state
Jan Mulder <jlmulder@xs4all.nl>
parents:
167
diff
changeset
|
1401 if (k == page) |
| 38 | 1402 { |
| 1403 color_top.al8[1] = 0xFF; | |
| 1404 } | |
| 1405 else | |
| 1406 { | |
| 1407 color_top.al8[1] = 0x50; | |
| 1408 } | |
| 1409 | |
| 1410 if(k4text == pageText) | |
| 1411 { | |
| 1412 colorText = CLUT_Font020; | |
| 1413 } | |
| 1414 else | |
| 1415 { | |
| 1416 colorText = CLUT_Font021; | |
| 1417 } | |
| 1418 | |
| 1419 write_content_simple(&tMscreen,positionText,775,0,&FontT42,text8max[k4text],colorText); | |
| 1420 /* | |
| 1421 write_content_simple(&tMscreen,positionText,775,0,&FontT42,text8max[k],colorText); | |
| 1422 if((text8max[k][0] == 0) && (menu.pageCountNumber[k-1] == 0)) | |
| 1423 write_content_simple(&tMscreen,positionText,775,0,&FontT42,text8max[k-1],colorText); | |
| 1424 */ | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1425 /* Draw color bars */ |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1426 if(!settingsGetPointer()->FlipDisplay) |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1427 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1428 pDestination += 5 * 480; |
| 38 | 1429 |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1430 for(j = 60; j > 0; j--) |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1431 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1432 pDestination += (390 + 26); |
| 38 | 1433 |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1434 for(i = 16; i > 0; i--) |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1435 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1436 *(__IO uint16_t*)pDestination++ = color_top.al88; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1437 } |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1438 pDestination += 48; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1439 } |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1440 |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1441 pDestination += 5 * 480; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1442 positionText += 70; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1443 |
|
647
15f6f0b5786c
Integrated selection of bailout in the diluent selection page:
Ideenmodellierer
parents:
521
diff
changeset
|
1444 if(((k == 4) && (actual_menu_content != MENU_SURFACE)) || ((k == 6) && (menu.pageCountNumber[5] == 0))) |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1445 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1446 pDestination += 70 * 480; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1447 positionText += 70; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1448 } |
| 38 | 1449 |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1450 if(spacing[k]) |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1451 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1452 pDestination += 35 * 480; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1453 positionText += 35; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1454 } |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1455 } |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1456 else |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1457 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1458 pDestination += (800 - 5)* 480; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1459 |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1460 for(j = 60; j > 0; j--) |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1461 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1462 pDestination -= (390 + 26); |
| 38 | 1463 |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1464 for(i = 16; i > 0; i--) |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1465 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1466 *(__IO uint16_t*)pDestination-- = color_top.al88; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1467 } |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1468 pDestination -= 48; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1469 } |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1470 |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1471 pDestination -= (800) * 480; |
| 824 | 1472 positionText += 66; |
| 38 | 1473 |
|
658
4df22790dc0c
Bugfix handling of new menu tab in flipped mode:
Ideenmodellierer
parents:
650
diff
changeset
|
1474 if(((k == 4) && (actual_menu_content != MENU_SURFACE)) || ((k == 6) && (menu.pageCountNumber[5] == 0))) |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1475 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1476 pDestination -= 70 * 480; |
| 824 | 1477 positionText += 66; |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1478 } |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1479 |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1480 if(spacing[k]) |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1481 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1482 pDestination -= 35 * 480; |
| 824 | 1483 positionText += 31; |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1484 } |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
51
diff
changeset
|
1485 } |
| 38 | 1486 } |
| 1487 } | |
| 1488 tMscreen.FBStartAdress = pBackup; | |
| 1489 } | |
|
774
6169309d6eb9
more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents:
662
diff
changeset
|
1490 |
|
6169309d6eb9
more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents:
662
diff
changeset
|
1491 |
|
6169309d6eb9
more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents:
662
diff
changeset
|
1492 char *makeGrey(bool isGrey) |
|
6169309d6eb9
more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents:
662
diff
changeset
|
1493 { |
|
6169309d6eb9
more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents:
662
diff
changeset
|
1494 return isGrey ? "\031" : ""; |
|
6169309d6eb9
more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents:
662
diff
changeset
|
1495 } |