Mercurial > public > ostc4
comparison Discovery/Src/tMenu.c @ 1037:2af07aa38531 GasConsumption
Merge with external development branches:
Some features have been prepared for integration: Profiles, DMA UART on Firmware part, Bluetooth discovery and messges logging for development phase. All these new function are deactivated by compile switch and may be activated using the configuration.h for testing purpose.
| author | Ideenmodellierer |
|---|---|
| date | Mon, 15 Sep 2025 21:12:44 +0200 |
| parents | 3d9552e4997c |
| children | f8e2895c91e5 |
comparison
equal
deleted
inserted
replaced
| 1029:e938901f6386 | 1037:2af07aa38531 |
|---|---|
| 824 tMHardware_refresh(line, text, &tabPosition, subtext); | 824 tMHardware_refresh(line, text, &tabPosition, subtext); |
| 825 clean_line_actual_page(); | 825 clean_line_actual_page(); |
| 826 update_content_actual_page(text, tabPosition, subtext); | 826 update_content_actual_page(text, tabPosition, subtext); |
| 827 break; | 827 break; |
| 828 case StMSYS: | 828 case StMSYS: |
| 829 if((line == get_lineOfID(StMSYS1_DateTime)) || (line == get_lineOfID(StMSYS2_English)) || (line == get_lineOfID(StMSYS_Profile))) | 829 if((line == get_lineOfID(StMSYS1_DateTime)) || (line == get_lineOfID(StMSYS2_English)) |
| 830 #ifdef ENABLE_SETTING_PROFILES | |
| 831 || (line == get_lineOfID(StMSYS_Profile))) | |
| 832 #else | |
| 833 ) | |
| 834 #endif | |
| 830 { | 835 { |
| 831 tM_rebuild_pages(); | 836 tM_rebuild_pages(); |
| 832 menu.lineMemoryForNavigationForPage[page] = line; // fix 160623 | 837 menu.lineMemoryForNavigationForPage[page] = line; // fix 160623 |
| 833 GFX_SetFrameTop(menu.StartAddressForPage[page]); | 838 GFX_SetFrameTop(menu.StartAddressForPage[page]); |
| 834 menu.lineMemoryForNavigationForPage[page] = line; | 839 menu.lineMemoryForNavigationForPage[page] = line; |
