tsndr/M5PaperOS
1
0
Fork 0
Code Issues Pull Requests Activity

Removed language selection

Browse Source
This commit is contained in:
Toby
2021-03-20 16:53:05 +01:00
parent b53332acdd
commit 5514a50af8
26 changed files with 109 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/epdgui/epdgui_keyboard.cpp
View File

@@ -53,8 +53,6 @@ enum {
}; };
EPDGUI_Keyboard::EPDGUI_Keyboard(int16_t dir, uint32_t style): EPDGUI_Base() { EPDGUI_Keyboard::EPDGUI_Keyboard(int16_t dir, uint32_t style): EPDGUI_Base() {
uint8_t language = GetLanguage();
if(dir) { // Horizontal if(dir) { // Horizontal
const uint16_t kKeyWidth = 72; const uint16_t kKeyWidth = 72;
const uint16_t kKeyHeight = 44; const uint16_t kKeyHeight = 44;
@@ -81,25 +79,11 @@ EPDGUI_Keyboard::EPDGUI_Keyboard(int16_t dir, uint32_t style): EPDGUI_Base() {
_btn[kKeyBackspace]->CanvasPressed()->pushImage(_btn[kKeyBackspace]->getW() / 2 - 16, _btn[kKeyBackspace]->getH() / 2 - 16, 32, 32, ImageResource_backspace_32x32); _btn[kKeyBackspace]->CanvasPressed()->pushImage(_btn[kKeyBackspace]->getW() / 2 - 16, _btn[kKeyBackspace]->getH() / 2 - 16, 32, 32, ImageResource_backspace_32x32);
_btn[kKeyBackspace]->CanvasPressed()->ReverseColor(); _btn[kKeyBackspace]->CanvasPressed()->ReverseColor();
if(language == LANGUAGE_JA) { _btn[kKeySpace] = new EPDGUI_Button("Space", kBaseX + 162, k4thLineY, 468, kKeyHeight);
_btn[kKeySpace] = new EPDGUI_Button("空白", kBaseX + 162, k4thLineY, 468, kKeyHeight); if(style & STYLE_INPUTMODE_NORMALTEXT)
if(style & STYLE_INPUTMODE_NORMALTEXT) _btn[kKeyWrap] = new EPDGUI_Button("Wrap", kBaseX + 792 - 152, k4thLineY, 152, kKeyHeight);
_btn[kKeyWrap] = new EPDGUI_Button("改行", kBaseX + 792 - 152, k4thLineY, 152, kKeyHeight); else if(style & STYLE_INPUTMODE_NEEDCONFIRM)
else if(style & STYLE_INPUTMODE_NEEDCONFIRM) _btn[kKeyWrap] = new EPDGUI_Button("Confirm", kBaseX + 792 - 152, k4thLineY, 152, kKeyHeight);
_btn[kKeyWrap] = new EPDGUI_Button("確認", kBaseX + 792 - 152, k4thLineY, 152, kKeyHeight);
} else if(language == LANGUAGE_ZH) {
_btn[kKeySpace] = new EPDGUI_Button("空格", kBaseX + 162, k4thLineY, 468, kKeyHeight);
if(style & STYLE_INPUTMODE_NORMALTEXT)
_btn[kKeyWrap] = new EPDGUI_Button("换行", kBaseX + 792 - 152, k4thLineY, 152, kKeyHeight);
else if(style & STYLE_INPUTMODE_NEEDCONFIRM)
_btn[kKeyWrap] = new EPDGUI_Button("确认", kBaseX + 792 - 152, k4thLineY, 152, kKeyHeight);
} else {
_btn[kKeySpace] = new EPDGUI_Button("Space", kBaseX + 162, k4thLineY, 468, kKeyHeight);
if(style & STYLE_INPUTMODE_NORMALTEXT)
_btn[kKeyWrap] = new EPDGUI_Button("Wrap", kBaseX + 792 - 152, k4thLineY, 152, kKeyHeight);
else if(style & STYLE_INPUTMODE_NEEDCONFIRM)
_btn[kKeyWrap] = new EPDGUI_Button("Confirm", kBaseX + 792 - 152, k4thLineY, 152, kKeyHeight);
}
// function key // function key
_sw[kSWCase] = new EPDGUI_Switch(2, kBaseX, kThirdLineY, 96, kKeyHeight); _sw[kSWCase] = new EPDGUI_Switch(2, kBaseX, kThirdLineY, 96, kKeyHeight);
@@ -132,25 +116,11 @@ EPDGUI_Keyboard::EPDGUI_Keyboard(int16_t dir, uint32_t style): EPDGUI_Base() {
_btn[kKeyBackspace]->CanvasPressed()->pushImage(_btn[kKeyBackspace]->getW() / 2 - 16, _btn[kKeyBackspace]->getH() / 2 - 16, 32, 32, ImageResource_backspace_32x32); _btn[kKeyBackspace]->CanvasPressed()->pushImage(_btn[kKeyBackspace]->getW() / 2 - 16, _btn[kKeyBackspace]->getH() / 2 - 16, 32, 32, ImageResource_backspace_32x32);
_btn[kKeyBackspace]->CanvasPressed()->ReverseColor(); _btn[kKeyBackspace]->CanvasPressed()->ReverseColor();
if(language == LANGUAGE_JA) { _btn[kKeySpace] = new EPDGUI_Button("Space", kBaseX + 132, k4thLineY, 244, kKeyHeight);
_btn[kKeySpace] = new EPDGUI_Button("空白", kBaseX + 132, k4thLineY, 244, kKeyHeight); if(style & STYLE_INPUTMODE_NORMALTEXT)
if(style & STYLE_INPUTMODE_NORMALTEXT) _btn[kKeyWrap] = new EPDGUI_Button("Wrap", kBaseX + 512 - 128, k4thLineY, 128, kKeyHeight);
_btn[kKeyWrap] = new EPDGUI_Button("改行", kBaseX + 512 - 128, k4thLineY, 128, kKeyHeight); else if(style & STYLE_INPUTMODE_NEEDCONFIRM)
else if(style & STYLE_INPUTMODE_NEEDCONFIRM) _btn[kKeyWrap] = new EPDGUI_Button("Confirm", kBaseX + 512 - 128, k4thLineY, 128, kKeyHeight);
_btn[kKeyWrap] = new EPDGUI_Button("確認", kBaseX + 512 - 128, k4thLineY, 128, kKeyHeight);
} else if(language == LANGUAGE_ZH) {
_btn[kKeySpace] = new EPDGUI_Button("空格", kBaseX + 132, k4thLineY, 244, kKeyHeight);
if(style & STYLE_INPUTMODE_NORMALTEXT)
_btn[kKeyWrap] = new EPDGUI_Button("换行", kBaseX + 512 - 128, k4thLineY, 128, kKeyHeight);
else if(style & STYLE_INPUTMODE_NEEDCONFIRM)
_btn[kKeyWrap] = new EPDGUI_Button("确认", kBaseX + 512 - 128, k4thLineY, 128, kKeyHeight);
} else {
_btn[kKeySpace] = new EPDGUI_Button("Space", kBaseX + 132, k4thLineY, 244, kKeyHeight);
if(style & STYLE_INPUTMODE_NORMALTEXT)
_btn[kKeyWrap] = new EPDGUI_Button("Wrap", kBaseX + 512 - 128, k4thLineY, 128, kKeyHeight);
else if(style & STYLE_INPUTMODE_NEEDCONFIRM)
_btn[kKeyWrap] = new EPDGUI_Button("Confirm", kBaseX + 512 - 128, k4thLineY, 128, kKeyHeight);
}
// function key // function key
_sw[kSWCase] = new EPDGUI_Switch(2, kBaseX, kThirdLineY, 60, kKeyHeight); _sw[kSWCase] = new EPDGUI_Switch(2, kBaseX, kThirdLineY, 60, kKeyHeight);

3
src/frame/frame.h
View File

@@ -2,8 +2,7 @@
#define _FRAME_H_ #define _FRAME_H_
#include "frame_main.h" #include "frame_main.h"
#include "frame_setting.h" #include "frame_settings.h"
#include "frame_setting_language.h"
#include "frame_setting_wallpaper.h" #include "frame_setting_wallpaper.h"
#include "frame_keyboard.h" #include "frame_keyboard.h"
#include "frame_factorytest.h" #include "frame_factorytest.h"

17
src/frame/frame_compare.cpp
View File

@@ -74,20 +74,9 @@ Frame_Compare::Frame_Compare(void) {
_canvas_time->setTextSize(26); _canvas_time->setTextSize(26);
_canvas_time->setTextDatum(CR_DATUM); _canvas_time->setTextDatum(CR_DATUM);
uint8_t language = GetLanguage(); exitbtn("Home");
if(language == LANGUAGE_JA) { _canvas_title->drawString("Compare", 270, 34);
exitbtn("ホーム"); _key_updatemode[UPDATE_MODE_INIT] = new EPDGUI_Button("Reset all", 4, 88, 532, 60);
_canvas_title->drawString("比較", 270, 34);
_key_updatemode[UPDATE_MODE_INIT] = new EPDGUI_Button("リセット", 4, 88, 532, 60);
} else if(language == LANGUAGE_ZH) {
exitbtn("主页");
_canvas_title->drawString("比较", 270, 34);
_key_updatemode[UPDATE_MODE_INIT] = new EPDGUI_Button("全部重置", 4, 88, 532, 60);
} else {
exitbtn("Home");
_canvas_title->drawString("Compare", 270, 34);
_key_updatemode[UPDATE_MODE_INIT] = new EPDGUI_Button("Reset all", 4, 88, 532, 60);
}
_key_updatemode[UPDATE_MODE_INIT]->Bind(EPDGUI_Button::EVENT_RELEASED, key_update_reset_cb); _key_updatemode[UPDATE_MODE_INIT]->Bind(EPDGUI_Button::EVENT_RELEASED, key_update_reset_cb);

57
src/frame/frame_factorytest.cpp
View File

@@ -39,17 +39,8 @@ Frame_FactoryTest::Frame_FactoryTest(void) {
_canvas_btn->setTextDatum(CR_DATUM); _canvas_btn->setTextDatum(CR_DATUM);
_canvas_pass->setTextDatum(CR_DATUM); _canvas_pass->setTextDatum(CR_DATUM);
_language = GetLanguage(); exitbtn("Home");
if (_language == LANGUAGE_JA) { _canvas_title->drawString("Factory Test", 270, 34);
exitbtn("ホーム");
_canvas_title->drawString("工場テスト", 270, 34);
} else if (_language == LANGUAGE_ZH) {
exitbtn("主页");
_canvas_title->drawString("出厂测试", 270, 34);
} else {
exitbtn("Home");
_canvas_title->drawString("Factory Test", 270, 34);
}
_key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void *)(&_is_run)); _key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void *)(&_is_run));
_key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb); _key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb);
@@ -110,40 +101,16 @@ void Frame_FactoryTest::drawItem(uint16_t flag, const char* str, int y) {
void Frame_FactoryTest::drawItem(m5epd_update_mode_t mode) { void Frame_FactoryTest::drawItem(m5epd_update_mode_t mode) {
_canvas_base->fillCanvas(0); _canvas_base->fillCanvas(0);
if (_language == LANGUAGE_JA) { drawItem(0x0001, "1.day", 30);
drawItem(0x0001, "1.期日", 30); drawItem(0x0002, "2.Time", 90);
drawItem(0x0002, "2.時間", 90); drawItem(0x0004, "3.Temperature", 150);
drawItem(0x0004, "3.温度", 150); drawItem(0x0008, "4.Humidity", 210);
drawItem(0x0008, "4.湿度", 210); drawItem(0x0010, "5.Battery", 270);
drawItem(0x0010, "5.電池", 270); drawItem(0x0020, "6.Wi-Fi", 330);
drawItem(0x0020, "6.Wi-Fi", 330); drawItem(0x0040, "7.PSRAM", 390);
drawItem(0x0040, "7.PSRAM", 390); drawItem(0x0080, "8.SD Card", 450);
drawItem(0x0080, "8.SDカード", 450); drawItem(0x0100, "9.Button", 510);
drawItem(0x0100, "9.ボタン", 510); drawItem(0x0200, "10.TouchPad", 570);
drawItem(0x0200, "10.タッチパッド", 570);
} else if (_language == LANGUAGE_ZH) {
drawItem(0x0001, "1.日期", 30);
drawItem(0x0002, "2.时间", 90);
drawItem(0x0004, "3.温度", 150);
drawItem(0x0008, "4.湿度", 210);
drawItem(0x0010, "5.电池", 270);
drawItem(0x0020, "6.Wi-Fi", 330);
drawItem(0x0040, "7.PSRAM", 390);
drawItem(0x0080, "8.SD卡", 450);
drawItem(0x0100, "9.按键", 510);
drawItem(0x0200, "10.触屏", 570);
} else {
drawItem(0x0001, "1.day", 30);
drawItem(0x0002, "2.Time", 90);
drawItem(0x0004, "3.Temperature", 150);
drawItem(0x0008, "4.Humidity", 210);
drawItem(0x0010, "5.Battery", 270);
drawItem(0x0020, "6.Wi-Fi", 330);
drawItem(0x0040, "7.PSRAM", 390);
drawItem(0x0080, "8.SD Card", 450);
drawItem(0x0100, "9.Button", 510);
drawItem(0x0200, "10.TouchPad", 570);
}
_canvas_base->pushCanvas(0, 100, mode); _canvas_base->pushCanvas(0, 100, mode);
} }

1
src/frame/frame_factorytest.h
View File

@@ -26,7 +26,6 @@ private:
M5EPD_Canvas *_canvas_pos; M5EPD_Canvas *_canvas_pos;
M5EPD_Canvas *_canvas_btn; M5EPD_Canvas *_canvas_btn;
M5EPD_Canvas *_canvas_pass; M5EPD_Canvas *_canvas_pass;
uint8_t _language;
uint32_t _time; uint32_t _time;
uint8_t _btn; uint8_t _btn;
bool _psram_success; bool _psram_success;

9
src/frame/frame_fileindex.cpp
View File

@@ -35,16 +35,9 @@ Frame_FileIndex::Frame_FileIndex(String path) {
_frame_name = "Frame_FileIndex"; _frame_name = "Frame_FileIndex";
_path = path; _path = path;
uint8_t language = GetLanguage();
_canvas_title->setTextDatum(CR_DATUM); _canvas_title->setTextDatum(CR_DATUM);
if (path == "/") { if (path == "/") {
if (language == LANGUAGE_JA) { exitbtn("Home");
exitbtn("ホーム");
} else if (language == LANGUAGE_ZH) {
exitbtn("主页");
} else {
exitbtn("Home");
}
_canvas_title->drawString("SD/", 540 - 15, 34); _canvas_title->drawString("SD/", 540 - 15, 34);
} else { } else {
String parent_directory = path.substring(0, path.lastIndexOf("/")); String parent_directory = path.substring(0, path.lastIndexOf("/"));

51
src/frame/frame_home.cpp
View File

@@ -83,37 +83,16 @@ Frame_Home::Frame_Home(void) {
M5EPD_Canvas canvas_temp(&M5.EPD); M5EPD_Canvas canvas_temp(&M5.EPD);
canvas_temp.createRender(36); canvas_temp.createRender(36);
uint8_t language = GetLanguage();
if(language == LANGUAGE_JA) {
InitSwitch(_sw_light1, "ランプ", "客間", ImageResource_home_icon_light_off_92x92, ImageResource_home_icon_light_on_92x92);
InitSwitch(_sw_light2, "ランプ", "寝室", ImageResource_home_icon_light_off_92x92, ImageResource_home_icon_light_on_92x92);
InitSwitch(_sw_socket1, "炊飯器", "厨房", ImageResource_home_icon_socket_off_92x92, ImageResource_home_icon_socket_on_92x92);
InitSwitch(_sw_socket2, "パソコン", "寝室", ImageResource_home_icon_socket_off_92x92, ImageResource_home_icon_socket_on_92x92);
} else if(language == LANGUAGE_ZH) {
InitSwitch(_sw_light1, "吸顶灯", "客厅", ImageResource_home_icon_light_off_92x92, ImageResource_home_icon_light_on_92x92);
InitSwitch(_sw_light2, "台灯", "卧室", ImageResource_home_icon_light_off_92x92, ImageResource_home_icon_light_on_92x92);
InitSwitch(_sw_socket1, "电饭煲", "厨房", ImageResource_home_icon_socket_off_92x92, ImageResource_home_icon_socket_on_92x92);
InitSwitch(_sw_socket2, "电脑", "卧室", ImageResource_home_icon_socket_off_92x92, ImageResource_home_icon_socket_on_92x92);
} else {
InitSwitch(_sw_light1, "Ceiling Light", "Living Room", ImageResource_home_icon_light_off_92x92, ImageResource_home_icon_light_on_92x92);
InitSwitch(_sw_light2, "Table Lamp", "Bedroom", ImageResource_home_icon_light_off_92x92, ImageResource_home_icon_light_on_92x92);
InitSwitch(_sw_socket1, "Rice Cooker", "Kitchen", ImageResource_home_icon_socket_off_92x92, ImageResource_home_icon_socket_on_92x92);
InitSwitch(_sw_socket2, "Computer", "Bedroom", ImageResource_home_icon_socket_off_92x92, ImageResource_home_icon_socket_on_92x92);
}
InitSwitch(_sw_light1, "Ceiling Light", "Living Room", ImageResource_home_icon_light_off_92x92, ImageResource_home_icon_light_on_92x92);
InitSwitch(_sw_light2, "Table Lamp", "Bedroom", ImageResource_home_icon_light_off_92x92, ImageResource_home_icon_light_on_92x92);
InitSwitch(_sw_socket1, "Rice Cooker", "Kitchen", ImageResource_home_icon_socket_off_92x92, ImageResource_home_icon_socket_on_92x92);
InitSwitch(_sw_socket2, "Computer", "Bedroom", ImageResource_home_icon_socket_off_92x92, ImageResource_home_icon_socket_on_92x92);
memcpy(_sw_air_1->Canvas(0)->frameBuffer(), ImageResource_home_air_background_228x184, 228 * 184 / 2); memcpy(_sw_air_1->Canvas(0)->frameBuffer(), ImageResource_home_air_background_228x184, 228 * 184 / 2);
_sw_air_1->Canvas(0)->setTextDatum(TC_DATUM); _sw_air_1->Canvas(0)->setTextDatum(TC_DATUM);
_sw_air_1->Canvas(0)->setTextSize(26); _sw_air_1->Canvas(0)->setTextSize(26);
if(language == LANGUAGE_JA) { _sw_air_1->Canvas(0)->drawString("Bedroom", 114, 152);
_sw_air_1->Canvas(0)->drawString("寝室", 114, 152);
} else if(language == LANGUAGE_ZH) {
_sw_air_1->Canvas(0)->drawString("卧室", 114, 152);
} else {
_sw_air_1->Canvas(0)->drawString("Bedroom", 114, 152);
}
memcpy(_sw_air_1->Canvas(1)->frameBuffer(), _sw_air_1->Canvas(0)->frameBuffer(), 228 * 184 / 2); memcpy(_sw_air_1->Canvas(1)->frameBuffer(), _sw_air_1->Canvas(0)->frameBuffer(), 228 * 184 / 2);
_sw_air_1->Canvas(0)->setTextSize(36); _sw_air_1->Canvas(0)->setTextSize(36);
_sw_air_1->Canvas(0)->drawString("OFF", 114, 108); _sw_air_1->Canvas(0)->drawString("OFF", 114, 108);
@@ -125,13 +104,7 @@ Frame_Home::Frame_Home(void) {
memcpy(_sw_air_2->Canvas(0)->frameBuffer(), ImageResource_home_air_background_228x184, 228 * 184 / 2); memcpy(_sw_air_2->Canvas(0)->frameBuffer(), ImageResource_home_air_background_228x184, 228 * 184 / 2);
_sw_air_2->Canvas(0)->setTextDatum(TC_DATUM); _sw_air_2->Canvas(0)->setTextDatum(TC_DATUM);
_sw_air_2->Canvas(0)->setTextSize(26); _sw_air_2->Canvas(0)->setTextSize(26);
if(language == LANGUAGE_JA) { _sw_air_2->Canvas(0)->drawString("Living Room", 114, 152);
_sw_air_2->Canvas(0)->drawString("客間", 114, 152);
} else if(language == LANGUAGE_ZH) {
_sw_air_2->Canvas(0)->drawString("客厅", 114, 152);
} else {
_sw_air_2->Canvas(0)->drawString("Living Room", 114, 152);
}
memcpy(_sw_air_2->Canvas(1)->frameBuffer(), _sw_air_2->Canvas(0)->frameBuffer(), 228 * 184 / 2); memcpy(_sw_air_2->Canvas(1)->frameBuffer(), _sw_air_2->Canvas(0)->frameBuffer(), 228 * 184 / 2);
_sw_air_2->Canvas(0)->setTextSize(36); _sw_air_2->Canvas(0)->setTextSize(36);
_sw_air_2->Canvas(0)->drawString("OFF", 114, 108); _sw_air_2->Canvas(0)->drawString("OFF", 114, 108);
@@ -181,16 +154,8 @@ Frame_Home::Frame_Home(void) {
_sw_air_2->AddArgs(1, 2, _sw_air_2); _sw_air_2->AddArgs(1, 2, _sw_air_2);
_sw_air_2->Bind(1, key_home_air_state1_cb); _sw_air_2->Bind(1, key_home_air_state1_cb);
if(language == LANGUAGE_JA) { exitbtn("Home");
exitbtn("ホーム"); _canvas_title->drawString("Control Panel", 270, 34);
_canvas_title->drawString("コントロールパネル", 270, 34);
} else if(language == LANGUAGE_ZH) {
exitbtn("主页");
_canvas_title->drawString("控制面板", 270, 34);
} else {
exitbtn("Home");
_canvas_title->drawString("Control Panel", 270, 34);
}
_key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run)); _key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
_key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb); _key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb);

29
src/frame/frame_keyboard.cpp
View File

@@ -41,29 +41,16 @@ void key_textsize_reset_cb(epdgui_args_vector_t &args) {
Frame_Keyboard::Frame_Keyboard(bool isHorizontal) : Frame_Base() { Frame_Keyboard::Frame_Keyboard(bool isHorizontal) : Frame_Base() {
_frame_name = "Frame_Keyboard"; _frame_name = "Frame_Keyboard";
uint8_t language = GetLanguage();
if(isHorizontal) { if(isHorizontal) {
inputbox = new EPDGUI_Textbox(84, 25, 712, 250); inputbox = new EPDGUI_Textbox(84, 25, 712, 250);
if(language == LANGUAGE_JA) key_textclear = new EPDGUI_Button("CLR", 804, 25, 72, 120);
key_textclear = new EPDGUI_Button("削除", 804, 25, 72, 120);
else if(language == LANGUAGE_ZH)
key_textclear = new EPDGUI_Button("清屏", 804, 25, 72, 120);
else
key_textclear = new EPDGUI_Button("CLR", 804, 25, 72, 120);
key_textsize_plus = new EPDGUI_Button("+", 804, 157, 72, 40); key_textsize_plus = new EPDGUI_Button("+", 804, 157, 72, 40);
key_textsize_reset = new EPDGUI_Button("26", 804, 196, 72, 40); key_textsize_reset = new EPDGUI_Button("26", 804, 196, 72, 40);
key_textsize_minus = new EPDGUI_Button("-", 804, 235, 72, 40); key_textsize_minus = new EPDGUI_Button("-", 804, 235, 72, 40);
} else { } else {
const uint16_t kKeyBaseY = 628; const uint16_t kKeyBaseY = 628;
inputbox = new EPDGUI_Textbox(4, 100, 532, 512); inputbox = new EPDGUI_Textbox(4, 100, 532, 512);
if(language == LANGUAGE_JA) key_textclear = new EPDGUI_Button("CLR", 4, kKeyBaseY, 260, 52);
key_textclear = new EPDGUI_Button("削除", 4, kKeyBaseY, 260, 52);
else if(language == LANGUAGE_ZH)
key_textclear = new EPDGUI_Button("清屏", 4, kKeyBaseY, 260, 52);
else
key_textclear = new EPDGUI_Button("CLR", 4, kKeyBaseY, 260, 52);
key_textsize_plus = new EPDGUI_Button("+", 448, kKeyBaseY, 88, 52); key_textsize_plus = new EPDGUI_Button("+", 448, kKeyBaseY, 88, 52);
key_textsize_reset = new EPDGUI_Button("26", 360, kKeyBaseY, 88, 52); key_textsize_reset = new EPDGUI_Button("26", 360, kKeyBaseY, 88, 52);
key_textsize_minus = new EPDGUI_Button("-", 272, kKeyBaseY, 88, 52); key_textsize_minus = new EPDGUI_Button("-", 272, kKeyBaseY, 88, 52);
@@ -85,16 +72,8 @@ Frame_Keyboard::Frame_Keyboard(bool isHorizontal) : Frame_Base() {
key_textsize_minus->AddArgs(EPDGUI_Button::EVENT_RELEASED, 1, (void*)key_textsize_reset); key_textsize_minus->AddArgs(EPDGUI_Button::EVENT_RELEASED, 1, (void*)key_textsize_reset);
key_textsize_minus->Bind(EPDGUI_Button::EVENT_RELEASED, key_textsize_minus_cb); key_textsize_minus->Bind(EPDGUI_Button::EVENT_RELEASED, key_textsize_minus_cb);
if(language == LANGUAGE_JA) { exitbtn("Home");
exitbtn("ホーム"); _canvas_title->drawString("Keyboard", 270, 34);
_canvas_title->drawString("鍵盤", 270, 34);
} else if(language == LANGUAGE_ZH) {
exitbtn("主页");
_canvas_title->drawString("键盘", 270, 34);
} else {
exitbtn("Home");
_canvas_title->drawString("Keyboard", 270, 34);
}
_key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run)); _key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
_key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb); _key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb);

13
src/frame/frame_lifegame.cpp
View File

@@ -152,17 +152,8 @@ void Frame_Lifegame::exit() {
Frame_Lifegame::Frame_Lifegame(void) { Frame_Lifegame::Frame_Lifegame(void) {
_frame_name = "Frame_Lifegame"; _frame_name = "Frame_Lifegame";
uint8_t language = GetLanguage(); exitbtn("Home");
if(language == LANGUAGE_JA) { _canvas_title->drawString("Life Game", 270, 34);
exitbtn("ホーム");
_canvas_title->drawString("ライフゲーム", 270, 34);
} else if(language == LANGUAGE_ZH) {
exitbtn("主页");
_canvas_title->drawString("生命游戏", 270, 34);
} else {
exitbtn("Home");
_canvas_title->drawString("Life Game", 270, 34);
}
_key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run)); _key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
_key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb); _key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb);

46
src/frame/frame_main.cpp
View File

@@ -1,5 +1,5 @@
#include "frame_main.h" #include "frame_main.h"
#include "frame_setting.h" #include "frame_settings.h"
#include "frame_keyboard.h" #include "frame_keyboard.h"
#include "frame_factorytest.h" #include "frame_factorytest.h"
#include "frame_wifiscan.h" #include "frame_wifiscan.h"
@@ -23,10 +23,10 @@ enum {
#define KEY_H 92 #define KEY_H 92
void key_setting_cb(epdgui_args_vector_t &args) { void key_setting_cb(epdgui_args_vector_t &args) {
Frame_Base *frame = EPDGUI_GetFrame("Frame_Setting"); Frame_Base *frame = EPDGUI_GetFrame("Frame_Settings");
if(frame == NULL) { if(frame == NULL) {
frame = new Frame_Setting(); frame = new Frame_Settings();
EPDGUI_AddFrame("Frame_Setting", frame); EPDGUI_AddFrame("Frame_Settings", frame);
} }
EPDGUI_PushFrame(frame); EPDGUI_PushFrame(frame);
*((int*)(args[0])) = 0; *((int*)(args[0])) = 0;
@@ -184,40 +184,18 @@ void Frame_Main::AppName(m5epd_update_mode_t mode) {
} }
_names->setTextSize(20); _names->setTextSize(20);
_names->fillCanvas(0); _names->fillCanvas(0);
uint8_t language = GetLanguage();
_names->drawString("WLAN", 20 + 46 + 3 * 136, 16); _names->drawString("WLAN", 20 + 46 + 3 * 136, 16);
if(language == LANGUAGE_JA) { _names->drawString("Test", 20 + 46, 16);
_names->drawString("工場テスト", 20 + 46, 16); _names->drawString("Settings", 20 + 46 + 136, 16);
_names->drawString("設定", 20 + 46 + 136, 16); _names->drawString("Keyboard", 20 + 46 + 2 * 136, 16);
_names->drawString("鍵盤", 20 + 46 + 2 * 136, 16);
} else if(language == LANGUAGE_ZH) {
_names->drawString("出厂测试", 20 + 46, 16);
_names->drawString("设定", 20 + 46 + 136, 16);
_names->drawString("键盘", 20 + 46 + 2 * 136, 16);
} else {
_names->drawString("Test", 20 + 46, 16);
_names->drawString("Setting", 20 + 46 + 136, 16);
_names->drawString("Keyboard", 20 + 46 + 2 * 136, 16);
}
_names->pushCanvas(0, 186, mode); _names->pushCanvas(0, 186, mode);
_names->fillCanvas(0); _names->fillCanvas(0);
if(language == LANGUAGE_JA) { _names->drawString("Storage", 20 + 46, 16);
_names->drawString("メモリー", 20 + 46, 16); _names->drawString("Compare", 20 + 46 + 136, 16);
_names->drawString("刷新比較", 20 + 46 + 136, 16); _names->drawString("Home", 20 + 46 + 2 * 136, 16);
_names->drawString("家", 20 + 46 + 2 * 136, 16); _names->drawString("LifeGame", 20 + 46 + 3 * 136, 16);
_names->drawString("ライフゲーム", 20 + 46 + 3 * 136, 16);
} else if(language == LANGUAGE_ZH) {
_names->drawString("存储", 20 + 46, 16);
_names->drawString("刷新比较", 20 + 46 + 136, 16);
_names->drawString("家", 20 + 46 + 2 * 136, 16);
_names->drawString("生命游戏", 20 + 46 + 3 * 136, 16);
} else {
_names->drawString("Storage", 20 + 46, 16);
_names->drawString("Compare", 20 + 46 + 136, 16);
_names->drawString("Home", 20 + 46 + 2 * 136, 16);
_names->drawString("LifeGame", 20 + 46 + 3 * 136, 16);
}
_names->pushCanvas(0, 337, mode); _names->pushCanvas(0, 337, mode);
} }

9
src/frame/frame_pictureviewer.cpp
View File

@@ -16,14 +16,7 @@ Frame_PictureViewer::Frame_PictureViewer(String path) {
_canvas_picture->setTextColor(0); _canvas_picture->setTextColor(0);
_canvas_picture->setTextDatum(CC_DATUM); _canvas_picture->setTextDatum(CC_DATUM);
uint8_t language = GetLanguage(); exitbtn("Back");
if(language == LANGUAGE_JA) {
exitbtn("戻る");
} else if(language == LANGUAGE_ZH) {
exitbtn("返回");
} else {
exitbtn("Back");
}
_canvas_title->drawString(path.substring(path.lastIndexOf("/") + 1, path.lastIndexOf(".")), 270, 34); _canvas_title->drawString(path.substring(path.lastIndexOf("/") + 1, path.lastIndexOf(".")), 270, 34);

89
src/frame/frame_setting_language.cpp
View File

@@ -1,89 +0,0 @@
#include "frame_setting_language.h"
void sw_en_cb(epdgui_args_vector_t &args) {
SetLanguage(LANGUAGE_EN);
}
void sw_zh_cb(epdgui_args_vector_t &args) {
SetLanguage(LANGUAGE_ZH);
}
void sw_ja_cb(epdgui_args_vector_t &args) {
SetLanguage(LANGUAGE_JA);
}
Frame_Setting_Language::Frame_Setting_Language(void) {
_frame_name = "Frame_Setting_Language";
_sw_en = new EPDGUI_Switch(2, 4, 100, 532, 61);
_sw_zh = new EPDGUI_Switch(2, 4, 160, 532, 61);
_sw_ja = new EPDGUI_Switch(2, 4, 220, 532, 61);
if(isTTFLoaded()) {
_sw_en->SetLabel(0, "English");
_sw_en->SetLabel(1, "English");
_sw_en->Canvas(1)->ReverseColor();
_sw_en->Bind(1, &sw_en_cb);
_sw_zh->SetLabel(0, "中文");
_sw_zh->SetLabel(1, "中文");
_sw_zh->Canvas(1)->ReverseColor();
_sw_zh->Bind(1, &sw_zh_cb);
_sw_ja->SetLabel(0, "日本語");
_sw_ja->SetLabel(1, "日本語");
_sw_ja->Canvas(1)->ReverseColor();
_sw_ja->Bind(1, &sw_ja_cb);
} else {
_sw_en->SetLabel(0, "English");
_sw_en->SetLabel(1, "English");
_sw_en->Canvas(1)->ReverseColor();
_sw_en->Bind(1, &sw_en_cb);
_sw_zh->SetLabel(0, "Chinese (Need .ttf file)");
_sw_zh->SetLabel(1, "Chinese (Need .ttf file)");
_sw_zh->Canvas(1)->ReverseColor();
_sw_zh->Bind(1, &sw_zh_cb);
_sw_ja->SetLabel(0, "Japanese (Need .ttf file)");
_sw_ja->SetLabel(1, "Japanese (Need .ttf file)");
_sw_ja->Canvas(1)->ReverseColor();
_sw_ja->Bind(1, &sw_ja_cb);
}
_sw_mutex_group = new EPDGUI_MutexSwitch();
_sw_mutex_group->Add(_sw_en);
_sw_mutex_group->Add(_sw_zh);
_sw_mutex_group->Add(_sw_ja);
uint8_t language = GetLanguage();
if(language == LANGUAGE_JA) {
exitbtn("設定");
_canvas_title->drawString("言語", 270, 34);
_sw_ja->setState(1);
} else if(language == LANGUAGE_ZH) {
exitbtn("设置");
_canvas_title->drawString("语言", 270, 34);
_sw_zh->setState(1);
} else {
exitbtn("Setting");
_canvas_title->drawString("Language", 270, 34);
_sw_en->setState(1);
}
_key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
_key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb);
}
Frame_Setting_Language::~Frame_Setting_Language(void) {
delete _sw_en;
delete _sw_zh;
delete _sw_ja;
delete _sw_mutex_group;
}
int Frame_Setting_Language::init(epdgui_args_vector_t &args) {
_is_run = 1;
M5.EPD.WriteFullGram4bpp(GetWallpaper());
_canvas_title->pushCanvas(0, 8, UPDATE_MODE_NONE);
EPDGUI_AddObject(_sw_mutex_group);
EPDGUI_AddObject(_key_exit);
return 2;
}

20
src/frame/frame_setting_language.h
View File

@@ -1,20 +0,0 @@
#ifndef _FRAME_LANGUAGE_H_
#define _FRAME_LANGUAGE_H_
#include "frame_base.h"
#include "../epdgui/epdgui.h"
class Frame_Setting_Language : public Frame_Base {
public:
Frame_Setting_Language();
~Frame_Setting_Language();
int init(epdgui_args_vector_t &args);
private:
EPDGUI_Switch* _sw_en;
EPDGUI_Switch* _sw_zh;
EPDGUI_Switch* _sw_ja;
EPDGUI_MutexSwitch* _sw_mutex_group;
};
#endif //_FRAME_LANGUAGE_H_

21
src/frame/frame_setting_wallpaper.cpp
View File

@@ -4,8 +4,8 @@ void sw_wallpapers_cb(epdgui_args_vector_t &args) {
SetWallpaper(*((uint32_t*)(args[0]))); SetWallpaper(*((uint32_t*)(args[0])));
} }
Frame_Setting_Wallpaper::Frame_Setting_Wallpaper(void) { Frame_Settings_Wallpaper::Frame_Settings_Wallpaper(void) {
_frame_name = "Frame_Setting_Wallpaper"; _frame_name = "Frame_Settings_Wallpaper";
_sw_mutex_group = new EPDGUI_MutexSwitch(); _sw_mutex_group = new EPDGUI_MutexSwitch();
@@ -21,30 +21,21 @@ Frame_Setting_Wallpaper::Frame_Setting_Wallpaper(void) {
} }
_sw_wallpapers[GetWallpaperID()]->setState(1); _sw_wallpapers[GetWallpaperID()]->setState(1);
uint8_t language = GetLanguage(); exitbtn("Setting");
if(language == LANGUAGE_JA) { _canvas_title->drawString("Wallpaper", 270, 34);
exitbtn("設定");
_canvas_title->drawString("壁紙", 270, 34);
} else if(language == LANGUAGE_ZH) {
exitbtn("设置");
_canvas_title->drawString("壁纸", 270, 34);
} else {
exitbtn("Setting");
_canvas_title->drawString("Wallpaper", 270, 34);
}
_key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run)); _key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
_key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb); _key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb);
} }
Frame_Setting_Wallpaper::~Frame_Setting_Wallpaper(void) { Frame_Settings_Wallpaper::~Frame_Settings_Wallpaper(void) {
for(int i = 0; i < WALLPAPER_NUM; i++) { for(int i = 0; i < WALLPAPER_NUM; i++) {
delete _sw_wallpapers[i]; delete _sw_wallpapers[i];
} }
delete _sw_mutex_group; delete _sw_mutex_group;
} }
int Frame_Setting_Wallpaper::init(epdgui_args_vector_t &args) { int Frame_Settings_Wallpaper::init(epdgui_args_vector_t &args) {
_is_run = 1; _is_run = 1;
M5.EPD.WriteFullGram4bpp(GetWallpaper()); M5.EPD.WriteFullGram4bpp(GetWallpaper());
_canvas_title->pushCanvas(0, 8, UPDATE_MODE_NONE); _canvas_title->pushCanvas(0, 8, UPDATE_MODE_NONE);

6
src/frame/frame_setting_wallpaper.h
View File

@@ -4,10 +4,10 @@
#include "frame_base.h" #include "frame_base.h"
#include "../epdgui/epdgui.h" #include "../epdgui/epdgui.h"
class Frame_Setting_Wallpaper : public Frame_Base { class Frame_Settings_Wallpaper : public Frame_Base {
public: public:
Frame_Setting_Wallpaper(); Frame_Settings_Wallpaper();
~Frame_Setting_Wallpaper(); ~Frame_Settings_Wallpaper();
int init(epdgui_args_vector_t &args); int init(epdgui_args_vector_t &args);
private: private:

102
src/frame/frame_setting.cpp → src/frame/frame_settings.cpp
View File

@@ -1,11 +1,10 @@
#include "frame_setting.h" #include "frame_settings.h"
#include "frame_setting_language.h"
#include "frame_setting_wallpaper.h" #include "frame_setting_wallpaper.h"
#include "WiFi.h" #include "WiFi.h"
#define KEY_W 92 #define KEY_W 92
#define KEY_H 92 #define KEY_H 92
const uint16_t kTimeZoneY = 520; const uint16_t kTimeZoneY = 460;
void key_shutdown_cb(epdgui_args_vector_t &args) { void key_shutdown_cb(epdgui_args_vector_t &args) {
M5.EPD.WriteFullGram4bpp(GetWallpaper()); M5.EPD.WriteFullGram4bpp(GetWallpaper());
@@ -27,21 +26,11 @@ void key_restart_cb(epdgui_args_vector_t &args) {
esp_restart(); esp_restart();
} }
void key_language_cb(epdgui_args_vector_t &args) {
Frame_Base *frame = EPDGUI_GetFrame("Frame_Setting_Language");
if(frame == NULL) {
frame = new Frame_Setting_Language();
EPDGUI_AddFrame("Frame_Setting_Language", frame);
}
EPDGUI_PushFrame(frame);
*((int*)(args[0])) = 0;
}
void key_wallpaper_cb(epdgui_args_vector_t &args) { void key_wallpaper_cb(epdgui_args_vector_t &args) {
Frame_Base *frame = EPDGUI_GetFrame("Frame_Setting_Wallpaper"); Frame_Base *frame = EPDGUI_GetFrame("Frame_Settings_Wallpaper");
if(frame == NULL) { if(frame == NULL) {
frame = new Frame_Setting_Wallpaper(); frame = new Frame_Settings_Wallpaper();
EPDGUI_AddFrame("Frame_Setting_Wallpaper", frame); EPDGUI_AddFrame("Frame_Settings_Wallpaper", frame);
} }
EPDGUI_PushFrame(frame); EPDGUI_PushFrame(frame);
*((int*)(args[0])) = 0; *((int*)(args[0])) = 0;
@@ -57,15 +46,8 @@ void key_synctime_cb(epdgui_args_vector_t &args) {
info.setTextSize(26); info.setTextSize(26);
info.setTextColor(0); info.setTextColor(0);
info.setTextDatum(CC_DATUM); info.setTextDatum(CC_DATUM);
uint8_t language = GetLanguage();
if(WiFi.status() != WL_CONNECTED) { if(WiFi.status() != WL_CONNECTED) {
if(language == LANGUAGE_JA) { info.drawString("WLAN not connected", 150, 55);
info.drawString("WLANが接続いません", 150, 55);
} else if(language == LANGUAGE_ZH) {
info.drawString("WLAN未连接", 150, 55);
} else {
info.drawString("WLAN not connected", 150, 55);
}
info.pushCanvas(120, 430, UPDATE_MODE_GL16); info.pushCanvas(120, 430, UPDATE_MODE_GL16);
M5.EPD.WriteFullGram4bpp(GetWallpaper()); M5.EPD.WriteFullGram4bpp(GetWallpaper());
title->pushCanvas(0, 8, UPDATE_MODE_NONE); title->pushCanvas(0, 8, UPDATE_MODE_NONE);
@@ -80,22 +62,10 @@ void key_synctime_cb(epdgui_args_vector_t &args) {
LoadingAnime_32x32_Stop(); LoadingAnime_32x32_Stop();
if(ret == 0) { if(ret == 0) {
if(language == LANGUAGE_JA) { info.drawString("Time sync failed", 150, 55);
info.drawString("シンクロが失敗しました", 150, 55);
} else if(language == LANGUAGE_ZH) {
info.drawString("同步失败", 150, 55);
} else {
info.drawString("Time sync failed", 150, 55);
}
info.pushCanvas(120, 430, UPDATE_MODE_GL16); info.pushCanvas(120, 430, UPDATE_MODE_GL16);
} else { } else {
if(language == LANGUAGE_JA) { info.drawString("Success", 150, 55);
info.drawString("成功", 150, 55);
} else if(language == LANGUAGE_ZH) {
info.drawString("成功", 150, 55);
} else {
info.drawString("Success", 150, 55);
}
info.pushCanvas(120, 430, UPDATE_MODE_GL16); info.pushCanvas(120, 430, UPDATE_MODE_GL16);
} }
M5.EPD.WriteFullGram4bpp(GetWallpaper()); M5.EPD.WriteFullGram4bpp(GetWallpaper());
@@ -144,8 +114,8 @@ void key_timezone_reset_cb(epdgui_args_vector_t &args) {
SetTimeZone(*tz); SetTimeZone(*tz);
} }
Frame_Setting::Frame_Setting(void) { Frame_Settings::Frame_Settings(void) {
_frame_name = "Frame_Setting"; _frame_name = "Frame_Settings";
_timezone_canvas = new M5EPD_Canvas(&M5.EPD); _timezone_canvas = new M5EPD_Canvas(&M5.EPD);
_timezone_canvas->createCanvas(540, 60); _timezone_canvas->createCanvas(540, 60);
@@ -154,12 +124,10 @@ Frame_Setting::Frame_Setting(void) {
_timezone_canvas->setTextColor(15); _timezone_canvas->setTextColor(15);
_timezone_canvas->setTextDatum(CL_DATUM); _timezone_canvas->setTextDatum(CL_DATUM);
uint8_t language = GetLanguage();
_key_wallpaper = new EPDGUI_Button(4, 100, 532, 61); _key_wallpaper = new EPDGUI_Button(4, 100, 532, 61);
_key_language = new EPDGUI_Button(4, 160, 532, 61); _key_syncntp = new EPDGUI_Button(4, 160, 532, 61);
_key_syncntp = new EPDGUI_Button(4, 220, 532, 61); _key_restart = new EPDGUI_Button(4, 280, 532, 61);
_key_restart = new EPDGUI_Button(4, 340, 532, 61); _key_shutdown = new EPDGUI_Button(4, 340, 532, 61);
_key_shutdown = new EPDGUI_Button(4, 400, 532, 61);
key_timezone_plus = new EPDGUI_Button("+", 448, kTimeZoneY, 88, 52); key_timezone_plus = new EPDGUI_Button("+", 448, kTimeZoneY, 88, 52);
String str = String(GetTimeZone()); String str = String(GetTimeZone());
@@ -181,41 +149,17 @@ Frame_Setting::Frame_Setting(void) {
key_timezone_minus->AddArgs(EPDGUI_Button::EVENT_RELEASED, 1, key_timezone_reset); key_timezone_minus->AddArgs(EPDGUI_Button::EVENT_RELEASED, 1, key_timezone_reset);
key_timezone_minus->Bind(EPDGUI_Button::EVENT_RELEASED, key_timezone_minus_cb); key_timezone_minus->Bind(EPDGUI_Button::EVENT_RELEASED, key_timezone_minus_cb);
if(language == LANGUAGE_JA) { _key_wallpaper->setBMPButton(" Wallpaper", "\u25B6", ImageResource_item_icon_wallpaper_32x32);
_key_wallpaper->setBMPButton(" 壁紙", "\u25B6", ImageResource_item_icon_wallpaper_32x32); _key_syncntp->setBMPButton(" Sync Time", "", ImageResource_item_icon_ntptime_32x32);
_key_language->setBMPButton(" 言語", "\u25B6", ImageResource_item_icon_language_32x32); _key_restart->setBMPButton(" Restart", "", ImageResource_item_icon_restart_32x32);
_key_syncntp->setBMPButton(" 時間シンクロ", "", ImageResource_item_icon_ntptime_32x32); _key_shutdown->setBMPButton(" Shutdown", "", ImageResource_item_icon_shutdown_32x32);
_key_restart->setBMPButton(" 再起動", "", ImageResource_item_icon_restart_32x32); _timezone_canvas->drawString("Time zone (UTC)", 15, 35);
_key_shutdown->setBMPButton(" 電源オフ", "", ImageResource_item_icon_shutdown_32x32); exitbtn("Home");
_timezone_canvas->drawString("時間帯 (UTC)", 15, 35); _canvas_title->drawString("Setting", 270, 34);
exitbtn("ホーム");
_canvas_title->drawString("設定", 270, 34);
} else if(language == LANGUAGE_ZH) {
_key_wallpaper->setBMPButton(" 壁纸", "\u25B6", ImageResource_item_icon_wallpaper_32x32);
_key_language->setBMPButton(" 语言", "\u25B6", ImageResource_item_icon_language_32x32);
_key_syncntp->setBMPButton(" 同步时间", "", ImageResource_item_icon_ntptime_32x32);
_key_restart->setBMPButton(" 重启", "", ImageResource_item_icon_restart_32x32);
_key_shutdown->setBMPButton(" 关机", "", ImageResource_item_icon_shutdown_32x32);
_timezone_canvas->drawString("时区 (UTC)", 15, 35);
exitbtn("主页");
_canvas_title->drawString("设置", 270, 34);
} else {
_key_wallpaper->setBMPButton(" Wallpaper", "\u25B6", ImageResource_item_icon_wallpaper_32x32);
_key_language->setBMPButton(" Language", "\u25B6", ImageResource_item_icon_language_32x32);
_key_syncntp->setBMPButton(" Sync Time", "", ImageResource_item_icon_ntptime_32x32);
_key_restart->setBMPButton(" Restart", "", ImageResource_item_icon_restart_32x32);
_key_shutdown->setBMPButton(" Shutdown", "", ImageResource_item_icon_shutdown_32x32);
_timezone_canvas->drawString("Time zone (UTC)", 15, 35);
exitbtn("Home");
_canvas_title->drawString("Setting", 270, 34);
}
_key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run)); _key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
_key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb); _key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb);
_key_language->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
_key_language->Bind(EPDGUI_Button::EVENT_RELEASED, &key_language_cb);
_key_wallpaper->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run)); _key_wallpaper->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
_key_wallpaper->Bind(EPDGUI_Button::EVENT_RELEASED, &key_wallpaper_cb); _key_wallpaper->Bind(EPDGUI_Button::EVENT_RELEASED, &key_wallpaper_cb);
@@ -228,21 +172,19 @@ Frame_Setting::Frame_Setting(void) {
_timezone = GetTimeZone(); _timezone = GetTimeZone();
} }
Frame_Setting::~Frame_Setting(void) { Frame_Settings::~Frame_Settings(void) {
delete _key_wallpaper; delete _key_wallpaper;
delete _key_language;
delete _key_shutdown; delete _key_shutdown;
delete _key_restart; delete _key_restart;
delete _key_syncntp; delete _key_syncntp;
} }
int Frame_Setting::init(epdgui_args_vector_t &args) { int Frame_Settings::init(epdgui_args_vector_t &args) {
_is_run = 1; _is_run = 1;
M5.EPD.WriteFullGram4bpp(GetWallpaper()); M5.EPD.WriteFullGram4bpp(GetWallpaper());
_canvas_title->pushCanvas(0, 8, UPDATE_MODE_NONE); _canvas_title->pushCanvas(0, 8, UPDATE_MODE_NONE);
_timezone_canvas->pushCanvas(0, kTimeZoneY, UPDATE_MODE_NONE); _timezone_canvas->pushCanvas(0, kTimeZoneY, UPDATE_MODE_NONE);
EPDGUI_AddObject(_key_wallpaper); EPDGUI_AddObject(_key_wallpaper);
EPDGUI_AddObject(_key_language);
EPDGUI_AddObject(_key_shutdown); EPDGUI_AddObject(_key_shutdown);
EPDGUI_AddObject(_key_restart); EPDGUI_AddObject(_key_restart);
EPDGUI_AddObject(_key_syncntp); EPDGUI_AddObject(_key_syncntp);

13
src/frame/frame_setting.h → src/frame/frame_settings.h
View File

@@ -1,19 +1,18 @@
#ifndef _FRAME_SETTING_H_ #ifndef _FRAME_SETTINGS_H_
#define _FRAME_SETTING_H_ #define _FRAME_SETTINGS_H_
#include "frame_base.h" #include "frame_base.h"
#include "../epdgui/epdgui.h" #include "../epdgui/epdgui.h"
class Frame_Setting : public Frame_Base { class Frame_Settings : public Frame_Base {
public: public:
Frame_Setting(); Frame_Settings();
~Frame_Setting(); ~Frame_Settings();
int init(epdgui_args_vector_t &args); int init(epdgui_args_vector_t &args);
private: private:
EPDGUI_Button *_key_wallpaper; EPDGUI_Button *_key_wallpaper;
EPDGUI_Button *_key_language;
EPDGUI_Button *_key_shutdown; EPDGUI_Button *_key_shutdown;
EPDGUI_Button *_key_restart; EPDGUI_Button *_key_restart;
EPDGUI_Button *_key_syncntp; EPDGUI_Button *_key_syncntp;
@@ -25,4 +24,4 @@ private:
M5EPD_Canvas *_timezone_canvas; M5EPD_Canvas *_timezone_canvas;
}; };
#endif //_FRAME_SETTING_H_ #endif //_FRAME_SETTINGS_H_

9
src/frame/frame_txtreader.cpp
View File

@@ -33,14 +33,7 @@ Frame_txtReader::Frame_txtReader(String path) {
// _key_prev->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, &_key_operation); // _key_prev->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, &_key_operation);
_key_prev->Bind(EPDGUI_Button::EVENT_RELEASED, key_prevpage_released_cb); _key_prev->Bind(EPDGUI_Button::EVENT_RELEASED, key_prevpage_released_cb);
_language = GetLanguage(); exitbtn("Back");
if(_language == LANGUAGE_JA) {
exitbtn("戻る");
} else if(_language == LANGUAGE_ZH) {
exitbtn("返回");
} else {
exitbtn("Back");
}
_canvas_title->drawString(path.substring(path.lastIndexOf("/") + 1, path.lastIndexOf(".")), 270, 34); _canvas_title->drawString(path.substring(path.lastIndexOf("/") + 1, path.lastIndexOf(".")), 270, 34);

1
src/frame/frame_txtreader.h
View File

@@ -16,7 +16,6 @@ public:
private: private:
EPDGUI_Button *_key_next; EPDGUI_Button *_key_next;
EPDGUI_Button *_key_prev; EPDGUI_Button *_key_prev;
uint8_t _language;
uint16_t _text_size = 32; uint16_t _text_size = 32;
M5EPD_Canvas *_canvas_prev; M5EPD_Canvas *_canvas_prev;
M5EPD_Canvas *_canvas_current; M5EPD_Canvas *_canvas_current;

27
src/frame/frame_wifipassword.cpp
View File

@@ -8,24 +8,13 @@ void key_passwordclear_cb(epdgui_args_vector_t &args) {
Frame_WifiPassword::Frame_WifiPassword(bool isHorizontal) : Frame_Base() { Frame_WifiPassword::Frame_WifiPassword(bool isHorizontal) : Frame_Base() {
_frame_name = "Frame_WifiPassword"; _frame_name = "Frame_WifiPassword";
uint8_t language = GetLanguage();
if(isHorizontal) { if(isHorizontal) {
inputbox = new EPDGUI_Textbox(84, 25, 712, 250); inputbox = new EPDGUI_Textbox(84, 25, 712, 250);
if(language == LANGUAGE_JA) key_textclear = new EPDGUI_Button("CLR", 804, 25, 72, 120);
key_textclear = new EPDGUI_Button("削除", 804, 25, 72, 120);
else if(language == LANGUAGE_ZH)
key_textclear = new EPDGUI_Button("清除", 804, 25, 72, 120);
else
key_textclear = new EPDGUI_Button("CLR", 804, 25, 72, 120);
} else { } else {
const uint16_t kKeyBaseY = 176; const uint16_t kKeyBaseY = 176;
inputbox = new EPDGUI_Textbox(4, 100, 532, 60); inputbox = new EPDGUI_Textbox(4, 100, 532, 60);
if(language == LANGUAGE_JA) key_textclear = new EPDGUI_Button("CLR", 4, kKeyBaseY, 260, 52);
key_textclear = new EPDGUI_Button("削除", 4, kKeyBaseY, 260, 52);
else if(language == LANGUAGE_ZH)
key_textclear = new EPDGUI_Button("清除", 4, kKeyBaseY, 260, 52);
else
key_textclear = new EPDGUI_Button("CLR", 4, kKeyBaseY, 260, 52);
} }
inputbox->SetTextMargin(8, 15, 8, 8); inputbox->SetTextMargin(8, 15, 8, 8);
@@ -36,16 +25,8 @@ Frame_WifiPassword::Frame_WifiPassword(bool isHorizontal) : Frame_Base() {
key_textclear->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)inputbox); key_textclear->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)inputbox);
key_textclear->Bind(EPDGUI_Button::EVENT_RELEASED, key_passwordclear_cb); key_textclear->Bind(EPDGUI_Button::EVENT_RELEASED, key_passwordclear_cb);
if(language == LANGUAGE_JA) { exitbtn("WLAN");
exitbtn("WLAN"); _canvas_title->drawString("Password", 270, 34);
_canvas_title->drawString("パスワード", 270, 34);
} else if(language == LANGUAGE_ZH) {
exitbtn("无线局域网", 200);
_canvas_title->drawString("密码", 270, 34);
} else {
exitbtn("WLAN");
_canvas_title->drawString("Password", 270, 34);
}
_key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run)); _key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
_key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb); _key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb);

29
src/frame/frame_wifiscan.cpp
View File

@@ -44,17 +44,8 @@ Frame_WifiScan::Frame_WifiScan(void) {
_key_wifi[i]->Bind(EPDGUI_Button::EVENT_RELEASED, key_wifi_cb); _key_wifi[i]->Bind(EPDGUI_Button::EVENT_RELEASED, key_wifi_cb);
} }
_language = GetLanguage(); exitbtn("Home");
if(_language == LANGUAGE_JA) { _canvas_title->drawString("WLAN", 270, 34);
exitbtn("ホーム");
_canvas_title->drawString("WLAN", 270, 34);
} else if(_language == LANGUAGE_ZH) {
exitbtn("主页");
_canvas_title->drawString("无线局域网", 270, 34);
} else {
exitbtn("Home");
_canvas_title->drawString("WLAN", 270, 34);
}
_key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run)); _key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
_key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb); _key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb);
@@ -182,13 +173,7 @@ int Frame_WifiScan::scan() {
_key_wifi[wifi_num]->CanvasNormal()->fillCanvas(0); _key_wifi[wifi_num]->CanvasNormal()->fillCanvas(0);
_key_wifi[wifi_num]->CanvasNormal()->drawRect(0, 0, 532, 61, 15); _key_wifi[wifi_num]->CanvasNormal()->drawRect(0, 0, 532, 61, 15);
_key_wifi[wifi_num]->CanvasNormal()->pushImage(15, 14, 32, 32, ImageResource_item_icon_refresh_32x32); _key_wifi[wifi_num]->CanvasNormal()->pushImage(15, 14, 32, 32, ImageResource_item_icon_refresh_32x32);
if(_language == LANGUAGE_JA) { _key_wifi[wifi_num]->CanvasNormal()->drawString("Refresh", 58, 35);
_key_wifi[wifi_num]->CanvasNormal()->drawString("刷新", 58, 35);
} else if(_language == LANGUAGE_ZH) {
_key_wifi[wifi_num]->CanvasNormal()->drawString("刷新", 58, 35);
} else {
_key_wifi[wifi_num]->CanvasNormal()->drawString("Refresh", 58, 35);
}
*(_key_wifi[wifi_num]->CanvasPressed()) = *(_key_wifi[wifi_num]->CanvasNormal()); *(_key_wifi[wifi_num]->CanvasPressed()) = *(_key_wifi[wifi_num]->CanvasNormal());
_key_wifi[wifi_num]->CanvasPressed()->ReverseColor(); _key_wifi[wifi_num]->CanvasPressed()->ReverseColor();
_key_wifi[wifi_num]->Draw(UPDATE_MODE_A2); _key_wifi[wifi_num]->Draw(UPDATE_MODE_A2);
@@ -230,13 +215,7 @@ void Frame_WifiScan::Connect() {
err.setTextSize(26); err.setTextSize(26);
err.setTextColor(0); err.setTextColor(0);
err.setTextDatum(CC_DATUM); err.setTextDatum(CC_DATUM);
if(_language == LANGUAGE_JA) { err.drawString("Wrong password", 150, 55);
err.drawString("パスワードが違います", 150, 55);
} else if(_language == LANGUAGE_ZH) {
err.drawString("密码错误", 150, 55);
} else {
err.drawString("Wrong password", 150, 55);
}
err.pushCanvas(120, 430, UPDATE_MODE_GL16); err.pushCanvas(120, 430, UPDATE_MODE_GL16);
return; return;
} }

3
src/frame/frame_wifiscan.h
View File

@@ -17,7 +17,6 @@ public:
private: private:
EPDGUI_Button *_key_wifi[14]; EPDGUI_Button *_key_wifi[14];
uint8_t _language;
uint32_t _scan_count = 0; uint32_t _scan_count = 0;
bool _connect; bool _connect;
uint8_t _connected; uint8_t _connected;
@@ -25,4 +24,4 @@ private:
String _connect_password; String _connect_password;
}; };
#endif //_FRAME_SETTING_H_ #endif //_FRAME_SETTINGS_H_

