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

Improvements and bugfixes

Browse Source
This commit is contained in:
Toby
2021-03-21 02:11:06 +01:00
parent b25ffff28b
commit 3b6b28bf1c
30 changed files with 590 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/epdgui/epdgui.cpp
View File

@@ -24,19 +24,19 @@ void EPDGUI_AddObject(EPDGUI_Base* object) {
}
void EPDGUI_Draw(m5epd_update_mode_t mode) {
for(std::list<EPDGUI_Base*>::iterator p = epdgui_object_list.begin(); p != epdgui_object_list.end(); p++) {
for (std::list<EPDGUI_Base*>::iterator p = epdgui_object_list.begin(); p != epdgui_object_list.end(); p++) {
(*p)->Draw(mode);
}
}
void EPDGUI_Process(void) {
for(std::list<EPDGUI_Base*>::iterator p = epdgui_object_list.begin(); p != epdgui_object_list.end(); p++) {
for (std::list<EPDGUI_Base*>::iterator p = epdgui_object_list.begin(); p != epdgui_object_list.end(); p++) {
(*p)->UpdateState(-1, -1);
}
}
void EPDGUI_Process(int16_t x, int16_t y) {
for(std::list<EPDGUI_Base*>::iterator p = epdgui_object_list.begin(); p != epdgui_object_list.end(); p++) {
for (std::list<EPDGUI_Base*>::iterator p = epdgui_object_list.begin(); p != epdgui_object_list.end(); p++) {
// log_d("%d, %d -> %d, %d, %d, %d", x, y, (*p)->getX(), (*p)->getY(), (*p)->getRX(), (*p)->getBY());
(*p)->UpdateState(x, y);
}
@@ -49,10 +49,10 @@ void EPDGUI_Clear(void) {
void EPDGUI_Run(Frame_Base* frame) {
uint32_t last_active_time = 0;
if(frame->isRun() == 0) {
if (frame->isRun() == 0) {
frame->exit();
log_d("Exit %s", frame->GetFrameName().c_str());
if(wait_for_delete != NULL) {
if (wait_for_delete != NULL) {
delete wait_for_delete;
wait_for_delete = NULL;
}
@@ -60,7 +60,7 @@ void EPDGUI_Run(Frame_Base* frame) {
}
EPDGUI_Draw(UPDATE_MODE_NONE);
if((frame->GetFrameID() == 1) || (frame_switch_count > 3)) {
if ((frame->GetFrameID() == 1) || (frame_switch_count > 3)) {
frame_switch_count = 0;
M5.EPD.UpdateFull(UPDATE_MODE_GC16);
} else {
@@ -68,12 +68,12 @@ void EPDGUI_Run(Frame_Base* frame) {
frame_switch_count++;
}
while (1) {
if((frame->isRun() == 0) || (frame->run() == 0)) {
while (true) {
if ((frame->isRun() == 0) || (frame->run() == 0)) {
frame->exit();
// M5.EPD.Clear();
log_d("Exit %s", frame->GetFrameName().c_str());
if(wait_for_delete != NULL) {
if (wait_for_delete != NULL) {
log_d("delete %s", wait_for_delete->GetFrameName().c_str());
delete wait_for_delete;
wait_for_delete = NULL;
@@ -84,10 +84,10 @@ void EPDGUI_Run(Frame_Base* frame) {
if (M5.TP.avaliable()) {
M5.TP.update();
bool is_finger_up = M5.TP.isFingerUp();
if(is_finger_up || (_last_pos_x != M5.TP.readFingerX(0)) || (_last_pos_y != M5.TP.readFingerY(0))) {
if (is_finger_up || (_last_pos_x != M5.TP.readFingerX(0)) || (_last_pos_y != M5.TP.readFingerY(0))) {
_last_pos_x = M5.TP.readFingerX(0);
_last_pos_y = M5.TP.readFingerY(0);
if(is_finger_up) {
if (is_finger_up) {
EPDGUI_Process();
last_active_time = millis();
} else {
@@ -100,10 +100,10 @@ void EPDGUI_Run(Frame_Base* frame) {
M5.TP.flush();
}
if((last_active_time != 0) && (millis() - last_active_time > 2000)) {
if(M5.EPD.UpdateCount() > 4) {
if ((last_active_time != 0) && (millis() - last_active_time > 2000)) {
if (M5.EPD.UpdateCount() > 4) {
M5.EPD.ResetUpdateCount();
if(_is_auto_update) {
if (_is_auto_update) {
M5.EPD.UpdateFull(UPDATE_MODE_GL16);
}
}
@@ -113,7 +113,7 @@ void EPDGUI_Run(Frame_Base* frame) {
}
void EPDGUI_MainLoop(void) {
if((!frame_stack.empty()) && (frame_stack.top() != NULL)) {
if ((!frame_stack.empty()) && (frame_stack.top() != NULL)) {
Frame_Base *frame = frame_stack.top();
log_d("Run %s", frame->GetFrameName().c_str());
EPDGUI_Clear();
@@ -130,10 +130,10 @@ void EPDGUI_AddFrame(String name, Frame_Base* frame) {
}
void EPDGUI_AddFrameArg(String name, int n, void* arg) {
if(frame_map.count(name) == 0) {
if (frame_map.count(name) == 0) {
return;
}
if(frame_map[name].args.size() > n) {
if (frame_map[name].args.size() > n) {
frame_map[name].args[n] = arg;
} else {
frame_map[name].args.push_back(arg);
@@ -142,7 +142,7 @@ void EPDGUI_AddFrameArg(String name, int n, void* arg) {
}
Frame_Base* EPDGUI_GetFrame(String name) {
if(frame_map.count(name) > 0) {
if (frame_map.count(name) > 0) {
return frame_map[name].frame;
}
return NULL;
@@ -153,14 +153,14 @@ void EPDGUI_PushFrame(Frame_Base* frame) {
}
void EPDGUI_PopFrame(bool isDelete) {
if(isDelete) {
if (isDelete) {
wait_for_delete = frame_stack.top();
}
frame_stack.pop();
}
void EPDGUI_OverwriteFrame(Frame_Base* frame) {
while(!frame_stack.empty()) {
while (!frame_stack.empty()) {
frame_stack.pop();
}
frame_stack.push(frame);

50
src/epdgui/epdgui_button.cpp
View File

@@ -10,7 +10,7 @@ EPDGUI_Base(x, y, w, h) {
EPDGUI_Button::EPDGUI_Button(String label, int16_t x, int16_t y, int16_t w, int16_t h, uint32_t style):
EPDGUI_Base(x, y, w, h) {
if(style & STYLE_INVISABLE) {
if (style & STYLE_INVISABLE) {
_is_invisable = true;
return;
}
@@ -32,21 +32,21 @@ EPDGUI_Base(x, y, w, h) {
this->_CanvasPressed->fillCanvas(15);
this->_CanvasPressed->setTextSize(26);
this->_CanvasPressed->setTextColor(0);
if(style & STYLE_SOLIDBORDER) {
if (style & STYLE_SOLIDBORDER) {
this->_CanvasNormal->drawRect(0, 0, _w, _h, 15);
}
if(style & STYLE_ALIGN_LEFT) {
if (style & STYLE_ALIGN_LEFT) {
this->_CanvasNormal->setTextDatum(CL_DATUM);
this->_CanvasPressed->setTextDatum(CL_DATUM);
this->_CanvasNormal->drawString(_label, 5, _h / 2 + 3);
this->_CanvasPressed->drawString(_label, 5, _h / 2 + 3);
} else if(style & STYLE_ALIGN_RIGHT) {
} else if (style & STYLE_ALIGN_RIGHT) {
this->_CanvasNormal->setTextDatum(CR_DATUM);
this->_CanvasPressed->setTextDatum(CR_DATUM);
this->_CanvasNormal->drawString(_label, _w - 5, _h / 2 + 3);
this->_CanvasPressed->drawString(_label, _w - 5, _h / 2 + 3);
} else if(style & STYLE_ALIGN_CENTER) {
} else if (style & STYLE_ALIGN_CENTER) {
this->_CanvasNormal->setTextDatum(CC_DATUM);
this->_CanvasPressed->setTextDatum(CC_DATUM);
this->_CanvasNormal->drawString(_label, _w / 2, _h / 2 + 3);
@@ -68,58 +68,58 @@ M5EPD_Canvas* EPDGUI_Button::CanvasPressed() {
}
void EPDGUI_Button::Draw(m5epd_update_mode_t mode) {
if(_ishide || _is_invisable) {
if (_ishide || _is_invisable) {
return;
}
if(_state == EVENT_NONE || _state == EVENT_RELEASED) {
if (_state == EVENT_NONE || _state == EVENT_RELEASED) {
this->_CanvasNormal->pushCanvas(_x, _y, mode);
} else if(_state == EVENT_PRESSED) {
} else if (_state == EVENT_PRESSED) {
this->_CanvasPressed->pushCanvas(_x, _y, mode);
}
}
void EPDGUI_Button::Draw(M5EPD_Canvas* canvas) {
if(_ishide) {
if (_ishide) {
return;
}
if(_state == EVENT_NONE || _state == EVENT_RELEASED) {
if (_state == EVENT_NONE || _state == EVENT_RELEASED) {
_CanvasNormal->pushToCanvas(_x, _y, canvas);
} else if(_state == EVENT_PRESSED) {
} else if (_state == EVENT_PRESSED) {
_CanvasPressed->pushToCanvas(_x, _y, canvas);
}
}
void EPDGUI_Button::Bind(int16_t event, void (* func_cb)(epdgui_args_vector_t&)) {
if(event == EVENT_PRESSED) {
if (event == EVENT_PRESSED) {
_pressed_cb = func_cb;
} else if(event == EVENT_RELEASED) {
} else if (event == EVENT_RELEASED) {
_released_cb = func_cb;
}
}
void EPDGUI_Button::UpdateState(int16_t x, int16_t y) {
if(!_isenable || _ishide) {
if (!_isenable || _ishide) {
return;
}
bool is_in_area = isInBox(x, y);
if(is_in_area) {
if(_state == EVENT_NONE) {
if (is_in_area) {
if (_state == EVENT_NONE) {
_state = EVENT_PRESSED;
// Serial.printf("%s Pressed ", _label.c_str());
Draw();
if(_pressed_cb != NULL) {
if (_pressed_cb != NULL) {
_pressed_cb(_pressed_cb_args);
}
}
} else {
if(_state == EVENT_PRESSED) {
if (_state == EVENT_PRESSED) {
_state = EVENT_NONE;
Draw();
if(_released_cb != NULL) {
if (_released_cb != NULL) {
_released_cb(_released_cb_args);
}
}
@@ -131,11 +131,11 @@ void EPDGUI_Button::setBMPButton(String label_l, String label_r, const uint8_t *
_CanvasNormal->drawRect(0, 0, _w, _h, 15);
_CanvasNormal->setTextSize(26);
_CanvasNormal->setTextColor(15);
if(label_l.length()) {
if (label_l.length()) {
_CanvasNormal->setTextDatum(CL_DATUM);
_CanvasNormal->drawString(label_l, 47 + 8, (_h >> 1) + 2); // Default: (_h >> 1) + 5
}
if(label_r.length()) {
if (label_r.length()) {
_CanvasNormal->setTextDatum(CR_DATUM);
_CanvasNormal->drawString(label_r, _w - 15, (_h >> 1)); // Default: (_h >> 1) + 5
}
@@ -161,14 +161,14 @@ void EPDGUI_Button::setLabel(String label) {
}
void EPDGUI_Button::AddArgs(int16_t event, uint16_t n, void* arg) {
if(event == EVENT_PRESSED) {
if(_pressed_cb_args.size() > n) {
if (event == EVENT_PRESSED) {
if (_pressed_cb_args.size() > n) {
_pressed_cb_args[n] = arg;
} else {
_pressed_cb_args.push_back(arg);
}
} else if(event == EVENT_RELEASED) {
if(_released_cb_args.size() > n) {
} else if (event == EVENT_RELEASED) {
if (_released_cb_args.size() > n) {
_released_cb_args[n] = arg;
} else {
_released_cb_args.push_back(arg);

56
src/epdgui/epdgui_keyboard.cpp
View File

@@ -55,13 +55,13 @@ EPDGUI_Keyboard::EPDGUI_Keyboard(uint32_t style): EPDGUI_Base() {
const uint16_t kThirdLineY = kSecondLineY + 64;
const uint16_t k4thLineY = kThirdLineY + 64;
for(int i = 0; i < 10; i++) {
for (int i = 0; i < 10; i++) {
_btn[i] = new EPDGUI_Button(kKeyAlphaMapLowerCase[i], kBaseX + (kKeyInterval + kKeyWidth) * i, kFirstLineY, kKeyWidth, kKeyHeight);
}
for(int i = 10; i < 19; i++) {
for (int i = 10; i < 19; i++) {
_btn[i] = new EPDGUI_Button(kKeyAlphaMapLowerCase[i], kBaseX + 28 + (kKeyInterval + kKeyWidth) * (i - 10), kSecondLineY, kKeyWidth, kKeyHeight);
}
for(int i = 19; i < 26; i++) {
for (int i = 19; i < 26; i++) {
_btn[i] = new EPDGUI_Button(kKeyAlphaMapLowerCase[i], kBaseX + 80 + (kKeyInterval + kKeyWidth) * (i - 19), kThirdLineY, kKeyWidth, kKeyHeight);
}
@@ -72,9 +72,9 @@ EPDGUI_Keyboard::EPDGUI_Keyboard(uint32_t style): EPDGUI_Base() {
_btn[kKeyBackspace]->CanvasPressed()->ReverseColor();
_btn[kKeySpace] = new EPDGUI_Button("Space", 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);
else if(style & STYLE_INPUTMODE_NEEDCONFIRM)
else if (style & STYLE_INPUTMODE_NEEDCONFIRM)
_btn[kKeyWrap] = new EPDGUI_Button("Confirm", kBaseX + 512 - 128, k4thLineY, 128, kKeyHeight);
// function key
@@ -87,7 +87,7 @@ EPDGUI_Keyboard::EPDGUI_Keyboard(uint32_t style): EPDGUI_Base() {
_sw[kSWNumber]->SetLabel(0, "123");
_sw[kSWNumber]->SetLabel(1, "Abc");
for(int i = 0; i < 29; i++) {
for (int i = 0; i < 29; i++) {
_key[i] = _btn[i];
}
_key[kKeyCase] = _sw[kSWCase];
@@ -97,30 +97,30 @@ EPDGUI_Keyboard::EPDGUI_Keyboard(uint32_t style): EPDGUI_Base() {
}
EPDGUI_Keyboard::~EPDGUI_Keyboard() {
for(int i = 0; i < 29; i++) {
for (int i = 0; i < 29; i++) {
delete _btn[i];
}
for(int i = 0; i < 2; i++) {
for (int i = 0; i < 2; i++) {
delete _sw[i];
}
}
void EPDGUI_Keyboard::Draw(m5epd_update_mode_t mode) {
if(_ishide) {
if (_ishide) {
return;
}
for(int i = 0; i < 31; i++) {
for (int i = 0; i < 31; i++) {
_key[i]->Draw(mode);
}
}
void EPDGUI_Keyboard::Draw(M5EPD_Canvas* canvas) {
if(_ishide) {
if (_ishide) {
return;
}
for(int i = 0; i < 31; i++) {
for (int i = 0; i < 31; i++) {
_key[i]->Draw(canvas);
}
}
@@ -130,16 +130,16 @@ void EPDGUI_Keyboard::Bind(int16_t state, void (* func_cb)(epdgui_args_vector_t&
}
void EPDGUI_Keyboard::UpdateState(int16_t x, int16_t y) {
if(!_isenable) {
if (!_isenable) {
return;
}
// log_d("UpdateState %d, %d", x, y);
for(int i = 0; i < 31; i++) {
for (int i = 0; i < 31; i++) {
bool keypressed = _key[i]->isInBox(x, y);
_key[i]->UpdateState(x, y);
if(keypressed) {
if(i < 26) {
switch(_layout) {
if (keypressed) {
if (i < 26) {
switch (_layout) {
case kLayoutLowerAlpha:
_data += kKeyAlphaMapLowerCase[i];
break;
@@ -154,7 +154,7 @@ void EPDGUI_Keyboard::UpdateState(int16_t x, int16_t y) {
break;
}
}
switch(i) {
switch (i) {
case kKeyBackspace:
_data += "\u0008";
break;
@@ -165,14 +165,14 @@ void EPDGUI_Keyboard::UpdateState(int16_t x, int16_t y) {
_data += "\n";
break;
case kKeyCase:
if(_layout == kLayoutNumber || _layout == kLayoutSymbol) {
if(_sw[kSWCase]->getState() == 1) {
for(int j = 0; j < 26; j++) {
if (_layout == kLayoutNumber || _layout == kLayoutSymbol) {
if (_sw[kSWCase]->getState() == 1) {
for (int j = 0; j < 26; j++) {
_btn[j]->setLabel(kKeyAlphaMapNumber[j]);
_layout = kLayoutNumber;
}
} else {
for(int j = 0; j < 26; j++) {
for (int j = 0; j < 26; j++) {
_btn[j]->setLabel(kKeyAlphaMapSymbol[j]);
_layout = kLayoutSymbol;
}
@@ -181,13 +181,13 @@ void EPDGUI_Keyboard::UpdateState(int16_t x, int16_t y) {
Draw(UPDATE_MODE_NONE);
M5.EPD.UpdateFull(UPDATE_MODE_GL16);
} else {
if(_sw[kSWCase]->getState() == 1) {
for(int j = 0; j < 26; j++) {
if (_sw[kSWCase]->getState() == 1) {
for (int j = 0; j < 26; j++) {
_btn[j]->setLabel(kKeyAlphaMapLowerCase[j]);
_layout = kLayoutLowerAlpha;
}
} else {
for(int j = 0; j < 26; j++) {
for (int j = 0; j < 26; j++) {
_btn[j]->setLabel(kKeyAlphaMapUpperCase[j]);
_layout = kLayoutUpperAlpha;
}
@@ -198,7 +198,7 @@ void EPDGUI_Keyboard::UpdateState(int16_t x, int16_t y) {
}
break;
case kKeyNumber:
if(_sw[kSWNumber]->getState() == 1) {
if (_sw[kSWNumber]->getState() == 1) {
_sw[kSWCase]->setState(0);
_sw[kSWCase]->Canvas(0)->fillCanvas(0);
_sw[kSWCase]->Canvas(1)->fillCanvas(0);
@@ -208,7 +208,7 @@ void EPDGUI_Keyboard::UpdateState(int16_t x, int16_t y) {
_sw[kSWCase]->Canvas(1)->pushImage(_sw[kSWCase]->getW() / 2 - 16, _sw[kSWCase]->getH() / 2 - 16, 32, 32, ImageResource_upper_32x32);
_sw[kSWCase]->Canvas(1)->ReverseColor();
for(int j = 0; j < 26; j++) {
for (int j = 0; j < 26; j++) {
_btn[j]->setLabel(kKeyAlphaMapLowerCase[j]);
_layout = kLayoutLowerAlpha;
}
@@ -217,7 +217,7 @@ void EPDGUI_Keyboard::UpdateState(int16_t x, int16_t y) {
_sw[kSWCase]->SetLabel(0, "#+-");
_sw[kSWCase]->SetLabel(1, "123");
for(int j = 0; j < 26; j++) {
for (int j = 0; j < 26; j++) {
_btn[j]->setLabel(kKeyAlphaMapNumber[j]);
_layout = kLayoutNumber;
}

32
src/epdgui/epdgui_mutexswitch.cpp
View File

@@ -5,19 +5,19 @@ EPDGUI_MutexSwitch::EPDGUI_MutexSwitch() {
}
void EPDGUI_MutexSwitch::Draw(m5epd_update_mode_t mode) {
if(_ishide) {
if (_ishide) {
return;
}
for(std::list<EPDGUI_Switch*>::iterator p = _object_list.begin(); p != _object_list.end(); p++) {
for (std::list<EPDGUI_Switch*>::iterator p = _object_list.begin(); p != _object_list.end(); p++) {
(*p)->Draw(mode);
}
}
void EPDGUI_MutexSwitch::Draw(M5EPD_Canvas* canvas) {
if(_ishide) {
if (_ishide) {
return;
}
for(std::list<EPDGUI_Switch*>::iterator p = _object_list.begin(); p != _object_list.end(); p++) {
for (std::list<EPDGUI_Switch*>::iterator p = _object_list.begin(); p != _object_list.end(); p++) {
(*p)->Draw(canvas);
}
}
@@ -27,18 +27,18 @@ void EPDGUI_MutexSwitch::Bind(int16_t event, void (* func_cb)(epdgui_args_vector
}
void EPDGUI_MutexSwitch::UpdateState(int16_t x, int16_t y) {
if(!_isenable) {
if (!_isenable) {
return;
}
std::list<EPDGUI_Switch*>::iterator pressed_sw = _object_list.end();
for(std::list<EPDGUI_Switch*>::iterator p = _object_list.begin(); p != _object_list.end(); p++) {
if(_last_pressed == p) {
for (std::list<EPDGUI_Switch*>::iterator p = _object_list.begin(); p != _object_list.end(); p++) {
if (_last_pressed == p) {
(*p)->UpdateState(-1, -1);
continue;
}
if((*p)->isInBox(x, y)) {
if ((*p)->isInBox(x, y)) {
_last_pressed = p;
pressed_sw = p;
}
@@ -46,20 +46,20 @@ void EPDGUI_MutexSwitch::UpdateState(int16_t x, int16_t y) {
(*p)->UpdateState(x, y);
}
if(!_is_exclusive) {
if (!_is_exclusive) {
return;
}
if(pressed_sw == _object_list.end()) {
if (pressed_sw == _object_list.end()) {
return;
}
for(std::list<EPDGUI_Switch*>::iterator p = _object_list.begin(); p != _object_list.end(); p++) {
if(pressed_sw == p) {
for (std::list<EPDGUI_Switch*>::iterator p = _object_list.begin(); p != _object_list.end(); p++) {
if (pressed_sw == p) {
continue;
}
if((*p)->getState() != 0) {
if ((*p)->getState() != 0) {
(*p)->setState(0);
(*p)->Draw(UPDATE_MODE_GL16);
}
@@ -67,13 +67,13 @@ void EPDGUI_MutexSwitch::UpdateState(int16_t x, int16_t y) {
}
void EPDGUI_MutexSwitch::SetDefault(uint16_t idx) {
if(idx < _object_list.size()) {
if (idx < _object_list.size()) {
_default_idx = idx;
}
int i = 0;
for(std::list<EPDGUI_Switch*>::iterator p = _object_list.begin(); p != _object_list.end(); p++) {
if(i == _default_idx) {
for (std::list<EPDGUI_Switch*>::iterator p = _object_list.begin(); p != _object_list.end(); p++) {
if (i == _default_idx) {
_last_pressed = p;
(*p)->setState(1);
// (*p)->Draw(UPDATE_MODE_GL16);

38
src/epdgui/epdgui_switch.cpp
View File

@@ -2,12 +2,12 @@
EPDGUI_Switch::EPDGUI_Switch(int16_t state_num, int16_t x, int16_t y, int16_t w, int16_t h):
EPDGUI_Base(x, y, w, h) {
if(state_num > EPDGUI_SWITCH_MAX_STATE) {
if (state_num > EPDGUI_SWITCH_MAX_STATE) {
state_num = EPDGUI_SWITCH_MAX_STATE;
}
this->_state_num = state_num;
for(int i = 0; i < _state_num; i++) {
for (int i = 0; i < _state_num; i++) {
this->_canvas[i] = new M5EPD_Canvas(&M5.EPD);
this->_canvas[i]->createCanvas(_w, _h);
// this->_canvas[i]->fillCanvas(i & 0x01 ? 0 : 15);
@@ -21,20 +21,20 @@ EPDGUI_Base(x, y, w, h) {
}
EPDGUI_Switch::~EPDGUI_Switch() {
for(int i = 0; i < _state_num; i++) {
for (int i = 0; i < _state_num; i++) {
delete this->_canvas[i];
}
}
M5EPD_Canvas* EPDGUI_Switch::Canvas(int16_t state) {
if(state == -1) {
if (state == -1) {
return _canvas_pressed;
}
return _canvas[state];
}
void EPDGUI_Switch::SetLabel(int16_t state, String label) {
if(state > EPDGUI_SWITCH_MAX_STATE || state < 0) {
if (state > EPDGUI_SWITCH_MAX_STATE || state < 0) {
return;
}
@@ -49,11 +49,11 @@ void EPDGUI_Switch::SetLabel(int16_t state, String label) {
}
void EPDGUI_Switch::Draw(m5epd_update_mode_t mode) {
if(_ishide) {
if (_ishide) {
return;
}
if(_event == EVENT_PRESSED) {
if (_event == EVENT_PRESSED) {
_canvas_pressed->pushCanvas(_x, _y, mode);
return;
}
@@ -62,11 +62,11 @@ void EPDGUI_Switch::Draw(m5epd_update_mode_t mode) {
}
void EPDGUI_Switch::Draw(M5EPD_Canvas* canvas) {
if(_ishide) {
if (_ishide) {
return;
}
if(_event == EVENT_PRESSED) {
if (_event == EVENT_PRESSED) {
_canvas_pressed->pushToCanvas(_x, _y, canvas);
return;
}
@@ -75,7 +75,7 @@ void EPDGUI_Switch::Draw(M5EPD_Canvas* canvas) {
}
void EPDGUI_Switch::Bind(int16_t state, void (* func_cb)(epdgui_args_vector_t&)) {
if(state > EPDGUI_SWITCH_MAX_STATE || state < 0) {
if (state > EPDGUI_SWITCH_MAX_STATE || state < 0) {
return;
}
@@ -83,27 +83,27 @@ void EPDGUI_Switch::Bind(int16_t state, void (* func_cb)(epdgui_args_vector_t&))
}
void EPDGUI_Switch::UpdateState(int16_t x, int16_t y) {
if(!_isenable || _ishide) {
if (!_isenable || _ishide) {
return;
}
bool is_in_area = isInBox(x, y);
if(is_in_area) {
if(_event == EVENT_NONE) {
if (is_in_area) {
if (_event == EVENT_NONE) {
_event = EVENT_PRESSED;
Draw();
}
} else {
if(_event == EVENT_PRESSED) {
if (_event == EVENT_PRESSED) {
_event = EVENT_NONE;
_state++;
if(_state == _state_num) {
if (_state == _state_num) {
_state = 0;
}
Draw();
if(this->_func_cb_array[_state] != NULL) {
if (this->_func_cb_array[_state] != NULL) {
this->_func_cb_array[_state](this->_func_cb_param_array[_state]);
}
}
@@ -111,7 +111,7 @@ void EPDGUI_Switch::UpdateState(int16_t x, int16_t y) {
}
void EPDGUI_Switch::setState(int16_t state) {
if(state >= _state_num || state < 0) {
if (state >= _state_num || state < 0) {
return;
}
_state = state;
@@ -123,11 +123,11 @@ int16_t EPDGUI_Switch::getState(void) {
}
void EPDGUI_Switch::AddArgs(int16_t state, uint16_t n, void* arg) {
if(state > EPDGUI_SWITCH_MAX_STATE || state < 0) {
if (state > EPDGUI_SWITCH_MAX_STATE || state < 0) {
return;
}
if(this->_func_cb_param_array[state].size() > n) {
if (this->_func_cb_param_array[state].size() > n) {
this->_func_cb_param_array[state][n] = arg;
} else {
this->_func_cb_param_array[state].push_back(arg);

10
src/epdgui/epdgui_textbox.cpp
View File

@@ -136,7 +136,7 @@ void EPDGUI_Textbox::UpdateState(int16_t x, int16_t y) {
void EPDGUI_Textbox::SetState(int16_t state) {
if (state != _state) {
if(state == EVENT_PRESSED) {
if (state == EVENT_PRESSED) {
_textbox_touching_id = _id;
}
_state = state;
@@ -158,19 +158,19 @@ void EPDGUI_Textbox::Remove(int16_t idx) {
while (n < len) {
last_n = n;
_canvas->decodeUTF8(buf, &n, len - n);
if(cnt == idx) {
if (cnt == idx) {
_data.remove(last_n, n - last_n);
return;
}
cnt++;
}
if(idx == -1) {
if (idx == -1) {
_data.remove(last_n, n - last_n);
}
}
void EPDGUI_Textbox::AddText(String text) {
if(text.length() == 0) {
if (text.length() == 0) {
return;
}
@@ -181,7 +181,7 @@ void EPDGUI_Textbox::AddText(String text) {
while (n < len) {
last_n = n;
uint16_t uniCode = _canvas->decodeUTF8(buf, &n, len - n);
if(uniCode == 0x0008) {
if (uniCode == 0x0008) {
Remove(-1);
} else {
_data += text.substring(last_n, n);

8
src/frame/frame.h
View File

@@ -3,11 +3,11 @@
#include "frame_main.h"
#include "frame_settings.h"
#include "frame_setting_wallpaper.h"
#include "frame_settings_wifi.h"
#include "frame_settings_wallpaper.h"
#include "frame_keyboard.h"
#include "frame_factorytest.h"
#include "frame_wifiscan.h"
#include "frame_wifipassword.h"
#include "frame_settings_wifi_password.h"
#include "frame_lifegame.h"
#include "frame_fileindex.h"
#include "frame_txtreader.h"
@@ -15,4 +15,4 @@
#include "frame_pictureviewer.h"
#include "frame_home.h"
#endif
#endif // _FRAME_H_

6
src/frame/frame_base.cpp
View File

@@ -2,7 +2,7 @@
#include "../epdgui/epdgui.h"
Frame_Base::Frame_Base(bool _has_title) {
if(_has_title) {
if (_has_title) {
_canvas_title = new M5EPD_Canvas(&M5.EPD);
_canvas_title->createCanvas(540, 64);
_canvas_title->drawFastHLine(0, 64, 540, 15);
@@ -16,9 +16,9 @@ Frame_Base::Frame_Base(bool _has_title) {
}
Frame_Base::~Frame_Base() {
if(_key_exit != NULL)
if (_key_exit != NULL)
delete _key_exit;
if(_canvas_title != NULL)
if (_canvas_title != NULL)
delete _canvas_title;
}

14
src/frame/frame_compare.cpp
View File

@@ -2,10 +2,10 @@
void UpdateCompareCanvasDraw(uint8_t mode, M5EPD_Canvas *update_canvas) {
update_canvas->fillCanvas(0);
for(int i = 0; i < 16; i++) {
for (int i = 0; i < 16; i++) {
update_canvas->fillRect(i * 27, 0, 27, 50, i);
}
switch(mode) {
switch (mode) {
case UPDATE_MODE_INIT : {
update_canvas->drawString("Display initialization", 8, 60);
break;
@@ -80,7 +80,7 @@ Frame_Compare::Frame_Compare(void) {
_key_updatemode[UPDATE_MODE_INIT]->Bind(EPDGUI_Button::EVENT_RELEASED, key_update_reset_cb);
for(int i = 1; i < 8; i++) {
for (int i = 1; i < 8; i++) {
_key_updatemode[i] = new EPDGUI_Button(0, 168 + (i-1) * 108, 100, 100);
char buf[10];
sprintf(buf, "%d", i);
@@ -104,17 +104,17 @@ Frame_Compare::Frame_Compare(void) {
}
Frame_Compare::~Frame_Compare(void) {
for(int i = 0; i < 8; i++) {
for (int i = 0; i < 8; i++) {
delete _key_updatemode[i];
}
delete _canvas;
}
int Frame_Compare::run() {
switch(_update_flag) {
switch (_update_flag) {
case 1: {
_update_flag = 0;
for(int i = 1; i < 8; i++) {
for (int i = 1; i < 8; i++) {
UpdateCompareCanvasDraw(i, _canvas);
_canvas->pushCanvas(104, 168 + (i-1) * 108, (m5epd_update_mode_t)i);
}
@@ -130,7 +130,7 @@ int Frame_Compare::init(epdgui_args_vector_t &args) {
M5.EPD.Clear();
_canvas_title->pushCanvas(0, 8, UPDATE_MODE_NONE);
EPDGUI_AddObject(_key_exit);
for(int i = 0; i < 8; i++) {
for (int i = 0; i < 8; i++) {
EPDGUI_AddObject(_key_updatemode[i]);
}
EPDGUI_SetAutoUpdate(false);

14
src/frame/frame_factorytest.cpp
View File

@@ -90,7 +90,7 @@ Frame_FactoryTest::~Frame_FactoryTest(void) {
void Frame_FactoryTest::drawItem(uint16_t flag, const char* str, int y) {
String prefix_pass("[PASS] ");
String prefix_none("");
if(_pass_flag & flag) {
if (_pass_flag & flag) {
_canvas_base->drawString(prefix_pass + str, POS_LX, y);
} else {
_canvas_base->drawString(str, POS_LX, y);
@@ -157,7 +157,7 @@ void Frame_FactoryTest::scan(String *ssid, int32_t *rssi) {
WiFi.scanNetworks(true);
int wifi_num;
while (1) {
while (true) {
wifi_num = WiFi.scanComplete();
if (wifi_num >= 0) {
break;
@@ -207,7 +207,7 @@ int Frame_FactoryTest::run() {
ispressed = true;
}
buf[ptr] = '\0';
if(ptr == 0) {
if (ptr == 0) {
strcpy(buf, "Waiting...");
}
if (ispressed) {
@@ -244,7 +244,7 @@ int Frame_FactoryTest::run() {
// SHT30
M5.SHT30.UpdateData();
if(M5.SHT30.GetError() == 0) {
if (M5.SHT30.GetError() == 0) {
float ctemp = M5.SHT30.GetTemperature();
float chumi = M5.SHT30.GetRelHumidity();
@@ -348,8 +348,8 @@ int Frame_FactoryTest::run() {
}
bool update_flag = false;
if(temp != pass_flag) {
if(pass_flag != _pass_flag) {
if (temp != pass_flag) {
if (pass_flag != _pass_flag) {
update_flag = true;
}
_pass_flag = pass_flag;
@@ -360,7 +360,7 @@ int Frame_FactoryTest::run() {
drawItem(UPDATE_MODE_GL16);
update_flag = true;
}
if(update_flag) {
if (update_flag) {
drawPassCount(UPDATE_MODE_GL16);
}

24
src/frame/frame_fileindex.cpp
View File

@@ -44,7 +44,7 @@ Frame_FileIndex::Frame_FileIndex(String path) {
exitbtn("/..");
String subpath = path;
if(path.length() > 20) {
if (path.length() > 20) {
subpath = path.substring(0, 20) + "...";
}
_canvas_title->drawString("SD" + subpath, 540 - 15, 34);
@@ -78,8 +78,8 @@ void Frame_FileIndex::listDir(fs::FS &fs, const char *dirname) {
file = root.openNextFile();
}
for(int n = 0; n < floders.size(); n++) {
if(_key_files.size() > MAX_BTN_NUM) {
for (int n = 0; n < floders.size(); n++) {
if (_key_files.size() > MAX_BTN_NUM) {
break;
}
File file = floders[n];
@@ -88,7 +88,7 @@ void Frame_FileIndex::listDir(fs::FS &fs, const char *dirname) {
String filename(file.name());
filename = filename.substring(filename.lastIndexOf("/"));
if(filename.length() > 19) {
if (filename.length() > 19) {
filename = filename.substring(0, 19) + "...";
}
btn->CanvasNormal()->fillCanvas(0);
@@ -109,8 +109,8 @@ void Frame_FileIndex::listDir(fs::FS &fs, const char *dirname) {
btn->Bind(EPDGUI_Button::EVENT_RELEASED, key_fileindex_floder_cb);
}
for(int n = 0; n < files.size(); n++) {
if(_key_files.size() > MAX_BTN_NUM) {
for (int n = 0; n < files.size(); n++) {
if (_key_files.size() > MAX_BTN_NUM) {
break;
}
File file = files[n];
@@ -119,7 +119,7 @@ void Frame_FileIndex::listDir(fs::FS &fs, const char *dirname) {
String filename(file.name());
filename = filename.substring(filename.lastIndexOf("/"));
if(filename.length() > 19) {
if (filename.length() > 19) {
filename = filename.substring(0, 19) + "...";
}
btn->CanvasNormal()->fillCanvas(0);
@@ -132,12 +132,12 @@ void Frame_FileIndex::listDir(fs::FS &fs, const char *dirname) {
btn->CanvasNormal()->setTextDatum(CR_DATUM);
String suffix = filename.substring(filename.lastIndexOf("."));
if(suffix.indexOf("txt") >= 0) {
if (suffix.indexOf("txt") >= 0) {
btn->CanvasNormal()->pushImage(15, 14, 32, 32, ImageResource_item_icon_file_text_32x32);
btn->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, btn);
btn->AddArgs(EPDGUI_Button::EVENT_RELEASED, 1, (void*)(&_is_run));
btn->Bind(EPDGUI_Button::EVENT_RELEASED, key_fileindex_text_cb);
} else if((suffix.indexOf("bmp") >= 0)
} else if ((suffix.indexOf("bmp") >= 0)
|| (suffix.indexOf("BMP") >= 0)
|| (suffix.indexOf("png") >= 0)
|| (suffix.indexOf("PNG") >= 0)
@@ -161,7 +161,7 @@ void Frame_FileIndex::listDir(fs::FS &fs, const char *dirname) {
}
Frame_FileIndex::~Frame_FileIndex(void) {
for(int i = 0; i < _key_files.size(); i++) {
for (int i = 0; i < _key_files.size(); i++) {
delete _key_files[i];
}
}
@@ -169,7 +169,7 @@ Frame_FileIndex::~Frame_FileIndex(void) {
int Frame_FileIndex::init(epdgui_args_vector_t &args) {
_is_run = 1;
if(_key_files.size() == 0) {
if (_key_files.size() == 0) {
listDir(SD, _path.c_str());
}
@@ -177,7 +177,7 @@ int Frame_FileIndex::init(epdgui_args_vector_t &args) {
_canvas_title->pushCanvas(0, 8, UPDATE_MODE_NONE);
EPDGUI_AddObject(_key_exit);
for(int i = 0; i < _key_files.size(); i++) {
for (int i = 0; i < _key_files.size(); i++) {
EPDGUI_AddObject(_key_files[i]);
}

4
src/frame/frame_home.cpp
View File

@@ -15,12 +15,12 @@ void Frame_Home::InitSwitch(EPDGUI_Switch* sw, String title, String subtitle, co
void key_home_air_adjust_cb(epdgui_args_vector_t &args) {
int operation = ((EPDGUI_Button*)(args[0]))->GetCustomString().toInt();
EPDGUI_Switch *sw = ((EPDGUI_Switch*)(args[1]));
if(sw->getState() == 0) {
if (sw->getState() == 0) {
return;
}
int temp = sw->GetCustomString().toInt();
char buf[10];
if(operation == 1) {
if (operation == 1) {
temp++;
} else {

4
src/frame/frame_keyboard.cpp
View File

@@ -8,7 +8,7 @@ void key_textclear_cb(epdgui_args_vector_t &args) {
void key_textsize_plus_cb(epdgui_args_vector_t &args) {
textsize += 4;
if(textsize > 96) {
if (textsize > 96) {
textsize = 96;
}
char buf[10];
@@ -20,7 +20,7 @@ void key_textsize_plus_cb(epdgui_args_vector_t &args) {
void key_textsize_minus_cb(epdgui_args_vector_t &args) {
textsize -= 4;
if(textsize < 12) {
if (textsize < 12) {
textsize = 12;
}
char buf[10];

34
src/frame/frame_lifegame.cpp
View File

@@ -36,14 +36,14 @@ void LifeGame_RandomCell() {
uint8_t LifeGame_Count3x3_0(uint8_t x, uint8_t y) {
uint8_t count = 0;
for(int j = y - 1; j < y + 2; j++) {
for(int i = x - 1; i < x + 2; i++) {
if(lifegame_cells_0.readPixel(i, j)) {
for (int j = y - 1; j < y + 2; j++) {
for (int i = x - 1; i < x + 2; i++) {
if (lifegame_cells_0.readPixel(i, j)) {
count++;
}
}
}
if(lifegame_cells_0.readPixel(x, y)) {
if (lifegame_cells_0.readPixel(x, y)) {
count--;
}
return count;
@@ -51,14 +51,14 @@ uint8_t LifeGame_Count3x3_0(uint8_t x, uint8_t y) {
uint8_t LifeGame_Count3x3_1(uint8_t x, uint8_t y) {
uint8_t count = 0;
for(int j = y - 1; j < y + 2; j++) {
for(int i = x - 1; i < x + 2; i++) {
if(lifegame_cells_1.readPixel(i, j)) {
for (int j = y - 1; j < y + 2; j++) {
for (int i = x - 1; i < x + 2; i++) {
if (lifegame_cells_1.readPixel(i, j)) {
count++;
}
}
}
if(lifegame_cells_1.readPixel(x, y)) {
if (lifegame_cells_1.readPixel(x, y)) {
count--;
}
return count;
@@ -66,16 +66,16 @@ uint8_t LifeGame_Count3x3_1(uint8_t x, uint8_t y) {
void LifeGame_CellProcess_0(uint8_t x, uint8_t y) {
uint8_t count = LifeGame_Count3x3_0(x, y);
if(lifegame_cells_0.readPixel(x, y)) {
if (lifegame_cells_0.readPixel(x, y)) {
//dead
if(count < 2 || count > 3) {
if (count < 2 || count > 3) {
lifegame_cells_1.drawPixel(x, y, 0);
} else {
lifegame_cells_1.drawPixel(x, y, 15);
}
} else {
//new life
if(count == 3) {
if (count == 3) {
lifegame_cells_1.drawPixel(x, y, 15);
} else {
lifegame_cells_1.drawPixel(x, y, 0);
@@ -85,16 +85,16 @@ void LifeGame_CellProcess_0(uint8_t x, uint8_t y) {
void LifeGame_CellProcess_1(uint8_t x, uint8_t y) {
uint8_t count = LifeGame_Count3x3_1(x, y);
if(lifegame_cells_1.readPixel(x, y)) {
if (lifegame_cells_1.readPixel(x, y)) {
//dead
if(count < 2 || count > 3) {
if (count < 2 || count > 3) {
lifegame_cells_0.drawPixel(x, y, 0);
} else {
lifegame_cells_0.drawPixel(x, y, 15);
}
} else {
//new life
if(count == 3) {
if (count == 3) {
lifegame_cells_0.drawPixel(x, y, 15);
} else {
lifegame_cells_0.drawPixel(x, y, 0);
@@ -103,7 +103,7 @@ void LifeGame_CellProcess_1(uint8_t x, uint8_t y) {
}
void LifeGame_RoundProcess() {
if(lifegame_cells_flag == 0) {
if (lifegame_cells_flag == 0) {
for (int y = 1; y < CELL_Y - 1; y++) {
for (int x = 1; x < CELL_X - 1; x++) {
LifeGame_CellProcess_0(x, y);
@@ -129,11 +129,11 @@ void LifeGame_NextGen(void *pvParameters) {
int Frame_Lifegame::run() {
M5.update();
if(M5.BtnP.wasReleased()) {
if (M5.BtnP.wasReleased()) {
LifeGame_RandomCell();
}
xTaskCreatePinnedToCore(LifeGame_NextGen, "LifeGame_NextGen", 4096, NULL, 1, NULL, 0);
if(lifegame_cells_flag == 0) {
if (lifegame_cells_flag == 0) {
lifegame_canvas_1.pushCanvas(0, 72, UPDATE_MODE_DU4);
} else {
lifegame_canvas_0.pushCanvas(0, 72, UPDATE_MODE_DU4);

84
src/frame/frame_main.cpp
View File

@@ -2,11 +2,11 @@
#include "frame_settings.h"
#include "frame_keyboard.h"
#include "frame_factorytest.h"
#include "frame_wifiscan.h"
#include "frame_lifegame.h"
#include "frame_fileindex.h"
#include "frame_compare.h"
#include "frame_home.h"
#include <WiFi.h>
enum {
kKeyFactoryTest = 0,
@@ -24,7 +24,7 @@ enum {
void key_setting_cb(epdgui_args_vector_t &args) {
Frame_Base *frame = EPDGUI_GetFrame("Frame_Settings");
if(frame == NULL) {
if (frame == NULL) {
frame = new Frame_Settings();
EPDGUI_AddFrame("Frame_Settings", frame);
}
@@ -34,7 +34,7 @@ void key_setting_cb(epdgui_args_vector_t &args) {
void key_keyboard_cb(epdgui_args_vector_t &args) {
Frame_Base *frame = EPDGUI_GetFrame("Frame_Keyboard");
if(frame == NULL) {
if (frame == NULL) {
frame = new Frame_Keyboard();
EPDGUI_AddFrame("Frame_Keyboard", frame);
}
@@ -44,7 +44,7 @@ void key_keyboard_cb(epdgui_args_vector_t &args) {
void key_factorytest_cb(epdgui_args_vector_t &args) {
Frame_Base *frame = EPDGUI_GetFrame("Frame_FactoryTest");
if(frame == NULL) {
if (frame == NULL) {
frame = new Frame_FactoryTest();
EPDGUI_AddFrame("Frame_FactoryTest", frame);
}
@@ -52,19 +52,19 @@ void key_factorytest_cb(epdgui_args_vector_t &args) {
*((int*)(args[0])) = 0;
}
void key_wifiscan_cb(epdgui_args_vector_t &args) {
Frame_Base *frame = EPDGUI_GetFrame("Frame_WifiScan");
if(frame == NULL) {
frame = new Frame_WifiScan();
EPDGUI_AddFrame("Frame_WifiScan", frame);
}
EPDGUI_PushFrame(frame);
*((int*)(args[0])) = 0;
}
// void key_wifiscan_cb(epdgui_args_vector_t &args) {
// Frame_Base *frame = EPDGUI_GetFrame("Frame_WifiScan");
// if (frame == NULL) {
// frame = new Frame_WifiScan();
// EPDGUI_AddFrame("Frame_WifiScan", frame);
// }
// EPDGUI_PushFrame(frame);
// *((int*)(args[0])) = 0;
// }
void key_lifegame_cb(epdgui_args_vector_t &args) {
Frame_Base *frame = EPDGUI_GetFrame("Frame_Lifegame");
if(frame == NULL) {
if (frame == NULL) {
frame = new Frame_Lifegame();
EPDGUI_AddFrame("Frame_Lifegame", frame);
}
@@ -80,7 +80,7 @@ void key_sdfile_cb(epdgui_args_vector_t &args) {
void key_compare_cb(epdgui_args_vector_t &args) {
Frame_Base *frame = EPDGUI_GetFrame("Frame_Compare");
if(frame == NULL) {
if (frame == NULL) {
frame = new Frame_Compare();
EPDGUI_AddFrame("Frame_Compare", frame);
}
@@ -90,7 +90,7 @@ void key_compare_cb(epdgui_args_vector_t &args) {
void key_home_cb(epdgui_args_vector_t &args) {
Frame_Base *frame = EPDGUI_GetFrame("Frame_Home");
if(frame == NULL) {
if (frame == NULL) {
frame = new Frame_Home();
EPDGUI_AddFrame("Frame_Home", frame);
}
@@ -111,11 +111,11 @@ Frame_Main::Frame_Main(void): Frame_Base(false) {
_names->createCanvas(540, 32);
_names->setTextDatum(CC_DATUM);
for(int i = 0; i < 4; i++) {
for (int i = 0; i < 4; i++) {
_key[i] = new EPDGUI_Button("Test", 20 + i * 136, 90, KEY_W, KEY_H);
}
for(int i = 0; i < 4; i++) {
for (int i = 0; i < 4; i++) {
_key[i + 4] = new EPDGUI_Button("Test", 20 + i * 136, 240, KEY_W, KEY_H);
}
@@ -137,11 +137,11 @@ Frame_Main::Frame_Main(void): Frame_Base(false) {
_key[kKeyFactoryTest]->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
_key[kKeyFactoryTest]->Bind(EPDGUI_Button::EVENT_RELEASED, key_factorytest_cb);
_key[kKeyWifiScan]->CanvasNormal()->pushImage(0, 0, 92, 92, ImageResource_main_icon_wifi_92x92);
*(_key[kKeyWifiScan]->CanvasPressed()) = *(_key[kKeyWifiScan]->CanvasNormal());
_key[kKeyWifiScan]->CanvasPressed()->ReverseColor();
_key[kKeyWifiScan]->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
_key[kKeyWifiScan]->Bind(EPDGUI_Button::EVENT_RELEASED, key_wifiscan_cb);
// _key[kKeyWifiScan]->CanvasNormal()->pushImage(0, 0, 92, 92, ImageResource_main_icon_wifi_92x92);
// *(_key[kKeyWifiScan]->CanvasPressed()) = *(_key[kKeyWifiScan]->CanvasNormal());
// _key[kKeyWifiScan]->CanvasPressed()->ReverseColor();
// _key[kKeyWifiScan]->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
// _key[kKeyWifiScan]->Bind(EPDGUI_Button::EVENT_RELEASED, key_wifiscan_cb);
_key[kKeyLifeGame]->CanvasNormal()->pushImage(0, 0, 92, 92, ImageResource_main_icon_lifegame_92x92);
*(_key[kKeyLifeGame]->CanvasPressed()) = *(_key[kKeyLifeGame]->CanvasNormal());
@@ -173,22 +173,22 @@ Frame_Main::Frame_Main(void): Frame_Base(false) {
Frame_Main::~Frame_Main(void) {
for(int i = 0; i < 8; i++) {
for (int i = 0; i < 8; i++) {
delete _key[i];
}
}
void Frame_Main::AppName(m5epd_update_mode_t mode) {
if(!_names->isRenderExist(20)) {
if (!_names->isRenderExist(20)) {
_names->createRender(20, 26);
}
_names->setTextSize(20);
_names->fillCanvas(0);
_names->drawString("Wi-Fi", 20 + 46 + 3 * 136, 16);
_names->drawString("Test", 20 + 46, 16);
_names->drawString("Settings", 20 + 46 + 136, 16);
_names->drawString("Keyboard", 20 + 46 + 2 * 136, 16);
_names->drawString("Wi-Fi", 20 + 46 + 3 * 136, 16);
_names->pushCanvas(0, 186, mode);
_names->fillCanvas(0);
@@ -200,7 +200,7 @@ void Frame_Main::AppName(m5epd_update_mode_t mode) {
}
void Frame_Main::StatusBar(m5epd_update_mode_t mode) {
if((millis() - _time) < _next_update_time) {
if ((millis() - _time) < _next_update_time) {
return;
}
char buf[20];
@@ -209,21 +209,41 @@ void Frame_Main::StatusBar(m5epd_update_mode_t mode) {
_bar->setTextDatum(CL_DATUM);
_bar->drawString("M5Paper", 10, 27);
// Wi-Fi
const uint8_t *kIMGWifiLevel[4] = {
NULL,
ImageResource_item_icon_wifi_1_32x32,
ImageResource_item_icon_wifi_2_32x32,
ImageResource_item_icon_wifi_3_32x32
};
if (WiFi.status() == WL_CONNECTED) {
int rssi = WiFi.RSSI();
int level = 0;
if (rssi > -55) {
level = 3;
} else if (rssi > -88) {
level = 2;
} else {
level = 1;
}
_bar->pushImage(134, 8, 32, 32, kIMGWifiLevel[level]);
}
// Battery
_bar->setTextDatum(CR_DATUM);
_bar->pushImage(498, 8, 32, 32, ImageResource_status_bar_battery_32x32);
uint32_t vol = M5.getBatteryVoltage();
if(vol < 3300) {
if (vol < 3300) {
vol = 3300;
} else if(vol > 4350) {
} else if (vol > 4350) {
vol = 4350;
}
float battery = (float)(vol - 3300) / (float)(4350 - 3300);
if(battery <= 0.01) {
if (battery <= 0.01) {
battery = 0.01;
}
if(battery > 1) {
if (battery > 1) {
battery = 1;
}
uint8_t px = battery * 25;
@@ -250,7 +270,7 @@ void Frame_Main::StatusBar(m5epd_update_mode_t mode) {
int Frame_Main::init(epdgui_args_vector_t &args) {
_is_run = 1;
M5.EPD.WriteFullGram4bpp(GetWallpaper());
for(int i = 0; i < 8; i++) {
for (int i = 0; i < 8; i++) {
EPDGUI_AddObject(_key[i]);
}
_time = 0;

10
src/frame/frame_pictureviewer.cpp
View File

@@ -37,23 +37,23 @@ void Frame_PictureViewer::err(String info) {
}
int Frame_PictureViewer::run() {
if(_is_first) {
if (_is_first) {
_is_first = false;
LoadingAnime_32x32_Start(254, 500);
String suffix = _pic_path.substring(_pic_path.lastIndexOf("."));
if((suffix.indexOf("bmp") >= 0) || (suffix.indexOf("BMP") >= 0)) {
if ((suffix.indexOf("bmp") >= 0) || (suffix.indexOf("BMP") >= 0)) {
bool ret = _canvas_picture->drawBmpFile(SD, _pic_path.c_str(), 0, 0);
if(ret == 0) {
if (ret == 0) {
err("Error opening " + _pic_path.substring(_pic_path.lastIndexOf("/")));
}
} else if ((suffix.indexOf("png") >= 0) || (suffix.indexOf("PNG") >= 0)) {
bool ret = _canvas_picture->drawPngFile(SD, _pic_path.c_str());
if(ret == 0) {
if (ret == 0) {
err("Error opening " + _pic_path.substring(_pic_path.lastIndexOf("/")));
}
} else if ((suffix.indexOf("jpg") >= 0) || (suffix.indexOf("JPG") >= 0)) {
bool ret = _canvas_picture->drawJpgFile(SD, _pic_path.c_str());
if(ret == 0) {
if (ret == 0) {
err("Error opening " + _pic_path.substring(_pic_path.lastIndexOf("/")));
}
}

56
src/frame/frame_settings.cpp
View File

@@ -1,10 +1,11 @@
#include "frame_settings.h"
#include "frame_setting_wallpaper.h"
#include "frame_settings_wifi.h"
#include "frame_settings_wallpaper.h"
#include "WiFi.h"
#define KEY_W 92
#define KEY_H 92
const uint16_t kTimeZoneY = 460;
const uint16_t kTimeZoneY = 500;
void key_shutdown_cb(epdgui_args_vector_t &args) {
M5.EPD.WriteFullGram4bpp(GetWallpaper());
@@ -16,7 +17,7 @@ void key_shutdown_cb(epdgui_args_vector_t &args) {
M5.disableEXTPower();
M5.disableMainPower();
esp_deep_sleep_start();
while(1);
while (true);
}
void key_restart_cb(epdgui_args_vector_t &args) {
@@ -26,9 +27,19 @@ void key_restart_cb(epdgui_args_vector_t &args) {
esp_restart();
}
void key_wifi2_cb(epdgui_args_vector_t &args) {
Frame_Base *frame = EPDGUI_GetFrame("Frame_Settings_Wifi");
if (frame == NULL) {
frame = new Frame_Settings_Wifi();
EPDGUI_AddFrame("Frame_Settings_Wifi", frame);
}
EPDGUI_PushFrame(frame);
*((int*)(args[0])) = 0;
}
void key_wallpaper_cb(epdgui_args_vector_t &args) {
Frame_Base *frame = EPDGUI_GetFrame("Frame_Settings_Wallpaper");
if(frame == NULL) {
if (frame == NULL) {
frame = new Frame_Settings_Wallpaper();
EPDGUI_AddFrame("Frame_Settings_Wallpaper", frame);
}
@@ -37,7 +48,7 @@ void key_wallpaper_cb(epdgui_args_vector_t &args) {
}
void key_synctime_cb(epdgui_args_vector_t &args) {
SaveSetting();
// SaveSetting();
M5EPD_Canvas info(&M5.EPD);
M5EPD_Canvas *title = (M5EPD_Canvas*)(args[0]);
M5EPD_Canvas *tzone = (M5EPD_Canvas*)(args[1]);
@@ -46,14 +57,14 @@ void key_synctime_cb(epdgui_args_vector_t &args) {
info.setTextSize(26);
info.setTextColor(0);
info.setTextDatum(CC_DATUM);
if(WiFi.status() != WL_CONNECTED) {
if (WiFi.status() != WL_CONNECTED) {
info.drawString("Wi-Fi not connected", 150, 55);
info.pushCanvas(120, 430, UPDATE_MODE_GL16);
M5.EPD.WriteFullGram4bpp(GetWallpaper());
title->pushCanvas(0, 8, UPDATE_MODE_NONE);
tzone->pushCanvas(4, kTimeZoneY, UPDATE_MODE_NONE);
EPDGUI_Draw(UPDATE_MODE_NONE);
while(!M5.TP.avaliable());
while (!M5.TP.avaliable());
M5.EPD.UpdateFull(UPDATE_MODE_GL16);
return;
}
@@ -61,7 +72,7 @@ void key_synctime_cb(epdgui_args_vector_t &args) {
bool ret = SyncNTPTime();
LoadingAnime_32x32_Stop();
if(ret == 0) {
if (ret == 0) {
info.drawString("Time sync failed", 150, 55);
info.pushCanvas(120, 430, UPDATE_MODE_GL16);
} else {
@@ -72,18 +83,18 @@ void key_synctime_cb(epdgui_args_vector_t &args) {
title->pushCanvas(0, 8, UPDATE_MODE_NONE);
tzone->pushCanvas(4, kTimeZoneY, UPDATE_MODE_NONE);
EPDGUI_Draw(UPDATE_MODE_NONE);
while(!M5.TP.avaliable());
while (!M5.TP.avaliable());
M5.EPD.UpdateFull(UPDATE_MODE_GL16);
}
void key_timezone_plus_cb(epdgui_args_vector_t &args) {
int *tz = (int*)(args[0]);
(*tz)++;
if((*tz) > 12) {
if ((*tz) > 12) {
(*tz) = 12;
}
String str = String(*tz);
if((*tz) > 0) {
if ((*tz) > 0) {
str = "+" + str;
}
((EPDGUI_Button*)(args[1]))->setLabel(str);
@@ -94,11 +105,11 @@ void key_timezone_plus_cb(epdgui_args_vector_t &args) {
void key_timezone_minus_cb(epdgui_args_vector_t &args) {
int *tz = (int*)(args[0]);
(*tz)--;
if((*tz) < -11) {
if ((*tz) < -11) {
(*tz) = -11;
}
String str = String(*tz);
if((*tz) > 0) {
if ((*tz) > 0) {
str = "+" + str;
}
((EPDGUI_Button*)(args[1]))->setLabel(str);
@@ -124,14 +135,15 @@ Frame_Settings::Frame_Settings(void) {
_timezone_canvas->setTextColor(15);
_timezone_canvas->setTextDatum(CL_DATUM);
_key_wallpaper = new EPDGUI_Button(4, 100, 532, 61);
_key_syncntp = new EPDGUI_Button(4, 160, 532, 61);
_key_restart = new EPDGUI_Button(4, 280, 532, 61);
_key_shutdown = new EPDGUI_Button(4, 340, 532, 61);
_key_wifi = new EPDGUI_Button(4, 100, 532, 61);
_key_wallpaper = new EPDGUI_Button(4, 160, 532, 61);
_key_syncntp = new EPDGUI_Button(4, 220, 532, 61);
_key_restart = new EPDGUI_Button(4, 320, 532, 61);
_key_shutdown = new EPDGUI_Button(4, 380, 532, 61);
key_timezone_plus = new EPDGUI_Button("+", 448, kTimeZoneY, 88, 52);
String str = String(GetTimeZone());
if(GetTimeZone() > 0) {
if (GetTimeZone() > 0) {
str = "+" + str;
}
key_timezone_reset = new EPDGUI_Button(str, 360, kTimeZoneY, 88, 52);
@@ -149,17 +161,21 @@ Frame_Settings::Frame_Settings(void) {
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_wifi->setBMPButton(" Wi-Fi", "\u25B6", ImageResource_item_icon_wifi_3_32x32);
_key_wallpaper->setBMPButton(" Wallpaper", "\u25B6", ImageResource_item_icon_wallpaper_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);
_canvas_title->drawString("Settings", 270, 34);
_key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
_key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb);
_key_wifi->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
_key_wifi->Bind(EPDGUI_Button::EVENT_RELEASED, &key_wifi2_cb);
_key_wallpaper->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
_key_wallpaper->Bind(EPDGUI_Button::EVENT_RELEASED, &key_wallpaper_cb);
@@ -173,6 +189,7 @@ Frame_Settings::Frame_Settings(void) {
}
Frame_Settings::~Frame_Settings(void) {
delete _key_wifi;
delete _key_wallpaper;
delete _key_shutdown;
delete _key_restart;
@@ -184,6 +201,7 @@ int Frame_Settings::init(epdgui_args_vector_t &args) {
M5.EPD.WriteFullGram4bpp(GetWallpaper());
_canvas_title->pushCanvas(0, 8, UPDATE_MODE_NONE);
_timezone_canvas->pushCanvas(0, kTimeZoneY, UPDATE_MODE_NONE);
EPDGUI_AddObject(_key_wifi);
EPDGUI_AddObject(_key_wallpaper);
EPDGUI_AddObject(_key_shutdown);
EPDGUI_AddObject(_key_restart);

1
src/frame/frame_settings.h
View File

@@ -12,6 +12,7 @@ public:
private:
EPDGUI_Button *_key_wifi;
EPDGUI_Button *_key_wallpaper;
EPDGUI_Button *_key_shutdown;
EPDGUI_Button *_key_restart;

8
src/frame/frame_setting_wallpaper.cpp → src/frame/frame_settings_wallpaper.cpp
View File

@@ -1,4 +1,4 @@
#include "frame_setting_wallpaper.h"
#include "frame_settings_wallpaper.h"
void sw_wallpapers_cb(epdgui_args_vector_t &args) {
SetWallpaper(*((uint32_t*)(args[0])));
@@ -9,7 +9,7 @@ Frame_Settings_Wallpaper::Frame_Settings_Wallpaper(void) {
_sw_mutex_group = new EPDGUI_MutexSwitch();
for(int i = 0; i < WALLPAPER_NUM; i++) {
for (int i = 0; i < WALLPAPER_NUM; i++) {
_sw_wallpapers[i] = new EPDGUI_Switch(2, 4, 100 + i * 60, 532, 61);
_sw_mutex_group->Add(_sw_wallpapers[i]);
_sw_wallpapers[i]->SetLabel(0, GetWallpaperName(i));
@@ -21,7 +21,7 @@ Frame_Settings_Wallpaper::Frame_Settings_Wallpaper(void) {
}
_sw_wallpapers[GetWallpaperID()]->setState(1);
exitbtn("Setting");
exitbtn("Settings");
_canvas_title->drawString("Wallpaper", 270, 34);
_key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
@@ -29,7 +29,7 @@ Frame_Settings_Wallpaper::Frame_Settings_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_mutex_group;

0
src/frame/frame_setting_wallpaper.h → src/frame/frame_settings_wallpaper.h
View File

111
src/frame/frame_wifiscan.cpp → src/frame/frame_settings_wifi.cpp
View File

@@ -1,5 +1,5 @@
#include "frame_wifiscan.h"
#include "frame_wifipassword.h"
#include "frame_settings_wifi.h"
#include "frame_settings_wifi_password.h"
#include <WiFi.h>
#define MAX_BTN_NUM 14
@@ -7,33 +7,25 @@
bool _update_flag = false;
EPDGUI_Button *_connect_key = NULL;
const uint8_t *kIMGWifiLevel[4] = {
NULL,
ImageResource_item_icon_wifi_1_32x32,
ImageResource_item_icon_wifi_2_32x32,
ImageResource_item_icon_wifi_3_32x32
};
void key_wifi_cb(epdgui_args_vector_t &args) {
if(((EPDGUI_Button*)(args[0]))->GetCustomString() == "_$refresh$_") {
if (((EPDGUI_Button*)(args[0]))->GetCustomString() == "_$refresh$_") {
_update_flag = true;
} else {
_connect_key = (EPDGUI_Button*)(args[0]);
Frame_Base *frame = EPDGUI_GetFrame("Frame_WifiPassword");
if(frame == NULL) {
frame = new Frame_WifiPassword();
EPDGUI_AddFrame("Frame_WifiPassword", frame);
Frame_Base *frame = EPDGUI_GetFrame("Frame_Settings_Wifi_Password");
if (frame == NULL) {
frame = new Frame_Settings_Wifi_Password();
EPDGUI_AddFrame("Frame_Settings_Wifi_Password", frame);
}
EPDGUI_PushFrame(frame);
*((int*)(args[1])) = 0;
}
}
Frame_Settings_Wifi::Frame_Settings_Wifi(void) {
_frame_name = "Frame_Settings_Wifi";
Frame_WifiScan::Frame_WifiScan(void) {
_frame_name = "Frame_WifiScan";
for(int i = 0; i < MAX_BTN_NUM; i++) {
for (int i = 0; i < MAX_BTN_NUM; i++) {
_key_wifi[i] = new EPDGUI_Button(4, 100 + i * 60, 532, 61);
_key_wifi[i]->SetHide(true);
_key_wifi[i]->CanvasNormal()->setTextSize(26);
@@ -44,7 +36,7 @@ Frame_WifiScan::Frame_WifiScan(void) {
_key_wifi[i]->Bind(EPDGUI_Button::EVENT_RELEASED, key_wifi_cb);
}
exitbtn("Home");
exitbtn("Settings");
_canvas_title->drawString("Wi-Fi", 270, 34);
_key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
@@ -54,22 +46,28 @@ Frame_WifiScan::Frame_WifiScan(void) {
_connected = 0;
}
Frame_WifiScan::~Frame_WifiScan(void) {
for(int i = 0; i < MAX_BTN_NUM; i++) {
Frame_Settings_Wifi::~Frame_Settings_Wifi(void) {
for (int i = 0; i < MAX_BTN_NUM; i++) {
delete _key_wifi[i];
}
}
void Frame_WifiScan::DrawItem(EPDGUI_Button *btn, String ssid, int rssi) {
void Frame_Settings_Wifi::DrawItem(EPDGUI_Button *btn, String ssid, int rssi) {
const uint8_t *kIMGWifiLevel[4] = {
NULL,
ImageResource_item_icon_wifi_1_32x32,
ImageResource_item_icon_wifi_2_32x32,
ImageResource_item_icon_wifi_3_32x32
};
int level = 0;
if(rssi > -55) {
if (rssi > -55) {
level = 3;
} else if(rssi > -88) {
} else if (rssi > -88) {
level = 2;
} else {
level = 1;
}
if(ssid.length() > 22) {
if (ssid.length() > 22) {
ssid = ssid.substring(0, 22) + "...";
}
btn->SetHide(false);
@@ -82,24 +80,24 @@ void Frame_WifiScan::DrawItem(EPDGUI_Button *btn, String ssid, int rssi) {
btn->CanvasPressed()->ReverseColor();
}
int Frame_WifiScan::run() {
if(_connect) {
int Frame_Settings_Wifi::run() {
if (_connect) {
_connect = false;
Connect();
}
if(_update_flag) {
if (_update_flag) {
_update_flag = false;
scan();
}
return 1;
}
int Frame_WifiScan::scan() {
int Frame_Settings_Wifi::scan() {
WiFi.mode(WIFI_STA);
// WiFi.disconnect();
WiFi.scanNetworks(true);
if(_scan_count > 0) {
if (_scan_count > 0) {
M5.EPD.WriteFullGram4bpp(GetWallpaper());
_canvas_title->pushCanvas(0, 8, UPDATE_MODE_NONE);
_key_exit->Draw(UPDATE_MODE_NONE);
@@ -108,31 +106,31 @@ int Frame_WifiScan::scan() {
_scan_count++;
int wifi_num;
while(1) {
while (true) {
wifi_num = WiFi.scanComplete();
if(wifi_num >= 0) {
if (wifi_num >= 0) {
break;
}
}
int connect_wifi_idx = -1;
if(_connected) {
for(int i = 0; i < wifi_num; i++) {
if (_connected) {
for (int i = 0; i < wifi_num; i++) {
String ssid = WiFi.SSID(i);
if(ssid == _connect_ssid) {
if (ssid == _connect_ssid) {
connect_wifi_idx = i;
if(WiFi.RSSI(i) < -90) {
if (WiFi.RSSI(i) < -90) {
connect_wifi_idx = -1;
}
break;
}
}
if(connect_wifi_idx == -1) {
if (connect_wifi_idx == -1) {
WiFi.disconnect();
_key_wifi[0]->SetEnable(true);
_connected = 0;
for(int i = 1; i < MAX_BTN_NUM; i++) {
for (int i = 1; i < MAX_BTN_NUM; i++) {
_key_wifi[i]->SetPos(_key_wifi[i]->getX(), _key_wifi[i]->getY() - 32);
}
}
@@ -141,17 +139,17 @@ int Frame_WifiScan::scan() {
wifi_num = wifi_num > MAX_WIFI_NUM ? MAX_WIFI_NUM : wifi_num;
wifi_num -= _connected;
for(int i = _connected; i < MAX_BTN_NUM; i++) {
for (int i = _connected; i < MAX_BTN_NUM; i++) {
_key_wifi[i]->SetHide(true);
}
if(_connected) {
if (_connected) {
_key_wifi[0]->Draw(UPDATE_MODE_A2);
}
int idx = 0, cnt = _connected;
while(1) {
if(idx == connect_wifi_idx) {
while (true) {
if (idx == connect_wifi_idx) {
idx++;
continue;
}
@@ -161,7 +159,7 @@ int Frame_WifiScan::scan() {
_key_wifi[cnt]->Draw(UPDATE_MODE_A2);
idx++;
if(idx == wifi_num) {
if (idx == wifi_num) {
break;
}
@@ -186,7 +184,7 @@ int Frame_WifiScan::scan() {
return 0;
}
void Frame_WifiScan::Connect() {
void Frame_Settings_Wifi::Connect() {
int anime_cnt = 0;
int x = 532 - 15 - 32;
int y = _connect_key->getY() + 14;
@@ -204,7 +202,7 @@ void Frame_WifiScan::Connect() {
loading.pushImage(0, 0, 32, 32, GetLoadingIMG_32x32(anime_cnt));
loading.pushCanvas(x, y, UPDATE_MODE_DU4);
anime_cnt++;
if(anime_cnt == 16) {
if (anime_cnt == 16) {
anime_cnt = 0;
}
@@ -221,7 +219,7 @@ void Frame_WifiScan::Connect() {
}
}
for(int i = 1; i < MAX_BTN_NUM; i++) {
for (int i = 1; i < MAX_BTN_NUM; i++) {
_key_wifi[i]->SetPos(_key_wifi[i]->getX(), _key_wifi[i]->getY() + 32);
}
@@ -229,7 +227,7 @@ void Frame_WifiScan::Connect() {
_key_wifi[0]->SetEnable(false);
_key_wifi[0]->SetHide(false);
if(_connect_key != _key_wifi[0]) {
if (_connect_key != _key_wifi[0]) {
*(_key_wifi[0]->CanvasNormal()) = *(_connect_key->CanvasNormal());
*(_key_wifi[0]->CanvasPressed()) = *(_connect_key->CanvasNormal());
_key_wifi[0]->CanvasPressed()->ReverseColor();
@@ -239,14 +237,15 @@ void Frame_WifiScan::Connect() {
_connected = 1;
SetWifi(_connect_ssid, _connect_password);
log_d("Saved Wifi Network");
SyncNTPTime();
scan();
}
void Frame_WifiScan::SetConnected(String ssid, int rssi) {
void Frame_Settings_Wifi::SetConnected(String ssid, int rssi) {
_connect_ssid = ssid;
DrawItem(_key_wifi[0], ssid, rssi);
for(int i = 1; i < MAX_BTN_NUM; i++) {
for (int i = 1; i < MAX_BTN_NUM; i++) {
_key_wifi[i]->SetPos(_key_wifi[i]->getX(), _key_wifi[i]->getY() + 32);
}
_key_wifi[0]->SetEnable(false);
@@ -254,28 +253,27 @@ void Frame_WifiScan::SetConnected(String ssid, int rssi) {
_connected = 1;
}
int Frame_WifiScan::init(epdgui_args_vector_t &args) {
int Frame_Settings_Wifi::init(epdgui_args_vector_t &args) {
_is_run = 1;
_connect = false;
M5.EPD.WriteFullGram4bpp(GetWallpaper());
_canvas_title->pushCanvas(0, 8, UPDATE_MODE_NONE);
if(args.size() > 0) {
if (args.size() > 0) {
String *password = (String*)(args[0]);
_connect_password = *password;
delete password;
args.pop_back();
for(int i = 0; i < MAX_BTN_NUM; i++) {
for (int i = 0; i < MAX_BTN_NUM; i++) {
EPDGUI_AddObject(_key_wifi[i]);
}
_update_flag = false;
_connect = true;
} else {
for(int i = 0; i < MAX_BTN_NUM; i++) {
for (int i = 0; i < MAX_BTN_NUM; i++) {
_key_wifi[i]->SetHide(true);
EPDGUI_AddObject(_key_wifi[i]);
}
if(_connected) {
if (_connected) {
_key_wifi[0]->SetHide(false);
}
_update_flag = true;
@@ -283,6 +281,5 @@ int Frame_WifiScan::init(epdgui_args_vector_t &args) {
_connect = false;
}
EPDGUI_AddObject(_key_exit);
return 3;
return 2;
}

12
src/frame/frame_wifiscan.h → src/frame/frame_settings_wifi.h
View File

@@ -1,13 +1,13 @@
#ifndef _FRAME_WIFISCAN_H_
#define _FRAME_WIFISCAN_H_
#ifndef _FRAME_SETTINGS_WIFI_H_
#define _FRAME_SETTINGS_WIFI_H_
#include "frame_base.h"
#include "../epdgui/epdgui.h"
class Frame_WifiScan : public Frame_Base {
class Frame_Settings_Wifi : public Frame_Base {
public:
Frame_WifiScan();
~Frame_WifiScan();
Frame_Settings_Wifi();
~Frame_Settings_Wifi();
int init(epdgui_args_vector_t &args);
int scan();
int run();
@@ -24,4 +24,4 @@ private:
String _connect_password;
};
#endif //_FRAME_SETTINGS_H_
#endif //_FRAME_SETTINGS_WIFI_H_

17
src/frame/frame_wifipassword.cpp → src/frame/frame_settings_wifi_password.cpp
View File

@@ -1,13 +1,12 @@
#include "frame_wifipassword.h"
#include "frame_settings_wifi_password.h"
void key_passwordclear_cb(epdgui_args_vector_t &args) {
((EPDGUI_Textbox*)(args[0]))->SetText("");
}
Frame_WifiPassword::Frame_WifiPassword() : Frame_Base() {
_frame_name = "Frame_WifiPassword";
Frame_Settings_Wifi_Password::Frame_Settings_Wifi_Password() : Frame_Base() {
_frame_name = "Frame_Settings_Wifi_Password";
const uint16_t kKeyBaseY = 176;
inputbox = new EPDGUI_Textbox(4, 100, 532, 60);
key_textclear = new EPDGUI_Button("CLR", 4, kKeyBaseY, 260, 52);
@@ -27,13 +26,13 @@ Frame_WifiPassword::Frame_WifiPassword() : Frame_Base() {
_key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb);
}
Frame_WifiPassword::~Frame_WifiPassword() {
Frame_Settings_Wifi_Password::~Frame_Settings_Wifi_Password() {
delete inputbox;
delete keyboard;
delete key_textclear;
}
int Frame_WifiPassword::init(epdgui_args_vector_t &args) {
int Frame_Settings_Wifi_Password::init(epdgui_args_vector_t &args) {
_is_run = 1;
M5.EPD.Clear();
_canvas_title->pushCanvas(0, 8, UPDATE_MODE_NONE);
@@ -44,11 +43,11 @@ int Frame_WifiPassword::init(epdgui_args_vector_t &args) {
return 6;
}
int Frame_WifiPassword::run(void) {
int Frame_Settings_Wifi_Password::run(void) {
String data = keyboard->getData();
if(data.indexOf("\n") >= 0) {
if (data.indexOf("\n") >= 0) {
String *pswd = new String(inputbox->GetText());
EPDGUI_AddFrameArg("Frame_WifiScan", 0, pswd);
EPDGUI_AddFrameArg("Frame_Settings_Wifi", 0, pswd);
inputbox->SetText("");
EPDGUI_PopFrame();
_is_run = 0;

20
src/frame/frame_settings_wifi_password.h Normal file
View File

@@ -0,0 +1,20 @@
#ifndef _FRAME_SETTINGS_WIFI_PASSWORD_H_
#define _FRAME_SETTINGS_WIFI_PASSWORD_H_
#include "frame_base.h"
#include "../epdgui/epdgui.h"
class Frame_Settings_Wifi_Password : public Frame_Base {
public:
Frame_Settings_Wifi_Password();
~Frame_Settings_Wifi_Password();
int run();
int init(epdgui_args_vector_t &args);
private:
EPDGUI_Textbox *inputbox;
EPDGUI_Keyboard *keyboard;
EPDGUI_Button *key_textclear;
};
#endif //_FRAME_SETTINGS_WIFI_PASSWORD_H_

32
src/frame/frame_txtreader.cpp
View File

@@ -42,7 +42,7 @@ Frame_txtReader::Frame_txtReader(String path) {
}
Frame_txtReader::~Frame_txtReader(void) {
if(_text_size != 26) {
if (_text_size != 26) {
_canvas_prev->destoryRender(_text_size);
}
delete _canvas_prev;
@@ -68,20 +68,20 @@ uint32_t Frame_txtReader::renderText(uint32_t cursor, uint32_t length, M5EPD_Can
}
int Frame_txtReader::run() {
if(_is_first) {
if (_is_first) {
LoadingAnime_32x32_Start(254, 500);
_is_first = false;
uint32_t cursor;
_page_cursor.insert(std::pair<uint32_t, uint32_t>(0, 0));
cursor = renderText(0, _render_len, _canvas_current);
if(cursor == 0) {
if (cursor == 0) {
_page_end = 0;
_end_accessed = true;
} else {
_page_end = _page + 1;
_page_cursor.insert(std::pair<uint32_t, uint32_t>(1, cursor));
uint32_t offset = renderText(_page_cursor[1], _render_len, _canvas_next);
if(offset == 0) {
if (offset == 0) {
_page_end = 1;
_end_accessed = true;
} else {
@@ -92,44 +92,44 @@ int Frame_txtReader::run() {
_canvas_current->pushCanvas(0, 72, UPDATE_MODE_GC16);
} else {
M5.update();
if(M5.BtnR.wasReleased() || (_key_operation == 1)) {
if (M5.BtnR.wasReleased() || (_key_operation == 1)) {
_key_operation = 0;
if(_page != _page_end) {
if (_page != _page_end) {
_page++;
_canvas_next->pushCanvas(0, 72, UPDATE_MODE_GC16);
memcpy(_canvas_prev->frameBuffer(), _canvas_current->frameBuffer(), _canvas_current->getBufferSize());
memcpy(_canvas_current->frameBuffer(), _canvas_next->frameBuffer(), _canvas_next->getBufferSize());
if((_end_accessed == false) || (_page != _page_end)) {
if ((_end_accessed == false) || (_page != _page_end)) {
uint32_t offset = renderText(_page_cursor[_page + 1], _render_len, _canvas_next);
if(offset != 0) {
if(_page_cursor.count(_page + 2) == 0) {
if (offset != 0) {
if (_page_cursor.count(_page + 2) == 0) {
_page_cursor.insert(std::pair<uint32_t, uint32_t>(_page + 2, _page_cursor[_page + 1] + offset));
}
} else if(_end_accessed == false) {
} else if (_end_accessed == false) {
_page_end = _page + 1;
_end_accessed = true;
}
if(!_end_accessed) {
if (!_end_accessed) {
_page_end = _page + 1;
}
}
}
} else if(M5.BtnL.wasReleased() || (_key_operation == -1)) {
} else if (M5.BtnL.wasReleased() || (_key_operation == -1)) {
_key_operation = 0;
if(_page > 0) {
if (_page > 0) {
_page--;
_canvas_prev->pushCanvas(0, 72, UPDATE_MODE_GC16);
memcpy(_canvas_next->frameBuffer(), _canvas_current->frameBuffer(), _canvas_current->getBufferSize());
memcpy(_canvas_current->frameBuffer(), _canvas_prev->frameBuffer(), _canvas_prev->getBufferSize());
if(_page != 0) {
if (_page != 0) {
renderText(_page_cursor[_page - 1], _render_len, _canvas_prev);
}
}
}
}
if(_last_page != _page) {
if (_last_page != _page) {
_last_page = _page;
_canvas_page->setTextSize(26);
_canvas_page->fillCanvas(0);
@@ -150,7 +150,7 @@ int Frame_txtReader::init(epdgui_args_vector_t &args) {
_canvas_next->createCanvas(540, 888);
_canvas_page->createCanvas(100, 60);
_canvas_page->setTextDatum(CR_DATUM);
if(!_canvas_prev->isRenderExist(_text_size)) {
if (!_canvas_prev->isRenderExist(_text_size)) {
_canvas_prev->createRender(_text_size, 128);
}
EPDGUI_AddObject(_key_exit);

20
src/frame/frame_wifipassword.h
View File

@@ -1,20 +0,0 @@
#ifndef _FRAME_WIFIPASSWORD_H_
#define _FRAME_WIFIPASSWORD_H_
#include "frame_base.h"
#include "../epdgui/epdgui.h"
class Frame_WifiPassword : public Frame_Base {
public:
Frame_WifiPassword();
~Frame_WifiPassword();
int run();
int init(epdgui_args_vector_t &args);
private:
EPDGUI_Textbox *inputbox;
EPDGUI_Keyboard *keyboard;
EPDGUI_Button *key_textclear;
};
#endif //_FRAME_WIFIPASSWORD_H_

27
src/global_setting.cpp
View File

@@ -110,12 +110,12 @@ const char *GetWallpaperName(uint16_t wallpaper_id) {
esp_err_t LoadSetting(void) {
nvs_handle 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_u8(nvs_arg, "Timesync", &global_time_synced));
NVS_CHECK(nvs_open("settings", NVS_READONLY, &nvs_arg));
NVS_CHECK(nvs_get_u16(nvs_arg, "wallpaper", &global_wallpaper));
NVS_CHECK(nvs_get_u8(nvs_arg, "time_synced", &global_time_synced));
nvs_get_i8(nvs_arg, "timezone", &global_timezone);
if(global_wallpaper >= WALLPAPER_NUM) {
if (global_wallpaper >= WALLPAPER_NUM) {
global_wallpaper = DEFAULT_WALLPAPER;
}
@@ -126,16 +126,17 @@ esp_err_t LoadSetting(void) {
length = 128;
NVS_CHECK(nvs_get_str(nvs_arg, "pswd", buf, &length));
global_wifi_password = String(buf);
global_wifi_configed = true;
if (!global_wifi_ssid.isEmpty() && !global_wifi_password.isEmpty())
global_wifi_configed = true;
nvs_close(nvs_arg);
return ESP_OK;
}
esp_err_t SaveSetting(void) {
nvs_handle 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_u8(nvs_arg, "Timesync", global_time_synced));
NVS_CHECK(nvs_open("settings", NVS_READWRITE, &nvs_arg));
NVS_CHECK(nvs_set_u16(nvs_arg, "wallpaper", global_wallpaper));
NVS_CHECK(nvs_set_u8(nvs_arg, "time_synced", global_time_synced));
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, "pswd", global_wifi_password.c_str()));
@@ -209,19 +210,19 @@ void __LoadingAnime_32x32(void *pargs) {
loading.pushCanvas(x, y, UPDATE_MODE_GL16);
int anime_cnt = 0;
uint32_t time = 0;
while (1) {
if(millis() - time > 200) {
while (true) {
if (millis() - time > 200) {
time = millis();
loading.pushImage(0, 0, 32, 32, GetLoadingIMG_32x32(anime_cnt));
loading.pushCanvas(x, y, UPDATE_MODE_DU4);
anime_cnt++;
if(anime_cnt == 16) {
if (anime_cnt == 16) {
anime_cnt = 0;
}
}
xSemaphoreTake(_xSemaphore_LoadingAnime, portMAX_DELAY);
if(_loading_anime_eixt_flag == true) {
if (_loading_anime_eixt_flag == true) {
xSemaphoreGive(_xSemaphore_LoadingAnime);
break;
}
@@ -231,7 +232,7 @@ void __LoadingAnime_32x32(void *pargs) {
}
void LoadingAnime_32x32_Start(uint16_t x, uint16_t y) {
if(_xSemaphore_LoadingAnime == NULL) {
if (_xSemaphore_LoadingAnime == NULL) {
_xSemaphore_LoadingAnime = xSemaphoreCreateMutex();
}
_loading_anime_eixt_flag = false;

256
src/resources/ImageResource.h
View File

@@ -1,5 +1,5 @@
#ifndef IMAGERESOURCE_H
#define IMAGERESOURCE_H
#ifndef _IMAGERESOURCE_H
#define _IMAGERESOURCE_H
// ----- ImageResource Overview -----
// Name, Width x Height
@@ -3650,7 +3650,7 @@ const unsigned char ImageResource_logo_356x300[53400] = {
0x02, 0x33, 0x33, 0x32, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
0x22, 0x22, 0x33, 0x10, 0x00, 0x00, 0x00, 0x00, 0x01, 0x32, 0x22, 0x23, 0x21, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x32, 0x22, 0x23, 0x31, 0x00, 0x00,
};
};
const unsigned char ImageResource_backspace_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -3687,7 +3687,8 @@ const unsigned char ImageResource_backspace_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
};
const unsigned char ImageResource_factory_pass_h_100x40[2000] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -3823,7 +3824,8 @@ const unsigned char ImageResource_factory_pass_h_100x40[2000] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, };
0xFF, 0xFF, 0xFF, 0xFF, 0xFF
};
const unsigned char ImageResource_factory_pass_v_40x100[2000] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -3959,7 +3961,8 @@ const unsigned char ImageResource_factory_pass_v_40x100[2000] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, };
0xFF, 0xFF, 0xFF, 0xFF, 0xFF
};
const unsigned char ImageResource_factory_port_a_100x40[2000] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -4095,7 +4098,8 @@ const unsigned char ImageResource_factory_port_a_100x40[2000] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, };
0xFF, 0xFF, 0xFF, 0xFF, 0xFF
};
const unsigned char ImageResource_factory_port_b_40x100[2000] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -4231,7 +4235,8 @@ const unsigned char ImageResource_factory_port_b_40x100[2000] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xF0, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, };
0xFF, 0xFF, 0xFF, 0xFF, 0xFF
};
const unsigned char ImageResource_factory_port_c_40x100[2000] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -4367,7 +4372,8 @@ const unsigned char ImageResource_factory_port_c_40x100[2000] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xF0, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, };
0xFF, 0xFF, 0xFF, 0xFF, 0xFF
};
const unsigned char ImageResource_home_air_background_228x184[20976] = {
0x00, 0x00, 0x00, 0x5A, 0xDF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -5768,7 +5774,8 @@ const unsigned char ImageResource_home_air_background_228x184[20976] = {
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, 0x0F, 0xFF, };
0x00, 0x00, 0x00, 0x00, 0x0F, 0xFF
};
const unsigned char ImageResource_home_air_background_l_116x44[2552] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -5941,7 +5948,8 @@ const unsigned char ImageResource_home_air_background_l_116x44[2552] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, };
0xFF, 0xFF
};
const unsigned char ImageResource_home_air_background_r_112x44[2464] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -6108,7 +6116,8 @@ const unsigned char ImageResource_home_air_background_r_112x44[2464] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD,
0xA5, 0x00, 0x00, 0x00, };
0xA5, 0x00, 0x00, 0x00
};
const unsigned char ImageResource_home_button_background_228x228[25992] = {
0x00, 0x00, 0x00, 0x5A, 0xDF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -7843,7 +7852,8 @@ const unsigned char ImageResource_home_button_background_228x228[25992] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xA5, 0x00, 0x00, 0x00, };
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xA5, 0x00, 0x00, 0x00
};
const unsigned char ImageResource_home_icon_conditioner_off_92x92[4232] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8128,7 +8138,8 @@ const unsigned char ImageResource_home_icon_conditioner_off_92x92[4232] = {
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
};
const unsigned char ImageResource_home_icon_conditioner_on_92x92[4232] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8413,7 +8424,8 @@ const unsigned char ImageResource_home_icon_conditioner_on_92x92[4232] = {
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
};
const unsigned char ImageResource_home_icon_light_off_92x92[4232] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8698,7 +8710,8 @@ const unsigned char ImageResource_home_icon_light_off_92x92[4232] = {
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
};
const unsigned char ImageResource_home_icon_light_on_92x92[4232] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8983,7 +8996,8 @@ const unsigned char ImageResource_home_icon_light_on_92x92[4232] = {
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
};
const unsigned char ImageResource_home_icon_socket_off_92x92[4232] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -9268,7 +9282,8 @@ const unsigned char ImageResource_home_icon_socket_off_92x92[4232] = {
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
};
const unsigned char ImageResource_home_icon_socket_on_92x92[4232] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -9553,7 +9568,8 @@ const unsigned char ImageResource_home_icon_socket_on_92x92[4232] = {
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
};
const unsigned char ImageResource_item_icon_arrow_l_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -9590,7 +9606,8 @@ const unsigned char ImageResource_item_icon_arrow_l_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
};
const unsigned char ImageResource_item_icon_arrow_r_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -9627,7 +9644,8 @@ const unsigned char ImageResource_item_icon_arrow_r_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
};
const unsigned char ImageResource_item_icon_file_floder_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -9664,7 +9682,8 @@ const unsigned char ImageResource_item_icon_file_floder_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
};
const unsigned char ImageResource_item_icon_file_image_32x32[512] = {
0x00, 0x00, 0x07, 0xDF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x00, 0x00, 0x00, 0x00,
@@ -9701,7 +9720,8 @@ const unsigned char ImageResource_item_icon_file_image_32x32[512] = {
0x00, 0xDF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0x00, 0x00,
0x00, 0x00, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x00,
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_file_text_32x32[512] = {
0x00, 0x00, 0x07, 0xDF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x00, 0x00, 0x00, 0x00,
@@ -9738,7 +9758,8 @@ const unsigned char ImageResource_item_icon_file_text_32x32[512] = {
0x00, 0xDF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0x00, 0x00,
0x00, 0x00, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x00,
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_file_unknow_32x32[512] = {
0x00, 0x00, 0x07, 0xDF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x00, 0x00, 0x00, 0x00,
@@ -9775,7 +9796,8 @@ const unsigned char ImageResource_item_icon_file_unknow_32x32[512] = {
0x00, 0xDF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0x00, 0x00,
0x00, 0x00, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x00,
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_ntptime_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -9812,7 +9834,8 @@ 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
};
const unsigned char ImageResource_item_icon_refresh_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -9849,7 +9872,8 @@ const unsigned char ImageResource_item_icon_refresh_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x02, 0x6A, 0xCE, 0xFE, 0xDA, 0x72, 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
};
const unsigned char ImageResource_item_icon_restart_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -9886,7 +9910,8 @@ const unsigned char ImageResource_item_icon_restart_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x59, 0xCD, 0xFF, 0xC9, 0x60, 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
};
const unsigned char ImageResource_item_icon_shutdown_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -9923,7 +9948,8 @@ const unsigned char ImageResource_item_icon_shutdown_32x32[512] = {
0x00, 0x00, 0x00, 0x04, 0xAD, 0xEF, 0xFF, 0xFF, 0xFE, 0xDA, 0x40, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x8B, 0xDE, 0xED, 0xB7, 0x41, 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_success_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -9960,7 +9986,8 @@ const unsigned char ImageResource_item_icon_success_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
};
const unsigned char ImageResource_item_icon_wallpaper_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -9997,7 +10024,8 @@ const unsigned char ImageResource_item_icon_wallpaper_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
};
const unsigned char ImageResource_item_icon_wifi_1_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10034,7 +10062,8 @@ const unsigned char ImageResource_item_icon_wifi_1_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
};
const unsigned char ImageResource_item_icon_wifi_2_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10071,7 +10100,8 @@ const unsigned char ImageResource_item_icon_wifi_2_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
};
const unsigned char ImageResource_item_icon_wifi_3_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10108,7 +10138,8 @@ const unsigned char ImageResource_item_icon_wifi_3_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
};
const unsigned char ImageResource_item_loading_01_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10145,7 +10176,8 @@ const unsigned char ImageResource_item_loading_01_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
};
const unsigned char ImageResource_item_loading_02_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10182,7 +10214,8 @@ const unsigned char ImageResource_item_loading_02_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
};
const unsigned char ImageResource_item_loading_03_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10219,7 +10252,8 @@ const unsigned char ImageResource_item_loading_03_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
};
const unsigned char ImageResource_item_loading_04_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10256,7 +10290,8 @@ const unsigned char ImageResource_item_loading_04_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x43, 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_loading_05_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10293,7 +10328,8 @@ const unsigned char ImageResource_item_loading_05_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x43, 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_loading_06_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10330,7 +10366,8 @@ const unsigned char ImageResource_item_loading_06_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x43, 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_loading_07_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10367,7 +10404,8 @@ const unsigned char ImageResource_item_loading_07_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x43, 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_loading_08_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10404,7 +10442,8 @@ const unsigned char ImageResource_item_loading_08_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x43, 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_loading_09_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10441,7 +10480,8 @@ const unsigned char ImageResource_item_loading_09_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x43, 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_loading_10_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10478,7 +10518,8 @@ const unsigned char ImageResource_item_loading_10_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x43, 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_loading_11_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10515,7 +10556,8 @@ const unsigned char ImageResource_item_loading_11_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x43, 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_loading_12_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10552,7 +10594,8 @@ const unsigned char ImageResource_item_loading_12_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
};
const unsigned char ImageResource_item_loading_13_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10589,7 +10632,8 @@ const unsigned char ImageResource_item_loading_13_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
};
const unsigned char ImageResource_item_loading_14_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10626,7 +10670,8 @@ const unsigned char ImageResource_item_loading_14_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
};
const unsigned char ImageResource_item_loading_15_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10663,7 +10708,8 @@ const unsigned char ImageResource_item_loading_15_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
};
const unsigned char ImageResource_item_loading_16_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10700,7 +10746,8 @@ const unsigned char ImageResource_item_loading_16_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
};
const unsigned char ImageResource_lifegame_seeder_132x120[7920] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -11231,7 +11278,7 @@ const unsigned char ImageResource_lifegame_seeder_132x120[7920] = {
0x00, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 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_loading_01_96x96[4608] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -11541,7 +11588,8 @@ const unsigned char ImageResource_loading_01_96x96[4608] = {
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
};
const unsigned char ImageResource_loading_02_96x96[4608] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -11851,7 +11899,8 @@ const unsigned char ImageResource_loading_02_96x96[4608] = {
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
};
const unsigned char ImageResource_loading_03_96x96[4608] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -12161,7 +12210,8 @@ const unsigned char ImageResource_loading_03_96x96[4608] = {
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
};
const unsigned char ImageResource_loading_04_96x96[4608] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -12471,7 +12521,8 @@ const unsigned char ImageResource_loading_04_96x96[4608] = {
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
};
const unsigned char ImageResource_loading_05_96x96[4608] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -12781,7 +12832,8 @@ const unsigned char ImageResource_loading_05_96x96[4608] = {
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
};
const unsigned char ImageResource_loading_06_96x96[4608] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -13091,7 +13143,8 @@ const unsigned char ImageResource_loading_06_96x96[4608] = {
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
};
const unsigned char ImageResource_loading_07_96x96[4608] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -13401,7 +13454,8 @@ const unsigned char ImageResource_loading_07_96x96[4608] = {
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
};
const unsigned char ImageResource_loading_08_96x96[4608] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -13711,7 +13765,8 @@ const unsigned char ImageResource_loading_08_96x96[4608] = {
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
};
const unsigned char ImageResource_loading_09_96x96[4608] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -14021,7 +14076,8 @@ const unsigned char ImageResource_loading_09_96x96[4608] = {
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
};
const unsigned char ImageResource_loading_10_96x96[4608] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -14331,7 +14387,8 @@ const unsigned char ImageResource_loading_10_96x96[4608] = {
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
};
const unsigned char ImageResource_loading_11_96x96[4608] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -14641,7 +14698,8 @@ const unsigned char ImageResource_loading_11_96x96[4608] = {
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
};
const unsigned char ImageResource_loading_12_96x96[4608] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -14951,7 +15009,8 @@ const unsigned char ImageResource_loading_12_96x96[4608] = {
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
};
const unsigned char ImageResource_loading_13_96x96[4608] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -15261,7 +15320,8 @@ const unsigned char ImageResource_loading_13_96x96[4608] = {
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
};
const unsigned char ImageResource_loading_14_96x96[4608] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -15571,7 +15631,8 @@ const unsigned char ImageResource_loading_14_96x96[4608] = {
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
};
const unsigned char ImageResource_loading_15_96x96[4608] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -15881,7 +15942,8 @@ const unsigned char ImageResource_loading_15_96x96[4608] = {
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
};
const unsigned char ImageResource_loading_16_96x96[4608] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -16191,7 +16253,8 @@ const unsigned char ImageResource_loading_16_96x96[4608] = {
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
};
const unsigned char ImageResource_loading_error_96x96[4608] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -16501,7 +16564,8 @@ const unsigned char ImageResource_loading_error_96x96[4608] = {
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
};
const unsigned char ImageResource_loading_success_96x96[4608] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -16811,7 +16875,8 @@ const unsigned char ImageResource_loading_success_96x96[4608] = {
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
};
const unsigned char ImageResource_main_icon_compare_92x92[4232] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -17096,7 +17161,8 @@ const unsigned char ImageResource_main_icon_compare_92x92[4232] = {
0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, };
0xFF, 0xFF
};
const unsigned char ImageResource_main_icon_factorytest_92x92[4232] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -17381,7 +17447,8 @@ const unsigned char ImageResource_main_icon_factorytest_92x92[4232] = {
0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, };
0xFF, 0xFF
};
const unsigned char ImageResource_main_icon_home_92x92[4232] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -17666,7 +17733,8 @@ const unsigned char ImageResource_main_icon_home_92x92[4232] = {
0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, };
0xFF, 0xFF
};
const unsigned char ImageResource_main_icon_keyboard_92x92[4232] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -17951,7 +18019,8 @@ const unsigned char ImageResource_main_icon_keyboard_92x92[4232] = {
0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, };
0xFF, 0xFF
};
const unsigned char ImageResource_main_icon_lifegame_92x92[4232] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -18236,7 +18305,8 @@ const unsigned char ImageResource_main_icon_lifegame_92x92[4232] = {
0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, };
0xFF, 0xFF
};
const unsigned char ImageResource_main_icon_restart_92x92[4232] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -18521,7 +18591,8 @@ const unsigned char ImageResource_main_icon_restart_92x92[4232] = {
0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, };
0xFF, 0xFF
};
const unsigned char ImageResource_main_icon_sdcard_92x92[4232] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -18806,7 +18877,8 @@ const unsigned char ImageResource_main_icon_sdcard_92x92[4232] = {
0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, };
0xFF, 0xFF
};
const unsigned char ImageResource_main_icon_setting_92x92[4232] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -19091,7 +19163,8 @@ const unsigned char ImageResource_main_icon_setting_92x92[4232] = {
0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, };
0xFF, 0xFF
};
const unsigned char ImageResource_main_icon_shutdown_92x92[4232] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -19376,7 +19449,8 @@ const unsigned char ImageResource_main_icon_shutdown_92x92[4232] = {
0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, };
0xFF, 0xFF
};
const unsigned char ImageResource_main_icon_todo_92x92[4232] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -19661,7 +19735,8 @@ const unsigned char ImageResource_main_icon_todo_92x92[4232] = {
0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, };
0xFF, 0xFF
};
const unsigned char ImageResource_main_icon_wifi_92x92[4232] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -19946,7 +20021,8 @@ const unsigned char ImageResource_main_icon_wifi_92x92[4232] = {
0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, };
0xFF, 0xFF
};
const unsigned char ImageResource_status_bar_battery_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -19983,7 +20059,8 @@ const unsigned char ImageResource_status_bar_battery_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
};
const unsigned char ImageResource_status_bar_battery_charging_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -20020,7 +20097,8 @@ const unsigned char ImageResource_status_bar_battery_charging_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
};
const unsigned char ImageResource_upper_32x32[512] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -20057,7 +20135,8 @@ const unsigned char ImageResource_upper_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
};
const unsigned char ImageResource_wallpaper_engine_540x960[259200] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -37340,7 +37419,7 @@ const unsigned char ImageResource_wallpaper_engine_540x960[259200] = {
0x00, 0x00, 0x00, 0x35, 0x88, 0x87, 0x10, 0x10, 0x00, 0x00, 0x3F, 0x04, 0xE0, 0x00, 0x88,
0x06, 0xE0, 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, 0xCF, 0x66,
};
};
const unsigned char ImageResource_wallpaper_m5stack_540x960[259200] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -54623,7 +54702,7 @@ const unsigned char ImageResource_wallpaper_m5stack_540x960[259200] = {
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,
};
};
const unsigned char ImageResource_wallpaper_penrose_triangle_540x960[259200] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -71906,9 +71985,6 @@ const unsigned char ImageResource_wallpaper_penrose_triangle_540x960[259200] = {
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,
};
#endif
};
#endif // _IMAGERESOURCE_H

2
src/resources/binaryttf.h
View File

@@ -75711,4 +75711,4 @@ const unsigned char binaryttf[757076] = {
0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B,
0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x1D, };
#endif
#endif // _BINARYTTF_H_

100
src/systeminit.cpp
View File

@@ -10,9 +10,9 @@ QueueHandle_t xQueue_Info = xQueueCreate(20, sizeof(uint32_t));
void WaitForUser(void) {
SysInit_UpdateInfo("$ERR");
while(1) {
while (true) {
M5.update();
if(M5.BtnP.wasReleased()) {
if (M5.BtnP.wasReleased()) {
SysInit_UpdateInfo("$RESUME");
return;
}
@@ -46,22 +46,18 @@ void SysInit_Start(void) {
disableCore0WDT();
xTaskCreatePinnedToCore(SysInit_Loading, "SysInit_Loading", 4096, NULL, 1, NULL, 0);
// SysInit_UpdateInfo("Initializing SD card...");
bool is_factory_test;
SysInit_UpdateInfo("Initializing SD card...");
SPI.begin(14, 13, 12, 4);
ret = SD.begin(4, SPI, 20000000);
if(ret == false) {
is_factory_test = true;
if (ret == false) {
SetInitStatus(0, 0);
// log_e("Failed to initialize SD card.");
log_e("Failed to initialize SD card.");
// SysInit_UpdateInfo("[ERROR] Failed to initialize SD card.");
// WaitForUser();
} else {
is_factory_test = SD.exists("/__factory_test_flag__");
}
SysInit_UpdateInfo("Initializing Touch pad...");
if(M5.TP.begin(21, 22, 36) != ESP_OK) {
if (M5.TP.begin(21, 22, 36) != ESP_OK) {
SetInitStatus(1, 0);
log_e("Touch pad initialization failed.");
SysInit_UpdateInfo("[ERROR] Failed to initialize Touch pad.");
@@ -72,73 +68,48 @@ void SysInit_Start(void) {
LoadSetting();
M5EPD_Canvas _initcanvas(&M5.EPD);
if((!is_factory_test) && SD.exists("/font.ttf")) {
if (SD.exists("/font.ttf")) {
_initcanvas.loadFont("/font.ttf", SD);
SetTTFLoaded(true);
} else {
} else {
_initcanvas.loadFont(binaryttf, sizeof(binaryttf));
SetTTFLoaded(false);
is_factory_test = true;
}
if(is_factory_test) {
SysInit_UpdateInfo("$OK");
} else {
SysInit_UpdateInfo("Initializing system...");
}
SysInit_UpdateInfo("Initializing system...");
_initcanvas.createRender(26, 128);
Frame_Main *frame_main = new Frame_Main();
EPDGUI_PushFrame(frame_main);
Frame_FactoryTest *frame_factorytest = new Frame_FactoryTest();
EPDGUI_AddFrame("Frame_FactoryTest", frame_factorytest);
if(!is_factory_test) {
Frame_Settings *frame_setting = new Frame_Settings();
EPDGUI_AddFrame("Frame_Settings", frame_setting);
Frame_Settings_Wallpaper *frame_wallpaper = new Frame_Settings_Wallpaper();
EPDGUI_AddFrame("Frame_Settings_Wallpaper", frame_wallpaper);
Frame_Keyboard *frame_keyboard = new Frame_Keyboard();
EPDGUI_AddFrame("Frame_Keyboard", frame_keyboard);
Frame_WifiScan *frame_wifiscan = new Frame_WifiScan();
EPDGUI_AddFrame("Frame_WifiScan", frame_wifiscan);
Frame_WifiPassword *frame_wifipassword = new Frame_WifiPassword();
EPDGUI_AddFrame("Frame_WifiPassword", frame_wifipassword);
Frame_Lifegame *frame_lifegame = new Frame_Lifegame();
EPDGUI_AddFrame("Frame_Lifegame", frame_lifegame);
Frame_Compare *frame_compare = new Frame_Compare();
EPDGUI_AddFrame("Frame_Compare", frame_compare);
Frame_Home *frame_home = new Frame_Home();
EPDGUI_AddFrame("Frame_Home", frame_home);
if(isWiFiConfiged()) {
SysInit_UpdateInfo("Connect to " + GetWifiSSID() + "...");
WiFi.begin(GetWifiSSID().c_str(), GetWifiPassword().c_str());
uint32_t t = millis();
while (1) {
if(millis() - t > 8000) {
break;
}
Frame_Settings_Wifi *frame_settings_wifi = new Frame_Settings_Wifi();
if(WiFi.status() == WL_CONNECTED) {
frame_wifiscan->SetConnected(GetWifiSSID(), WiFi.RSSI());
break;
}
if (isWiFiConfiged()) {
SysInit_UpdateInfo("Connect to " + GetWifiSSID() + "...");
WiFi.begin(GetWifiSSID().c_str(), GetWifiPassword().c_str());
uint32_t t = millis();
while (true) {
if (millis() - t > 8000) {
break;
}
if (WiFi.status() == WL_CONNECTED) {
frame_settings_wifi->SetConnected(GetWifiSSID(), WiFi.RSSI());
break;
}
}
}
log_d("done");
while(uxQueueMessagesWaiting(xQueue_Info));
while (uxQueueMessagesWaiting(xQueue_Info));
if(!is_factory_test) {
SysInit_UpdateInfo("$OK");
}
SysInit_UpdateInfo("$OK");
Serial.println("OK");
delay(500);
delay(1000);
}
void SysInit_Loading(void *pvParameters) {
@@ -159,7 +130,8 @@ void SysInit_Loading(void *pvParameters) {
ImageResource_loading_13_96x96,
ImageResource_loading_14_96x96,
ImageResource_loading_15_96x96,
ImageResource_loading_16_96x96};
ImageResource_loading_16_96x96
};
M5EPD_Canvas LoadingIMG(&M5.EPD);
M5EPD_Canvas Info(&M5.EPD);
@@ -176,8 +148,8 @@ void SysInit_Loading(void *pvParameters) {
int i = 0;
char *p;
uint32_t time = 0;
while (1) {
if(millis() - time > 250) {
while (true) {
if (millis() - time > 250) {
time = millis();
LoadingIMG.pushImage(0, 0, 96, 96, kLD[i]);
LoadingIMG.pushCanvas(220, kPosy + 80, UPDATE_MODE_DU4);
@@ -187,22 +159,22 @@ void SysInit_Loading(void *pvParameters) {
}
}
if(xQueueReceive(xQueue_Info, &p, 0)) {
if (xQueueReceive(xQueue_Info, &p, 0)) {
String str(p);
free(p);
if(str.indexOf("$OK") >= 0) {
if (str.indexOf("$OK") >= 0) {
LoadingIMG.pushImage(0, 0, 96, 96, ImageResource_loading_success_96x96);
LoadingIMG.pushCanvas(220, kPosy + 80, UPDATE_MODE_GL16);
break;
} else if(str.indexOf("$ERR") >= 0) {
} else if (str.indexOf("$ERR") >= 0) {
LoadingIMG.pushImage(0, 0, 96, 96, ImageResource_loading_error_96x96);
LoadingIMG.pushCanvas(220, kPosy + 80, UPDATE_MODE_GL16);
LoadingIMG.fillCanvas(0);
while(1) {
if(xQueueReceive(xQueue_Info, &p, 0)) {
while (true) {
if (xQueueReceive(xQueue_Info, &p, 0)) {
String str(p);
free(p);
if(str.indexOf("$RESUME") >= 0) {
if (str.indexOf("$RESUME") >= 0) {
LoadingIMG.pushCanvas(220, kPosy + 80, UPDATE_MODE_GC16);
break;
}
@@ -222,7 +194,7 @@ void SysInit_UpdateInfo(String info) {
char *p = (char*)malloc(info.length() + 1);
memcpy(p, info.c_str(), info.length());
p[info.length()] = '\0';
if(xQueueSend(xQueue_Info, &p, 0) == 0) {
if (xQueueSend(xQueue_Info, &p, 0) == 0) {
free(p);
}
}