Mercurial > public > ostc4

comparison Discovery/Src/tMenu.c @ 225:2bb1db22b5f5 div-fixes-3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: random set of cleanups A random set of cleanups, as found during code reading, and looking around fixing issues. Contains all kinds of things: typo's in comment, typo in variable name, removal of unused code, making things static where possible. Does not contain any functional changes. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
author Jan Mulder <jlmulder@xs4all.nl>
date Mon, 01 Apr 2019 15:50:41 +0200
parents 842f57bbaaad
children 0dbf550dc743
comparison
equal deleted inserted replaced
224:ceecabfddb57 225:2bb1db22b5f5
396 localtext[2] = TXT2BYTE_ButtonNext; 396 localtext[2] = TXT2BYTE_ButtonNext;
397 localtext[3] = 0; 397 localtext[3] = 0;
398 write_content_simple(&tMscreen, 0, 800, 480-KEY_LABEL_HIGH, &FontT24,localtext,CLUT_ButtonSurfaceScreen); 398 write_content_simple(&tMscreen, 0, 800, 480-KEY_LABEL_HIGH, &FontT24,localtext,CLUT_ButtonSurfaceScreen);
399 } 399 }
400 400
401 /*
402 _Bool skipCCRpage(uint8_t page)
403 {
404 if(menu.ccrOnlyContentForPage[page])
405 {
406 if(actual_menu_content == MENU_SURFACE)
407 {
408 SSettings *data = settingsGetPointer();
409 if((data->dive_mode != DIVEMODE_CCR) && data->hideCCRinOCmode)
410 return 1;
411 }
412 }
413 return 0;
414 }
415 */
416
417 static void findValidPosition(uint8_t *pageOuput, uint8_t *lineOutput) 401 static void findValidPosition(uint8_t *pageOuput, uint8_t *lineOutput)
418 { 402 {
419 uint8_t page = 0; 403 uint8_t page = 0;
420 uint8_t line = 0; 404 uint8_t line = 0;
421 uint8_t first = 0; 405 uint8_t first = 0;
565 { 549 {
566 uint8_t page = 0; 550 uint8_t page = 0;
567 char text[MAX_PAGE_TEXTSIZE]; 551 char text[MAX_PAGE_TEXTSIZE];
568 char subtext[MAX_PAGE_TEXTSIZE]; 552 char subtext[MAX_PAGE_TEXTSIZE];
569 uint16_t tabPosition; 553 uint16_t tabPosition;
570
571 // if(menu.modeFlipPages == 0)
572 // return;
573 554
574 if((get_globalState() == StMSYS) && (actual_menu_content == MENU_SURFACE)) 555 if((get_globalState() == StMSYS) && (actual_menu_content == MENU_SURFACE))
575 { 556 {
576 page = menu.pageMemoryForNavigation; 557 page = menu.pageMemoryForNavigation;
577 tMSystem_refresh(0, text, &tabPosition, subtext); 558 tMSystem_refresh(0, text, &tabPosition, subtext);