mirror of https://github.com/sqfmi/Watchy.git
Compare commits
6 Commits
bb0c781883
...
aa8ea04003
Author | SHA1 | Date |
---|---|---|
bushmango | aa8ea04003 | |
SQFMI | 71457b5f32 | |
SQFMI | cee857bac2 | |
SQFMI | c1c9ddc6a3 | |
SQFMI | d1c6d90598 | |
Unknown | 2aebb46823 |
|
@ -14,7 +14,7 @@ jobs:
|
||||||
- uses: actions/checkout@master
|
- uses: actions/checkout@master
|
||||||
- uses: ArminJo/arduino-test-compile@v3
|
- uses: ArminJo/arduino-test-compile@v3
|
||||||
with:
|
with:
|
||||||
arduino-board-fqbn: esp32:esp32:watchy:Revision=${{ matrix.board-revisions }},PartitionScheme=min_spiffs,UploadSpeed=921600,DebugLevel=none,EraseFlash=none
|
arduino-board-fqbn: esp32:esp32:watchy:Revision=${{ matrix.board-revisions }},PartitionScheme=huge_app,UploadSpeed=921600,DebugLevel=none,EraseFlash=none
|
||||||
platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
|
platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
|
||||||
arduino-platform: esp32:esp32@2.0.17
|
arduino-platform: esp32:esp32@2.0.17
|
||||||
required-libraries: Adafruit GFX Library,Arduino_JSON,DS3232RTC,NTPClient,Rtc_Pcf8563,GxEPD2,WiFiManager
|
required-libraries: Adafruit GFX Library,Arduino_JSON,DS3232RTC,NTPClient,Rtc_Pcf8563,GxEPD2,WiFiManager
|
||||||
|
|
|
@ -0,0 +1,39 @@
|
||||||
|
name: ReleaseV3
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- "v[0-9]+.[0-9]+.[0-9]+"
|
||||||
|
jobs:
|
||||||
|
release:
|
||||||
|
name: Build and Release
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
board-revisions: [v30]
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@master
|
||||||
|
- uses: ArminJo/arduino-test-compile@v3
|
||||||
|
with:
|
||||||
|
arduino-board-fqbn: esp32:esp32:esp32s3:FlashSize=8M,PartitionScheme=default_8MB,UploadSpeed=921600,DebugLevel=none,EraseFlash=none
|
||||||
|
platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
|
||||||
|
arduino-platform: esp32:esp32@2.0.17
|
||||||
|
required-libraries: Adafruit GFX Library,Arduino_JSON,DS3232RTC,NTPClient,Rtc_Pcf8563,GxEPD2,WiFiManager
|
||||||
|
set-build-path: true
|
||||||
|
- name: Rename binaries with board revision
|
||||||
|
run: |
|
||||||
|
parent_dir="${{ github.workspace }}/examples/WatchFaces"
|
||||||
|
for dir in "$parent_dir"/*; do
|
||||||
|
if [ -d "$dir" ]; then
|
||||||
|
cd "$dir/build"
|
||||||
|
for file in *; do
|
||||||
|
name="${file%%.*}"
|
||||||
|
ext="${file#$name.}"
|
||||||
|
mv "$file" "$name-${{ matrix.board-revisions }}.$ext"
|
||||||
|
done
|
||||||
|
cd -
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
- uses: softprops/action-gh-release@v1
|
||||||
|
with:
|
||||||
|
name: "Watchy Arduino Library ${{ github.ref_name }}"
|
||||||
|
files: ${{ github.workspace }}/examples/WatchFaces/**/build/*.bin
|
|
@ -180,6 +180,7 @@ void Watchy::handleButtonPress() {
|
||||||
} else if (guiState == FW_UPDATE_STATE) {
|
} else if (guiState == FW_UPDATE_STATE) {
|
||||||
showMenu(menuIndex, false); // exit to menu if already in app
|
showMenu(menuIndex, false); // exit to menu if already in app
|
||||||
} else if (guiState == WATCHFACE_STATE) {
|
} else if (guiState == WATCHFACE_STATE) {
|
||||||
|
button1();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -192,6 +193,7 @@ void Watchy::handleButtonPress() {
|
||||||
}
|
}
|
||||||
showMenu(menuIndex, true);
|
showMenu(menuIndex, true);
|
||||||
} else if (guiState == WATCHFACE_STATE) {
|
} else if (guiState == WATCHFACE_STATE) {
|
||||||
|
button2();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -204,6 +206,7 @@ void Watchy::handleButtonPress() {
|
||||||
}
|
}
|
||||||
showMenu(menuIndex, true);
|
showMenu(menuIndex, true);
|
||||||
} else if (guiState == WATCHFACE_STATE) {
|
} else if (guiState == WATCHFACE_STATE) {
|
||||||
|
button3();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -685,6 +688,17 @@ void Watchy::drawWatchFace() {
|
||||||
display.println(currentTime.Minute);
|
display.println(currentTime.Minute);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Watchy::button1()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
void Watchy::button2()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
void Watchy::button3()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
weatherData Watchy::getWeatherData() {
|
weatherData Watchy::getWeatherData() {
|
||||||
return _getWeatherData(settings.cityID, settings.lat, settings.lon,
|
return _getWeatherData(settings.cityID, settings.lat, settings.lon,
|
||||||
settings.weatherUnit, settings.weatherLang, settings.weatherURL,
|
settings.weatherUnit, settings.weatherLang, settings.weatherURL,
|
||||||
|
|
|
@ -101,6 +101,9 @@ public:
|
||||||
void showWatchFace(bool partialRefresh);
|
void showWatchFace(bool partialRefresh);
|
||||||
virtual void drawWatchFace(); // override this method for different watch
|
virtual void drawWatchFace(); // override this method for different watch
|
||||||
// faces
|
// faces
|
||||||
|
virtual void button1(); // override these methods to handle different non-menu button presses
|
||||||
|
virtual void button2();
|
||||||
|
virtual void button3();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void _bmaConfig();
|
void _bmaConfig();
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#define CONFIG_H
|
#define CONFIG_H
|
||||||
|
|
||||||
// Versioning
|
// Versioning
|
||||||
#define WATCHY_LIB_VER "1.4.13"
|
#define WATCHY_LIB_VER "1.4.14"
|
||||||
|
|
||||||
//pins
|
//pins
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue