LCD dynamic characters (+diacritics support)

Firmware/FontTable.h

@@ -0,0 +1,62 @@
+{0x3E, {0x0F, 0xA8, 0xAF, 0x00, }, 'H'}, // index=0x80, utf8='🄷'
+{0x00, {0x69, 0x96, 0x00, 0x00, }, '\xdf'}, // index=0x81, utf8='°'
+{0x60, {0x25, 0x55, 0x58, 0x87, }, 'h'}, // index=0x82, utf8='🌡'
+{0x04, {0x27, 0xF2, 0xE0, 0x00, }, '^'}, // index=0x83, utf8='⬏'
+{0x34, {0x03, 0xCC, 0x19, 0x60, }, '\xf3'}, // index=0x84, utf8='🔃'
+{0x3C, {0x0E, 0xF8, 0x8F, 0x00, }, '\xdb'}, // index=0x85, utf8='🗀'
+{0x08, {0x02, 0x94, 0x92, 0x00, }, '>'}, // index=0x86, utf8='»'
+{0x1C, {0x07, 0x9A, 0x87, 0x00, }, '\xe5'}, // index=0x87, utf8='🕑'
+{0x24, {0x00, 0x85, 0x28, 0x52, }, '\x7e'}, // index=0x88, utf8='⏬'
+{0x06, {0x00, 0x1B, 0xE4, 0x00, }, '\x7e'}, // index=0x89, utf8='✔'
+{0x78, {0x12, 0x70, 0x78, 0x70, }, 'a'}, // index=0x8A, utf8='á'
+{0xF8, {0x12, 0x78, 0x8F, 0x88, }, 'A'}, // index=0x8B, utf8='Á'
+{0x78, {0x42, 0x70, 0x78, 0x70, }, 'a'}, // index=0x8C, utf8='à'
+{0x78, {0x25, 0x70, 0x78, 0x70, }, 'a'}, // index=0x8D, utf8='â'
+{0xF8, {0x50, 0x78, 0x8F, 0x88, }, '\xd1'}, // index=0x8E, utf8='Ä'
+{0xF0, {0x25, 0x27, 0x07, 0x87, }, 'a'}, // index=0x8F, utf8='å'
+{0xF0, {0x25, 0x27, 0x8F, 0x88, }, 'A'}, // index=0x90, utf8='Å'
+{0x2C, {0x0D, 0x27, 0xAA, 0x50, }, '\xd1'}, // index=0x91, utf8='æ'
+{0xBC, {0x07, 0x07, 0x87, 0x11, }, 'a'}, // index=0x92, utf8='ą'
+{0xBE, {0x78, 0x8F, 0x88, 0x11, }, 'A'}, // index=0x93, utf8='Ą'
+{0x78, {0x52, 0x70, 0x78, 0x70, }, 'a'}, // index=0x94, utf8='ă'
+{0xF8, {0x52, 0x78, 0x8F, 0x88, }, 'A'}, // index=0x95, utf8='Ă'
+{0x20, {0x12, 0x78, 0x88, 0x70, }, 'c'}, // index=0x96, utf8='ć'
+{0x20, {0x12, 0x78, 0x88, 0x70, }, 'c'}, // index=0x97, utf8='ć'
+{0x20, {0x52, 0x78, 0x88, 0x70, }, 'c'}, // index=0x98, utf8='č'
+{0x03, {0x11, 0x17, 0x99, 0x70, }, 'd'}, // index=0x99, utf8='ď'
+{0x18, {0x12, 0x78, 0xF8, 0x70, }, 'e'}, // index=0x9A, utf8='é'
+{0x18, {0x42, 0x78, 0xF8, 0x70, }, 'e'}, // index=0x9B, utf8='è'
+{0x18, {0x52, 0x78, 0xF8, 0x70, }, 'e'}, // index=0x9C, utf8='ě'
+{0x0C, {0x07, 0x8F, 0x87, 0x23, }, 'e'}, // index=0x9D, utf8='ę'
+{0x44, {0x12, 0xF8, 0xF8, 0xF0, }, 'E'}, // index=0x9E, utf8='É'
+{0x00, {0x12, 0x06, 0x22, 0x70, }, 'i'}, // index=0x9F, utf8='í'
+{0x00, {0x25, 0x06, 0x22, 0x70, }, 'i'}, // index=0xA0, utf8='î'
+{0x00, {0x25, 0x07, 0x22, 0x27, }, 'I'}, // index=0xA1, utf8='Î'
+{0x00, {0x12, 0x06, 0x22, 0x27, }, 'l'}, // index=0xA2, utf8='ĺ'
+{0x02, {0x62, 0x36, 0xA2, 0x70, }, 'l'}, // index=0xA3, utf8='ł'
+{0x03, {0x62, 0x22, 0x22, 0x70, }, 'l'}, // index=0xA4, utf8='ľ'
+{0x40, {0x45, 0x6C, 0x44, 0x70, }, 'L'}, // index=0xA5, utf8='Ł'
+{0x43, {0x88, 0x88, 0x88, 0xF0, }, 'L'}, // index=0xA6, utf8='Ľ'
+{0x78, {0x12, 0xBC, 0x88, 0x80, }, 'n'}, // index=0xA7, utf8='ń'
+{0x78, {0x52, 0xBC, 0x88, 0x80, }, 'n'}, // index=0xA8, utf8='ň'
+{0x71, {0x69, 0x0B, 0xC8, 0x80, }, 'n'}, // index=0xA9, utf8='ñ'
+{0x38, {0x12, 0x78, 0x88, 0x70, }, 'o'}, // index=0xAA, utf8='ó'
+{0x38, {0x42, 0x78, 0x88, 0x70, }, 'o'}, // index=0xAB, utf8='ò'
+{0x38, {0x25, 0x78, 0x88, 0x70, }, 'o'}, // index=0xAC, utf8='ô'
+{0x3A, {0x00, 0x79, 0xAC, 0x78, }, 'o'}, // index=0xAD, utf8='ø'
+{0x39, {0x49, 0x78, 0x88, 0x70, }, 'o'}, // index=0xAE, utf8='ő'
+{0x08, {0x52, 0xBC, 0x88, 0x80, }, 'r'}, // index=0xAF, utf8='ř'
+{0x20, {0x12, 0x78, 0x70, 0xF0, }, 's'}, // index=0xB0, utf8='ś'
+{0x20, {0x52, 0x78, 0x70, 0xF0, }, 's'}, // index=0xB1, utf8='š'
+{0x10, {0x07, 0x87, 0x0F, 0x24, }, 's'}, // index=0xB2, utf8='ș'
+{0x60, {0x69, 0x9A, 0x98, 0x8B, }, '\xe2'}, // index=0xB3, utf8='ß'
+{0x23, {0x04, 0xE4, 0x44, 0x30, }, 't'}, // index=0xB4, utf8='ť'
+{0x10, {0x4E, 0x44, 0x43, 0x24, }, 't'}, // index=0xB5, utf8='ț'
+{0x01, {0xF2, 0x22, 0x20, 0x24, }, 'T'}, // index=0xB6, utf8='Ț'
+{0x7C, {0x12, 0x88, 0x89, 0x60, }, 'u'}, // index=0xB7, utf8='ú'
+{0x78, {0x25, 0x28, 0x89, 0x60, }, 'u'}, // index=0xB8, utf8='ů'
+{0x79, {0x49, 0x08, 0x89, 0x60, }, 'u'}, // index=0xB9, utf8='ű'
+{0x3C, {0x12, 0x88, 0x70, 0x70, }, 'y'}, // index=0xBA, utf8='ý'
+{0x44, {0x12, 0xF1, 0x24, 0xF0, }, 'z'}, // index=0xBB, utf8='ź'
+{0x44, {0x52, 0xF1, 0x24, 0xF0, }, 'z'}, // index=0xBC, utf8='ž'
+{0x44, {0x20, 0xF1, 0x24, 0xF0, }, 'z'}, // index=0xBD, utf8='ż'

