3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-08-06 09:58:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

0.8.122

Browse source 
* fix github action
This commit is contained in:
lumapu 2024-05-24 00:01:52 +02:00
parent 73ca5aae9f
commit d8a1528c99
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.github/workflows/compile_development.yml vendored
View file

@ -70,6 +70,11 @@ jobs:
- name: Run PlatformIO - name: Run PlatformIO
run: pio run -d src -e ${{ matrix.variant }} run: pio run -d src -e ${{ matrix.variant }}
- name: Compress .elf
uses: edgarrc/action-7z@v1
with:
args: 7z a -t7z -mx=9 src/.pio/build/${{ matrix.variant }}/firmware.elf.7z src/.pio/build/${{ matrix.variant }}/firmware.elf
- name: Rename Firmware - name: Rename Firmware
run: python scripts/getVersion.py ${{ matrix.variant }} >> $GITHUB_OUTPUT run: python scripts/getVersion.py ${{ matrix.variant }} >> $GITHUB_OUTPUT
@ -135,7 +140,7 @@ jobs:
- name: Compress .elf - name: Compress .elf
uses: edgarrc/action-7z@v1 uses: edgarrc/action-7z@v1
with: with:
args: 7z a -t7z -mx=9 src/.pio/build/${{ matrix.variant }}firmware.elf.7z src/.pio/build/${{ matrix.variant }}firmware.elf args: 7z a -t7z -mx=9 src/.pio/build/${{ matrix.variant }}/firmware.elf.7z src/.pio/build/${{ matrix.variant }}/firmware.elf
- name: Rename Firmware - name: Rename Firmware
run: python scripts/getVersion.py ${{ matrix.variant }} >> $GITHUB_OUTPUT run: python scripts/getVersion.py ${{ matrix.variant }} >> $GITHUB_OUTPUT

2
src/CHANGES.md
View file

@ -1,7 +1,7 @@
# Development Changes # Development Changes
## 0.8.122 - 2024-05-23 ## 0.8.122 - 2024-05-23
* add button for donwloading coredump * add button for donwloading coredump (ESP32 variants only)
## 0.8.121 - 2024-05-20 ## 0.8.121 - 2024-05-20
* fix ESP32 factory image generation * fix ESP32 factory image generation

9
src/web/RestApi.h
View file

@ -55,7 +55,9 @@ class RestApi {
mSrv->on("/api", HTTP_GET, std::bind(&RestApi::onApi, this, std::placeholders::_1)); mSrv->on("/api", HTTP_GET, std::bind(&RestApi::onApi, this, std::placeholders::_1));
mSrv->on("/get_setup", HTTP_GET, std::bind(&RestApi::onDwnldSetup, this, std::placeholders::_1)); mSrv->on("/get_setup", HTTP_GET, std::bind(&RestApi::onDwnldSetup, this, std::placeholders::_1));
#if defined(ESP32)
mSrv->on("/coredump", HTTP_GET, std::bind(&RestApi::getCoreDump, this, std::placeholders::_1)); mSrv->on("/coredump", HTTP_GET, std::bind(&RestApi::getCoreDump, this, std::placeholders::_1));
#endif
} }
uint32_t getTimezoneOffset(void) { uint32_t getTimezoneOffset(void) {
@ -349,6 +351,7 @@ class RestApi {
fp.close(); fp.close();
} }
#if defined(ESP32)
void getCoreDump(AsyncWebServerRequest *request) { void getCoreDump(AsyncWebServerRequest *request) {
const esp_partition_t *partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_COREDUMP, "coredump"); const esp_partition_t *partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_COREDUMP, "coredump");
if (partition != NULL) { if (partition != NULL) {
@ -375,6 +378,7 @@ class RestApi {
request->send(response); request->send(response);
} }
} }
#endif
void getGeneric(AsyncWebServerRequest *request, JsonObject obj) { void getGeneric(AsyncWebServerRequest *request, JsonObject obj) {
mApp->resetLockTimeout(); mApp->resetLockTimeout();
@ -463,8 +467,13 @@ class RestApi {
void getHtmlSystem(AsyncWebServerRequest *request, JsonObject obj) { void getHtmlSystem(AsyncWebServerRequest *request, JsonObject obj) {
getSysInfo(request, obj.createNestedObject(F("system"))); getSysInfo(request, obj.createNestedObject(F("system")));
getGeneric(request, obj.createNestedObject(F("generic"))); getGeneric(request, obj.createNestedObject(F("generic")));
#if defined(ESP32)
char tmp[300]; char tmp[300];
snprintf(tmp, 300, "<a href=\"/factory\" class=\"btn\">%s</a><br/><br/><a href=\"/reboot\" class=\"btn\">%s</a><br/><br/><a href=\"/coredump\" class=\"btn\">%s</a>", FACTORY_RESET, BTN_REBOOT, BTN_COREDUMP); snprintf(tmp, 300, "<a href=\"/factory\" class=\"btn\">%s</a><br/><br/><a href=\"/reboot\" class=\"btn\">%s</a><br/><br/><a href=\"/coredump\" class=\"btn\">%s</a>", FACTORY_RESET, BTN_REBOOT, BTN_COREDUMP);
#else
char tmp[200];
snprintf(tmp, 200, "<a href=\"/factory\" class=\"btn\">%s</a><br/><br/><a href=\"/reboot\" class=\"btn\">%s</a>", FACTORY_RESET, BTN_REBOOT);
#endif
obj[F("html")] = String(tmp); obj[F("html")] = String(tmp);
} }