mirror of https://github.com/sqfmi/Watchy.git
Compare commits
No commits in common. "1d5605c0e9f71767e550efe3b1171211035a22a5" and "c2bbf8a01ab7a4abf25af7096398b01aa1a02f30" have entirely different histories.
1d5605c0e9
...
c2bbf8a01a
|
@ -1,27 +0,0 @@
|
|||
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
|
|
@ -1,21 +0,0 @@
|
|||
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
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "Watchy",
|
||||
"version": "1.4.7",
|
||||
"version": "1.4.6",
|
||||
"description": "Watchy - An Open Source E-Paper Watch by SQFMI",
|
||||
"authors": [
|
||||
{
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
name=Watchy
|
||||
version=1.4.7
|
||||
version=1.4.6
|
||||
author=SQFMI
|
||||
maintainer=SQFMI
|
||||
sentence=Watchy - An Open Source E-Paper Watch by SQFMI
|
||||
|
|
|
@ -23,7 +23,6 @@ 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;
|
||||
|
|
|
@ -828,7 +828,6 @@ 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
|
||||
|
|
|
@ -36,6 +36,7 @@ typedef struct watchySettings {
|
|||
// NTP Settings
|
||||
String ntpServer;
|
||||
int gmtOffset;
|
||||
int dstOffset;
|
||||
//
|
||||
bool vibrateOClock;
|
||||
} watchySettings;
|
||||
|
@ -55,7 +56,7 @@ public:
|
|||
float getBatteryVoltage();
|
||||
void vibMotor(uint8_t intervalMs = 100, uint8_t length = 20);
|
||||
|
||||
virtual void handleButtonPress();
|
||||
void handleButtonPress();
|
||||
void showMenu(byte menuIndex, bool partialRefresh);
|
||||
void showFastMenu(byte menuIndex);
|
||||
void showAbout();
|
||||
|
|
Loading…
Reference in New Issue