Firmware/Marlin.h

@@ -65,16 +65,6 @@
 
 #include "lcd.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern FILE _uartout;
-#ifdef __cplusplus
-}
-#endif
-
-#define uartout (&_uartout)
-
 #define SERIAL_PROTOCOL(x) (MYSERIAL.print(x))
 #define SERIAL_PROTOCOL_F(x,y) (MYSERIAL.print(x,y))
 #define SERIAL_PROTOCOLPGM(x) (serialprintPGM(PSTR(x)))

Firmware/Marlin_main.cpp

@@ -773,9 +773,8 @@ static void factory_reset(char level)
 	}
 }
 
-extern "C" {
-FILE _uartout; //= {0}; Global variable is always zero initialized. No need to explicitly state this.
-}
+static FILE _uartout;
+#define uartout (&_uartout)
 
 int uart_putchar(char c, FILE *)
 {
@@ -921,7 +920,7 @@ void update_sec_lang_from_external_flash()
 			}
 		}
 	}
-	boot_app_flags &= ~BOOT_APP_FLG_USER0;
+	boot_app_magic = 0;
 }
 
 
@@ -4093,8 +4092,7 @@ void process_commands()
 		}
 		else if (code_seen_P(PSTR("RESET"))) { // PRUSA RESET
 #if defined(XFLASH) && defined(BOOTAPP)
-            boot_app_magic = BOOT_APP_MAGIC;
-            boot_app_flags = BOOT_APP_FLG_RUN;
+            boot_app_magic = 0;
 #endif //defined(XFLASH) && defined(BOOTAPP)
             softReset();
     }

