New 8bit font to make use of degree sign
This commit is contained in:
		
							parent
							
								
									7cf1b0e6af
								
							
						
					
					
						commit
						8439dcc18a
					
				|  | @ -24,6 +24,8 @@ | ||||||
| #include "DSEG7Classic-BoldItalic60pt7b.h" | #include "DSEG7Classic-BoldItalic60pt7b.h" | ||||||
| #include "Atari16px8b.h" // Key label font
 | #include "Atari16px8b.h" // Key label font
 | ||||||
| 
 | 
 | ||||||
|  | #include "Ubuntu_Bold20pt8b.h" | ||||||
|  | 
 | ||||||
| // E-Ink Display
 | // E-Ink Display
 | ||||||
| #define GxEPD_WIDTH 400     // Display width
 | #define GxEPD_WIDTH 400     // Display width
 | ||||||
| #define GxEPD_HEIGHT 300    // Display height
 | #define GxEPD_HEIGHT 300    // Display height
 | ||||||
|  |  | ||||||
|  | @ -31,6 +31,7 @@ extern const GFXfont Ubuntu_Bold10pt7b; | ||||||
| extern const GFXfont Ubuntu_Bold12pt7b; | extern const GFXfont Ubuntu_Bold12pt7b; | ||||||
| extern const GFXfont Ubuntu_Bold16pt7b; | extern const GFXfont Ubuntu_Bold16pt7b; | ||||||
| extern const GFXfont Ubuntu_Bold20pt7b; | extern const GFXfont Ubuntu_Bold20pt7b; | ||||||
|  | extern const GFXfont Ubuntu_Bold20pt8b; | ||||||
| extern const GFXfont Ubuntu_Bold32pt7b; | extern const GFXfont Ubuntu_Bold32pt7b; | ||||||
| extern const GFXfont DSEG7Classic_BoldItalic16pt7b; | extern const GFXfont DSEG7Classic_BoldItalic16pt7b; | ||||||
| extern const GFXfont DSEG7Classic_BoldItalic20pt7b; | extern const GFXfont DSEG7Classic_BoldItalic20pt7b; | ||||||
|  |  | ||||||
|  | @ -346,7 +346,7 @@ FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata){ | ||||||
|             else{ |             else{ | ||||||
|                 latdir = "S"; |                 latdir = "S"; | ||||||
|             } |             } | ||||||
|             latitude = String(degree,0) + "\" " + String(minute,4) + "' " + latdir; |             latitude = String(degree,0) + "\x90 " + String(minute,4) + "' " + latdir; | ||||||
|             result.unit = ""; |             result.unit = ""; | ||||||
|             strcpy(buffer, latitude.c_str()); |             strcpy(buffer, latitude.c_str()); | ||||||
|         } |         } | ||||||
|  | @ -370,7 +370,7 @@ FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata){ | ||||||
|             else{ |             else{ | ||||||
|                 londir = "W"; |                 londir = "W"; | ||||||
|             } |             } | ||||||
|             longitude = String(degree,0) + "\" " + String(minute,4) + "' " + londir; |             longitude = String(degree,0) + "\x90 " + String(minute,4) + "' " + londir; | ||||||
|             result.unit = ""; |             result.unit = ""; | ||||||
|             strcpy(buffer, longitude.c_str()); |             strcpy(buffer, longitude.c_str()); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  | @ -75,7 +75,7 @@ class PageTwoValues : public Page | ||||||
| 
 | 
 | ||||||
|         // Show name
 |         // Show name
 | ||||||
|         getdisplay().setTextColor(commonData->fgcolor); |         getdisplay().setTextColor(commonData->fgcolor); | ||||||
|         getdisplay().setFont(&Ubuntu_Bold20pt7b); |         getdisplay().setFont(&Ubuntu_Bold20pt8b); | ||||||
|         getdisplay().setCursor(20, 80); |         getdisplay().setCursor(20, 80); | ||||||
|         getdisplay().print(name1);                           // Page name
 |         getdisplay().print(name1);                           // Page name
 | ||||||
| 
 | 
 | ||||||
|  | @ -91,11 +91,11 @@ class PageTwoValues : public Page | ||||||
| 
 | 
 | ||||||
|         // Switch font if format for any values
 |         // Switch font if format for any values
 | ||||||
|         if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){ |         if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){ | ||||||
|             getdisplay().setFont(&Ubuntu_Bold20pt7b); |             getdisplay().setFont(&Ubuntu_Bold20pt8b); | ||||||
|             getdisplay().setCursor(50, 130); |             getdisplay().setCursor(50, 130); | ||||||
|         } |         } | ||||||
|         else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){ |         else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){ | ||||||
|             getdisplay().setFont(&Ubuntu_Bold20pt7b); |             getdisplay().setFont(&Ubuntu_Bold20pt8b); | ||||||
|             getdisplay().setCursor(170, 105); |             getdisplay().setCursor(170, 105); | ||||||
|         } |         } | ||||||
|         else{ |         else{ | ||||||
|  | @ -139,7 +139,7 @@ class PageTwoValues : public Page | ||||||
| 
 | 
 | ||||||
|         // Switch font if format for any values
 |         // Switch font if format for any values
 | ||||||
|         if(bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude"){ |         if(bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude"){ | ||||||
|             getdisplay().setFont(&Ubuntu_Bold20pt7b); |             getdisplay().setFont(&Ubuntu_Bold20pt8b); | ||||||
|             getdisplay().setCursor(50, 240); |             getdisplay().setCursor(50, 240); | ||||||
|         } |         } | ||||||
|         else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){ |         else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){ | ||||||
|  |  | ||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
		Loading…
	
		Reference in New Issue