Touch UI finishing touches
This commit is contained in:
		
							parent
							
								
									5639b8ca20
								
							
						
					
					
						commit
						5e5045c4ee
					
				| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -19,7 +19,7 @@ void sd_mmc_spi_mem_init() { | ||||
| } | ||||
| 
 | ||||
| Ctrl_status sd_mmc_spi_test_unit_ready() { | ||||
|   #if defined(DISABLE_DUE_SD_MMC) | ||||
|   #ifdef DISABLE_DUE_SD_MMC | ||||
|     return CTRL_NO_PRESENT; | ||||
|   #endif | ||||
|   if (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted()) | ||||
| @ -58,7 +58,7 @@ uint8_t sector_buf[SD_MMC_BLOCK_SIZE]; | ||||
| // #define DEBUG_MMC
 | ||||
| 
 | ||||
| Ctrl_status sd_mmc_spi_usb_read_10(uint32_t addr, uint16_t nb_sector) { | ||||
|   #if defined(DISABLE_DUE_SD_MMC) | ||||
|   #ifdef DISABLE_DUE_SD_MMC | ||||
|     return CTRL_NO_PRESENT; | ||||
|   #endif | ||||
|   if (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted()) | ||||
| @ -98,7 +98,7 @@ Ctrl_status sd_mmc_spi_usb_read_10(uint32_t addr, uint16_t nb_sector) { | ||||
| } | ||||
| 
 | ||||
| Ctrl_status sd_mmc_spi_usb_write_10(uint32_t addr, uint16_t nb_sector) { | ||||
|   #if defined(DISABLE_DUE_SD_MMC) | ||||
|   #ifdef DISABLE_DUE_SD_MMC | ||||
|     return CTRL_NO_PRESENT; | ||||
|   #endif | ||||
|   if (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted()) | ||||
|  | ||||
| @ -717,7 +717,8 @@ void kill(PGM_P const lcd_error/*=nullptr*/, PGM_P const lcd_component/*=nullptr | ||||
|   SERIAL_ERROR_MSG(MSG_ERR_KILLED); | ||||
| 
 | ||||
|   #if HAS_DISPLAY | ||||
|     ui.kill_screen(lcd_error ?: GET_TEXT(MSG_KILLED), lcd_component ?: PSTR("")); | ||||
|     extern const char NUL_STR[]; | ||||
|     ui.kill_screen(lcd_error ?: GET_TEXT(MSG_KILLED), lcd_component ?: NUL_STR); | ||||
|   #else | ||||
|     UNUSED(lcd_error); | ||||
|     UNUSED(lcd_component); | ||||
|  | ||||
| @ -599,11 +599,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS | ||||
|  * Custom Boot and Status screens | ||||
|  */ | ||||
| #if ENABLED(SHOW_CUSTOM_BOOTSCREEN) && !HAS_GRAPHICAL_LCD && !ENABLED(LULZBOT_TOUCH_UI) | ||||
|   #error "Graphical LCD is required for SHOW_CUSTOM_BOOTSCREEN." | ||||
| #endif | ||||
| 
 | ||||
| #if ENABLED(CUSTOM_STATUS_SCREEN_IMAGE) && !HAS_GRAPHICAL_LCD | ||||
|   #error "Graphical LCD is required for CUSTOM_STATUS_SCREEN_IMAGE." | ||||
|   #error "SHOW_CUSTOM_BOOTSCREEN requires Graphical LCD or LULZBOT_TOUCH_UI." | ||||
| #elif ENABLED(CUSTOM_STATUS_SCREEN_IMAGE) && !HAS_GRAPHICAL_LCD | ||||
|   #error "CUSTOM_STATUS_SCREEN_IMAGE requires a Graphical LCD." | ||||
| #endif | ||||
| 
 | ||||
| /**
 | ||||
|  | ||||
| @ -130,7 +130,7 @@ bool DLCache::store(uint32_t num_bytes /* = 0*/) { | ||||
|     #if ENABLED(TOUCH_UI_DEBUG) | ||||
|       SERIAL_ECHO_START(); | ||||
|       SERIAL_ECHOPAIR  ("Not enough space in GRAM to cache display list, free space: ", free_space); | ||||
|       SERIAL_ECHOLNPAIR(  " Required: ", dl_size); | ||||
|       SERIAL_ECHOLNPAIR(" Required: ", dl_size); | ||||
|     #endif | ||||
|     return false; | ||||
|   } else { | ||||
|  | ||||
| @ -38,7 +38,7 @@ namespace FTDI { | ||||
| 
 | ||||
|     #if ENABLED(TOUCH_UI_DEBUG) | ||||
|       SERIAL_ECHO_START(); | ||||
|       SERIAL_ECHOPAIR("Playing note ", int(note)); | ||||
|       SERIAL_ECHOPAIR  ("Playing note ", int(note)); | ||||
|       SERIAL_ECHOLNPAIR(", instrument ", int(effect)); | ||||
|     #endif | ||||
| 
 | ||||
|  | ||||
| @ -60,7 +60,7 @@ header = ''' | ||||
|  ****************************************************************************/ | ||||
| 
 | ||||
| /** | ||||
|  * This file was auto-generated using "svg2cpp.pl" | ||||
|  * This file was auto-generated using "svg2cpp.py" | ||||
|  * | ||||
|  * The encoding consists of x,y pairs with the min and max scaled to | ||||
|  * 0x0000 and 0xFFFE. A single 0xFFFF in the data stream indicates the | ||||
| @ -101,10 +101,11 @@ class ComputeBoundingBox: | ||||
|     pass | ||||
| 
 | ||||
|   def write(self): | ||||
|     print("constexpr float x_min = %f;\n" % self.x_min) | ||||
|     print("constexpr float x_max = %f;\n" % self.x_max) | ||||
|     print("constexpr float y_min = %f;\n" % self.y_min) | ||||
|     print("constexpr float y_max = %f;\n" % self.y_max) | ||||
|     print("constexpr float x_min = %f;" % self.x_min) | ||||
|     print("constexpr float x_max = %f;" % self.x_max) | ||||
|     print("constexpr float y_min = %f;" % self.y_min) | ||||
|     print("constexpr float y_max = %f;" % self.y_max) | ||||
|     print() | ||||
| 
 | ||||
|   def from_svg_view_box(self, svg): | ||||
|     s = re.search('<svg[^>]+>', svg); | ||||
| @ -118,6 +119,7 @@ class ComputeBoundingBox: | ||||
|         return True | ||||
|     return False | ||||
| 
 | ||||
| # op | ||||
| class WriteDataStructure: | ||||
|   def __init__(self, bounding_box): | ||||
|     self.bounds = bounding_box | ||||
| @ -126,7 +128,7 @@ class WriteDataStructure: | ||||
|     self.hex_words = [] | ||||
| 
 | ||||
|   def push(self, value): | ||||
|     self.hex_words.append("0x%04X" % (0xffff & int(value))) | ||||
|     self.hex_words.append("0x%04X" % (0xFFFF & int(value))) | ||||
| 
 | ||||
|   def command(self, type, x, y): | ||||
|     if type == "M": | ||||
| @ -138,7 +140,7 @@ class WriteDataStructure: | ||||
|   def path_finished(self, id): | ||||
|     if self.hex_words and self.hex_words[0] == "0xFFFF": | ||||
|       self.hex_words.pop(0) | ||||
|     print("const PROGMEM uint16_t", id + "[] = {" + ", ".join (self.hex_words) + "};\n") | ||||
|     print("const PROGMEM uint16_t", id + "[] = {" + ", ".join (self.hex_words) + "};") | ||||
|     self.hex_words = [] | ||||
| 
 | ||||
| class Parser: | ||||
|  | ||||
| @ -153,7 +153,7 @@ namespace Language_en { | ||||
|     PROGMEM Language_Str MSG_HOME_XYZ_WARNING       = u8"About to move to home position. Ensure the top and the bed of the printer are clear.\n\nContinue?"; | ||||
|     PROGMEM Language_Str MSG_HOME_E_WARNING         = u8"About to re-home plunger and auto-level. Remove syringe prior to proceeding.\n\nContinue?"; | ||||
|   #endif | ||||
|    | ||||
| 
 | ||||
|   #ifdef TOUCH_UI_COCOA_PRESS | ||||
|     PROGMEM Language_Str MSG_ZONE_1                 = u8"Zone 1:"; | ||||
|     PROGMEM Language_Str MSG_ZONE_2                 = u8"Zone 2:"; | ||||
|  | ||||
| @ -46,31 +46,34 @@ void AboutScreen::onRedraw(draw_mode_t) { | ||||
|      .tag(0); | ||||
| 
 | ||||
|   draw_text_box(cmd, BTN_POS(1,2), BTN_SIZE(4,1), | ||||
|       #ifdef CUSTOM_MACHINE_NAME | ||||
|         F(CUSTOM_MACHINE_NAME) | ||||
|       #else | ||||
|         GET_TEXT_F(MSG_ABOUT_TOUCH_PANEL_1) | ||||
|       #endif | ||||
|   , OPT_CENTER, font_xlarge); | ||||
|    | ||||
|   #ifdef TOOLHEAD_NAME | ||||
|    char about_str[ | ||||
|      strlen_P(GET_TEXT(FIRMWARE_FOR_TOOLHEAD)) + | ||||
|      strlen_P(TOOLHEAD_NAME) + | ||||
|      strlen_P(GET_TEXT(ABOUT_TOUCH_PANEL_2)) + 1]; | ||||
|     #ifdef CUSTOM_MACHINE_NAME | ||||
|       F(CUSTOM_MACHINE_NAME) | ||||
|     #else | ||||
|       GET_TEXT_F(MSG_ABOUT_TOUCH_PANEL_1) | ||||
|     #endif | ||||
|     , OPT_CENTER, font_xlarge | ||||
|   ); | ||||
| 
 | ||||
|    sprintf_P(about_str, GET_TEXT(FIRMWARE_FOR_TOOLHEAD), TOOLHEAD_NAME); | ||||
|    strcat_P (about_str, GET_TEXT(ABOUT_TOUCH_PANEL_2)); | ||||
|   #ifdef TOOLHEAD_NAME | ||||
|     char about_str[ | ||||
|       strlen_P(GET_TEXT(FIRMWARE_FOR_TOOLHEAD)) + | ||||
|       strlen_P(TOOLHEAD_NAME) + | ||||
|       strlen_P(GET_TEXT(ABOUT_TOUCH_PANEL_2)) + 1 | ||||
|     ]; | ||||
| 
 | ||||
|     sprintf_P(about_str, GET_TEXT(FIRMWARE_FOR_TOOLHEAD), TOOLHEAD_NAME); | ||||
|     strcat_P (about_str, GET_TEXT(ABOUT_TOUCH_PANEL_2)); | ||||
|   #endif | ||||
| 
 | ||||
|   cmd.tag(2); | ||||
|   draw_text_box(cmd, BTN_POS(1,3), BTN_SIZE(4,3), | ||||
|       #ifdef TOOLHEAD_NAME | ||||
|         about_str | ||||
|       #else | ||||
|         GET_TEXT_F(MSG_ABOUT_TOUCH_PANEL_2) | ||||
|       #endif | ||||
|   , OPT_CENTER, font_medium); | ||||
|     #ifdef TOOLHEAD_NAME | ||||
|       about_str | ||||
|     #else | ||||
|       GET_TEXT_F(MSG_ABOUT_TOUCH_PANEL_2) | ||||
|     #endif | ||||
|     , OPT_CENTER, font_medium | ||||
|   ); | ||||
| 
 | ||||
|   cmd.tag(0); | ||||
|   draw_text_box(cmd, BTN_POS(1,6), BTN_SIZE(4,2), progmem_str(getFirmwareName_str()), OPT_CENTER, font_medium); | ||||
|  | ||||
| @ -15,7 +15,7 @@ | ||||
|  ****************************************************************************/ | ||||
| 
 | ||||
| /**
 | ||||
|  * This file was auto-generated using "svg2cpp.pl" | ||||
|  * This file was auto-generated using "svg2cpp.py" | ||||
|  * | ||||
|  * The encoding consists of x,y pairs with the min and max scaled to | ||||
|  * 0x0000 and 0xFFFE. A single 0xFFFF in the data stream indicates the | ||||
| @ -25,58 +25,31 @@ | ||||
| #pragma once | ||||
| 
 | ||||
| constexpr float x_min = 0.000000; | ||||
| 
 | ||||
| constexpr float x_max = 480.000000; | ||||
| 
 | ||||
| constexpr float y_min = 0.000000; | ||||
| 
 | ||||
| constexpr float y_max = 272.000000; | ||||
| 
 | ||||
| const PROGMEM uint16_t z_neg[] = {0x7950, 0x51EA, 0x824E, 0x51EA, 0x824E, 0x71E2, 0x86CD, 0x71E2, 0x7DCF, 0x81DF, 0x74D1, 0x71E2, 0x7950, 0x71E2, 0x7950, 0x51EA}; | ||||
| 
 | ||||
| const PROGMEM uint16_t z_pos[] = {0x7950, 0x41EE, 0x824E, 0x41EE, 0x824E, 0x21F5, 0x86CD, 0x21F5, 0x7DCF, 0x11F9, 0x74D0, 0x21F5, 0x7950, 0x21F5, 0x7950, 0x41EE}; | ||||
| 
 | ||||
| const PROGMEM uint16_t y_neg[] = {0x3479, 0x56CF, 0x3EC6, 0x56CF, 0x3747, 0x7281, 0x3C6D, 0x7281, 0x2E61, 0x8059, 0x27D4, 0x7281, 0x2CFA, 0x7281, 0x3479, 0x56CF}; | ||||
| 
 | ||||
| const PROGMEM uint16_t y_pos[] = {0x3BF9, 0x3B1D, 0x4645, 0x3B1D, 0x4DC4, 0x1F6B, 0x52EB, 0x1F6B, 0x4C5E, 0x1192, 0x3E52, 0x1F6B, 0x4378, 0x1F6B, 0x3BF9, 0x3B1D}; | ||||
| 
 | ||||
| const PROGMEM uint16_t x_neg[] = {0x350E, 0x4209, 0x314E, 0x4FE2, 0x1CB5, 0x4FE2, 0x1AD6, 0x56CF, 0x1449, 0x48F6, 0x2255, 0x3B1D, 0x2075, 0x4209, 0x350E, 0x4209}; | ||||
| 
 | ||||
| const PROGMEM uint16_t x_pos[] = {0x498C, 0x4209, 0x45CC, 0x4FE2, 0x5A65, 0x4FE2, 0x5885, 0x56CF, 0x6691, 0x48F6, 0x6004, 0x3B1D, 0x5E25, 0x4209, 0x498C, 0x4209}; | ||||
| 
 | ||||
| const PROGMEM uint16_t syringe_fluid[] = {0xB4E9, 0x78BE, 0xBB12, 0x7C44, 0xBDE3, 0x7C44, 0xC426, 0x78BE, 0xC426, 0x250D, 0xB4E9, 0x250D, 0xB4E9, 0x78BE}; | ||||
| 
 | ||||
| const PROGMEM uint16_t syringe[] = {0xB8AD, 0x6BB1, 0xB8AD, 0x6E0C, 0xBE02, 0x6E0C, 0xBE02, 0x6BB1, 0xFFFF, 0xB8AD, 0x6248, 0xB8AD, 0x64A2, 0xBE02, 0x64A2, 0xBE02, 0x6248, 0xFFFF, 0xB8AD, 0x58DF, 0xB8AD, 0x5B39, 0xBE02, 0x5B39, 0xBE02, 0x58DF, 0xFFFF, 0xB8AD, 0x4F75, 0xB8AD, 0x51D0, 0xBE02, 0x51D0, 0xBE02, 0x4F75, 0xFFFF, 0xB8AD, 0x460C, 0xB8AD, 0x4866, 0xBE02, 0x4866, 0xBE02, 0x460C, 0xFFFF, 0xB8AD, 0x3CA3, 0xB8AD, 0x3EFD, 0xBE02, 0x3EFD, 0xBE02, 0x3CA3, 0xFFFF, 0xB8AD, 0x3339, 0xB8AD, 0x3594, 0xBE02, 0x3594, 0xBE02, 0x3339, 0xFFFF, 0xB396, 0x110A, 0xB396, 0x1818, 0xB995, 0x1818, 0xB995, 0x22AD, 0xB396, 0x22AD, 0xB396, 0x7ADA, 0xB995, 0x7E61, 0xB995, 0x88F5, 0xBB95, 0x88F5, 0xBB95, 0xA8B4, 0xBD94, 0xAC3B, 0xBD94, 0x88F5, 0xBF94, 0x88F5, 0xBF94, 0x7E61, 0xC593, 0x7ADA, 0xC593, 0x22AD, 0xBF94, 0x22AD, 0xBF94, 0x1818, 0xC593, 0x1818, 0xC593, 0x110A, 0xFFFF, 0xBB95, 0x1818, 0xBD94, 0x1818, 0xBD94, 0x22AD, 0xBB95, 0x22AD, 0xBB95, 0x1818, 0xFFFF, 0xB596, 0x2634, 0xC393, 0x2634, 0xC393, 0x7753, 0xBD94, 0x7ADA, 0xBB95, 0x7ADA, 0xB596, 0x7753, 0xB596, 0x2634}; | ||||
| 
 | ||||
| const PROGMEM uint16_t syringe_outline[] = {0xB396, 0x110A, 0xB396, 0x1818, 0xB995, 0x1818, 0xB995, 0x22AD, 0xB396, 0x22AD, 0xB396, 0x7ADA, 0xB995, 0x7E61, 0xB995, 0x88F5, 0xBB95, 0x88F5, 0xBB95, 0xA8B4, 0xBD94, 0xAC3B, 0xBD94, 0x88F5, 0xBF94, 0x88F5, 0xBF94, 0x7E61, 0xC593, 0x7ADA, 0xC593, 0x22AD, 0xBF94, 0x22AD, 0xBF94, 0x1818, 0xC593, 0x1818, 0xC593, 0x110A, 0xB396, 0x110A}; | ||||
| 
 | ||||
| const PROGMEM uint16_t padlock[] = {0x3FE3, 0x2A04, 0x3D34, 0x2AF9, 0x3AFF, 0x2D93, 0x397D, 0x316D, 0x38E8, 0x3626, 0x38E8, 0x3A14, 0x39B3, 0x3C8F, 0x3B50, 0x3C8F, 0x3C1C, 0x3A14, 0x3C1C, 0x363C, 0x3C6B, 0x33A9, 0x3D3A, 0x3193, 0x3E6C, 0x302D, 0x3FE3, 0x2FAA, 0x415A, 0x302D, 0x428C, 0x3192, 0x435B, 0x33A8, 0x43AB, 0x363C, 0x43AB, 0x4492, 0x38C3, 0x4492, 0x3741, 0x45AC, 0x36A1, 0x4856, 0x36A1, 0x5C41, 0x3741, 0x5EEC, 0x38C3, 0x6005, 0x4703, 0x6005, 0x4886, 0x5EEC, 0x4925, 0x5C41, 0x4925, 0x4856, 0x4886, 0x45AC, 0x4703, 0x4492, 0x46DE, 0x362B, 0x4649, 0x316D, 0x44C7, 0x2D92, 0x4292, 0x2AF9}; | ||||
| 
 | ||||
| const PROGMEM uint16_t home_z[] = {0x80BB, 0x2B43, 0x712C, 0x46B9, 0x750F, 0x46B9, 0x750F, 0x622F, 0x7CD7, 0x622F, 0x7CD7, 0x5474, 0x849F, 0x5474, 0x849F, 0x622F, 0x8C67, 0x622F, 0x8C67, 0x46B9, 0x904B, 0x46B9, 0x8A48, 0x3C1D, 0x8A48, 0x2ECD, 0x8664, 0x2ECD, 0x8664, 0x3540}; | ||||
| 
 | ||||
| const PROGMEM uint16_t usb_btn[] = {0x0558, 0xC0D6, 0x44A4, 0xC0D6, 0x44A4, 0xF431, 0x0558, 0xF431, 0x0558, 0xC0D6}; | ||||
| 
 | ||||
| const PROGMEM uint16_t menu_btn[] = {0x4B18, 0xC0D6, 0x8A64, 0xC0D6, 0x8A64, 0xF431, 0x4B18, 0xF431, 0x4B18, 0xC0D6}; | ||||
| 
 | ||||
| const PROGMEM uint16_t e_pos[] = {0xE04E, 0x5E7B, 0xE94C, 0x5E7B, 0xE94C, 0x7E74, 0xEDCB, 0x7E74, 0xE4CD, 0x8E70, 0xDBCF, 0x7E74, 0xE04E, 0x7E74, 0xE04E, 0x5E7B}; | ||||
| 
 | ||||
| const PROGMEM uint16_t e_neg[] = {0xE04E, 0x4E7F, 0xE94C, 0x4E7F, 0xE94C, 0x2E87, 0xEDCB, 0x2E87, 0xE4CD, 0x1E8A, 0xDBCF, 0x2E87, 0xE04E, 0x2E87, 0xE04E, 0x4E7F}; | ||||
| 
 | ||||
| const PROGMEM uint16_t home_e[] = {0xD705, 0x3885, 0xC775, 0x53FB, 0xCB59, 0x53FB, 0xCB59, 0x6F71, 0xD321, 0x6F71, 0xD321, 0x61B6, 0xDAE9, 0x61B6, 0xDAE9, 0x6F71, 0xE2B1, 0x6F71, 0xE2B1, 0x53FB, 0xE695, 0x53FB, 0xE092, 0x495F, 0xE092, 0x3C0E, 0xDCAE, 0x3C0E, 0xDCAE, 0x4281}; | ||||
| 
 | ||||
| const PROGMEM uint16_t fine_label[] = {0x0D92, 0x9444, 0x5211, 0x9444, 0x5211, 0xA9EA, 0x0D92, 0xA9EA}; | ||||
| 
 | ||||
| const PROGMEM uint16_t fine_toggle[] = {0x56E7, 0x9444, 0x8007, 0x9444, 0x8007, 0xA9EA, 0x56E7, 0xA9EA}; | ||||
| 
 | ||||
| const PROGMEM uint16_t zone2_temp[] = {0xC620, 0xD35A, 0xFD0E, 0xD35A, 0xFD0E, 0xF075, 0xC620, 0xF075}; | ||||
| 
 | ||||
| const PROGMEM uint16_t zone1_temp[] = {0x8E04, 0xD35A, 0xC4F3, 0xD35A, 0xC4F3, 0xF075, 0x8E04, 0xF075}; | ||||
| 
 | ||||
| const PROGMEM uint16_t zone2_label[] = {0xC620, 0xB4AD, 0xFD0A, 0xB4AD, 0xFD0A, 0xD1C8, 0xC620, 0xD1C8}; | ||||
| 
 | ||||
| const PROGMEM uint16_t zone1_label[] = {0x8E04, 0xB4AD, 0xC4F3, 0xB4AD, 0xC4F3, 0xD1C8, 0x8E04, 0xD1C8}; | ||||
| 
 | ||||
| const PROGMEM uint16_t actual_temp[] = {0xCDF6, 0xD037, 0xF7CA, 0xD037, 0xF7CA, 0xF424, 0xCDF6, 0xF424}; | ||||
| 
 | ||||
| const PROGMEM uint16_t bed_icon[] = {0xCDF6, 0xA5CC, 0xF7CA, 0xA5CC, 0xF7CA, 0xC9B9, 0xCDF6, 0xC9B9}; | ||||
| 
 | ||||
|  | ||||
| @ -15,7 +15,7 @@ | ||||
|  ****************************************************************************/ | ||||
| 
 | ||||
| /**
 | ||||
|  * This file was auto-generated using "svg2cpp.pl" | ||||
|  * This file was auto-generated using "svg2cpp.py" | ||||
|  * | ||||
|  * The encoding consists of x,y pairs with the min and max scaled to | ||||
|  * 0x0000 and 0xFFFE. A single 0xFFFF in the data stream indicates the | ||||
| @ -25,51 +25,28 @@ | ||||
| #pragma once | ||||
| 
 | ||||
| constexpr float x_min = 0.000000; | ||||
| 
 | ||||
| constexpr float x_max = 272.000000; | ||||
| 
 | ||||
| constexpr float y_min = 0.000000; | ||||
| 
 | ||||
| constexpr float y_max = 480.000000; | ||||
| 
 | ||||
| const PROGMEM uint16_t z_neg[] = {0xC9B1, 0x96B3, 0xD990, 0x96B3, 0xD990, 0xA8D0, 0xE17F, 0xA8D0, 0xD1A0, 0xB1DF, 0xC1C2, 0xA8D0, 0xC9B1, 0xA8D0, 0xC9B1, 0x96B3}; | ||||
| 
 | ||||
| const PROGMEM uint16_t z_pos[] = {0xC9B1, 0x8DA4, 0xD990, 0x8DA4, 0xD990, 0x7B86, 0xE17F, 0x7B86, 0xD1A0, 0x7277, 0xC1C2, 0x7B86, 0xC9B1, 0x7B86, 0xC9B1, 0x8DA4}; | ||||
| 
 | ||||
| const PROGMEM uint16_t y_neg[] = {0x5037, 0x9979, 0x6264, 0x9979, 0x5529, 0xA92A, 0x5E3F, 0xA92A, 0x4575, 0xB103, 0x39E6, 0xA92A, 0x42FC, 0xA92A, 0x5037, 0x9979}; | ||||
| 
 | ||||
| const PROGMEM uint16_t y_pos[] = {0x5D72, 0x89C7, 0x6F9F, 0x89C7, 0x7CDA, 0x7A15, 0x85F0, 0x7A15, 0x7A61, 0x723D, 0x6197, 0x7A15, 0x6AAD, 0x7A15, 0x5D72, 0x89C7}; | ||||
| 
 | ||||
| const PROGMEM uint16_t x_neg[] = {0x513D, 0x8DB3, 0x4AA0, 0x958C, 0x2647, 0x958C, 0x22F8, 0x9979, 0x1769, 0x91A0, 0x3033, 0x89C7, 0x2CE4, 0x8DB3, 0x513D, 0x8DB3}; | ||||
| 
 | ||||
| const PROGMEM uint16_t x_pos[] = {0x7566, 0x8DB3, 0x6EC9, 0x958C, 0x9322, 0x958C, 0x8FD4, 0x9979, 0xA89E, 0x91A0, 0x9D0E, 0x89C7, 0x99C0, 0x8DB3, 0x7566, 0x8DB3}; | ||||
| 
 | ||||
| const PROGMEM uint16_t syringe_fluid[] = {0x7D1D, 0x4A0F, 0x87FC, 0x4C0E, 0x8CF4, 0x4C0E, 0x9801, 0x4A0F, 0x9801, 0x1AA2, 0x7D1D, 0x1AA2, 0x7D1D, 0x4A0F}; | ||||
| 
 | ||||
| const PROGMEM uint16_t syringe[] = {0x83C2, 0x42AA, 0x83C2, 0x43FF, 0x8D2C, 0x43FF, 0x8D2C, 0x42AA, 0xFFFF, 0x83C2, 0x3D54, 0x83C2, 0x3EAA, 0x8D2C, 0x3EAA, 0x8D2C, 0x3D54, 0xFFFF, 0x83C2, 0x37FF, 0x83C2, 0x3954, 0x8D2C, 0x3954, 0x8D2C, 0x37FF, 0xFFFF, 0x83C2, 0x32AA, 0x83C2, 0x33FF, 0x8D2C, 0x33FF, 0x8D2C, 0x32AA, 0xFFFF, 0x83C2, 0x2D54, 0x83C2, 0x2EAA, 0x8D2C, 0x2EAA, 0x8D2C, 0x2D54, 0xFFFF, 0x83C2, 0x27FF, 0x83C2, 0x2955, 0x8D2C, 0x2955, 0x8D2C, 0x27FF, 0xFFFF, 0x83C2, 0x22AA, 0x83C2, 0x23FF, 0x8D2C, 0x23FF, 0x8D2C, 0x22AA, 0xFFFF, 0x7AC7, 0x0F4B, 0x7AC7, 0x134A, 0x855B, 0x134A, 0x855B, 0x1949, 0x7AC7, 0x1949, 0x7AC7, 0x4B40, 0x855B, 0x4D40, 0x855B, 0x533F, 0x88E2, 0x533F, 0x88E2, 0x653C, 0x8C69, 0x673C, 0x8C69, 0x533F, 0x8FF0, 0x533F, 0x8FF0, 0x4D40, 0x9A85, 0x4B40, 0x9A85, 0x1949, 0x8FF0, 0x1949, 0x8FF0, 0x134A, 0x9A85, 0x134A, 0x9A85, 0x0F4B, 0xFFFF, 0x88E2, 0x134A, 0x8C69, 0x134A, 0x8C69, 0x1949, 0x88E2, 0x1949, 0x88E2, 0x134A, 0xFFFF, 0x7E4D, 0x1B49, 0x96FE, 0x1B49, 0x96FE, 0x4941, 0x8C69, 0x4B40, 0x88E2, 0x4B40, 0x7E4D, 0x4941, 0x7E4D, 0x1B49}; | ||||
| 
 | ||||
| const PROGMEM uint16_t syringe_outline[] = {0x7AC7, 0x0F4B, 0x7AC7, 0x134A, 0x855B, 0x134A, 0x855B, 0x1949, 0x7AC7, 0x1949, 0x7AC7, 0x4B40, 0x855B, 0x4D40, 0x855B, 0x533F, 0x88E2, 0x533F, 0x88E2, 0x653C, 0x8C69, 0x673C, 0x8C69, 0x533F, 0x8FF0, 0x533F, 0x8FF0, 0x4D40, 0x9A85, 0x4B40, 0x9A85, 0x1949, 0x8FF0, 0x1949, 0x8FF0, 0x134A, 0x9A85, 0x134A, 0x9A85, 0x0F4B, 0x7AC7, 0x0F4B}; | ||||
| 
 | ||||
| const PROGMEM uint16_t padlock[] = {0x645A, 0x8017, 0x5F9E, 0x80A1, 0x5BBA, 0x821B, 0x5911, 0x844A, 0x580A, 0x86F7, 0x580A, 0x8931, 0x5970, 0x8A98, 0x5C49, 0x8A98, 0x5DB0, 0x8931, 0x5DB0, 0x8703, 0x5E3C, 0x858E, 0x5FAA, 0x845F, 0x61C5, 0x8394, 0x645A, 0x834A, 0x66F0, 0x8394, 0x690C, 0x845F, 0x6A7A, 0x858D, 0x6B07, 0x8703, 0x6B07, 0x8F23, 0x57C8, 0x8F23, 0x551E, 0x8FC3, 0x5404, 0x9145, 0x5404, 0x9C8F, 0x551E, 0x9E11, 0x57C8, 0x9EB1, 0x70EE, 0x9EB1, 0x7398, 0x9E11, 0x74B2, 0x9C8F, 0x74B2, 0x9145, 0x7398, 0x8FC3, 0x70EE, 0x8F23, 0x70AC, 0x86FA, 0x6FA5, 0x844A, 0x6CFD, 0x821B, 0x6917, 0x80A1}; | ||||
| 
 | ||||
| const PROGMEM uint16_t home_z[] = {0xD6C9, 0x80CC, 0xBB53, 0x905B, 0xC231, 0x905B, 0xC231, 0x9FEB, 0xCFEC, 0x9FEB, 0xCFEC, 0x9823, 0xDDA7, 0x9823, 0xDDA7, 0x9FEB, 0xEB62, 0x9FEB, 0xEB62, 0x905B, 0xF240, 0x905B, 0xE7A3, 0x8A58, 0xE7A3, 0x82CD, 0xE0C6, 0x82CD, 0xE0C6, 0x8674}; | ||||
| 
 | ||||
| const PROGMEM uint16_t home_e[] = {0xB94F, 0x25AA, 0x9DD8, 0x353A, 0xA4B6, 0x353A, 0xA4B6, 0x44C9, 0xB271, 0x44C9, 0xB271, 0x3D02, 0xC02C, 0x3D02, 0xC02C, 0x44C9, 0xCDE7, 0x44C9, 0xCDE7, 0x353A, 0xD4C5, 0x353A, 0xCA28, 0x2F36, 0xCA28, 0x27AB, 0xC34B, 0x27AB, 0xC34B, 0x2B53}; | ||||
| 
 | ||||
| const PROGMEM uint16_t bed_icon[] = {0x1764, 0x2C4C, 0x6135, 0x2C4C, 0x6135, 0x40A8, 0x1764, 0x40A8}; | ||||
| 
 | ||||
| const PROGMEM uint16_t actual_temp[] = {0x1764, 0x466F, 0x6135, 0x466F, 0x6135, 0x5ACB, 0x1764, 0x5ACB}; | ||||
| 
 | ||||
| const PROGMEM uint16_t target_temp[] = {0x1764, 0x1228, 0x6135, 0x1228, 0x6135, 0x2684, 0x1764, 0x2684}; | ||||
| 
 | ||||
| const PROGMEM uint16_t fine_label[] = {0x1AA7, 0xC6D2, 0x9387, 0xC6D2, 0x9387, 0xD316, 0x1AA7, 0xD316}; | ||||
| 
 | ||||
| const PROGMEM uint16_t fine_toggle[] = {0x9C10, 0xC6D2, 0xE4A3, 0xC6D2, 0xE4A3, 0xD316, 0x9C10, 0xD316}; | ||||
| 
 | ||||
| const PROGMEM uint16_t usb_btn[] = {0x0B68, 0xE880, 0x7B1A, 0xE880, 0x7B1A, 0xF94B, 0x0B68, 0xF94B, 0x0B68, 0xE880}; | ||||
| 
 | ||||
| const PROGMEM uint16_t menu_btn[] = {0x84E3, 0xE880, 0xF495, 0xE880, 0xF495, 0xF94B, 0x84E3, 0xF94B, 0x84E3, 0xE880}; | ||||
| 
 | ||||
| const PROGMEM uint16_t e_pos[] = {0xC9B1, 0x3B2D, 0xD990, 0x3B2D, 0xD990, 0x4D4B, 0xE17F, 0x4D4B, 0xD1A0, 0x565A, 0xC1C2, 0x4D4B, 0xC9B1, 0x4D4B, 0xC9B1, 0x3B2D}; | ||||
| 
 | ||||
| const PROGMEM uint16_t e_neg[] = {0xC9B1, 0x321E, 0xD990, 0x321E, 0xD990, 0x2000, 0xE17F, 0x2000, 0xD1A0, 0x16F1, 0xC1C2, 0x2000, 0xC9B1, 0x2000, 0xC9B1, 0x321E}; | ||||
|  | ||||
| @ -73,7 +73,7 @@ void StatusScreen::draw_temperature(draw_mode_t what) { | ||||
|     #if ENABLED(TOUCH_UI_LULZBOT_BIO) | ||||
|        // The LulzBot Bio shows the temperature for
 | ||||
|        // the bed.
 | ||||
|        | ||||
| 
 | ||||
|       #ifdef TOUCH_UI_PORTRAIT | ||||
|         // Draw touch surfaces
 | ||||
|         ui.bounds(POLY(target_temp), x, y, h, v); | ||||
| @ -86,7 +86,7 @@ void StatusScreen::draw_temperature(draw_mode_t what) { | ||||
|       #endif | ||||
|       ui.bounds(POLY(bed_icon), x, y, h, v); | ||||
|       cmd.rectangle(x, y, h, v); | ||||
|      | ||||
| 
 | ||||
|       // Draw bed icon
 | ||||
|       cmd.cmd(BITMAP_SOURCE(Bed_Heat_Icon_Info)) | ||||
|          .cmd(BITMAP_LAYOUT(Bed_Heat_Icon_Info)) | ||||
| @ -96,17 +96,17 @@ void StatusScreen::draw_temperature(draw_mode_t what) { | ||||
|          .cmd(COLOR_RGB(bg_text_enabled)) | ||||
|          .icon (x, y, h, v, Bed_Heat_Icon_Info, icon_scale * 2); | ||||
|     #endif | ||||
|      | ||||
| 
 | ||||
|     #if ENABLED(TOUCH_UI_COCOA_PRESS) | ||||
|       // The CocoaPress shows the temperature for two
 | ||||
|       // heating zones, but has no bed temperature
 | ||||
|        | ||||
| 
 | ||||
|       cmd.cmd(COLOR_RGB(bg_text_enabled)); | ||||
|       cmd.font(font_medium); | ||||
|        | ||||
| 
 | ||||
|       ui.bounds(POLY(zone1_label), x, y, h, v); | ||||
|       cmd.text(x, y, h, v, GET_TEXT_F(MSG_ZONE_1)); | ||||
|        | ||||
| 
 | ||||
|       ui.bounds(POLY(zone2_label), x, y, h, v); | ||||
|       cmd.text(x, y, h, v, GET_TEXT_F(MSG_ZONE_2)); | ||||
|     #endif | ||||
| @ -121,13 +121,13 @@ void StatusScreen::draw_temperature(draw_mode_t what) { | ||||
|     cmd.cmd(COLOR_RGB(bg_text_enabled)); | ||||
|     #if ENABLED(TOUCH_UI_LULZBOT_BIO) | ||||
|       cmd.font(font_medium); | ||||
|         | ||||
| 
 | ||||
|       #ifdef TOUCH_UI_PORTRAIT | ||||
|         if (!isHeaterIdle(BED) && getTargetTemp_celsius(BED) > 0) | ||||
|           format_temp(str, getTargetTemp_celsius(BED)); | ||||
|         else | ||||
|           strcpy_P(str, GET_TEXT(MSG_BED)); | ||||
|      | ||||
| 
 | ||||
|         ui.bounds(POLY(target_temp), x, y, h, v); | ||||
|         cmd.text(x, y, h, v, str); | ||||
| 
 | ||||
| @ -139,31 +139,31 @@ void StatusScreen::draw_temperature(draw_mode_t what) { | ||||
|           format_temp_and_temp(str, getActualTemp_celsius(BED), getTargetTemp_celsius(BED)); | ||||
|         else | ||||
|           format_temp_and_idle(str, getActualTemp_celsius(BED)); | ||||
|          | ||||
| 
 | ||||
|         ui.bounds(POLY(bed_temp), x, y, h, v); | ||||
|         cmd.text(x, y, h, v, str); | ||||
|       #endif | ||||
|     #endif | ||||
|      | ||||
| 
 | ||||
|     #if ENABLED(TOUCH_UI_COCOA_PRESS) | ||||
|       // The CocoaPress shows the temperature for two
 | ||||
|       // heating zones, but has no bed temperature
 | ||||
|        | ||||
| 
 | ||||
|       cmd.font(font_large); | ||||
|        | ||||
| 
 | ||||
|       if (!isHeaterIdle(E0) && getTargetTemp_celsius(E0) > 0) | ||||
|         format_temp_and_temp(str, getActualTemp_celsius(E0), getTargetTemp_celsius(E0)); | ||||
|       else | ||||
|         format_temp_and_idle(str, getActualTemp_celsius(E0)); | ||||
|        | ||||
| 
 | ||||
|       ui.bounds(POLY(zone1_temp), x, y, h, v); | ||||
|       cmd.text(x, y, h, v, str); | ||||
|        | ||||
| 
 | ||||
|       if (!isHeaterIdle(E1) && getTargetTemp_celsius(E1) > 0) | ||||
|         format_temp_and_temp(str, getActualTemp_celsius(E1), getTargetTemp_celsius(E1)); | ||||
|       else | ||||
|         format_temp_and_idle(str, getActualTemp_celsius(E1)); | ||||
|        | ||||
| 
 | ||||
|       ui.bounds(POLY(zone2_temp), x, y, h, v); | ||||
|       cmd.text(x, y, h, v, str); | ||||
|     #endif | ||||
| @ -177,11 +177,11 @@ void StatusScreen::draw_syringe(draw_mode_t what) { | ||||
|   #else | ||||
|     const float fill_level = 0.75; | ||||
|   #endif | ||||
|   #if ENABLED(TOUCH_UI_LULZBOT_BIO) | ||||
|     const bool  e_homed = isAxisPositionKnown(E0); | ||||
|   #else | ||||
|     const bool  e_homed = true; | ||||
|   #endif | ||||
|   const bool e_homed = (true | ||||
|     #if ENABLED(TOUCH_UI_LULZBOT_BIO) | ||||
|       && isAxisPositionKnown(E0) | ||||
|     #endif | ||||
|   ); | ||||
| 
 | ||||
|   CommandProcessor cmd; | ||||
|   PolyUI ui(cmd, what); | ||||
| @ -211,12 +211,12 @@ void StatusScreen::draw_syringe(draw_mode_t what) { | ||||
| } | ||||
| 
 | ||||
| void StatusScreen::draw_arrows(draw_mode_t what) { | ||||
|   #if ENABLED(TOUCH_UI_LULZBOT_BIO) | ||||
|     const bool  e_homed = isAxisPositionKnown(E0); | ||||
|   #else | ||||
|     const bool  e_homed = true; | ||||
|   #endif | ||||
|   const bool  z_homed = isAxisPositionKnown(Z); | ||||
|   const bool e_homed = (true | ||||
|     #if ENABLED(TOUCH_UI_LULZBOT_BIO) | ||||
|       && isAxisPositionKnown(E0) | ||||
|     #endif | ||||
|   ); | ||||
|   const bool z_homed = isAxisPositionKnown(Z); | ||||
| 
 | ||||
|   CommandProcessor cmd; | ||||
|   PolyUI ui(cmd, what); | ||||
| @ -255,7 +255,7 @@ void StatusScreen::draw_fine_motion(draw_mode_t what) { | ||||
|       font_small | ||||
|     #endif | ||||
|   ) | ||||
|   .tag(16);  | ||||
|   .tag(16); | ||||
| 
 | ||||
|   if (what & BACKGROUND) { | ||||
|     ui.bounds(POLY(fine_label), x, y, h, v); | ||||
| @ -271,12 +271,12 @@ void StatusScreen::draw_fine_motion(draw_mode_t what) { | ||||
| } | ||||
| 
 | ||||
| void StatusScreen::draw_overlay_icons(draw_mode_t what) { | ||||
|   #if ENABLED(TOUCH_UI_LULZBOT_BIO) | ||||
|     const bool  e_homed = isAxisPositionKnown(E0); | ||||
|   #else | ||||
|     const bool  e_homed = true; | ||||
|   #endif | ||||
|   const bool  z_homed = isAxisPositionKnown(Z); | ||||
|   const bool e_homed = (true | ||||
|     #if ENABLED(TOUCH_UI_LULZBOT_BIO) | ||||
|       && isAxisPositionKnown(E0) | ||||
|     #endif | ||||
|   ); | ||||
|   const bool z_homed = isAxisPositionKnown(Z); | ||||
| 
 | ||||
|   CommandProcessor cmd; | ||||
|   PolyUI ui(cmd, what); | ||||
| @ -294,12 +294,12 @@ void StatusScreen::draw_overlay_icons(draw_mode_t what) { | ||||
| 
 | ||||
| void StatusScreen::draw_buttons(draw_mode_t what) { | ||||
|   int16_t x, y, h, v; | ||||
|    | ||||
| 
 | ||||
|   const bool has_media = isMediaInserted() && !isPrintingFromMedia(); | ||||
| 
 | ||||
|   CommandProcessor cmd; | ||||
|   PolyUI ui(cmd, what); | ||||
|    | ||||
| 
 | ||||
|   ui.bounds(POLY(usb_btn), x, y, h, v); | ||||
|   cmd.font(font_medium) | ||||
|      .colors(normal_btn) | ||||
| @ -310,7 +310,7 @@ void StatusScreen::draw_buttons(draw_mode_t what) { | ||||
|           GET_TEXT_F(MSG_PRINTING) : | ||||
|           GET_TEXT_F(MSG_BUTTON_MEDIA) | ||||
|       ); | ||||
|        | ||||
| 
 | ||||
|   ui.bounds(POLY(menu_btn), x, y, h, v); | ||||
|   cmd.colors(!has_media ? action_btn : normal_btn).tag(10).button(x, y, h, v, GET_TEXT_F(MSG_BUTTON_MENU)); | ||||
| } | ||||
| @ -408,7 +408,7 @@ bool StatusScreen::onTouchHeld(uint8_t tag) { | ||||
| } | ||||
| 
 | ||||
| void StatusScreen::setStatusMessage(progmem_str pstr) { | ||||
|   #if defined(TOUCH_UI_LULZBOT_BIO) | ||||
|   #ifdef TOUCH_UI_LULZBOT_BIO | ||||
|     BioPrintingDialogBox::setStatusMessage(pstr); | ||||
|   #else | ||||
|     UNUSED(pstr); | ||||
| @ -416,7 +416,7 @@ void StatusScreen::setStatusMessage(progmem_str pstr) { | ||||
| } | ||||
| 
 | ||||
| void StatusScreen::setStatusMessage(const char * const str) { | ||||
|   #if defined(TOUCH_UI_LULZBOT_BIO) | ||||
|   #ifdef TOUCH_UI_LULZBOT_BIO | ||||
|     BioPrintingDialogBox::setStatusMessage(str); | ||||
|   #else | ||||
|     UNUSED(str); | ||||
| @ -428,7 +428,7 @@ void StatusScreen::onIdle() { | ||||
|   if (refresh_timer.elapsed(STATUS_UPDATE_INTERVAL)) { | ||||
|     if (!EventLoop::is_touch_held()) | ||||
|       onRefresh(); | ||||
|     #if defined(TOUCH_UI_LULZBOT_BIO) | ||||
|     #ifdef TOUCH_UI_LULZBOT_BIO | ||||
|       if (isPrintingFromMedia()) | ||||
|         BioPrintingDialogBox::show(); | ||||
|     #endif | ||||
|  | ||||
| @ -112,7 +112,7 @@ void BootScreen::showSplashScreen() { | ||||
| 
 | ||||
|   #define POLY(A) PolyUI::poly_reader_t(A, sizeof(A)/sizeof(A[0])) | ||||
|   #define LOGO_PAINT_PATH(rgb, path) cmd.cmd(COLOR_RGB(rgb)); ui.fill(POLY(path)); | ||||
|    | ||||
| 
 | ||||
|   PolyUI ui(cmd); | ||||
| 
 | ||||
|   LOGO_PAINT_PATHS | ||||
|  | ||||
| @ -36,11 +36,12 @@ void FilamentRunoutScreen::onRedraw(draw_mode_t what) { | ||||
|   w.toggle( 2, GET_TEXT_F(MSG_RUNOUT_SENSOR), getFilamentRunoutEnabled()); | ||||
| 
 | ||||
|   #ifdef FILAMENT_RUNOUT_DISTANCE_MM | ||||
|     extern const char NUL_STR[]; | ||||
|     w.heading(GET_TEXT_F(MSG_RUNOUT_DISTANCE_MM)); | ||||
|     w.units(GET_TEXT_F(MSG_UNITS_MM)); | ||||
|     w.precision(0); | ||||
|     w.color(e_axis); | ||||
|     w.adjuster( 10, PSTR(""), getFilamentRunoutDistance_mm(), getFilamentRunoutEnabled()); | ||||
|     w.adjuster( 10, NUL_STR, getFilamentRunoutDistance_mm(), getFilamentRunoutEnabled()); | ||||
|     w.increments(); | ||||
|   #endif | ||||
| } | ||||
|  | ||||
| @ -49,19 +49,19 @@ namespace Theme { | ||||
|   // Shades of accent color
 | ||||
| 
 | ||||
|   #ifdef TOUCH_UI_COCOA_PRESS | ||||
|     constexpr uint32_t accent_color_1     = hsl_to_rgb(12.8,0.597,0.263); // Darkest
 | ||||
|     constexpr uint32_t accent_color_2     = hsl_to_rgb(12.8,0.597,0.263); | ||||
|     constexpr uint32_t accent_color_3     = hsl_to_rgb( 9.6,0.664,0.443); | ||||
|     constexpr uint32_t accent_color_4     = hsl_to_rgb(16.3,0.873,0.537); | ||||
|     constexpr uint32_t accent_color_5     = hsl_to_rgb(23.0,0.889,0.539); | ||||
|     constexpr uint32_t accent_color_6     = hsl_to_rgb(23.0,0.889,0.539); // Lightest
 | ||||
|     constexpr uint32_t accent_color_1   = hsl_to_rgb(12.8,0.597,0.263); // Darkest
 | ||||
|     constexpr uint32_t accent_color_2   = hsl_to_rgb(12.8,0.597,0.263); | ||||
|     constexpr uint32_t accent_color_3   = hsl_to_rgb( 9.6,0.664,0.443); | ||||
|     constexpr uint32_t accent_color_4   = hsl_to_rgb(16.3,0.873,0.537); | ||||
|     constexpr uint32_t accent_color_5   = hsl_to_rgb(23.0,0.889,0.539); | ||||
|     constexpr uint32_t accent_color_6   = hsl_to_rgb(23.0,0.889,0.539); // Lightest
 | ||||
|   #else | ||||
|     constexpr uint32_t accent_color_1     = hsl_to_rgb(accent_hue, accent_sat, 0.26); // Darkest
 | ||||
|     constexpr uint32_t accent_color_2     = hsl_to_rgb(accent_hue, accent_sat, 0.39); | ||||
|     constexpr uint32_t accent_color_3     = hsl_to_rgb(accent_hue, accent_sat, 0.52); | ||||
|     constexpr uint32_t accent_color_4     = hsl_to_rgb(accent_hue, accent_sat, 0.65); | ||||
|     constexpr uint32_t accent_color_5     = hsl_to_rgb(accent_hue, accent_sat, 0.78); | ||||
|     constexpr uint32_t accent_color_6     = hsl_to_rgb(accent_hue, accent_sat, 0.91); // Lightest
 | ||||
|     constexpr uint32_t accent_color_1   = hsl_to_rgb(accent_hue, accent_sat, 0.26); // Darkest
 | ||||
|     constexpr uint32_t accent_color_2   = hsl_to_rgb(accent_hue, accent_sat, 0.39); | ||||
|     constexpr uint32_t accent_color_3   = hsl_to_rgb(accent_hue, accent_sat, 0.52); | ||||
|     constexpr uint32_t accent_color_4   = hsl_to_rgb(accent_hue, accent_sat, 0.65); | ||||
|     constexpr uint32_t accent_color_5   = hsl_to_rgb(accent_hue, accent_sat, 0.78); | ||||
|     constexpr uint32_t accent_color_6   = hsl_to_rgb(accent_hue, accent_sat, 0.91); // Lightest
 | ||||
|   #endif | ||||
| 
 | ||||
|   // Shades of gray
 | ||||
|  | ||||
| @ -15,7 +15,7 @@ | ||||
|  ****************************************************************************/ | ||||
| 
 | ||||
| /**
 | ||||
|  * This file was auto-generated using "svg2cpp.pl" | ||||
|  * This file was auto-generated using "svg2cpp.py" | ||||
|  * | ||||
|  * The encoding consists of x,y pairs with the min and max scaled to | ||||
|  * 0x0000 and 0xFFFE. A single 0xFFFF in the data stream indicates the | ||||
| @ -25,19 +25,14 @@ | ||||
| #pragma once | ||||
| 
 | ||||
| constexpr float x_min = 0.000000; | ||||
| 
 | ||||
| constexpr float x_max = 480.000000; | ||||
| 
 | ||||
| constexpr float y_min = 0.000000; | ||||
| 
 | ||||
| constexpr float y_max = 272.000000; | ||||
| 
 | ||||
| const PROGMEM uint16_t logo_fill[] = {0x419D, 0x546F, 0x3D05, 0x5615, 0x3942, 0x5A92, 0x36B7, 0x6136, 0x35C8, 0x6950, 0x35C8, 0x96B0, 0x36B7, 0x9ECA, 0x3942, 0xA56E, 0x3D05, 0xA9EB, 0x419D, 0xAB91, 0xBE60, 0xAB91, 0xC2F8, 0xA9EB, 0xC6BB, 0xA56E, 0xC946, 0x9ECA, 0xCA35, 0x96B0, 0xCA32, 0x546C, 0x419D, 0x546F}; | ||||
| 
 | ||||
| const PROGMEM uint16_t logo_stroke[] = {0xADF3, 0x546C, 0x419D, 0x546F, 0x3D05, 0x5615, 0x3942, 0x5A92, 0x36B7, 0x6136, 0x35C8, 0x6950, 0x35C8, 0x96B0, 0x36B7, 0x9ECA, 0x3942, 0xA56E, 0x3D05, 0xA9EB, 0x419D, 0xAB91, 0xBE60, 0xAB91, 0xC2F8, 0xA9EB, 0xC6BB, 0xA56E, 0xC946, 0x9ECA, 0xCA35, 0x96B0, 0xCA32, 0x546C, 0xADF3, 0x546C, 0xFFFF, 0x419D, 0x5913, 0xB08C, 0x5913, 0xC794, 0x8250, 0xC794, 0x96B0, 0xC6DA, 0x9CFF, 0xC4E1, 0xA229, 0xC1F4, 0xA5A5, 0xBE60, 0xA6ED, 0x419D, 0xA6ED, 0x3E09, 0xA5A5, 0x3B1C, 0xA229, 0x3923, 0x9CFF, 0x3869, 0x96B0, 0x3869, 0x6950, 0x3923, 0x6301, 0x3B1C, 0x5DD7, 0x3E09, 0x5A5B, 0x419D, 0x5913, 0xFFFF, 0xAC7A, 0x8620, 0xAC7A, 0x9373, 0xA767, 0x9373, 0xA767, 0x75CB, 0xA1C6, 0x75CB, 0xA1C6, 0x9373, 0xA1C6, 0x9C8E, 0xA767, 0x9C8E, 0xAC7A, 0x9C8E, 0xB21C, 0x9C8E, 0xB21C, 0x9373, 0xB21C, 0x85E7, 0xB350, 0x8093, 0xB65F, 0x7E86, 0xB9D5, 0x8165, 0xBA83, 0x85E7, 0xBA83, 0x9C8E, 0xBEFE, 0x9C8E, 0xC024, 0x99E1, 0xC024, 0x8620, 0xBF7B, 0x7F22, 0xBD8F, 0x79A9, 0xBA7E, 0x7617, 0xB65F, 0x74D0, 0xB24F, 0x7622, 0xAF30, 0x79C6, 0xAD2F, 0x7F43, 0xAC7A, 0x8620, 0xAC7A, 0x8620, 0xAC7A, 0x8620, 0xFFFF, 0x8179, 0x9C8E, 0x7CE9, 0x9C8E, 0x7747, 0x9C8E, 0x7747, 0x92EC, 0x7747, 0x8949, 0x75A2, 0x81A3, 0x71A6, 0x7E73, 0x6DAB, 0x818B, 0x6C05, 0x88FC, 0x6DAF, 0x9019, 0x71C7, 0x92EC, 0x7505, 0x92EC, 0x7505, 0x9C8E, 0x7118, 0x9C8E, 0x6CD3, 0x9B06, 0x696B, 0x96D6, 0x6729, 0x909E, 0x6658, 0x88FC, 0x672D, 0x8133, 0x6980, 0x7AC7, 0x6D13, 0x766C, 0x71A6, 0x74D0, 0x7632, 0x766D, 0x79C2, 0x7AD1, 0x7C14, 0x8153, 0x7CE9, 0x8949, 0x7CE9, 0x92EC, 0x8179, 0x92EC, 0x8179, 0x8620, 0x822E, 0x7F43, 0x842E, 0x79C6, 0x874E, 0x7622, 0x8B5E, 0x74D0, 0x8F7C, 0x7617, 0x928E, 0x79A9, 0x9479, 0x7F22, 0x9523, 0x8620, 0x9523, 0x87DB, 0x8F81, 0x87DB, 0x8F81, 0x85E7, 0x8ED4, 0x8165, 0x8B5E, 0x7E86, 0x884F, 0x8093, 0x871A, 0x85E7, 0x871A, 0x92EC, 0x871A, 0x9C8F, 0x8179, 0x9C8F, 0x8179, 0x9C8E, 0x8179, 0x9C8E, 0xFFFF, 0x6515, 0x79DB, 0x644C, 0x7281, 0x6218, 0x6C86, 0x5EB2, 0x6882, 0x5A56, 0x670A, 0x55D9, 0x68E0, 0x5272, 0x6DD0, 0x4F0B, 0x68E0, 0x4A8E, 0x670A, 0x4638, 0x6882, 0x42D5, 0x6C86, 0x40A2, 0x7281, 0x3FD9, 0x79DB, 0x3FD9, 0x9AC9, 0x40E4, 0x9C8E, 0x456F, 0x9C8E, 0x456F, 0x79B5, 0x46D4, 0x735D, 0x4A8E, 0x70C0, 0x4E3E, 0x735D, 0x4FA1, 0x79B5, 0x4FA1, 0x9C8E, 0x554D, 0x9C8E, 0x554D, 0x79B5, 0x56A7, 0x735D, 0x5A56, 0x70C0, 0x5E0C, 0x735D, 0x5F74, 0x79B5, 0x5F74, 0x9C8E, 0x6515, 0x9C8E, 0x6515, 0x79DB, 0x6515, 0x79DB, 0x6515, 0x79DB, 0xFFFF, 0x9672, 0x8C4C, 0x9714, 0x9379, 0x98F5, 0x98D2, 0x9C0B, 0x9BF4, 0xA04C, 0x9C7B, 0xA04C, 0x9373, 0x9D2B, 0x920C, 0x9C1E, 0x8C4C, 0x9C1E, 0x648E, 0x9672, 0x648E, 0x9672, 0x8C4C, 0x9672, 0x8C4C, 0x9672, 0x8C4C, 0xFFFF, 0xA767, 0x7194, 0xA767, 0x6C02, 0xA692, 0x687A, 0xA496, 0x670A, 0xA291, 0x687A, 0xA1BB, 0x6C02, 0xA1BB, 0x7194, 0xA767, 0x7194, 0xA767, 0x7194, 0xA767, 0x7194}; | ||||
| 
 | ||||
| #define LOGO_BACKGROUND logo_bg_rgb | ||||
| #define LOGO_PAINT_PATHS \ | ||||
|   LOGO_PAINT_PATH(logo_stroke_rgb, logo_stroke) \ | ||||
|   LOGO_PAINT_PATH(logo_fill_rgb,   logo_fill) | ||||
| 
 | ||||
|  | ||||
| @ -15,7 +15,7 @@ | ||||
|  ****************************************************************************/ | ||||
| 
 | ||||
| /**
 | ||||
|  * This file was auto-generated using "svg2cpp.pl" | ||||
|  * This file was auto-generated using "svg2cpp.py" | ||||
|  * | ||||
|  * The encoding consists of x,y pairs with the min and max scaled to | ||||
|  * 0x0000 and 0xFFFE. A single 0xFFFF in the data stream indicates the | ||||
| @ -25,11 +25,8 @@ | ||||
| #pragma once | ||||
| 
 | ||||
| constexpr float x_min = 0.000000; | ||||
| 
 | ||||
| constexpr float x_max = 272.000000; | ||||
| 
 | ||||
| constexpr float y_min = 0.000000; | ||||
| 
 | ||||
| constexpr float y_max = 480.000000; | ||||
| 
 | ||||
| const PROGMEM uint16_t logo_fill[] = {0x3C19, 0x70C5, 0x371A, 0x7159, 0x3302, 0x72EA, 0x303D, 0x753C, 0x2F39, 0x7811, 0x2F39, 0x87ED, 0x303D, 0x8AC2, 0x3302, 0x8D14, 0x371A, 0x8EA5, 0x3C19, 0x8F39, 0xC3E4, 0x8F39, 0xC8E3, 0x8EA5, 0xCCFB, 0x8D14, 0xCFC0, 0x8AC2, 0xD0C4, 0x87ED, 0xD0C0, 0x70C4, 0x3C19, 0x70C5}; | ||||
| @ -39,4 +36,4 @@ const PROGMEM uint16_t logo_stroke[] = {0x3C19, 0x70C5, 0x371A, 0x7159, 0x3302, | ||||
| #define LOGO_BACKGROUND logo_bg_rgb | ||||
| #define LOGO_PAINT_PATHS \ | ||||
|   LOGO_PAINT_PATH(logo_stroke_rgb, logo_stroke) \ | ||||
|   LOGO_PAINT_PATH(logo_fill_rgb,   logo_fill) | ||||
|   LOGO_PAINT_PATH(logo_fill_rgb,   logo_fill) | ||||
|  | ||||
| @ -2091,12 +2091,12 @@ void MarlinSettings::postprocess() { | ||||
|     validating = true; | ||||
|     #ifdef ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE | ||||
|       bool success = _load(); | ||||
|       if(!success && restoreEEPROM()) { | ||||
|       if (!success && restoreEEPROM()) { | ||||
|         SERIAL_ECHOLNPGM("Recovered backup EEPROM settings from SPI Flash"); | ||||
|         success = _load(); | ||||
|       } | ||||
|     #else | ||||
|     const bool success = _load(); | ||||
|       const bool success = _load(); | ||||
|     #endif | ||||
|     validating = false; | ||||
|     return success; | ||||
|  | ||||
| @ -1269,8 +1269,8 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
|    | ||||
|   // Enable developers menu (access by touching the copyright text on the About Printer)
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1273,6 +1273,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1272,6 +1272,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1273,6 +1273,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1277,6 +1277,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1268,6 +1268,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1264,6 +1264,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1273,6 +1273,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1248,6 +1248,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1274,6 +1274,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1269,6 +1269,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1274,6 +1274,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1266,6 +1266,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1266,6 +1266,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1268,6 +1268,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1266,6 +1266,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1266,6 +1266,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1267,6 +1267,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1266,6 +1266,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1266,6 +1266,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1266,6 +1266,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1266,6 +1266,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1266,6 +1266,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1266,6 +1266,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1266,6 +1266,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1266,6 +1266,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1266,6 +1266,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1266,6 +1266,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1266,6 +1266,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1266,6 +1266,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1266,6 +1266,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1266,6 +1266,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1266,6 +1266,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
| @ -1266,6 +1266,9 @@ | ||||
| 
 | ||||
|   // Output extra debug info for Touch UI events
 | ||||
|   //#define TOUCH_UI_DEBUG
 | ||||
| 
 | ||||
|   // Developer menu (accessed by touching "About Printer" copyright text)
 | ||||
|   //#define TOUCH_UI_DEVELOPER_MENU
 | ||||
| #endif | ||||
| 
 | ||||
| //
 | ||||
|  | ||||
Some files were not shown because too many files have changed in this diff Show More
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user