Compare commits

...

26 Commits

Author SHA1 Message Date
SQFMI 1d5605c0e9 Update dev.actions.yml 2023-04-23 23:36:49 -04:00
SQFMI 704ef60470 Update dev.actions.yml 2023-04-23 23:32:27 -04:00
SQFMI cc6c196e37 Create main.actions.yml 2023-04-23 23:28:57 -04:00
SQFMI 35e65a1972 update 2023-04-23 18:18:39 -04:00
SQFMI 65061fd30f updated 2023-04-23 18:16:57 -04:00
SQFMI b1b5eeb890
Merge pull request #217 from wjgeorge/dev
'WIDTH_VISIBLE' is not a member of 'WatchyDisplay'
2023-04-22 22:23:05 -04:00
SQFMI 2b327c64b8
remove dstOffset from watchySettings struct 2023-04-22 22:21:12 -04:00
wjgeorge 3c73c7e2c8 Add new static member WIDTH_VISIBLE 2023-04-21 23:13:53 -04:00
SQFMI cc1ff02123 Update test-compilation.yml 2023-04-11 16:19:06 -04:00
SQFMI 0e1aa800dd Update test-compilation.yml 2023-04-11 13:01:36 -04:00
SQFMI cc882cd9f7 Update test-compilation.yml 2023-04-11 11:01:48 -04:00
SQFMI 6682d501a6 test compile 2023-04-11 10:33:50 -04:00
SQFMI dc2795dcd9
Merge pull request #209 from aminch/weather-fix
Reset weather counter on Wifi connection
2023-04-11 09:48:25 -04:00
SQFMI 9177aee6d6 Merge branch 'master' into dev 2023-04-11 09:46:53 -04:00
Adam Minchinton 0e319fe3e7 Reset weather counter on Wifi connection 2023-02-14 20:22:05 +01:00
SQFMI f6f7a38c8e
fix path 2023-02-09 16:32:16 -05:00
SQFMI 266ae56458
fix path 2023-02-09 15:57:01 -05:00
SQFMI 96c4465924
fix path 2023-02-09 13:57:40 -05:00
SQFMI b48408be6e
Upload bins 2023-02-09 01:08:57 -05:00
SQFMI c0e814d269
Update test-compilation.yml 2023-02-08 21:15:51 -05:00
SQFMI 3300f6f271
Merge pull request #204 from khenderick/feature/virtual-button-press
Allow button press overrides
2023-02-08 20:57:03 -05:00
SQFMI e125f85926
Update test-compilation.yml 2023-02-08 20:40:20 -05:00
SQFMI ce8c5d4f78
Update test-compilation.yml 2023-02-08 20:34:25 -05:00
SQFMI 851467cc86
Merge pull request #122 from Meptl/auto-compile-check
Compile example programs on push with Github Actions
2023-02-08 17:00:21 -05:00
Kenneth Henderick 3a3a926c2a
Allow button press overrides 2022-12-30 17:14:13 +01:00
Christopher Chin 20dd8a26e0 Auto compile using Github Action. 2021-12-20 01:12:12 +00:00
7 changed files with 53 additions and 4 deletions

27
.github/workflows/dev.actions.yml vendored Normal file
View File

@ -0,0 +1,27 @@
name: Build Example Watchfaces
on:
push:
branches:
- "dev"
pull_request:
branches:
- "dev"
jobs:
build:
name: Build Example Watchfaces
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: ArminJo/arduino-test-compile@v3
with:
arduino-board-fqbn: esp32:esp32:watchy:Revision=v20,PartitionScheme=min_spiffs,UploadSpeed=921600,DebugLevel=none,EraseFlash=none
platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
required-libraries: Adafruit GFX Library,Arduino_JSON,DS3232RTC,NTPClient,Rtc_Pcf8563,GxEPD2,WiFiManager
set-build-path: true
- uses: actions/upload-artifact@v3
with:
name: binaries
path: ${{ github.workspace }}/examples/WatchFaces/**/build/*.bin
- uses: actions/download-artifact@v3
- name: Display structure of downloaded files
run: ls -R

21
.github/workflows/main.actions.yml vendored Normal file
View File

@ -0,0 +1,21 @@
name: Release
on:
push:
tags:
- "v[0-9]+.[0-9]+.[0-9]+"
jobs:
release:
name: Build and Release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: ArminJo/arduino-test-compile@v3
with:
arduino-board-fqbn: esp32:esp32:watchy:Revision=v20,PartitionScheme=min_spiffs,UploadSpeed=921600,DebugLevel=none,EraseFlash=none
platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
required-libraries: Adafruit GFX Library,Arduino_JSON,DS3232RTC,NTPClient,Rtc_Pcf8563,GxEPD2,WiFiManager
set-build-path: true
- uses: softprops/action-gh-release@v1
with:
name: "Watchy Arduino Library ${{ github.ref_name }}"
files: ${{ github.workspace }}/examples/WatchFaces/**/build/*.bin

View File

@ -1,6 +1,6 @@
{
"name": "Watchy",
"version": "1.4.6",
"version": "1.4.7",
"description": "Watchy - An Open Source E-Paper Watch by SQFMI",
"authors": [
{

View File

@ -1,5 +1,5 @@
name=Watchy
version=1.4.6
version=1.4.7
author=SQFMI
maintainer=SQFMI
sentence=Watchy - An Open Source E-Paper Watch by SQFMI

View File

@ -23,6 +23,7 @@ class WatchyDisplay : public GxEPD2_EPD
public:
// attributes
static const uint16_t WIDTH = 200;
static const uint16_t WIDTH_VISIBLE = WIDTH;
static const uint16_t HEIGHT = 200;
static const GxEPD2::Panel panel = GxEPD2::GDEH0154D67;
static const bool hasColor = false;

View File

@ -828,6 +828,7 @@ void Watchy::setupWifi() {
display.println(WiFi.SSID());
display.println("Local IP:");
display.println(WiFi.localIP());
weatherIntervalCounter = -1; // Reset to force weather to be read again
}
display.display(false); // full refresh
// turn off radios

View File

@ -36,7 +36,6 @@ typedef struct watchySettings {
// NTP Settings
String ntpServer;
int gmtOffset;
int dstOffset;
//
bool vibrateOClock;
} watchySettings;
@ -56,7 +55,7 @@ public:
float getBatteryVoltage();
void vibMotor(uint8_t intervalMs = 100, uint8_t length = 20);
void handleButtonPress();
virtual void handleButtonPress();
void showMenu(byte menuIndex, bool partialRefresh);
void showFastMenu(byte menuIndex);
void showAbout();