37
src/global_setting.cpp
View File

@@ -39,23 +39,14 @@ const uint8_t *kIMGLoading[16] = {
ImageResource_item_loading_15_32x32, ImageResource_item_loading_15_32x32,
ImageResource_item_loading_16_32x32 ImageResource_item_loading_16_32x32
}; };
const char *wallpapers_name_en[] = {
const char *wallpapers_name[] = {
"M5Paper", "M5Paper",
"Engine", "Engine",
"Penrose Triangle" "Penrose Triangle"
}; };
const char *wallpapers_name_zh[] = {
"M5Paper",
"引擎",
"彭罗斯三角"
};
const char *wallpapers_name_ja[] = {
"M5Paper",
"エンジン",
"ペンローズの三角形"
};
uint16_t global_wallpaper = DEFAULT_WALLPAPER; uint16_t global_wallpaper = DEFAULT_WALLPAPER;
uint8_t global_language = LANGUAGE_EN;
String global_wifi_ssid; String global_wifi_ssid;
String global_wifi_password; String global_wifi_password;
uint8_t global_wifi_configed = false; uint8_t global_wifi_configed = false;
@@ -100,17 +91,6 @@ void SetTimeSynced(uint8_t val) {
SaveSetting(); SaveSetting();
} }
void SetLanguage(uint8_t language) {
if (language >= LANGUAGE_EN && language <= LANGUAGE_ZH) {
global_language = language;
}
SaveSetting();
}
uint8_t GetLanguage(void) {
return global_language;
}
void SetWallpaper(uint16_t wallpaper_id) { void SetWallpaper(uint16_t wallpaper_id) {
global_wallpaper = wallpaper_id; global_wallpaper = wallpaper_id;
SaveSetting(); SaveSetting();
@@ -125,21 +105,13 @@ const uint8_t *GetWallpaper(void) {
} }
const char *GetWallpaperName(uint16_t wallpaper_id) { const char *GetWallpaperName(uint16_t wallpaper_id) {
switch (global_language) { return wallpapers_name[wallpaper_id];
case LANGUAGE_ZH:
return wallpapers_name_zh[wallpaper_id];
case LANGUAGE_JA:
return wallpapers_name_ja[wallpaper_id];
default:
return wallpapers_name_en[wallpaper_id];
}
} }
esp_err_t LoadSetting(void) { esp_err_t LoadSetting(void) {
nvs_handle nvs_arg; nvs_handle nvs_arg;
NVS_CHECK(nvs_open("Setting", NVS_READONLY, &nvs_arg)); NVS_CHECK(nvs_open("Setting", NVS_READONLY, &nvs_arg));
NVS_CHECK(nvs_get_u16(nvs_arg, "Wallpaper", &global_wallpaper)); NVS_CHECK(nvs_get_u16(nvs_arg, "Wallpaper", &global_wallpaper));
NVS_CHECK(nvs_get_u8(nvs_arg, "Language", &global_language));
NVS_CHECK(nvs_get_u8(nvs_arg, "Timesync", &global_time_synced)); NVS_CHECK(nvs_get_u8(nvs_arg, "Timesync", &global_time_synced));
nvs_get_i8(nvs_arg, "timezone", &global_timezone); nvs_get_i8(nvs_arg, "timezone", &global_timezone);
@@ -163,7 +135,6 @@ esp_err_t SaveSetting(void) {
nvs_handle nvs_arg; nvs_handle nvs_arg;
NVS_CHECK(nvs_open("Setting", NVS_READWRITE, &nvs_arg)); NVS_CHECK(nvs_open("Setting", NVS_READWRITE, &nvs_arg));
NVS_CHECK(nvs_set_u16(nvs_arg, "Wallpaper", global_wallpaper)); NVS_CHECK(nvs_set_u16(nvs_arg, "Wallpaper", global_wallpaper));
NVS_CHECK(nvs_set_u8(nvs_arg, "Language", global_language));
NVS_CHECK(nvs_set_u8(nvs_arg, "Timesync", global_time_synced)); NVS_CHECK(nvs_set_u8(nvs_arg, "Timesync", global_time_synced));
NVS_CHECK(nvs_set_i8(nvs_arg, "timezone", global_timezone)); NVS_CHECK(nvs_set_i8(nvs_arg, "timezone", global_timezone));
NVS_CHECK(nvs_set_str(nvs_arg, "ssid", global_wifi_ssid.c_str())); NVS_CHECK(nvs_set_str(nvs_arg, "ssid", global_wifi_ssid.c_str()));

2
src/global_setting.h
View File

@@ -13,8 +13,6 @@ enum {
LANGUAGE_ZH // Simplified Chinese LANGUAGE_ZH // Simplified Chinese
}; };
void SetLanguage(uint8_t language);
uint8_t GetLanguage(void);
void SetWallpaper(uint16_t wallpaper_id); void SetWallpaper(uint16_t wallpaper_id);
uint16_t GetWallpaperID(void); uint16_t GetWallpaperID(void);
const uint8_t* GetWallpaper(void); const uint8_t* GetWallpaper(void);

38
src/resources/ImageResource.h
View File

@@ -26,7 +26,6 @@
// ImageResource_item_icon_file_image_32x32 // ImageResource_item_icon_file_image_32x32
// ImageResource_item_icon_file_text_32x32 // ImageResource_item_icon_file_text_32x32
// ImageResource_item_icon_file_unknow_32x32 // ImageResource_item_icon_file_unknow_32x32
// ImageResource_item_icon_language_32x32
// ImageResource_item_icon_ntptime_32x32 // ImageResource_item_icon_ntptime_32x32
// ImageResource_item_icon_refresh_32x32 // ImageResource_item_icon_refresh_32x32
// ImageResource_item_icon_restart_32x32 // ImageResource_item_icon_restart_32x32
@@ -9778,43 +9777,6 @@ const unsigned char ImageResource_item_icon_file_unknow_32x32[512] = {
0x00, 0x00, 0x00, 0x07, 0xEF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x70, 0x00, 0x00, 0x00, 0x07, 0xEF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x70,
0x00, 0x00, }; 0x00, 0x00, };
const unsigned char ImageResource_item_icon_language_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x7A, 0xCE, 0xEC, 0xA7, 0x20, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xCF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x70,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xCF, 0xFE, 0xCF, 0xEF, 0xFE, 0xFC, 0xEF,
0xFC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0xFB, 0x57, 0xFF, 0x2F, 0xF2, 0xFF,
0x75, 0xBF, 0xF3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFF, 0x90, 0x2F, 0xF4, 0x0F, 0xF0,
0x4F, 0xF2, 0x09, 0xFF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xF7, 0x00, 0xAF, 0x80, 0x0F,
0xF0, 0x08, 0xFA, 0x00, 0x7F, 0xE2, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xFF, 0xD6, 0xFD, 0x00,
0x0F, 0xF0, 0x00, 0xDF, 0x6D, 0xFF, 0xFB, 0x00, 0x00, 0x00, 0x04, 0xFD, 0x3B, 0xFF, 0xFC,
0x84, 0x0F, 0xF0, 0x48, 0xCF, 0xFF, 0xB3, 0xDF, 0x40, 0x00, 0x00, 0x0A, 0xF7, 0x00, 0x5F,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x00, 0x7F, 0xA0, 0x00, 0x00, 0x3F, 0xC0, 0x00,
0x6F, 0xA5, 0x7A, 0xDF, 0xFD, 0xA7, 0x5A, 0xF6, 0x00, 0x0C, 0xF3, 0x00, 0x00, 0x6F, 0x80,
0x00, 0x8F, 0x80, 0x00, 0x0F, 0xF0, 0x00, 0x08, 0xF8, 0x00, 0x08, 0xF6, 0x00, 0x00, 0x9F,
0x50, 0x00, 0xBF, 0x60, 0x00, 0x0F, 0xF0, 0x00, 0x06, 0xFB, 0x00, 0x05, 0xF9, 0x00, 0x00,
0xBF, 0x30, 0x00, 0xDF, 0x00, 0x00, 0x0F, 0xF0, 0x00, 0x00, 0xFD, 0x00, 0x03, 0xFB, 0x00,
0x00, 0xEF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE,
0x00, 0x00, 0xEF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFE, 0x00, 0x00, 0xBF, 0x30, 0x00, 0xDF, 0x00, 0x00, 0x0F, 0xF0, 0x00, 0x00, 0xFD, 0x00,
0x03, 0xFB, 0x00, 0x00, 0x8F, 0x60, 0x00, 0xBF, 0x30, 0x00, 0x0F, 0xF0, 0x00, 0x03, 0xFB,
0x00, 0x06, 0xF8, 0x00, 0x00, 0x6F, 0x90, 0x00, 0x9F, 0x60, 0x00, 0x0F, 0xF0, 0x00, 0x06,
0xF9, 0x00, 0x09, 0xF6, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x7F, 0xA6, 0x9B, 0xDF, 0xFD, 0xB9,
0x6A, 0xF7, 0x00, 0x0C, 0xF3, 0x00, 0x00, 0x0A, 0xF7, 0x00, 0x5F, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xF5, 0x00, 0x7F, 0xA0, 0x00, 0x00, 0x04, 0xFD, 0x3B, 0xFF, 0xFC, 0x84, 0x0F,
0xF0, 0x48, 0xCF, 0xFF, 0xB3, 0xDF, 0x40, 0x00, 0x00, 0x00, 0xBF, 0xFF, 0xD6, 0xFD, 0x00,
0x0F, 0xF0, 0x00, 0xDF, 0x6D, 0xFF, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x3E, 0xF7, 0x00, 0xAF,
0x80, 0x0F, 0xF0, 0x08, 0xFA, 0x00, 0x7F, 0xE3, 0x00, 0x00, 0x00, 0x00, 0x04, 0xFF, 0x90,
0x3F, 0xF5, 0x0F, 0xF0, 0x5F, 0xF3, 0x09, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4F,
0xFB, 0x67, 0xFF, 0x3F, 0xF3, 0xFF, 0x76, 0xBF, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0xAF, 0xFE, 0xCF, 0xEF, 0xFE, 0xFC, 0xEF, 0xFA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x07, 0xCF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x03, 0x7A, 0xCE, 0xEC, 0xA7, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, };
const unsigned char ImageResource_item_icon_ntptime_32x32[512] = { const unsigned char ImageResource_item_icon_ntptime_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

11
src/systeminit.cpp
View File

@@ -78,7 +78,6 @@ void SysInit_Start(void) {
} else { } else {
_initcanvas.loadFont(binaryttf, sizeof(binaryttf)); _initcanvas.loadFont(binaryttf, sizeof(binaryttf));
SetTTFLoaded(false); SetTTFLoaded(false);
SetLanguage(LANGUAGE_EN);
is_factory_test = true; is_factory_test = true;
} }
@@ -95,12 +94,10 @@ void SysInit_Start(void) {
Frame_FactoryTest *frame_factorytest = new Frame_FactoryTest(); Frame_FactoryTest *frame_factorytest = new Frame_FactoryTest();
EPDGUI_AddFrame("Frame_FactoryTest", frame_factorytest); EPDGUI_AddFrame("Frame_FactoryTest", frame_factorytest);
if(!is_factory_test) { if(!is_factory_test) {
Frame_Setting *frame_setting = new Frame_Setting(); Frame_Settings *frame_setting = new Frame_Settings();
EPDGUI_AddFrame("Frame_Setting", frame_setting); EPDGUI_AddFrame("Frame_Settings", frame_setting);
Frame_Setting_Wallpaper *frame_wallpaper = new Frame_Setting_Wallpaper(); Frame_Settings_Wallpaper *frame_wallpaper = new Frame_Settings_Wallpaper();
EPDGUI_AddFrame("Frame_Setting_Wallpaper", frame_wallpaper); EPDGUI_AddFrame("Frame_Settings_Wallpaper", frame_wallpaper);
Frame_Setting_Language *frame_language = new Frame_Setting_Language();
EPDGUI_AddFrame("Frame_Setting_Language", frame_language);
Frame_Keyboard *frame_keyboard = new Frame_Keyboard(0); Frame_Keyboard *frame_keyboard = new Frame_Keyboard(0);
EPDGUI_AddFrame("Frame_Keyboard", frame_keyboard); EPDGUI_AddFrame("Frame_Keyboard", frame_keyboard);
Frame_WifiScan *frame_wifiscan = new Frame_WifiScan(); Frame_WifiScan *frame_wifiscan = new Frame_WifiScan();