Mercurial > public > ostc4
changeset 525:1f557e5f4b5a
Change color ID used in strings for light grey:
CLUT of id 21 and 31 were the same. Changed CLUT of 21 back to a dark grey (used to show off state) and updated strings to 31 => No visible change in menus
| author | Ideenmodellierer |
|---|---|
| date | Sun, 13 Sep 2020 20:49:58 +0200 |
| parents | b33a8c1c72e5 |
| children | 88c626d01ee5 |
| files | Discovery/Src/gfx_colors.c Discovery/Src/tInfoLog.c Discovery/Src/tMenuEditHardware.c Discovery/Src/tMenuEditPlanner.c Discovery/Src/tMenuHardware.c Discovery/Src/tMenuSetpoint.c |
| diffstat | 6 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/Discovery/Src/gfx_colors.c Sun Sep 13 20:44:50 2020 +0200 +++ b/Discovery/Src/gfx_colors.c Sun Sep 13 20:49:58 2020 +0200 @@ -39,7 +39,7 @@ { // ARGB 0x00FFFFFF, // \020 wei� - 0x00777777, // \021 grau f�r inaktiv / hw 151027: war zuvor 0x00555555 grau + 0x00333333, // \021 dark grey 0x0050FF50, // \022 units 0x003060FF, // \023 blau 0x00FFFF00, // \024 + CLUT_WarningYellow @@ -47,7 +47,7 @@ 0x0000FF00, // \026 + CLUT_NiceGreen 0x00FFFFFF, // \027 DIVE_MainColorIfNotWhite\020 0x00FFFFFF, // \030 DIVE_PluginBoxMainColor - 0x00777777, // \031 DIVE_PluginBoxGrey + 0x00777777, // \031 DIVE_PluginBoxGrey also used to display deactivation 0x0050FF50, // \032 DIVE_LabelColor 0x00FFFFFF, // CLUT_DIVE_FieldSeperatorLines 0x0050FF50, // CLUT_DIVE_pluginbox // old pink 0x00FF20FF
--- a/Discovery/Src/tInfoLog.c Sun Sep 13 20:44:50 2020 +0200 +++ b/Discovery/Src/tInfoLog.c Sun Sep 13 20:49:58 2020 +0200 @@ -328,11 +328,11 @@ date[month] = logbookHeader.dateMonth; text[textPointer++] = '\034';// monospaced space large size mode - textPointer += snprintf(&text[textPointer], 20,"\021%04u \020", number); + textPointer += snprintf(&text[textPointer], 20,"\031%04u \020", number); /* if(number < 1000) - textPointer += snprintf(&text[textPointer], 20,"\021%2u \020", number); + textPointer += snprintf(&text[textPointer], 20,"\031%2u \020", number); else - textPointer += snprintf(&text[textPointer], 20,"\021\016\016%3u \017\020", number); + textPointer += snprintf(&text[textPointer], 20,"\031\016\016%3u \017\020", number); */ textPointer += snprintf(&text[textPointer], 20,"%02d.%02d ",date[0],date[1]); textPointer += snprintf(&text[textPointer], 20,"%02d:%02d ",logbookHeader.timeHour,logbookHeader.timeMinute);
--- a/Discovery/Src/tMenuEditHardware.c Sun Sep 13 20:44:50 2020 +0200 +++ b/Discovery/Src/tMenuEditHardware.c Sun Sep 13 20:49:58 2020 +0200 @@ -480,7 +480,7 @@ write_buttonTextline(TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,TXT2BYTE_ButtonNext); - text[0] = '\020'; // '\021'; + text[0] = '\020'; // '\031'; text[1] = TXT_2BYTE; text[2] = TXT2BYTE_LowerIsLess; text[3] = 0;
--- a/Discovery/Src/tMenuEditPlanner.c Sun Sep 13 20:44:50 2020 +0200 +++ b/Discovery/Src/tMenuEditPlanner.c Sun Sep 13 20:49:58 2020 +0200 @@ -493,7 +493,7 @@ textptr += snprintf(&text[textptr],20," %3i'", lengthInMinutes); } else - textptr = snprintf(text,20,"\021\034%2u\016\016m\017 ",depthNext); + textptr = snprintf(text,20,"\031\034%2u\016\016m\017 ",depthNext); for(int i = 0; i < ListCount; i++) { @@ -630,7 +630,7 @@ text[textpointer] = 0; if(tMplan_pGasConsumption[j] == 0) - text[textpointer++] = '\021'; + text[textpointer++] = '\031'; textpointer += write_gas(&text[textpointer], settingsGetPointer()->gas[j].oxygen_percentage, settingsGetPointer()->gas[j].helium_percentage ); text[textpointer] = 0; @@ -641,7 +641,7 @@ text[textpointer] = 0; if(tMplan_pGasConsumption[j] == 0) - text[textpointer++] = '\021'; + text[textpointer++] = '\031'; textpointer += snprintf(&text[textpointer],20,"\002%u\016\016 ltr\017",tMplan_pGasConsumption[j]); text[textpointer] = 0;
--- a/Discovery/Src/tMenuHardware.c Sun Sep 13 20:44:50 2020 +0200 +++ b/Discovery/Src/tMenuHardware.c Sun Sep 13 20:49:58 2020 +0200 @@ -105,11 +105,11 @@ if(stateUsed->diveSettings.ppo2sensors_deactivated) { if(stateUsed->diveSettings.ppo2sensors_deactivated & 1) - sensorStatusColor[0] = '\021'; + sensorStatusColor[0] = '\031'; if(stateUsed->diveSettings.ppo2sensors_deactivated & 2) - sensorStatusColor[1] = '\021'; + sensorStatusColor[1] = '\031'; if(stateUsed->diveSettings.ppo2sensors_deactivated & 4) - sensorStatusColor[2] = '\021'; + sensorStatusColor[2] = '\031'; } textPointer += snprintf(&text[textPointer],20,"%c%01.1f %c%01.1f %c%01.1f\020" ,sensorStatusColor[0], stateUsed->lifeData.ppO2Sensor_bar[0]
--- a/Discovery/Src/tMenuSetpoint.c Sun Sep 13 20:44:50 2020 +0200 +++ b/Discovery/Src/tMenuSetpoint.c Sun Sep 13 20:49:58 2020 +0200 @@ -94,7 +94,7 @@ if((first == 0) || (actual_menu_content != MENU_SURFACE)) strcpy(&text[textPointer++],"\177"); - char color = '\021'; + char color = '\031'; if(depthUp) color = '\020';