Mercurial > public > ostc4

changeset 1076:c87753e73eb8 Icon_Integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Dev bugfix 50 pixel spacing: the control char '\007' was used for the new 50 pixel format style. This character was already in use as '\a' invert (same value different spelling) => The 50 pixel format has been switched to the control char '\033' which is not in use.
author Ideenmodellierer
date Sun, 22 Feb 2026 21:23:57 +0100
parents ef99fff2d2de
children bd8ab302ef4a
files Discovery/Inc/gfx_engine.h Discovery/Src/gfx_engine.c Discovery/Src/tMenuCvOptionText.c Discovery/Src/tMenuGas.c
diffstat 4 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/Discovery/Inc/gfx_engine.h	Sun Feb 22 20:00:00 2026 +0100
+++ b/Discovery/Inc/gfx_engine.h	Sun Feb 22 21:23:57 2026 +0100
@@ -106,7 +106,7 @@
     *  ...
     * \027  color 8
     * \026	color 11
-    * \033 UNUSED \c ESC
+    * \033  50 pixel spacing \c ESC
     * \034	monospaced space large size mode
     * \035	standard space size mode
     * \040	space == begin of text
--- a/Discovery/Src/gfx_engine.c	Sun Feb 22 20:00:00 2026 +0100
+++ b/Discovery/Src/gfx_engine.c	Sun Feb 22 21:23:57 2026 +0100
@@ -2139,7 +2139,7 @@
 			if(*pText == '\r') // carriage return, no newline
 				settings.Xdelta = 0;
 			else
-			if((*pText == '\007')) /* jump to next 50 pixel offset */
+			if((*pText == '\033')) /* jump to next 50 pixel offset */
 			{
 					settings.Xdelta = ((settings.Xdelta / 50) + 1) * 50;
 			}
--- a/Discovery/Src/tMenuCvOptionText.c	Sun Feb 22 20:00:00 2026 +0100
+++ b/Discovery/Src/tMenuCvOptionText.c	Sun Feb 22 21:23:57 2026 +0100
@@ -103,11 +103,11 @@
 
 		if((pSettings->ext_sensor_map[0] == SENSOR_ANALOG) || (pSettings->ext_sensor_map[0] == SENSOR_DIGO2M) || (pSettings->ext_sensor_map[0] == SENSOR_SENTINELM))
 		{
-			textPointer += snprintf(&pText[textPointer],20,"%c%01.1f \020\007",sensorStatusColor[0], stateUsed->lifeData.ppO2Sensor_bar[0]);
+			textPointer += snprintf(&pText[textPointer],20,"%c%01.1f \020\033",sensorStatusColor[0], stateUsed->lifeData.ppO2Sensor_bar[0]);
 		}
 		if((pSettings->ext_sensor_map[1] == SENSOR_ANALOG) || (pSettings->ext_sensor_map[1] == SENSOR_DIGO2M) || (pSettings->ext_sensor_map[1] == SENSOR_SENTINELM))
 		{
-			textPointer += snprintf(&pText[textPointer],20,"%c%01.1f \020\007",sensorStatusColor[1], stateUsed->lifeData.ppO2Sensor_bar[1]);
+			textPointer += snprintf(&pText[textPointer],20,"%c%01.1f \020\033",sensorStatusColor[1], stateUsed->lifeData.ppO2Sensor_bar[1]);
 		}
 		if((pSettings->ext_sensor_map[2] == SENSOR_ANALOG) || (pSettings->ext_sensor_map[2] == SENSOR_DIGO2M) || (pSettings->ext_sensor_map[2] == SENSOR_SENTINELM))
 		{
@@ -140,7 +140,7 @@
 	/* Grey out */
 	if(pSettings->co2_sensor_active == 0) sensorStatusColor = '\031';
 
-	textPointer += snprintf(&pText[textPointer],20,"%c%ld \020\007",sensorStatusColor, stateUsed->lifeData.CO2_data.CO2_ppm);
+	textPointer += snprintf(&pText[textPointer],20,"%c%ld \020\033",sensorStatusColor, stateUsed->lifeData.CO2_data.CO2_ppm);
 
 	pText[textPointer++] = '\020';
 	pText[textPointer] = 0;
--- a/Discovery/Src/tMenuGas.c	Sun Feb 22 20:00:00 2026 +0100
+++ b/Discovery/Src/tMenuGas.c	Sun Feb 22 21:23:57 2026 +0100
@@ -192,17 +192,17 @@
 #ifdef ENABLE_ADVANCED_GAS
 					if( ltr != 0)
 					{
-						textPointer += snprintf(&text[textPointer], 20,"\007 %2u\016\016ltr\017",ltr);
+						textPointer += snprintf(&text[textPointer], 20,"\033 %2u\016\016ltr\017",ltr);
 					}
 					else
 					{
-						text[textPointer++] = '\007';
-						text[textPointer++] = '\007';
-						text[textPointer++] = '\007';
+						text[textPointer++] = '\033';
+						text[textPointer++] = '\033';
+						text[textPointer++] = '\033';
 					}
                 	if( bar != 0)
                 	{
-                		textPointer += snprintf(&text[textPointer], 20,"\007 %2u\016\016bar\017",bar);
+                		textPointer += snprintf(&text[textPointer], 20,"\033 %2u\016\016bar\017",bar);
                 	}
 
 #endif
@@ -283,7 +283,7 @@
                 {
 					textPointer += snprintf(&text[textPointer], 12,\
 						"%c"
-						"\007\007%2u"
+						"\033\033%2u"
 						"\016\016"
 						"ltr"
 						"\017"
@@ -292,16 +292,16 @@
                 }
                 else
                 {
-                	text[textPointer++] = '\007';
-                	text[textPointer++] = '\007';
-                	text[textPointer++] = '\007';
+                	text[textPointer++] = '\033';
+                	text[textPointer++] = '\033';
+                	text[textPointer++] = '\033';
                 }
                 /* bar */
                 if(bar != 0)
                 {
 					textPointer += snprintf(&text[textPointer], 12,\
 						"%c"
-						"\007%3u"
+						"\033%3u"
 						"\016\016"
 						"bar"
 						"\017",