Skip to content

Commit

Permalink
Merge pull request #169 from tobozo/1.1.9
Browse files Browse the repository at this point in the history
1.1.9
  • Loading branch information
tobozo authored Feb 3, 2022
2 parents e159479 + 35d91e8 commit a576acc
Show file tree
Hide file tree
Showing 63 changed files with 6,370 additions and 49 deletions.
40 changes: 24 additions & 16 deletions .github/workflows/LibraryBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,24 +49,28 @@ jobs:
required-libraries: "LovyanGFX"
- matrix-context: M5Stack-SD-Menu
arduino-boards-fqbn: esp32:esp32:m5stack-core-esp32
sketch-names: M5Stack-SD-Menu.ino
bin-name: M5stack-Launcher.bin
required-libraries: "ESP32-Chimera-Core,LovyanGFX,ArduinoJson"
sketch-names: M5Stack-SD-Menu.ino,AppStore.ino
launcher-name: M5stack-Launcher.bin
appstore-name: M5stack-AppStore.bin
required-libraries: "ESP32-Chimera-Core,LovyanGFX,ArduinoJson,ESP32-targz"
- matrix-context: M5Core2-SD-Menu
arduino-boards-fqbn: esp32:esp32:m5stack-core2
sketch-names: M5Stack-SD-Menu.ino
bin-name: M5Core2-Launcher.bin
required-libraries: "ESP32-Chimera-Core,LovyanGFX,ArduinoJson"
sketch-names: M5Stack-SD-Menu.ino,AppStore.ino
launcher-name: M5Core2-Launcher.bin
appstore-name: M5Core2-AppStore.bin
required-libraries: "ESP32-Chimera-Core,LovyanGFX,ArduinoJson,ESP32-targz"
- matrix-context: M5Fire-SD-Menu
arduino-boards-fqbn: esp32:esp32:m5stack-fire
sketch-names: M5Stack-SD-Menu.ino
bin-name: M5Fire-Launcher.bin
required-libraries: "ESP32-Chimera-Core,LovyanGFX,ArduinoJson"
sketch-names: M5Stack-SD-Menu.ino,AppStore.ino
launcher-name: M5Fire-Launcher.bin
appstore-name: M5Fire-AppStore.bin
required-libraries: "ESP32-Chimera-Core,LovyanGFX,ArduinoJson,ESP32-targz"
- matrix-context: OdroidGo-SD-Menu
arduino-boards-fqbn: esp32:esp32:odroid_esp32
sketch-names: M5Stack-SD-Menu.ino
bin-name: OdroidGo-Launcher.bin
required-libraries: "ESP32-Chimera-Core,LovyanGFX,ArduinoJson"
sketch-names: M5Stack-SD-Menu.ino,AppStore.ino
launcher-name: OdroidGo-Launcher.bin
appstore-name: OdroidGo-AppStore.bin
required-libraries: "ESP32-Chimera-Core,LovyanGFX,ArduinoJson,ESP32-targz"
#- matrix-context: TTGO-LoRa32-V2-SDLoader-Snippet
#arduino-boards-fqbn: esp32:esp32:ttgo-lora32-v2
#sketch-names: TTGO-SDLoader-Snippet.ino
Expand All @@ -87,20 +91,24 @@ jobs:
arduino-board-fqbn: ${{ matrix.arduino-boards-fqbn }}
required-libraries: ${{ matrix.required-libraries }}
extra-arduino-lib-install-args: --no-deps
# extra-arduino-cli-args:
sketch-names: ${{ matrix.sketch-names }}
set-build-path: true
#build-properties: ${{ toJson(matrix.build-properties) }}
#debug-install: true
- name: Copy compiled binary
if: startsWith(matrix.sketch-names, 'M5Stack-SD-Menu')
run: |
cp examples/M5Stack-SD-Menu/build/M5Stack-SD-Menu.ino.bin examples/M5Stack-SD-Menu/build/${{ matrix.bin-name }}
- name: Upload artifact ${{ matrix.bin-name }}
cp examples/M5Stack-SD-Menu/build/M5Stack-SD-Menu.ino.bin examples/M5Stack-SD-Menu/build/${{ matrix.launcher-name }}
cp examples/AppStore/build/AppStore.ino.bin examples/M5Stack-SD-Menu/build/${{ matrix.appstore-name }}
- name: Upload artifact ${{ matrix.matrix-context }}
uses: actions/upload-artifact@v2
if: startsWith(matrix.sketch-names, 'M5Stack-SD-Menu')
with:
name: ${{ matrix.bin-name }}
path: examples/M5Stack-SD-Menu/build/${{ matrix.bin-name }}
name: ${{ matrix.matrix-context }}
path: |
examples/M5Stack-SD-Menu/build/${{ matrix.launcher-name }}
examples/M5Stack-SD-Menu/build/${{ matrix.appstore-name }}
post_build:
name: Gather Artefacts
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
[![Build Status](https://travis-ci.com/tobozo/M5Stack-SD-Updater.svg?branch=master)](https://travis-ci.com/github/tobozo/M5Stack-SD-Updater)
[![Gitter](https://badges.gitter.im/M5Stack-SD-Updater/community.svg)](https://gitter.im/M5Stack-SD-Updater/community)
[![arduino-library-badge](https://www.ardu-badge.com/badge/M5Stack-SD-Updater.svg?)](https://www.ardu-badge.com/M5Stack-SD-Updater)
[![PlatformIO Registry](https://badges.registry.platformio.org/packages/tobozo/library/M5Stack-SD-Updater.svg)](https://registry.platformio.org/packages/libraries/tobozo/M5Stack-SD-Updater)


# M5Stack-SD-Updater

Expand Down
2 changes: 2 additions & 0 deletions examples/AppStore/AppStore.ino
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

#include "main/main.cpp"
11 changes: 11 additions & 0 deletions examples/AppStore/img/.directory
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[Dolphin]
HeaderColumnWidths=493,72,118,134
SortOrder=1
SortRole=modificationtime
Timestamp=2021,11,26,16,18,14
Version=4
ViewMode=2
VisibleRoles=Details_text,Details_size,Details_modificationtime,Details_type,CustomizedDetails

[Settings]
HiddenFilesShown=true
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/AppStore/img/appstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/AppStore/img/capture.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions examples/AppStore/main/main.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@

#include "../modules/AppStoreMain/AppStoreMain.cpp"


void setup()
{
AppStore::setup();
}


void loop()
{
AppStore::loop();
}

#if !defined ARDUINO
extern "C" {
void loopTask(void*)
{
setup();
for(;;) {
loop();
}
}
void app_main()
{
xTaskCreatePinnedToCore( loopTask, "loopTask", 8192, NULL, 1, NULL, 1 );
}
}
#endif
10 changes: 10 additions & 0 deletions examples/AppStore/modules/.directory
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[Dolphin]
HeaderColumnWidths=493,72,118,134
PreviewsShown=false
Timestamp=2021,11,23,16,26,29
Version=4
ViewMode=1
VisibleRoles=Details_text,Details_size,Details_modificationtime,Details_type,CustomizedDetails

[Settings]
HiddenFilesShown=true
Loading

0 comments on commit a576acc

Please sign in to comment.