Moonphase

.github/workflows/dev.actions.yml

@@ -16,7 +16,7 @@ jobs:
       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
-        arduino-platform: esp32:[email protected].17
+        arduino-platform: esp32:[email protected].12
         required-libraries: Adafruit GFX Library,Arduino_JSON,DS3232RTC,NTPClient,Rtc_Pcf8563,GxEPD2,WiFiManager
         set-build-path: true
     - uses: actions/upload-artifact@v3

.github/workflows/main.actions.yml

@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@master
     - uses: ArminJo/arduino-test-compile@v3
       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=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:[email protected]
         required-libraries: Adafruit GFX Library,Arduino_JSON,DS3232RTC,NTPClient,Rtc_Pcf8563,GxEPD2,WiFiManager

.github/workflows/v3.actions.yml

@@ -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:[email protected]
+        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

.gitignore

@@ -1,3 +1,5 @@
+.pio/
+.vscode/
 app/bin/
 app/pde.jar
 build/macosx/work/

README.md

@@ -2,29 +2,15 @@
 
 ![Watchy](https://watchy.sqfmi.com/img/watchy_render.png)
 
-**Buy Watchy from [The Pi Hut](https://thepihut.com/collections/sqfmi), [Crowd Supply](https://www.crowdsupply.com/sqfmi/watchy), and [Mouser](https://www.mouser.com/ProductDetail/SQFMI/SQFMI-WATCHY-10?qs=DRkmTr78QARN9VSJRzqRxw%3D%3D)!**
+**Buy Watchy from [Mouser](https://www.mouser.com/ProductDetail/SQFMI/SQFMI-WATCHY-10?qs=DRkmTr78QARN9VSJRzqRxw%3D%3D), [The Pi Hut](https://thepihut.com/collections/sqfmi), and [Crowd Supply](https://www.crowdsupply.com/sqfmi/watchy)**
 
 [**Watchy Case & Accessories**](https://shop.sqfmi.com)
 
-Visit [**https://watchy.sqfmi.com**](https://watchy.sqfmi.com) for documentation, hardware design files, and more!
-
-## Setup
-1. In the Arduino IDE Boards Manager, [install support for the ESP32](https://docs.espressif.com/projects/arduino-esp32/en/latest/installing.html).
-    * Arduino > Preferences > Additional Board Manager URLs
-    * ```https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json```
-2. Install this library (search for **Watchy** in the library manager), and any other dependencies when prompted
-3. Check out the examples under ```Examples``` -> ```Watchy```
-4. Compile & Upload with these board settings:
-    * Board: "Watchy"
-    * Partition Scheme: "Huge App"
-    * Board Revision: Choose your Watchy version
-    * All Other Settings: leave to default
-
-You may also have to install the [CP2104 USB to Serial drivers](https://www.silabs.com/products/development-tools/software/usb-to-uart-bridge-vcp-drivers) if the port is not automatically detected.
+## Getting Started Guide
+Follow the instructions here https://watchy.sqfmi.com/docs/getting-started
 
 ### Have Fun! :)
 
-
 ### Got Questions?
 
 Join our [Discord](https://discord.gg/ZXDegGV8E7)

examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp

@@ -16,10 +16,15 @@ void Watchy7SEG::drawWatchFace(){
     drawSteps();
     drawWeather();
     drawBattery();
-    display.drawBitmap(120, 77, WIFI_CONFIGURED ? wifi : wifioff, 26, 18, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+    display.drawBitmap(116, 75, WIFI_CONFIGURED ? wifi : wifioff, 26, 18, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
     if(BLE_CONFIGURED){
-        display.drawBitmap(100, 75, bluetooth, 13, 21, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+        display.drawBitmap(100, 73, bluetooth, 13, 21, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
     }
+    #ifdef ARDUINO_ESP32S3_DEV
+    if(USB_PLUGGED_IN){
+      display.drawBitmap(140, 75, charge, 16, 18, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+    }
+    #endif
 }
 
 void Watchy7SEG::drawTime(){
@@ -81,10 +86,11 @@ void Watchy7SEG::drawSteps(){
     display.println(stepCount);
 }
 void Watchy7SEG::drawBattery(){
-    display.drawBitmap(154, 73, battery, 37, 21, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
-    display.fillRect(159, 78, 27, BATTERY_SEGMENT_HEIGHT, DARKMODE ? GxEPD_BLACK : GxEPD_WHITE);//clear battery segments
+    display.drawBitmap(158, 73, battery, 37, 21, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+    display.fillRect(163, 78, 27, BATTERY_SEGMENT_HEIGHT, DARKMODE ? GxEPD_BLACK : GxEPD_WHITE);//clear battery segments
     int8_t batteryLevel = 0;
     float VBAT = getBatteryVoltage();
+        #ifndef ARDUINO_ESP32S3_DEV
     if(VBAT > 4.1){
         batteryLevel = 3;
     }
@@ -97,9 +103,23 @@ void Watchy7SEG::drawBattery(){
     else if(VBAT <= 3.80){
         batteryLevel = 0;
     }
+    #else
+     if (VBAT > 3.90) {
+        batteryLevel = 3;
+    }
+    else if (VBAT > 3.75 && VBAT <= 3.90) {
+        batteryLevel = 2;
+    }
+    else if (VBAT > 3.60 && VBAT <= 3.75) {
+        batteryLevel = 1;
+    }
+    else if (VBAT <= 3.60) {
+        batteryLevel = 0;
+    }
+    #endif
 
     for(int8_t batterySegments = 0; batterySegments < batteryLevel; batterySegments++){
-        display.fillRect(159 + (batterySegments * BATTERY_SEGMENT_SPACING), 78, BATTERY_SEGMENT_WIDTH, BATTERY_SEGMENT_HEIGHT, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+        display.fillRect(163 + (batterySegments * BATTERY_SEGMENT_SPACING), 78, BATTERY_SEGMENT_WIDTH, BATTERY_SEGMENT_HEIGHT, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
     }
 }
 
@@ -150,4 +170,4 @@ void Watchy7SEG::drawWeather(){
     }
 
     display.drawBitmap(145, 158, weatherIcon, WEATHER_ICON_WIDTH, WEATHER_ICON_HEIGHT, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
-}
+}

examples/WatchFaces/7_SEG/icons.h

@@ -189,6 +189,14 @@ const unsigned char wifioff [] PROGMEM = {
 	0x01, 0xff, 0xc0, 0x00, 0x07, 0xe1, 0xc0, 0x00, 0x0f, 0xc0, 0x80, 0x00, 0x1f, 0x0c, 0x00, 0x00,
 	0x3c, 0x1e, 0x00, 0x00, 0xf8, 0x0c, 0x00, 0x00
 };
+
+// 'charge', 16x18px
+const unsigned char charge [] PROGMEM = {
+	0x00, 0x10, 0x00, 0x70, 0x00, 0xe0, 0x01, 0xe0, 0x03, 0xe0, 0x07, 0xc0, 0x0f, 0xc0, 0x1f, 0xff, 
+	0x3f, 0xfe, 0x7f, 0xfc, 0x7f, 0xf8, 0x03, 0xf0, 0x03, 0xe0, 0x07, 0xc0, 0x07, 0x80, 0x07, 0x00, 
+	0x0e, 0x00, 0x0c, 0x00
+};
+
 // 'chip', 48x32px
 const unsigned char chip [] PROGMEM = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 

examples/WatchFaces/pipboy/WatchyPipBoy.cpp

@@ -0,0 +1,207 @@
+#include "WatchyPipBoy.h"
+
+#define DARKMODE true
+#define STEPSGOAL 5000
+
+const uint8_t WEATHER_ICON_WIDTH = 48;
+const uint8_t WEATHER_ICON_HEIGHT = 32;
+
+RTC_DATA_ATTR uint8_t vaultBoyNum;
+
+void WatchyPipBoy::drawWatchFace(){
+    //top menu bar
+    display.fillScreen(DARKMODE ? GxEPD_BLACK : GxEPD_WHITE);
+    display.setFont(&monofonto8pt7b);
+    display.setTextColor(DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+    display.setCursor(22, 14);
+    display.print("STAT  INV  DATA  MAP");
+    display.drawBitmap(0, 10, menubar, 200, 9, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+
+    //bottom text
+    display.setFont(&monofonto8pt7b);
+    display.setCursor(10, 195);
+    display.println("PIP-BOY 3000 ROBCO IND.");
+
+    drawTime();
+    drawDate();
+    drawSteps();
+    drawWeather();
+    drawBattery();
+    // display.drawBitmap(120, 77, WIFI_CONFIGURED ? wifi : wifioff, 26, 18, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+    // if(BLE_CONFIGURED){
+    //     display.drawBitmap(100, 75, bluetooth, 13, 21, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+    // }
+}
+
+void WatchyPipBoy::drawTime(){
+
+    //draw random vault boy every 15mins
+    if(currentTime.Minute % 15 == 0){
+        vaultBoyNum = random(0, 3);
+    }
+
+    switch(vaultBoyNum){
+        case 0:
+            display.drawBitmap(70, 50, vaultboy, 57, 100, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+            break;
+        case 1:
+            display.drawBitmap(70, 50, vaultboypoint, 57, 100, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+            break;
+        case 2:
+            display.drawBitmap(60, 50, vaultboysmile, 67, 100, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+            break;
+    }    
+
+    //time border
+    display.drawLine(137, 28, 200, 28, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+    display.drawLine(137, 28, 137, 132, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+    display.drawLine(137, 132, 157, 132, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);    
+    display.drawLine(180, 132, 200, 132, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+
+    //draw time
+    display.setFont(&monofonto28pt7b);
+    display.setCursor(141, 75);
+
+    int displayHour;
+    if(HOUR_12_24==12){
+      displayHour = ((currentTime.Hour+11)%12)+1;
+    } else {
+      displayHour = currentTime.Hour;
+    }
+    if(displayHour < 10){
+        display.print("0");
+    }
+    display.print(displayHour);
+
+    display.setCursor(141, 125);
+    if(currentTime.Minute < 10){
+        display.print("0");
+    }
+    display.print(currentTime.Minute);
+
+    //AMPM
+    display.setFont(&monofonto8pt7b);
+    display.setCursor(160, 140);
+    display.print(currentTime.Hour < 11 ? "AM" : "PM");
+}
+
+void WatchyPipBoy::drawDate(){
+
+    display.setFont(&monofonto10pt7b);
+    int16_t  x1, y1;
+    uint16_t w, h;
+    String dayOfWeek = dayStr(currentTime.Wday);
+    dayOfWeek.toUpperCase();
+    display.setTextColor(DARKMODE ? GxEPD_BLACK : GxEPD_WHITE);
+    display.getTextBounds(dayOfWeek, 7, 42, &x1, &y1, &w, &h);
+    display.setCursor(7, 42);
+    display.fillRect(x1-2, y1-2, w+4, h+4, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+    display.print(dayOfWeek);
+
+    display.setFont(&monofonto10pt7b);
+    display.setTextColor(DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+    display.setCursor(7, 62);
+    display.print(monthShortStr(currentTime.Month));
+    display.print(" ");
+    display.print(currentTime.Day);
+    display.setCursor(7, 78);
+    display.print(tmYearToCalendar(currentTime.Year));
+}
+
+void WatchyPipBoy::drawSteps(){
+    // reset step counter at midnight
+    if (currentTime.Hour == 0 && currentTime.Minute == 0){
+      sensor.resetStepCounter();
+    }
+
+    //draw progress bar
+    uint32_t stepCount = sensor.getCounter();
+    uint8_t progress = (uint8_t)(stepCount * 100.0 / STEPSGOAL);
+    progress = progress > 100 ? 100 : progress;
+    display.drawBitmap(60, 155, gauge, 73, 10, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+    display.fillRect(60+13, 155+5, (progress/2)+5, 4, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+
+    //show step count
+    display.setFont(&monofonto8pt7b);
+    display.setTextColor(DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+    display.setCursor(150, 160);
+    display.print("STEPS");
+    display.setCursor(150, 175);
+    display.print(stepCount);
+}
+
+void WatchyPipBoy::drawBattery(){
+    display.drawBitmap(10, 150, battery, 37, 21, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+    display.fillRect(15, 155, 27, 11, DARKMODE ? GxEPD_BLACK : GxEPD_WHITE);//clear battery segments
+    int8_t batteryLevel = 0;
+    float VBAT = getBatteryVoltage();
+    #ifndef ARDUINO_ESP32S3_DEV
+    if(VBAT > 4.1){
+        batteryLevel = 3;
+    }
+    else if(VBAT > 3.95 && VBAT <= 4.1){
+        batteryLevel = 2;
+    }
+    else if(VBAT > 3.80 && VBAT <= 3.95){
+        batteryLevel = 1;
+    }
+    else if(VBAT <= 3.80){
+        batteryLevel = 0;
+    }
+    #else
+     if (VBAT > 3.90) {
+        batteryLevel = 3;
+    }
+    else if (VBAT > 3.75 && VBAT <= 3.90) {
+        batteryLevel = 2;
+    }
+    else if (VBAT > 3.60 && VBAT <= 3.75) {
+        batteryLevel = 1;
+    }
+    else if (VBAT <= 3.60) {
+        batteryLevel = 0;
+    }
+    #endif
+
+    for(int8_t batterySegments = 0; batterySegments < batteryLevel; batterySegments++){
+        display.fillRect(15 + (batterySegments * 9), 155, 7, 11, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+    }
+}
+
+void WatchyPipBoy::drawWeather(){
+
+    weatherData currentWeather = getWeatherData();
+
+    int8_t temperature = currentWeather.temperature;
+    int16_t weatherConditionCode = currentWeather.weatherConditionCode;
+
+    display.setFont(&monofonto10pt7b);
+    display.setTextColor(DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+    display.setCursor(12, 133);
+
+
+    display.print(temperature);
+    display.print(currentWeather.isMetric ? "C" : "F");
+    const unsigned char* weatherIcon;
+
+    //https://openweathermap.org/weather-conditions
+    if(weatherConditionCode > 801){//Cloudy
+    weatherIcon = cloudy;
+    }else if(weatherConditionCode == 801){//Few Clouds
+    weatherIcon = cloudsun;
+    }else if(weatherConditionCode == 800){//Clear
+    weatherIcon = sunny;
+    }else if(weatherConditionCode >=700){//Atmosphere
+    weatherIcon = atmosphere;
+    }else if(weatherConditionCode >=600){//Snow
+    weatherIcon = snow;
+    }else if(weatherConditionCode >=500){//Rain
+    weatherIcon = rain;
+    }else if(weatherConditionCode >=300){//Drizzle
+    weatherIcon = drizzle;
+    }else if(weatherConditionCode >=200){//Thunderstorm
+    weatherIcon = thunderstorm;
+    }else
+    return;
+    display.drawBitmap(5, 85, weatherIcon, WEATHER_ICON_WIDTH, WEATHER_ICON_HEIGHT, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK);
+}