Mercurial > public > ostc4
comparison Discovery/Src/tMenuPlanner.c @ 567:1c95f811967c
-Add 12HR Time Support
-Add firmware image only font extensions
-Show english units when required in log's graphs
-Show decompression info with Font84 if 10 characters long
-Remove usage of ' symbol to denote minutes and instead use min abbreviation
-Show english units when required on the simulation configuration screen
-Remove usage of ' symbol to denote feet in in non-metric mode and use ft abbrevation
author | izzni |
---|---|
date | Tue, 24 Nov 2020 13:22:23 -0600 |
parents | 5f11787b4f42 |
children | 52df13712fa3 |
comparison
equal
deleted
inserted
replaced
566:7761dd028386 | 567:1c95f811967c |
---|---|
39 #define STD_depth (50) | 39 #define STD_depth (50) |
40 #define STD_intervall (0) | 40 #define STD_intervall (0) |
41 #define STD_divetime (20) | 41 #define STD_divetime (20) |
42 | 42 |
43 uint16_t tMplan_depth_meter = STD_depth, tMplan_intervall_time_minutes = STD_intervall, tMplan_dive_time_minutes = STD_divetime; | 43 uint16_t tMplan_depth_meter = STD_depth, tMplan_intervall_time_minutes = STD_intervall, tMplan_dive_time_minutes = STD_divetime; |
44 uint16_t tMplan_depth_editor; | |
44 | 45 |
45 /* Exported functions --------------------------------------------------------*/ | 46 /* Exported functions --------------------------------------------------------*/ |
46 | 47 |
47 uint32_t tMPlanner_refresh(uint8_t line, char *text, uint16_t *tab, char *subtext) | 48 uint32_t tMPlanner_refresh(uint8_t line, char *text, uint16_t *tab, char *subtext) |
48 { | 49 { |
86 if((line == 0) || (line == 2)) | 87 if((line == 0) || (line == 2)) |
87 { | 88 { |
88 text[textPointer++] = TXT_2BYTE; | 89 text[textPointer++] = TXT_2BYTE; |
89 text[textPointer++] = TXT2BYTE_Intervall; | 90 text[textPointer++] = TXT2BYTE_Intervall; |
90 text[textPointer++] = '\t'; | 91 text[textPointer++] = '\t'; |
91 textPointer += snprintf(&text[textPointer],30,"%u'",tMplan_intervall_time_minutes); | 92 textPointer += snprintf(&text[textPointer],30,"%u \016\016min\017",tMplan_intervall_time_minutes); |
92 } | 93 } |
93 strcpy(&text[textPointer],"\n\r"); | 94 strcpy(&text[textPointer],"\n\r"); |
94 textPointer += 2; | 95 textPointer += 2; |
95 if((line == 0) || (line == 3)) | 96 if((line == 0) || (line == 3)) |
96 { | 97 { |
97 text[textPointer++] = TXT_2BYTE; | 98 text[textPointer++] = TXT_2BYTE; |
98 text[textPointer++] = TXT2BYTE_SimDiveTime; | 99 text[textPointer++] = TXT2BYTE_SimDiveTime; |
99 text[textPointer++] = '\t'; | 100 text[textPointer++] = '\t'; |
100 textPointer += snprintf(&text[textPointer],30,"%u'",tMplan_dive_time_minutes); | 101 textPointer += snprintf(&text[textPointer],30,"%u \016\016min\017",tMplan_dive_time_minutes); |
101 } | 102 } |
102 strcpy(&text[textPointer],"\n\r"); | 103 strcpy(&text[textPointer],"\n\r"); |
103 textPointer += 2; | 104 textPointer += 2; |
104 if((line == 0) || (line == 4)) | 105 if((line == 0) || (line == 4)) |
105 { | 106 { |