Mercurial > public > ostc4

diff Discovery/Src/show_logbook.c @ 567:1c95f811967c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
-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 eea282e733e8
children 3860b8fa4b29
line wrap: on
line diff
--- a/Discovery/Src/show_logbook.c	Sat Nov 21 17:41:59 2020 +0100
+++ b/Discovery/Src/show_logbook.c	Tue Nov 24 13:22:23 2020 -0600
@@ -121,7 +121,14 @@
     winsmal.right = wintemp.left -1;
     winsmal.bottom = winsmal.top + 16;
 
-    Gfx_write_label_var(hgfx, winsmal.left, winsmal.right,winsmal.top, &FontT24,CLUT_GasSensor1,"[m]");
+    if(settingsGetPointer()->nonMetricalSystem)
+    {
+    	Gfx_write_label_var(hgfx, winsmal.left, winsmal.right,winsmal.top, &FontT24,CLUT_GasSensor1,"[ft]");
+    }
+    else
+    {
+    	Gfx_write_label_var(hgfx, winsmal.left, winsmal.right,winsmal.top, &FontT24,CLUT_GasSensor1,"[m]");
+    }
 
  //   winsmal.left = wintemp.left - 48;
     char msg[3];
@@ -132,7 +139,7 @@
         winsmal.bottom = winsmal.top + 16;
 
     //    winsmal.right = wintemp.left - 2;
-        snprintf(msg,5,"%i",i * vstep);
+        snprintf(msg,5,"%i",unit_depth_integer(i * vstep));
         Gfx_write_label_var(hgfx, winsmal.left, winsmal.right,winsmal.top, &FontT24,CLUT_GasSensor1,msg);
     }
 
@@ -421,6 +428,8 @@
     wintemp.right = 799 - wintemp.left;
     wintemp.top = LOG_BORDER_OFFSET;
     wintemp.bottom = 479 - 40;
+    char timeSuffix;
+    uint8_t hoursToDisplay;
 
     SLogbookHeader logbookHeader;
     logbook_getHeader(StepBackwards ,&logbookHeader);
@@ -467,7 +476,36 @@
     //Print time
     uint8_t hour = logbookHeader.timeHour;
     uint8_t minute = logbookHeader.timeMinute;
-    snprintf(text,20,"\002%02i:%02i",hour,minute);
+
+    if (settingsGetPointer()->amPMTime)
+    {
+    	if (logbookHeader.timeHour > 11)
+    	{
+    		timeSuffix = 'P';
+    	}
+    	else
+    	{
+    		timeSuffix = 'A';
+    	}
+
+    	if (logbookHeader.timeHour % 12 == 0)
+    	{
+    		hoursToDisplay = 12;
+    	}
+    	else
+    	{
+    		hoursToDisplay = (logbookHeader.timeHour % 12);
+    	}
+
+    	snprintf(text,20,"\002%02i:%02i %cM",hoursToDisplay,minute,timeSuffix);
+    }
+    else
+    {
+    	hoursToDisplay = logbookHeader.timeHour;
+    	snprintf(text,20,"\002%02i:%02i",hoursToDisplay,minute);
+    }
+
+
     Gfx_write_label_var(hgfx, 600, wintemp.right,10, &FontT42,CLUT_GasSensor1,text);
 
     //Print Dive Mode (OC/CCR/...)
@@ -705,7 +743,14 @@
     winsmal.right =  wintemp.right + 30;
     winsmal.bottom = winsmal.top + 16;
 
-    Gfx_write_label_var(hgfx, winsmal.left, winsmal.right,winsmal.top, &FontT24,CLUT_LogbookTemperature,"[C]");
+    if(settingsGetPointer()->nonMetricalSystem)
+    {
+    	Gfx_write_label_var(hgfx, winsmal.left, winsmal.right,winsmal.top, &FontT24,CLUT_LogbookTemperature,"[F]");
+    }
+    else
+    {
+    	Gfx_write_label_var(hgfx, winsmal.left, winsmal.right,winsmal.top, &FontT24,CLUT_LogbookTemperature,"[C]");
+    }
 
     int16_t minVal = 0;
     int16_t maxVal = 0;
@@ -726,17 +771,24 @@
     int deltaline = (1 + wintemp.bottom - wintemp.top)/5;
     char msg[3];
     int tmp = maxValTop;
+    int converted;
     for(int i = 1; i<=5; i++)
     {
         tmp -= 	step;
+        if(settingsGetPointer()->nonMetricalSystem) {
+        	converted = unit_temperature_integer(tmp);
+        }
+        else{
+        	converted = tmp;
+        }
         //if(tmp < 0)
             //break;
         winsmal.top	= wintemp.top + deltaline * i - 14;
         winsmal.bottom = winsmal.top + 16;
-        if((tmp >= 0) && (tmp < 100))
-            snprintf(msg,2,"%1i",tmp);
+        if((converted >= 0) && (converted < 100))
+            snprintf(msg,2,"%1i",converted);
         else
-            snprintf(msg,3,"%2i",tmp);
+            snprintf(msg,3,"%2i",converted);
         Gfx_write_label_var(hgfx, winsmal.left, winsmal.right,winsmal.top, &FontT24,CLUT_LogbookTemperature,msg);
     }