Firmware/bootapp.c

@@ -24,12 +24,11 @@ void bootapp_ram2flash(uint16_t rptr, uint16_t fptr, uint16_t size)
 {
 	cli();
 	boot_app_magic = BOOT_APP_MAGIC;
-	boot_app_flags |= BOOT_APP_FLG_COPY;
-	boot_app_flags |= BOOT_APP_FLG_ERASE;
+	boot_app_flags |= BOOT_APP_FLG_COPY | BOOT_APP_FLG_ERASE;
 	boot_copy_size = (uint16_t)size;
 	boot_src_addr = (uint32_t)rptr;
 	boot_dst_addr = (uint32_t)fptr;
-	bootapp_print_vars();
+	// bootapp_print_vars();
 	softReset();
 }
 
@@ -38,7 +37,8 @@ void bootapp_reboot_user0(uint8_t reserved)
 	cli();
 	boot_app_magic = BOOT_APP_MAGIC;
 	boot_app_flags = BOOT_APP_FLG_USER0;
+	boot_copy_size = 0;
 	boot_reserved = reserved;
-	bootapp_print_vars();
+	// bootapp_print_vars();
 	softReset();
 }

Firmware/bootapp.h

@@ -17,11 +17,10 @@
 #define BOOT_APP_FLG_ERASE 0x01
 #define BOOT_APP_FLG_COPY  0x02
 #define BOOT_APP_FLG_FLASH 0x04
-#define BOOT_APP_FLG_RUN 0x08
 
 #define BOOT_APP_FLG_USER0 0x80
 
-#define BOOT_APP_MAGIC 0x55aa55aa
+#define BOOT_APP_MAGIC 0x55aa55aaUL
 
 
 #if defined(__cplusplus)

Firmware/eeprom.h

@@ -18,7 +18,7 @@
 
 typedef struct
 {
-    char name[MAX_SHEET_NAME_LENGTH]; //!< Can be null terminated, doesn't need to be null terminated
+    unsigned char name[MAX_SHEET_NAME_LENGTH]; //!< Can be null terminated, doesn't need to be null terminated
     int16_t z_offset; //!< Z_BABYSTEP_MIN .. Z_BABYSTEP_MAX = Z_BABYSTEP_MIN*2/1000 [mm] .. Z_BABYSTEP_MAX*2/1000 [mm]
     uint8_t bed_temp; //!< 0 .. 254 [°C] NOTE: currently only written-to and never used
     uint8_t pinda_temp; //!< 0 .. 254 [°C] NOTE: currently only written-to and never used