Move build info to long hold B

7 files changed, 107 insertions, 46 deletions

diff --git a/workspace/TS100/.settings/org.eclipse.core.resources.prefs b/workspace/TS100/.settings/org.eclipse.core.resources.prefs
index 801fab74..99f26c02 100644
--- a/workspace/TS100/.settings/org.eclipse.core.resources.prefs
+++ b/workspace/TS100/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +1,2 @@
 eclipse.preferences.version=1
-encoding/<project>=utf8
+encoding/<project>=UTF-8
diff --git a/workspace/TS100/inc/Settings.h b/workspace/TS100/inc/Settings.h
index d3d4581d..6e5118c1 100644
--- a/workspace/TS100/inc/Settings.h
+++ b/workspace/TS100/inc/Settings.h
@@ -42,5 +42,5 @@ void saveSettings();
 void restoreSettings();
 uint8_t lookupVoltageLevel(uint8_t level);
 void resetSettings();
-void showBootLogoIfavailable();
+bool showBootLogoIfavailable();
 #endif /* SETTINGS_H_ */
diff --git a/workspace/TS100/src/OLED.cpp b/workspace/TS100/src/OLED.cpp
index f0828ebd..04c40370 100644
--- a/workspace/TS100/src/OLED.cpp
+++ b/workspace/TS100/src/OLED.cpp
@@ -93,8 +93,6 @@ void OLED::refresh() {
 
 void OLED::drawChar(char c, char PrecursorCommand) {
 //prints a char to the screen
-	if (c == '\n')
-		cursor_y += fontHeight;
 	if (c < ' ')
 		return;
 	//We are left with
@@ -115,19 +113,18 @@ void OLED::drawChar(char c, char PrecursorCommand) {
 		//Latin stats at 96
 		c -= 0x80;
 		if (PrecursorCommand == 0xC3)
-			index = (96 + 32) + (c);
+			index = (128) + (c);
 		else if (PrecursorCommand == 0xC2)
 			index = (96) + (c);
 		else if (PrecursorCommand == 0xD0)
-			index = (208) + (c);
+			index = (192) + (c);
 		else if (PrecursorCommand == 0xD1)
-			index = (272) + (c);
+			index = (256) + (c);
 		else
 			return;
-		index -=0x10;//offset removal
 	}
 	charPointer = ((uint8_t*) currentFont) + ((fontWidth * (fontHeight / 8)) * index);
-	if (cursor_x >= 0)
+	if (cursor_x >= 0 && cursor_x < 96)
 		drawArea(cursor_x, cursor_y, fontWidth, fontHeight, charPointer);
 	cursor_x += fontWidth;
 }
diff --git a/workspace/TS100/src/Translation.c b/workspace/TS100/src/Translation.c
index 66d88032..8604f097 100644
--- a/workspace/TS100/src/Translation.c
+++ b/workspace/TS100/src/Translation.c
@@ -5,6 +5,10 @@
  *      Author: Ben V. Brown
  */
 #include "Translation.h"
+
+#define LANG_RU
+#define LANG
+
 #ifndef LANG
 #define LANG_EN
 #define LANG
@@ -215,6 +219,42 @@ const char SettingTempCChar = 'C';
 const char SettingTempFChar = 'F';
 #endif
 
+#ifdef LANG_RU
+const char* SettingsLongNames[13] =
+{
+//These are all the help text for all the settings./
+	"Источник питания. Установка напряжения отключения. <DC 10V> <S 3.3 V на батарею>",
+	"Температура Сна <С>",
+	"Переход в режим Сна <Минуты>",
+	"Переходит в режим ожидания <Минуты>",
+	"Акселерометр <0. Выкл. 1. мин. чувствительный 9. макс. чувствительный>",
+	"В чем измерять температуру",
+	"Шаг измерения температуры",
+	"Скорость обновления дисплея температуры",
+	"Ориентация Дисплея <A. Автоматический L. Левая Рука R. Правая Рука>",
+	"Активация кнопки A для Турбо режима до 450С при пайке ",
+	"Установка температуры для Турбо режима",
+	"Изменяет стрелки на дисплей питания при пайке",
+	"Автоматический запуск паяльника при включении питания. T=Нагрев, S=Режим Сна,F=Выкл.",
+	"Мигает температура на экране охлаждения, пока жало остается горячим."};
+
+const char* SettingsCalibrationWarning = "Please ensure the tip is at room temperature before continuing!";
+
+const char* UVLOWarningString = "Low Volt";//Fixed width 8 chars
+const char* CoolingPromptString = "Выкл. ";//Fixed width 5 chars
+const char SettingTrueChar = 'T';
+const char SettingFalseChar = 'F';
+const char SettingSleepChar = 'S';
+const char SettingFastChar = 'F';
+const char SettingMediumChar = 'M';
+const char SettingSlowChar = 'S';
+const char SettingRightChar = 'R';
+const char SettingLeftChar = 'L';
+const char SettingAutoChar = 'A';
+const char SettingTempCChar = 'C';
+const char SettingTempFChar = 'F';
+
+#endif
 const char* SettingsShortNames[13] = { /**/
 "PWRSC ",    // Power Source (DC or batt)
 		"STMP ", 	// Sleep Temperature
diff --git a/workspace/TS100/src/gui.cpp b/workspace/TS100/src/gui.cpp
index 5395150b..b6af794d 100644
--- a/workspace/TS100/src/gui.cpp
+++ b/workspace/TS100/src/gui.cpp
@@ -43,7 +43,7 @@ const menuitem settingsMenu[] = { /*Struct used for all settings options in the
 { (const char*) SettingsLongNames[2], { settings_setSleepTime }, { settings_displaySleepTime } }, /*Sleep Time*/
 { (const char*) SettingsLongNames[3], { settings_setShutdownTime }, { settings_displayShutdownTime } }, /*Shutdown Time*/
 { (const char*) SettingsLongNames[4], { settings_setSensitivity }, { settings_displaySensitivity } },/* Motion Sensitivity*/
-{ (const char*) SettingsLongNames[4], { settings_setAdvancedScreens }, { settings_displayAdvancedScreens } },/* Advanced screens*/
+{ (const char*) SettingsLongNames[5], { settings_setAdvancedScreens }, { settings_displayAdvancedScreens } },/* Advanced screens*/
 { (const char*) SettingsLongNames[6], { settings_setDisplayRotation }, { settings_displayDisplayRotation } }, /**/
 { (const char*) SettingsLongNames[7], { settings_setBoostModeEnabled }, { settings_displayBoostModeEnabled } }, /**/
 { (const char*) SettingsLongNames[8], { settings_setBoostTemp }, { settings_displayBoostTemp } }, /**/
diff --git a/workspace/TS100/src/main.cpp b/workspace/TS100/src/main.cpp
index 61e328a8..e85c378d 100644
--- a/workspace/TS100/src/main.cpp
+++ b/workspace/TS100/src/main.cpp
@@ -41,18 +41,8 @@ int main(void) {
 	lcd.initialize();    //start up the LCD
 	lcd.setFont(0);    //default to bigger font
 	accel.initalize();    //this sets up the I2C registers and loads up the default settings
-	lcd.clearScreen();			//Ensure the buffer starts clean
-	lcd.setCursor(0, 0);		//Position the cursor at the 0,0 (top left)
-	lcd.setFont(1);		//small font
-	lcd.print((char*) "V2.00");    //Print version number
-	lcd.setCursor(0, 8);    //second line
-	lcd.print(__DATE__);    //print the compile date
-	lcd.refresh();
 	HAL_IWDG_Refresh(&hiwdg);
-	HAL_Delay(500);
 	restoreSettings();    //load the settings from flash
-
-	showBootLogoIfavailable();
 	setCalibrationOffset(systemSettings.CalibrationOffset);
 	HAL_IWDG_Refresh(&hiwdg);
 	/* Create the thread(s) */
@@ -146,11 +136,31 @@ ButtonState getButtonState() {
 static void waitForButtonPress() {
 	//we are just lazy and sleep until user confirms button press
 	//This also eats the button press event!
+	ButtonState buttons = getButtonState();
+	while (buttons) {
+		buttons = getButtonState();
+		osDelay(100);
+		HAL_IWDG_Refresh(&hiwdg);
+		lcd.refresh();
+	}
+	while (!buttons) {
+		buttons = getButtonState();
+
+		osDelay(100);
+		HAL_IWDG_Refresh(&hiwdg);
+		lcd.refresh();
+	}
+}
+static void waitForButtonPressOrTimeout(uint32_t timeout) {
+	timeout += HAL_GetTick();
+	//Make timeout our exit value
 	for (;;) {
 		ButtonState buttons = getButtonState();
 		if (buttons)
 			return;
-		osDelay(100);
+		if (HAL_GetTick() > timeout)
+			return;
+		osDelay(50);
 		HAL_IWDG_Refresh(&hiwdg);
 
 	}
@@ -251,6 +261,7 @@ static void gui_settingsMenu() {
 	bool earlyExit = false;
 	uint32_t descriptionStart = 0;
 	while ((settingsMenu[currentScreen].description != NULL) && earlyExit == false) {
+		lcd.setFont(0);
 		lcd.clearScreen();
 		lcd.setCursor(0, 0);
 		if (HAL_GetTick() - lastButtonTime < 4000) {
@@ -259,7 +270,7 @@ static void gui_settingsMenu() {
 		} else {
 			//Draw description
 			//draw string starting from descriptionOffset
-			lcd.setFont(0);
+
 			int16_t maxOffset = strlen(settingsMenu[currentScreen].description);
 			if (!descriptionStart)
 				descriptionStart = HAL_GetTick();
@@ -573,15 +584,16 @@ void startGUITask(void const * argument) {
 			gui_solderingMode();
 	}
 	HAL_IWDG_Refresh(&hiwdg);
-	osDelay(1000);
+	if (showBootLogoIfavailable())
+		waitForButtonPressOrTimeout(1000);
 	HAL_IWDG_Refresh(&hiwdg);
-
-	/*for (;;) {
+	/*
+	 for (;;) {
 	 HAL_IWDG_Refresh(&hiwdg);
 	 lcd.clearScreen();
 	 lcd.setCursor(0, 0);
-	 lcd.setFont(1);
-	 lcd.printNumber(lastMovementTime, 5);
+	 lcd.setFont(0);
+	 lcd.print("");
 	 lcd.refresh();
 	 osDelay(100);
 	 HAL_IWDG_Refresh(&hiwdg);
@@ -597,8 +609,19 @@ void startGUITask(void const * argument) {
 			case BUTTON_BOTH:
 				//Not used yet
 				break;
-				//Long presses are ignored for now
+
 			case BUTTON_B_LONG:
+				//Show the version information
+			{
+				lcd.clearScreen();			//Ensure the buffer starts clean
+				lcd.setCursor(0, 0);		//Position the cursor at the 0,0 (top left)
+				lcd.setFont(1);					//small font
+				lcd.print((char*) "V2.00");    //Print version number
+				lcd.setCursor(0, 8);    //second line
+				lcd.print(__DATE__);    //print the compile date
+				lcd.refresh();
+				waitForButtonPress();
+			}
 				break;
 			case BUTTON_F_LONG:
 				gui_solderingTempAdjust();
@@ -855,9 +878,9 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) {
 
 #define FLASH_LOGOADDR 	(0x8000000|0xB800) /*second last page of flash set aside for logo image*/
 
-void showBootLogoIfavailable() {
-	//check if the header is there (0xAA,0x55,0xF0,0x0D)
-	//If so display logo
+bool showBootLogoIfavailable() {
+//check if the header is there (0xAA,0x55,0xF0,0x0D)
+//If so display logo
 	uint16_t temp[98];
 
 	for (uint8_t i = 0; i < (98); i++) {
@@ -871,15 +894,16 @@ void showBootLogoIfavailable() {
 	}
 
 	if (temp8[0] != 0xAA)
-		return;
+		return false;
 	if (temp8[1] != 0x55)
-		return;
+		return false;
 	if (temp8[2] != 0xF0)
-		return;
+		return false;
 	if (temp8[3] != 0x0D)
-		return;
+		return false;
 
 	lcd.drawArea(0, 0, 96, 16, (uint8_t*) (temp8 + 4));
 	lcd.refresh();
+	return true;
 
 }
diff --git a/workspace/ts100/inc/Font.h b/workspace/ts100/inc/Font.h
index c1e8538c..e5065d58 100644
--- a/workspace/ts100/inc/Font.h
+++ b/workspace/ts100/inc/Font.h
@@ -133,7 +133,7 @@ const uint8_t FONT_12[]={
 		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,//AD (blank)
 		0x00,0xF0,0xF8,0x1C,0xEC,0xEC,0xAC,0xEC,0x4C,0x1C,0xF8,0xF0,0x00,0x07,0x0F,0x1C,0x1B,0x1B,0x18,0x1B,0x1B,0x1C,0x0F,0x07,//AE//174
 		0x00,0x00,0x00,0x00,0x00,0x0C,0x0C,0x0C,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,//AF//175
-		//V128
+		//V112
 		0x00,0x00,0x00,0x1E,0x3F,0x33,0x33,0x3F,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,//B0//176
 		0x00,0x00,0x00,0xC0,0xC0,0xF0,0xF0,0xC0,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x1B,0x1B,0x18,0x18,0x00,0x00,0x00,//B1//177
 		0x00,0x00,0x19,0x1D,0x15,0x17,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,//B2//178
@@ -150,7 +150,7 @@ const uint8_t FONT_12[]={
 		0x00,0x48,0x7C,0x7C,0x40,0x80,0xC0,0x60,0x30,0x10,0x00,0x00,0x00,0x00,0x04,0x06,0x03,0x01,0x00,0x19,0x1D,0x17,0x12,0x00,//BD//189
 		0x00,0x44,0x54,0x7C,0x28,0x80,0xC0,0x60,0x30,0x10,0x00,0x00,0x00,0x00,0x04,0x06,0x03,0x01,0x06,0x07,0x04,0x1F,0x1F,0x00,//BE//190
 		0x00,0x00,0x00,0x80,0xC0,0xFB,0x7B,0x00,0x00,0x00,0x00,0x00,0x00,0x0E,0x1F,0x3B,0x31,0x30,0x30,0x30,0x38,0x1E,0x0E,0x00,//BF//191
-		//V144
+		//V128
 		0x00,0x00,0x00,0x80,0xE1,0x7B,0x7E,0xE4,0x80,0x00,0x00,0x00,0x00,0x38,0x3E,0x0F,0x0D,0x0C,0x0C,0x0D,0x0F,0x3E,0x38,0x00,//C0//192
 		0x00,0x00,0x00,0x80,0xE4,0x7E,0x7B,0xE1,0x80,0x00,0x00,0x00,0x00,0x38,0x3E,0x0F,0x0D,0x0C,0x0C,0x0D,0x0F,0x3E,0x38,0x00,//C1//193
 		0x00,0x00,0x00,0x84,0xE6,0x7B,0x7B,0xE6,0x84,0x00,0x00,0x00,0x00,0x38,0x3E,0x0F,0x0D,0x0C,0x0C,0x0D,0x0F,0x3E,0x38,0x00,//C2//194
@@ -167,7 +167,7 @@ const uint8_t FONT_12[]={
 		0x00,0x00,0x00,0x18,0x18,0xFC,0xFE,0x1B,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00,//CD//205
 		0x00,0x00,0x00,0x1C,0x1E,0xFB,0xFB,0x1E,0x1C,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00,//CE//206
 		0x00,0x00,0x00,0x1B,0x1B,0xF8,0xF8,0x1B,0x1B,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00,//CF//207
-		//V160
+		//V144
 		0x00,0xC0,0xFF,0xFF,0xC3,0x03,0x03,0x07,0x0E,0xFC,0xF0,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x38,0x1C,0x0F,0x03,0x00,//D0//208
 		0x00,0xF8,0xF8,0x72,0xE3,0xC1,0x83,0x02,0x03,0xF9,0xF8,0x00,0x00,0x3F,0x3F,0x00,0x00,0x01,0x03,0x07,0x0E,0x3F,0x3F,0x00,//D1//209
 		0x00,0xE0,0xF0,0x39,0x1B,0x1E,0x1C,0x18,0x38,0xF0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00,//D2//210
@@ -184,7 +184,7 @@ const uint8_t FONT_12[]={
 		0x00,0x08,0x18,0x30,0x60,0xC4,0xC6,0x63,0x31,0x18,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,//DD//221
 		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,//DE (blank)
 		0x00,0x00,0xC0,0xE0,0x30,0x10,0x10,0x30,0xE0,0xC0,0x00,0x00,0x00,0x00,0xFF,0xFF,0x21,0x21,0x21,0x33,0x3F,0x1E,0x00,0x00,//DF//223
-		//V176
+		//V160
 		0x00,0x00,0x40,0x60,0x62,0x66,0x6C,0x68,0x60,0xE0,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00,//E0//224
 		0x00,0x00,0x40,0x60,0x68,0x6C,0x66,0x62,0x60,0xE0,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00,//E1//225
 		0x00,0x00,0x40,0x68,0x6C,0x66,0x66,0x6C,0x68,0xE0,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00,//E2//226
@@ -201,7 +201,7 @@ const uint8_t FONT_12[]={
 		0x00,0x00,0x00,0x00,0x68,0xEC,0xE6,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00,//ED//237
 		0x00,0x00,0x00,0x08,0x6C,0xE6,0xE6,0x0C,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00,//EE//238
 		0x00,0x00,0x00,0x0C,0x6C,0xE0,0xEC,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00,//EF//239
-		//V192
+		//V176
 		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,//F0 (blank)
 		0x00,0x00,0xE0,0xE8,0x6C,0x64,0x6C,0x68,0xEC,0xC4,0x80,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,//F1//241
 		0x00,0x80,0xC0,0xE0,0x62,0x66,0x6C,0x68,0xE0,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00,//F2//242
@@ -218,7 +218,7 @@ const uint8_t FONT_12[]={
 		0x00,0x00,0x60,0xE0,0x80,0x10,0x18,0x8C,0xE4,0x60,0x00,0x00,0x00,0x00,0x00,0x81,0xE7,0x7E,0x1E,0x07,0x01,0x00,0x00,0x00,//FD//253
 		0x00,0x00,0x03,0xFF,0xFF,0x1B,0x18,0x18,0xF8,0xF0,0x00,0x00,0x00,0x00,0x30,0x3F,0x3F,0x36,0x06,0x06,0x07,0x03,0x00,0x00,//FE//254
 		0x00,0x00,0x60,0xEC,0x8C,0x00,0x00,0x8C,0xEC,0x60,0x00,0x00,0x00,0x00,0x00,0x81,0xE7,0x7E,0x1E,0x07,0x01,0x00,0x00,0x00,//FF//255
-		//V208
+		//V192
 		/* Cyrillic Glyphs */
 		0x00,0xFC,0xFC,0x8D,0x8F,0x8E,0x8C,0x8C,0x8C,0x0C,0x0C,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x31,0x31,0x30,0x30,0x00, // Ѐ  d0 80
 		0x00,0xFE,0xFE,0xC7,0xC7,0xC6,0xC6,0xC7,0xC7,0x06,0x06,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00, // Ё  d0 81
@@ -236,7 +236,7 @@ const uint8_t FONT_12[]={
 		0x00,0xFF,0xFF,0x00,0x01,0xC3,0xF2,0x38,0x0E,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x1C,0x07,0x03,0x00,0x00,0x00,0x3F,0x3F,0x00, // Ѝ  d0 8d
 		0x00,0x07,0x1F,0x7C,0xF1,0xC1,0xC1,0xF1,0x7C,0x1F,0x07,0x00,0x00,0x00,0x30,0x30,0x3C,0x0F,0x07,0x01,0x00,0x00,0x00,0x00, // Ў  d0 8e
 		0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x1F,0x1F,0x18,0x18,0x78,0x78,0x18,0x18,0x1F,0x1F,0x00, // Џ  d0 8f
-		//V224
+		//V208
 		0x00,0x80,0xE0,0x78,0x1E,0x07,0x07,0x1E,0x78,0xE0,0x80,0x00,0x00,0x3F,0x3F,0x06,0x06,0x06,0x06,0x06,0x06,0x3F,0x3F,0x00, // A  d0 90
 		0x00,0xFF,0xFF,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0x83,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x39,0x1F,0x0F,0x00, // Б  d0 91
 		0x00,0xFF,0xFF,0xC3,0xC3,0xC3,0xC3,0xE7,0xFE,0xBC,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x39,0x1F,0x0F,0x00, // В  d0 92
@@ -253,7 +253,7 @@ const uint8_t FONT_12[]={
 		0x00,0xFF,0xFF,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00, // Н  d0 9d
 		0x00,0xF0,0xFC,0x0E,0x07,0x03,0x03,0x07,0x0E,0xFC,0xF0,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x38,0x1C,0x0F,0x03,0x00, // О  d0 9e
 		0x00,0xFF,0xFF,0x03,0x03,0x03,0x03,0x03,0x03,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00, // П  d0 9f
-		//V240
+		//V224
 		0x00,0xFF,0xFF,0x83,0x83,0x83,0x83,0x83,0xC7,0xFE,0x7C,0x00,0x00,0x3F,0x3F,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00, // Р  d0 a0
 		0x00,0xF0,0xFC,0x0E,0x07,0x03,0x03,0x03,0x07,0x0E,0x0C,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x30,0x38,0x1C,0x0C,0x00, // С  d0 a1
 		0x00,0x03,0x03,0x03,0x03,0xFF,0xFF,0x03,0x03,0x03,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00, // Т  d0 a2
@@ -270,7 +270,7 @@ const uint8_t FONT_12[]={
 		0x00,0x0C,0x0E,0x07,0xC3,0xC3,0xC3,0xC7,0xCE,0xFC,0xF8,0x00,0x00,0x0C,0x1C,0x38,0x30,0x30,0x30,0x38,0x1C,0x0F,0x07,0x00, // Э  d0 ad
 		0x00,0xFF,0xFF,0xC0,0xFC,0xFE,0x07,0x03,0x07,0xFE,0xFC,0x00,0x00,0x3F,0x3F,0x00,0x0F,0x1F,0x38,0x30,0x38,0x1F,0x0F,0x00, // Ю  d0 ae
 		0x00,0x7C,0xFE,0xC7,0x83,0x83,0x83,0x83,0x83,0xFF,0xFF,0x00,0x00,0x30,0x38,0x1D,0x0F,0x07,0x03,0x01,0x01,0x3F,0x3F,0x00, // Я  d0 af
-		//V256
+		//V240
 		0x00,0x00,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0xF0,0xE0,0x00,0x00,0x1E,0x3F,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00, // а  d0 b0
 		0x00,0xE0,0xF0,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00,0x00,0x00,0x1F,0x3F,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x1E,0x00, // б  d0 b1
 		0x00,0xF0,0xF0,0x30,0x30,0x30,0x30,0x30,0xF0,0xE0,0x00,0x00,0x00,0x3F,0x3F,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x1E,0x00, // в  d0 b2
@@ -287,7 +287,7 @@ const uint8_t FONT_12[]={
 		0x00,0xF0,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x03,0x03,0x03,0x03,0x03,0x03,0x3F,0x3F,0x00, // н  d0 bd
 		0x00,0xC0,0xE0,0x70,0x30,0x30,0x30,0x30,0x70,0xE0,0xC0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00, // о  d0 be
 		0x00,0xF0,0xF0,0x30,0x30,0x30,0x30,0x30,0x30,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00, // п  d0 bf
-		//V272
+		//V256
 		0x00,0xF0,0xF0,0x30,0x30,0x30,0x30,0x30,0x70,0xE0,0xC0,0x00,0x00,0xFF,0xFF,0x0C,0x0C,0x0C,0x0C,0x0C,0x0E,0x07,0x03,0x00, // р  d1 80
 		0x00,0xC0,0xE0,0x70,0x30,0x30,0x30,0x30,0x70,0x60,0x40,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x18,0x08,0x00, // с  d1 81
 		0x00,0x30,0x30,0x30,0x30,0xF0,0xF0,0x30,0x30,0x30,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00, // т  d1 82
@@ -304,7 +304,7 @@ const uint8_t FONT_12[]={
 		0x00,0x40,0x60,0x70,0x30,0x30,0x30,0x30,0x70,0xE0,0xC0,0x00,0x00,0x08,0x18,0x38,0x30,0x33,0x33,0x33,0x3B,0x1F,0x0F,0x00, // э  d1 8d
 		0x00,0xF0,0xF0,0x00,0xE0,0xF0,0x30,0x30,0x30,0xF0,0xE0,0x00,0x00,0x3F,0x3F,0x03,0x1F,0x3F,0x30,0x30,0x30,0x3F,0x1F,0x00, // ю  d1 8e
 		0x00,0xC0,0xE0,0x70,0x30,0x30,0x30,0x30,0x30,0xF0,0xF0,0x00,0x00,0x21,0x33,0x3B,0x1E,0x0E,0x06,0x06,0x06,0x3F,0x3F,0x00, // я  d1 8f
-
+		//V272
 		0x00,0xE0,0xF0,0x32,0x36,0x36,0x34,0x30,0x30,0xF0,0xE0,0x00,0x00,0x1F,0x3F,0x33,0x33,0x33,0x33,0x33,0x33,0x33,0x33,0x00, // ѐ  d1 90
 		0x00,0xE0,0xF0,0x34,0x34,0x30,0x30,0x34,0x34,0xF0,0xE0,0x00,0x00,0x1F,0x3F,0x33,0x33,0x33,0x33,0x33,0x33,0x33,0x33,0x00, // ё  d1 91
 		0x00,0x30,0xFC,0xFC,0x30,0xB0,0xB0,0xB0,0x80,0x80,0x00,0x00,0x00,0x00,0x3F,0x3F,0x07,0x03,0x01,0x01,0xC1,0xFF,0x3F,0x00, // ђ  d1 92