Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update upstream #3

Open
wants to merge 31 commits into
base: main
Choose a base branch
from
Open
Changes from 3 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
739b1e1
Support TXT when filesystem reports uppercase
eggfly Sep 20, 2021
c0a9780
Auto shutdown for power saving
eggfly Sep 19, 2021
4a403f2
Merge pull request #6 from eggfly/main
Gitshaoxiang Sep 23, 2021
588d8f2
update sleep logo and change page refresh mode
Gitshaoxiang Nov 12, 2021
860c8f0
Update platformio.ini to resolve upload failure
TRex22 Mar 31, 2022
485d7fc
Compatible with CH9102 chip
Tinyu-Zhao Jul 19, 2022
c6cdcb5
Fixed problem of compile error in new environment
Tinyu-Zhao Jul 19, 2022
4537be0
fix bug where 5th file item and later on a folder are not displayed o…
cat-in-136 Oct 23, 2022
a059c2d
Update frame_fileindex.cpp
Tinyu-Zhao Oct 24, 2022
f3eb8fa
Fix bug where 5th file item and later on a folder are not displayed o…
Tinyu-Zhao Oct 24, 2022
85ce8c4
Create M5Paper_FactoryTest.ino
tobozo Nov 21, 2022
64db8c6
Merge pull request #13 from tobozo/main
Nov 23, 2022
3f75bd5
Update: Update platformio.ini for limit some pacs
Nov 23, 2022
e8cd6f4
Merge pull request #14 from IcingTomato/main
Nov 23, 2022
8fbfa02
Use latest working platform package version
SomeoneToIgnore Nov 24, 2022
e375ac6
Use latest working platform package version
Tinyu-Zhao Nov 26, 2022
67e2346
Update platformio.ini
Dec 12, 2022
7d22adb
Merge pull request #17 from IcingTomato/main
Dec 12, 2022
b9b8d55
Update: Update framework in platformio.ini
Dec 12, 2022
5247147
Update platformio.ini
Dec 30, 2022
7ad43f1
Merge pull request #19 from IcingTomato/main
Dec 30, 2022
54e002e
fixed the spelling error in M5.TP.available(), otherwise the error wo…
HonestQiao Oct 2, 2023
6d44c01
When the language is set to zh, ntp.aliyun.com is used as the ntp ser…
HonestQiao Oct 2, 2023
6aa7ad3
M Fix typo
icyqwq Oct 25, 2023
d031740
Fix spi confliction issue at startup.
icyqwq Oct 26, 2023
ba03364
Merge branch 'm5stack:main' into main
HonestQiao Oct 26, 2023
a8d1808
Fix not being able to select the first item in the list without a crash.
hexmaster111 Jun 9, 2024
8699920
Error fixes and ntp synchronization time optimization
Tinyu-Zhao Jun 11, 2024
aadeebe
Fix not being able to select the first item in the Wifi list without …
Tinyu-Zhao Jun 18, 2024
7e1650f
Fix system crash when connecting to NTP
Tinyu-Zhao Jun 20, 2024
277b398
Merge branch 'main' of github.com:m5stack/M5Paper_FactoryTest
Tinyu-Zhao Jun 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/epdgui/epdgui.cpp
Original file line number Diff line number Diff line change
@@ -134,12 +134,14 @@ void EPDGUI_MainLoop(void) {
frame->init(frame_map[frame->GetFrameName()].args);
EPDGUI_Run(frame);
}
vTaskDelay(1);
}

void EPDGUI_AddFrame(String name, Frame_Base* frame) {
frame_struct_t f;
f.frame = frame;
frame_map.insert(std::pair<String, frame_struct_t>(name, f));
vTaskDelay(1);
}

void EPDGUI_AddFrameArg(String name, int n, void* arg) {
5 changes: 4 additions & 1 deletion src/global_setting.cpp
Original file line number Diff line number Diff line change
@@ -129,7 +129,10 @@ esp_err_t LoadSetting(void) {
char buf[128];
NVS_CHECK(nvs_get_str(nvs_arg, "ssid", buf, &length));
global_wifi_ssid = String(buf);
length = 128;
if (global_wifi_ssid.length() < 1) {
return ESP_FAIL;
}
length = 128;
NVS_CHECK(nvs_get_str(nvs_arg, "pswd", buf, &length));
global_wifi_password = String(buf);
global_wifi_configed = true;
22 changes: 15 additions & 7 deletions src/systeminit.cpp
Original file line number Diff line number Diff line change
@@ -82,13 +82,12 @@ void SysInit_Start(void) {
}
}

disableCore0WDT();
xTaskCreatePinnedToCore(SysInit_Loading, "SysInit_Loading", 4096, NULL, 1,
NULL, 0);
xTaskCreatePinnedToCore(SysInit_Loading, "SysInit_Loading", 4096, NULL, 5, NULL, 1);
vTaskDelay(50);
vTaskPrioritySet(NULL, 10);
// SysInit_UpdateInfo("Initializing SD card...");
bool is_factory_test;
SPI.begin(14, 13, 12, 4);
ret = SD.begin(4, SPI, 20000000);
ret = SD.begin(4, *M5.EPD.GetSPI(), 20000000);
if (ret == false) {
is_factory_test = true;
SetInitStatus(0, 0);
@@ -106,6 +105,7 @@ void SysInit_Start(void) {
SysInit_UpdateInfo("[ERROR] Failed to initialize Touch pad.");
WaitForUser();
}
taskYIELD();

M5.BatteryADCBegin();
LoadSetting();
@@ -119,12 +119,14 @@ void SysInit_Start(void) {
SetLanguage(LANGUAGE_EN);
is_factory_test = true;
}
taskYIELD();

if (is_factory_test) {
SysInit_UpdateInfo("$OK");
} else {
SysInit_UpdateInfo("Initializing system...");
}
taskYIELD();

_initcanvas.createRender(26, 128);

@@ -166,14 +168,17 @@ void SysInit_Start(void) {
frame_wifiscan->SetConnected(GetWifiSSID(), WiFi.RSSI());
break;
}

vTaskDelay(500);
}
}
}

log_d("done");

while (uxQueueMessagesWaiting(xQueue_Info))
;
while (uxQueueMessagesWaiting(xQueue_Info)) {
vTaskDelay(100);
}

if (!is_factory_test) {
SysInit_UpdateInfo("$OK");
@@ -212,6 +217,7 @@ void SysInit_Loading(void *pvParameters) {
char *p;
uint32_t time = 0;
while (1) {
vTaskPrioritySet(NULL, 15);
if (millis() - time > 250) {
time = millis();
LoadingIMG.pushImage(0, 0, 96, 96, kLD[i]);
@@ -252,6 +258,8 @@ void SysInit_Loading(void *pvParameters) {
Info.pushCanvas(0, kPosy, UPDATE_MODE_DU);
}
}
vTaskPrioritySet(NULL, 5);
vTaskDelay(10);
}
vTaskDelete(NULL);
}