From cc3c306acd6dae0bc0d927b351fb0b3c3dd58ebf Mon Sep 17 00:00:00 2001 From: Adam PIppin Date: Tue, 13 Jul 2021 22:35:12 -0700 Subject: [PATCH] Add battery meter --- watchos2/Module_UI.cpp | 33 ++++++++++++++ watchos2/Module_UI.h | 6 +++ watchos2/Task_Battery.cpp | 76 +++++++++++++++++++++++++++++++ watchos2/__vm/Compile.vmps.xml | 2 +- watchos2/__vm/Upload.vmps.xml | 2 +- watchos2/watchos2.ino | 3 +- watchos2/watchos2.vcxproj | 11 ++++- watchos2/watchos2.vcxproj.filters | 27 +++++++++++ 8 files changed, 156 insertions(+), 4 deletions(-) create mode 100644 watchos2/Task_Battery.cpp diff --git a/watchos2/Module_UI.cpp b/watchos2/Module_UI.cpp index 3a2de68..29dd032 100644 --- a/watchos2/Module_UI.cpp +++ b/watchos2/Module_UI.cpp @@ -376,6 +376,39 @@ void Module_UI::fill(int x, int y, int width, int height, uint16_t colour) gfx.fillRect(x, y, width, height, colour); } +void Module_UI::fillRectangle(int x, int y, int w, int h, uint16_t colour) +{ + local_to_screen(&x, &y); + gfx.fillRect(x, y, w, h, colour); +} + +void Module_UI::rectangle(int x, int y, int w, int h, uint16_t colour) +{ + local_to_screen(&x, &y); + gfx.drawRect(x, y, w, h, colour); +} + +void Module_UI::line(int x0, int y0, int x1, int y1, uint16_t colour) +{ + local_to_screen(&x0, &y0); + local_to_screen(&x1, &y1); + gfx.drawLine(x0, y0, x1, y1, colour); +} + +void Module_UI::horizontalLine(int y, uint16_t colour) +{ + int x = 0; + local_to_screen(&x, &y); + gfx.drawFastHLine(x, y, m_draw_w, colour); +} + +void Module_UI::verticalLine(int x, uint16_t colour) +{ + int y = 0; + local_to_screen(&x, &y); + gfx.drawFastVLine(x, y, m_draw_h, colour); +} + void Module_UI::print(int x, int y, char* str, uint16_t colour, void* font) { local_to_screen(&x, &y); diff --git a/watchos2/Module_UI.h b/watchos2/Module_UI.h index bece678..8fece42 100644 --- a/watchos2/Module_UI.h +++ b/watchos2/Module_UI.h @@ -242,6 +242,12 @@ public: /// id of a registered font void print(int x, int y, char* str, uint16_t colour = COLOUR_PRIMARY, byte font_id = 0); + void rectangle(int x, int y, int w, int h, uint16_t colour = COLOUR_PRIMARY); + void fillRectangle(int x, int y, int w, int h, uint16_t colour = COLOUR_PRIMARY); + void line(int x0, int y0, int x1, int y1, uint16_t colour = COLOUR_PRIMARY); + void horizontalLine(int y, uint16_t colour = COLOUR_PRIMARY); + void verticalLine(int x, uint16_t colour = COLOUR_PRIMARY); + /// /// Register a font with an id /// diff --git a/watchos2/Task_Battery.cpp b/watchos2/Task_Battery.cpp new file mode 100644 index 0000000..519daf4 --- /dev/null +++ b/watchos2/Task_Battery.cpp @@ -0,0 +1,76 @@ +#include "watchos.h" +#include "Module_UI.h" + +#define TASK_BATTERY_UPDATE_INTERVAL_MS 30000 + +class Task_Battery : public IRunnable, public IDrawable, public Task +{ + Module_UI* ui = nullptr; + kernel_handle_t window_handle; + int voltage = 0; + unsigned long last_update = 0; + + int getBatteryVoltage() + { + float raw_value = (analogRead(HW_BATTERY_ADC_PIN) / 4096.0 * 7.23); + return (int)round(raw_value * 100); + } + +public: + void start() + { + ui = static_cast(watchos::module(WATCHOS_MODULE_UI)); + window_handle = ui->createWindow(this, ui->getRoot()); + ui->setAbsolutePosition(window_handle, DISPLAY_WIDTH - 32, 2, 22, 10); + } + + void tick() + { + if (millis() - last_update > TASK_BATTERY_UPDATE_INTERVAL_MS) + { + int new_voltage = getBatteryVoltage(); + if (new_voltage != voltage) + { + ui->setDirty(window_handle); + voltage = new_voltage; + } + last_update = millis(); + } + } + void draw(kernel_handle_t handle) + { + delay(100); + voltage = getBatteryVoltage(); + // Main body + ui->fillRectangle(0, 0, 20, 10); + // Pin + ui->fillRectangle(20, 2, 2, 6); + + if (voltage >= 350) + { + int bars = 0; + if (voltage > 410) + bars = 3; + else if (voltage > 395) + bars = 2; + else if (voltage >= 380) + bars = 1; + else + bars = 0; + + int bar_width = (20 - 8) / 3; + int x = 2; + + for (int i = 0; i < bars; i++) + { + ui->fillRectangle(x, 2, bar_width, ui->getHeight() - 4, COLOUR_SECONDARY); + x += bar_width + 2; + } + } + else + { + ui->line(0, ui->getHeight(), ui->getWidth(), 0, COLOUR_SECONDARY); + } + } + +}; \ No newline at end of file diff --git a/watchos2/__vm/Compile.vmps.xml b/watchos2/__vm/Compile.vmps.xml index 7b14af7..e444da3 100644 --- a/watchos2/__vm/Compile.vmps.xml +++ b/watchos2/__vm/Compile.vmps.xml @@ -2,7 +2,7 @@ - + diff --git a/watchos2/__vm/Upload.vmps.xml b/watchos2/__vm/Upload.vmps.xml index 7b14af7..e444da3 100644 --- a/watchos2/__vm/Upload.vmps.xml +++ b/watchos2/__vm/Upload.vmps.xml @@ -2,7 +2,7 @@ - + diff --git a/watchos2/watchos2.ino b/watchos2/watchos2.ino index 2affaf3..7a3f18a 100644 --- a/watchos2/watchos2.ino +++ b/watchos2/watchos2.ino @@ -11,7 +11,7 @@ #include "Module_Input.h" #include "Task_Test.cpp" #include "Task_Clock.cpp" -#include +#include "Task_Battery.cpp" #include #include @@ -32,6 +32,7 @@ void setup() kernel->registerTask(ui = new Module_UI(), WATCHOS_MODULE_UI); watchos::run(new Task_Clock()); watchos::run(new Task_Test()); + watchos::run(new Task_Battery()); if (!storage->isValid()) { watchos::debug("Resetting storage"); diff --git a/watchos2/watchos2.vcxproj b/watchos2/watchos2.vcxproj index 5c70ef5..ce8f1e4 100644 --- a/watchos2/watchos2.vcxproj +++ b/watchos2/watchos2.vcxproj @@ -93,7 +93,7 @@ true true true - $(ProjectDir)..\watchos2;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\libraries\Preferences\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\cores\esp32;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\cores\esp32\apps;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\cores\esp32\libb64;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\variants\esp32;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\config;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\app_trace;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\app_update;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\asio;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\bootloader_support;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\bt;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\coap;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\console;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\driver;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\efuse;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp-tls;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp32;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp_adc_cal;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp_event;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp_http_client;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp_http_server;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp_https_ota;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp_https_server;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp_ringbuf;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp_websocket_client;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\espcoredump;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\ethernet;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\expat;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\fatfs;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\freemodbus;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\freertos;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\heap;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\idf_test;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\jsmn;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\json;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\libsodium;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\log;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\lwip;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\mbedtls;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\mdns;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\micro-ecc;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\mqtt;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\newlib;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\nghttp;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\nvs_flash;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\openssl;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\protobuf-c;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\protocomm;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\pthread;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\sdmmc;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\smartconfig_ack;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\soc;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\spi_flash;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\spiffs;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\tcp_transport;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\tcpip_adapter;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\ulp;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\unity;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\vfs;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\wear_levelling;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\wifi_provisioning;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\wpa_supplicant;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\xtensa-debug-module;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp-face;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp32-camera;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\fb_gfx;$(ProjectDir)..\..\..\..\..\DOCUME~1\Projects\Watchy\watchos2\watchos2;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-97-gc752ad5-5.2.0\lib\gcc\xtensa-esp32-elf\5.2.0\include;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-97-gc752ad5-5.2.0\xtensa-esp32-elf\include\c++\5.2.0\xtensa-esp32-elf;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-97-gc752ad5-5.2.0\xtensa-esp32-elf\include;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-97-gc752ad5-5.2.0\xtensa-esp32-elf\include\c++\5.2.0;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-97-gc752ad5-5.2.0\include\c++\5.2.0;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-97-gc752ad5-5.2.0\include;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\watchos2;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\libraries\Preferences\src;$(ProjectDir)..\..\..\..\Arduino\libraries\GxEPD2\src;$(ProjectDir)..\..\..\..\Arduino\libraries\Adafruit_GFX_Library;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\libraries\SPI\src;$(ProjectDir)..\..\..\..\Arduino\libraries\Watchy\src;$(ProjectDir)..\..\..\..\Arduino\libraries\Adafruit_BusIO;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\libraries\Wire\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\libraries\BLE\src;$(ProjectDir)..\..\..\..\Arduino\libraries\WiFiManager;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\libraries\WiFi\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\libraries\WebServer\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\libraries\DNSServer\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\libraries\HTTPClient\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\libraries\WiFiClientSecure\src;$(ProjectDir)..\..\..\..\Arduino\libraries\Arduino_JSON\src;$(ProjectDir)..\..\..\..\Arduino\libraries\DS3232RTC\src;$(ProjectDir)..\..\..\..\Arduino\libraries\Time;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\libraries\FS\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\libraries\EEPROM\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\cores\esp32;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\cores\esp32\apps;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\cores\esp32\libb64;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\variants\esp32;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\config;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\app_trace;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\app_update;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\asio;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\bootloader_support;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\bt;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\coap;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\console;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\driver;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\efuse;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp-tls;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp32;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp_adc_cal;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp_event;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp_http_client;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp_http_server;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp_https_ota;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp_https_server;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp_ringbuf;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp_websocket_client;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\espcoredump;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\ethernet;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\expat;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\fatfs;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\freemodbus;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\freertos;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\heap;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\idf_test;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\jsmn;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\json;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\libsodium;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\log;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\lwip;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\mbedtls;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\mdns;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\micro-ecc;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\mqtt;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\newlib;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\nghttp;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\nvs_flash;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\openssl;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\protobuf-c;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\protocomm;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\pthread;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\sdmmc;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\smartconfig_ack;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\soc;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\spi_flash;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\spiffs;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\tcp_transport;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\tcpip_adapter;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\ulp;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\unity;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\vfs;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\wear_levelling;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\wifi_provisioning;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\wpa_supplicant;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\xtensa-debug-module;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp-face;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\esp32-camera;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include\fb_gfx;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-97-gc752ad5-5.2.0\lib\gcc\xtensa-esp32-elf\5.2.0\include;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-97-gc752ad5-5.2.0\xtensa-esp32-elf\include\c++\5.2.0\xtensa-esp32-elf;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-97-gc752ad5-5.2.0\xtensa-esp32-elf\include;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-97-gc752ad5-5.2.0\xtensa-esp32-elf\include\c++\5.2.0;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-97-gc752ad5-5.2.0\include\c++\5.2.0;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-97-gc752ad5-5.2.0\include;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.6\tools\sdk\include;%(AdditionalIncludeDirectories) $(ProjectDir)__vm\.watchos2.vsarduino.h;%(ForcedIncludeFiles) __ESP32_esp32__;__ESP32_ESP32__;ESP_PLATFORM;HAVE_CONFIG_H;GCC_NOT_5_2_0=0;WITH_POSIX;F_CPU=240000000L;ARDUINO=108015;ARDUINO_ESP32_DEV;ARDUINO_ARCH_ESP32;ESP32;CORE_DEBUG_LEVEL=0;__cplusplus=201103L;_VMICRO_INTELLISENSE;%(PreprocessorDefinitions) @@ -124,6 +124,10 @@ + + + + @@ -137,9 +141,14 @@ + + + + + diff --git a/watchos2/watchos2.vcxproj.filters b/watchos2/watchos2.vcxproj.filters index d1a670f..346d7d8 100644 --- a/watchos2/watchos2.vcxproj.filters +++ b/watchos2/watchos2.vcxproj.filters @@ -63,6 +63,18 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + @@ -86,5 +98,20 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + \ No newline at end of file