From 1b11d6e1f451d7717963c991e401746dbb53ec11 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 19 Oct 2023 12:10:29 -0400 Subject: [PATCH 01/38] migrate to new ledc api --- .../ledc/drivers/servo/ws_ledc_servo.cpp | 8 +- src/components/ledc/ws_ledc.cpp | 162 +++--------------- src/components/ledc/ws_ledc.h | 32 +--- src/components/pwm/ws_pwm.cpp | 6 +- 4 files changed, 37 insertions(+), 171 deletions(-) diff --git a/src/components/ledc/drivers/servo/ws_ledc_servo.cpp b/src/components/ledc/drivers/servo/ws_ledc_servo.cpp index ae2c94055..e4095aa22 100644 --- a/src/components/ledc/drivers/servo/ws_ledc_servo.cpp +++ b/src/components/ledc/drivers/servo/ws_ledc_servo.cpp @@ -62,16 +62,14 @@ void ws_ledc_servo::setLEDCDriver(ws_ledc *ledcManager) { uint8_t ws_ledc_servo::attach(int pin, int minPulseWidth, int maxPulseWidth, int servoFreq) { // Attempt to attach a pin to ledc channel - uint8_t chan = - _ledcMgr->attachPin((uint8_t)pin, (double)servoFreq, LEDC_TIMER_WIDTH); - if (chan == LEDC_CH_ERR) // error! - return chan; + if (!_ledcMgr->attachPin((uint8_t)pin, (uint32_t)servoFreq, LEDC_TIMER_WIDTH)) + return 255; // configure the servo object and assign it to a pin _servo.Pin.nbr = pin; _servo.Pin.isActive = true; _minPulseWidth = minPulseWidth; _maxPulseWidth = maxPulseWidth; - return chan; + return 1; } /**************************************************************************/ diff --git a/src/components/ledc/ws_ledc.cpp b/src/components/ledc/ws_ledc.cpp index 4baba6bba..244bcb9e0 100644 --- a/src/components/ledc/ws_ledc.cpp +++ b/src/components/ledc/ws_ledc.cpp @@ -23,10 +23,7 @@ */ /**************************************************************************/ ws_ledc::ws_ledc() { - // reset active pins - for (int i = 0; i < MAX_LEDC_PWMS; i++) { - _ledcPins[i].isActive = false; - } + // TODO } /**************************************************************************/ @@ -35,170 +32,62 @@ ws_ledc::ws_ledc() { */ /**************************************************************************/ ws_ledc::~ws_ledc() { - // detach all active pins and de-allocate them - for (int i = 0; i < MAX_LEDC_PWMS; i++) { - detachPin(_ledcPins[i].pin); - _ledcPins[i].isActive = false; - } + // TODO } /**************************************************************************/ /*! - @brief Checks if a channel has already been allocated for a pin. - @param pin Desired GPIO pin number. - @return The channel number if the pin was successfully or already - attached, otherwise LEDC_CH_ERR. -*/ -/**************************************************************************/ -uint8_t ws_ledc::_getChannel(uint8_t pin) { - // have we already attached this pin? - for (int i = 0; i < MAX_LEDC_PWMS; i++) { - if (_ledcPins[i].pin == pin) - return _ledcPins[i].chan; - } - return LEDC_CH_ERR; -} - -/**************************************************************************/ -/*! - @brief Allocates a timer + channel for a pin and attaches it. + @brief Sets up a LEDC pin with given frequency and resolution. @param pin Desired GPIO pin number. @param freq Desired timer frequency, in Hz. @param resolution Desired timer resolution, in bits. - @return The channel number if the pin was successfully or already - attached, otherwise 255. + @return True if configuration is successful. False is returned if error + occurs and LEDC channel was not configured. */ /**************************************************************************/ -uint8_t ws_ledc::attachPin(uint8_t pin, double freq, uint8_t resolution) { - // have we already attached this pin? - for (int i = 0; i < MAX_LEDC_PWMS; i++) { - if (_ledcPins[i].pin == pin) - return _ledcPins[i].chan; - } - - // allocate chanel - uint8_t chanNum = _allocateChannel(freq, resolution); - if (chanNum == LEDC_CH_ERR) - return chanNum; - - // attach pin to channel - ledcAttachPin(pin, chanNum); - - // allocate pin in pool - _ledcPins[chanNum].pin = pin; - _ledcPins[chanNum].chan = chanNum; - - return chanNum; +bool ws_ledc::attachPin(uint8_t pin, uint32_t freq, uint8_t resolution) { + return ledcAttach(pin, freq, resolution); } /**************************************************************************/ /*! - @brief Detaches a pin and de-allocates it from the manager. + @brief Detaches a pin from LEDC. @param pin Desired GPIO pin number. + @return True if successfully detached, False otherwise. */ /**************************************************************************/ -void ws_ledc::detachPin(uint8_t pin) { - // de-allocate the pin and the channel - for (int i = 0; i < sizeof(_ledcPins); i++) { - if (_ledcPins[i].pin == pin) { - _ledcPins[i].pin = 0; - _ledcPins[i].chan = 255; - _ledcPins[i].isActive = false; - break; - } - } - - // detach the pin - ledcDetachPin(pin); -} - -/**************************************************************************/ -/*! - @brief Allocates a channel and timer. - @param freq Timer frequency, in Hz. - @param resolution Timer resolution, in bits. - @return The channel number if the timer was successfully initialized, - otherwise 255. -*/ -/**************************************************************************/ -uint8_t ws_ledc::_allocateChannel(double freq, uint8_t resolution = 16) { - // obtain an inactive channel number - uint8_t chanNum = _getInactiveChannel(); - if (chanNum == LEDC_CH_ERR) - return LEDC_CH_ERR; // failed to obtain inactive channel # - - // attempt to set up a ledc_timer on the free channel - double rc = ledcSetup(uint8_t(chanNum), freq, resolution); - if (rc == 0) - return 255; - - // Assign - _ledcPins[chanNum].chan = chanNum; - _ledcPins[chanNum].isActive = true; - - return chanNum; -} - -/**************************************************************************/ -/*! - @brief Returns an inactive LEDC channel number. - @returns Inactive channel number if free, otherwise LEDC_CH_ERR. -*/ -/**************************************************************************/ -uint8_t ws_ledc::_getInactiveChannel() { - for (int ch = 0; ch < sizeof(_ledcPins); ch++) { - if (_ledcPins[ch].isActive == false) { - return ch; - } - } - return LEDC_CH_ERR; -} +bool ws_ledc::detachPin(uint8_t pin) { return ledcDetach(pin); } /**************************************************************************/ /*! @brief Arduino AnalogWrite function, but for ESP32's LEDC. @param pin The desired pin to write to. @param value The duty cycle. + @return True if PWM value written to LEDC pin, False otherwise. */ /**************************************************************************/ -void ws_ledc::analogWrite(uint8_t pin, int value) { +bool ws_ledc::analogWrite(uint8_t pin, int value) { if (value > 255 || value < 0) - return; - - uint8_t ch; - ch = _getChannel(pin); - if (ch == LEDC_CH_ERR) { - Serial.println("ERROR: Pin not attached to channel"); - return; - } + return false; - // perform duty cycle calculation provided value + // Calculate duty cycle for the `value` passed in // (assumes 12-bit resolution, 2^12) uint32_t dutyCycle = (4095 / 255) * min(value, 255); - // set the duty cycle of the pin - setDuty(pin, dutyCycle); + // Call duty cycle write + return setDuty(pin, dutyCycle); } /**************************************************************************/ /*! - @brief Sets the duty cycle of a pin + @brief Sets the duty cycle of a LEDC pin. @param pin Desired GPIO pin to write to. @param duty Desired duty cycle. + @return True if duty cycle was set, False otherwise. */ /**************************************************************************/ -void ws_ledc::setDuty(uint8_t pin, uint32_t duty) { - // find the channel corresponding to the pin - uint8_t chan = 0; - for (int i = 0; i < sizeof(_ledcPins); i++) { - if (_ledcPins[i].pin == pin) { - chan = _ledcPins[i].chan; - break; - } - } - - // set the channel's duty cycle - ledcWrite(chan, duty); +bool ws_ledc::setDuty(uint8_t pin, uint32_t duty) { + return ledcWrite(pin, duty); } /**************************************************************************/ @@ -207,15 +96,12 @@ void ws_ledc::setDuty(uint8_t pin, uint32_t duty) { frequency to a pin. Used by piezo buzzers and speakers. @param pin The desired pin to write to. @param freq The frequency of the tone, in Hz. + @return The frequency of the LEDC pin. 0 if error occurs and LEDC pin was + not configured. */ /**************************************************************************/ -void ws_ledc::tone(uint8_t pin, uint32_t freq) { - uint8_t ch; - ch = _getChannel(pin); - if (ch == LEDC_CH_ERR) { - // Serial.println("ERROR: Pin not previously attached!"); - } - ledcWriteTone(ch, freq); +uint32_t ws_ledc::tone(uint8_t pin, uint32_t freq) { + return ledcWriteTone(pin, freq); } #endif // ARDUINO_ARCH_ESP32 \ No newline at end of file diff --git a/src/components/ledc/ws_ledc.h b/src/components/ledc/ws_ledc.h index 858fd9501..802c46742 100644 --- a/src/components/ledc/ws_ledc.h +++ b/src/components/ledc/ws_ledc.h @@ -8,7 +8,7 @@ * please support Adafruit and open-source hardware by purchasing * products from Adafruit! * - * Copyright (c) Brent Rubell 2022 for Adafruit Industries. + * Copyright (c) Brent Rubell 2022-2023 for Adafruit Industries. * * BSD license, all text here must be included in any redistribution. * @@ -21,18 +21,6 @@ #include "esp32-hal-ledc.h" #include "esp_err.h" -#define LEDC_CH_ERR 255 ///< LEDC channel error -#define MAX_LEDC_PWMS \ - 16 ///< maximum # of LEDC channels (see: LEDC Chan to Group/Channel/Timer - ///< Mapping) - -/** Defines a pin attached to an active LEDC timer group */ -typedef struct { - uint8_t pin; ///< GPIO pin number - uint8_t chan; ///< Channel allocated to the pin - bool isActive; ///< True if the ledcPin's timer has been initialized -} ledcPin_t; - // forward decl. class Wippersnapper; @@ -50,18 +38,12 @@ class ws_ledc { public: ws_ledc(); ~ws_ledc(); - uint8_t attachPin(uint8_t pin, double freq, uint8_t resolution); - void detachPin(uint8_t pin); - - void setDuty(uint8_t pin, uint32_t duty); - void analogWrite(uint8_t pin, int value); - void tone(uint8_t pin, uint32_t freq); - -private: - uint8_t _allocateChannel(double freq, uint8_t resolution); - uint8_t _getChannel(uint8_t pin); - uint8_t _getInactiveChannel(); - ledcPin_t _ledcPins[MAX_LEDC_PWMS]; ///< Pool of usable LEDC pins + bool attachPin(uint8_t pin, uint32_t freq, uint8_t resolution); + bool detachPin(uint8_t pin); + // LEDC-API + bool setDuty(uint8_t pin, uint32_t duty); + bool analogWrite(uint8_t pin, int value); + uint32_t tone(uint8_t pin, uint32_t freq); }; extern Wippersnapper WS; diff --git a/src/components/pwm/ws_pwm.cpp b/src/components/pwm/ws_pwm.cpp index 06c29ca35..b50bb0bb7 100644 --- a/src/components/pwm/ws_pwm.cpp +++ b/src/components/pwm/ws_pwm.cpp @@ -51,9 +51,9 @@ bool ws_pwm::attach(uint8_t pin, double freq, uint8_t resolution) { // Future TODO: Maybe this function should be within #ifdef for ARCH_ESP32 bool is_attached = true; #if defined(ARDUINO_ARCH_ESP32) - uint8_t rc = _ledcMgr->attachPin(pin, freq, resolution); - if (rc == LEDC_CH_ERR) - is_attached = false; + bool rc = _ledcMgr->attachPin(pin, (uint32_t)freq, resolution); + if (!rc) + return false; #else (void)pin; // marking as unused parameter to avoid compiler warning (void)freq; // marking as unused parameter to avoid compiler warning From 1e0c42a43045472ee3847528933ad7236daab7e3 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 19 Oct 2023 13:56:12 -0400 Subject: [PATCH 02/38] update copyright, remove todo --- src/components/ledc/ws_ledc.cpp | 10 +++------- src/components/ledc/ws_ledc.h | 4 ++-- src/components/uart/ws_uart.cpp | 13 ------------- 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/src/components/ledc/ws_ledc.cpp b/src/components/ledc/ws_ledc.cpp index 244bcb9e0..25b4ce2a4 100644 --- a/src/components/ledc/ws_ledc.cpp +++ b/src/components/ledc/ws_ledc.cpp @@ -8,7 +8,7 @@ * please support Adafruit and open-source hardware by purchasing * products from Adafruit! * - * Written by Brent Rubell for Adafruit Industries, 2022. + * Written by Brent Rubell for Adafruit Industries, 2022-2023 * * MIT license, all text here must be included in any redistribution. * @@ -22,18 +22,14 @@ @brief Constructor */ /**************************************************************************/ -ws_ledc::ws_ledc() { - // TODO -} +ws_ledc::ws_ledc() {} /**************************************************************************/ /*! @brief Destructor */ /**************************************************************************/ -ws_ledc::~ws_ledc() { - // TODO -} +ws_ledc::~ws_ledc() {} /**************************************************************************/ /*! diff --git a/src/components/ledc/ws_ledc.h b/src/components/ledc/ws_ledc.h index 802c46742..c61c9f439 100644 --- a/src/components/ledc/ws_ledc.h +++ b/src/components/ledc/ws_ledc.h @@ -36,8 +36,8 @@ class Wippersnapper; /**************************************************************************/ class ws_ledc { public: - ws_ledc(); - ~ws_ledc(); + ws_ledc(){}; + ~ws_ledc(){}; bool attachPin(uint8_t pin, uint32_t freq, uint8_t resolution); bool detachPin(uint8_t pin); // LEDC-API diff --git a/src/components/uart/ws_uart.cpp b/src/components/uart/ws_uart.cpp index ef16ab368..d5cef5ed3 100644 --- a/src/components/uart/ws_uart.cpp +++ b/src/components/uart/ws_uart.cpp @@ -43,13 +43,6 @@ void ws_uart::initUARTBus( int32_t tx = atoi(msgUARTRequest->bus_info.pin_tx + 1); bool invert = msgUARTRequest->bus_info.is_invert; - // Print bus_info - WS_DEBUG_PRINTLN("[INFO, UART]: Initializing SW UART bus..."); - WS_DEBUG_PRINTLN("[INFO, UART]: Baud Rate: " + String(baud)); - WS_DEBUG_PRINTLN("[INFO, UART]: RX Pin: " + String(rx)); - WS_DEBUG_PRINTLN("[INFO, UART]: TX Pin: " + String(tx)); - WS_DEBUG_PRINTLN("[INFO, UART]: Invert? " + String(invert)); - // Initialize and begin UART bus depending if the platform supports either HW // UART or SW UART #ifdef USE_SW_UART @@ -150,18 +143,14 @@ bool ws_uart::initUARTDevice( wippersnapper_uart_v1_UARTDeviceAttachRequest *msgUARTRequest) { // Ensure the protobuf contains a device identifier if (strlen(msgUARTRequest->device_id) == 0) { - WS_DEBUG_PRINTLN("[ERROR, UART]: Device ID is empty!"); return false; } // Do we already have a device with this ID? for (ws_uart_drv *ptrUARTDriver : uartDrivers) { if (strcmp(ptrUARTDriver->getDeviceID(), msgUARTRequest->device_id) == 0) { - WS_DEBUG_PRINTLN("[INFO, UART]: Device ID already exists on the bus, " - "disconnecting..."); deinitUARTDevice( msgUARTRequest->device_id); // Deinit the device and free resources - WS_DEBUG_PRINT("Disconnected!"); } } @@ -229,11 +218,9 @@ void ws_uart::detachUARTDevice( void ws_uart::update() { for (ws_uart_drv *ptrUARTDriver : uartDrivers) { if (ptrUARTDriver->isReady()) { - WS_DEBUG_PRINTLN("[INFO, UART]: UART driver is ready."); // Attempt to poll the UART driver for new data if (ptrUARTDriver->read_data()) { // Send UART driver's data to IO - WS_DEBUG_PRINTLN("[INFO, UART]: UART driver has new data."); ptrUARTDriver->send_data(); } } From 79c0fb45c2992793678ea406bff95beffb5314c8 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 19 Oct 2023 13:57:31 -0400 Subject: [PATCH 03/38] bump version --- library.properties | 2 +- src/Wippersnapper.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library.properties b/library.properties index da6dda71e..3b53ebab0 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Adafruit WipperSnapper -version=1.0.0-beta.73 +version=1.0.0-beta.74 author=Adafruit maintainer=Adafruit sentence=Arduino client for Adafruit.io WipperSnapper diff --git a/src/Wippersnapper.h b/src/Wippersnapper.h index 83dd295fc..2450dd142 100644 --- a/src/Wippersnapper.h +++ b/src/Wippersnapper.h @@ -9,7 +9,7 @@ * please support Adafruit and open-source hardware by purchasing * products from Adafruit! * - * Copyright (c) Brent Rubell 2020-2022 for Adafruit Industries. + * Copyright (c) Brent Rubell 2020-2023 for Adafruit Industries. * * BSD license, all text here must be included in any redistribution. * @@ -71,7 +71,7 @@ #endif #define WS_VERSION \ - "1.0.0-beta.73" ///< WipperSnapper app. version (semver-formatted) + "1.0.0-beta.74" ///< WipperSnapper app. version (semver-formatted) // Reserved Adafruit IO MQTT topics #define TOPIC_IO_THROTTLE "/throttle" ///< Adafruit IO Throttle MQTT Topic From 9a58778b26d39e6194d1de94ce8a179ad1fb9ebc Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 20 Oct 2023 10:59:13 -0400 Subject: [PATCH 04/38] hotpatch for arduino-cli failure --- .github/workflows/build-clang-doxy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 17b3a5fd7..610a87faa 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -36,7 +36,7 @@ jobs: echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags) - uses: actions/checkout@v2 with: - repository: adafruit/ci-arduino + repository: brentru/ci-arduino path: ci - name: Install CI-Arduino run: bash ci/actions_install.sh From b3e6230aa5040f360db67780a68e96b7e5bc7480 Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 20 Oct 2023 15:22:52 -0400 Subject: [PATCH 05/38] fix format error --- .github/workflows/build-clang-doxy.yml | 2 +- src/components/i2c/WipperSnapper_I2C.cpp | 47 +++++++++++++----------- src/components/ledc/ws_ledc.cpp | 14 ------- src/components/ledc/ws_ledc.h | 10 +++++ 4 files changed, 37 insertions(+), 36 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 610a87faa..17b3a5fd7 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -36,7 +36,7 @@ jobs: echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags) - uses: actions/checkout@v2 with: - repository: brentru/ci-arduino + repository: adafruit/ci-arduino path: ci - name: Install CI-Arduino run: bash ci/actions_install.sh diff --git a/src/components/i2c/WipperSnapper_I2C.cpp b/src/components/i2c/WipperSnapper_I2C.cpp index 0fea9a3e4..bc0274a8a 100644 --- a/src/components/i2c/WipperSnapper_I2C.cpp +++ b/src/components/i2c/WipperSnapper_I2C.cpp @@ -816,28 +816,29 @@ void WipperSnapper_Component_I2C::displayDeviceEventMessage( msgi2cResponse->payload.resp_i2c_device_event.sensor_event[i].type) { case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_AMBIENT_TEMPERATURE: case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_OBJECT_TEMPERATURE: - snprintf(buffer, 100, "[I2C: %#x] Read: %0.3f *C\n", sensorAddress, - value); + snprintf(buffer, 100, "[I2C: %#x] Read: %0.3f *C\n", + (unsigned int)sensorAddress, value); break; case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_AMBIENT_TEMPERATURE_FAHRENHEIT: case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_OBJECT_TEMPERATURE_FAHRENHEIT: - snprintf(buffer, 100, "[I2C: %#x] Read: %0.3f *F\n", sensorAddress, - value); + snprintf(buffer, 100, "[I2C: %#x] Read: %0.3f *F\n", + (unsigned int)sensorAddress, value); break; case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_RELATIVE_HUMIDITY: - snprintf(buffer, 100, "[I2C: %#x] Read: %0.3f %% rh\n", sensorAddress, - value); + snprintf(buffer, 100, "[I2C: %#x] Read: %0.3f %% rh\n", + (unsigned int)sensorAddress, value); break; case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_PRESSURE: - snprintf(buffer, 100, "[I2C: %#x] Read: %0.3f hPA\n", sensorAddress, - value); + snprintf(buffer, 100, "[I2C: %#x] Read: %0.3f hPA\n", + (unsigned int)sensorAddress, value); break; case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_ALTITUDE: - snprintf(buffer, 100, "[I2C: %x] Read: %0.3f m\n", sensorAddress, value); + snprintf(buffer, 100, "[I2C: %x] Read: %0.3f m\n", + (unsigned int)sensorAddress, value); break; case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_LIGHT: - snprintf(buffer, 100, "[I2C: %x] Read: %0.3f lux\n", sensorAddress, - value); + snprintf(buffer, 100, "[I2C: %x] Read: %0.3f lux\n", + (unsigned int)sensorAddress, value); break; case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_PM10_STD: case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_PM25_STD: @@ -852,29 +853,33 @@ void WipperSnapper_Component_I2C::displayDeviceEventMessage( value); break; case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_UNITLESS_PERCENT: - snprintf(buffer, 100, "[I2C: %x] Read: %0.3f%%\n", sensorAddress, value); + snprintf(buffer, 100, "[I2C: %x] Read: %0.3f%%\n", + (unsigned int)sensorAddress, value); break; case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_VOLTAGE: - snprintf(buffer, 100, "[I2C: %x] Read: %0.3f V\n", sensorAddress, value); + snprintf(buffer, 100, "[I2C: %x] Read: %0.3f V\n", + (unsigned int)sensorAddress, value); break; case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_CURRENT: - snprintf(buffer, 100, "[I2C: %x] Read: %0.3f mA\n", sensorAddress, value); + snprintf(buffer, 100, "[I2C: %x] Read: %0.3f mA\n", + (unsigned int)sensorAddress, value); break; case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_RAW: case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_PROXIMITY: - snprintf(buffer, 100, "[I2C: %x] Read: %0.3f\n", sensorAddress, value); + snprintf(buffer, 100, "[I2C: %x] Read: %0.3f\n", + (unsigned int)sensorAddress, value); break; case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_GAS_RESISTANCE: - snprintf(buffer, 100, "[I2C: %x] Read: %0.3f Ohms\n", sensorAddress, - value); + snprintf(buffer, 100, "[I2C: %x] Read: %0.3f Ohms\n", + (unsigned int)sensorAddress, value); break; case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_NOX_INDEX: - snprintf(buffer, 100, "[I2C: %x] Read: %0.3f NOX\n", sensorAddress, - value); + snprintf(buffer, 100, "[I2C: %x] Read: %0.3f NOX\n", + (unsigned int)sensorAddress, value); break; case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_VOC_INDEX: - snprintf(buffer, 100, "[I2C: %x] Read: %0.3f VOC\n", sensorAddress, - value); + snprintf(buffer, 100, "[I2C: %x] Read: %0.3f VOC\n", + (unsigned int)sensorAddress, value); break; default: break; diff --git a/src/components/ledc/ws_ledc.cpp b/src/components/ledc/ws_ledc.cpp index 25b4ce2a4..7416077bc 100644 --- a/src/components/ledc/ws_ledc.cpp +++ b/src/components/ledc/ws_ledc.cpp @@ -17,20 +17,6 @@ #include "ws_ledc.h" -/**************************************************************************/ -/*! - @brief Constructor -*/ -/**************************************************************************/ -ws_ledc::ws_ledc() {} - -/**************************************************************************/ -/*! - @brief Destructor -*/ -/**************************************************************************/ -ws_ledc::~ws_ledc() {} - /**************************************************************************/ /*! @brief Sets up a LEDC pin with given frequency and resolution. diff --git a/src/components/ledc/ws_ledc.h b/src/components/ledc/ws_ledc.h index c61c9f439..d206767a6 100644 --- a/src/components/ledc/ws_ledc.h +++ b/src/components/ledc/ws_ledc.h @@ -36,7 +36,17 @@ class Wippersnapper; /**************************************************************************/ class ws_ledc { public: + /**************************************************************************/ + /*! + @brief Ctor + */ + /**************************************************************************/ ws_ledc(){}; + /**************************************************************************/ + /*! + @brief Dtor + */ + /**************************************************************************/ ~ws_ledc(){}; bool attachPin(uint8_t pin, uint32_t freq, uint8_t resolution); bool detachPin(uint8_t pin); From 9f0af52d8388eabf074d8092b6821a88042aa204 Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 20 Oct 2023 15:29:43 -0400 Subject: [PATCH 06/38] missed two! --- src/components/i2c/WipperSnapper_I2C.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/i2c/WipperSnapper_I2C.cpp b/src/components/i2c/WipperSnapper_I2C.cpp index bc0274a8a..f220ae656 100644 --- a/src/components/i2c/WipperSnapper_I2C.cpp +++ b/src/components/i2c/WipperSnapper_I2C.cpp @@ -845,12 +845,12 @@ void WipperSnapper_Component_I2C::displayDeviceEventMessage( case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_PM100_STD: case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_CO2: case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_ECO2: - snprintf(buffer, 100, "[I2C: %x] Read: %0.3f ppm\n", sensorAddress, - value); + snprintf(buffer, 100, "[I2C: %x] Read: %0.3f ppm\n", + (unsigned int)sensorAddress, value); break; case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_TVOC: - snprintf(buffer, 100, "[I2C: %x] Read: %0.3f ppb\n", sensorAddress, - value); + snprintf(buffer, 100, "[I2C: %x] Read: %0.3f ppb\n", + (unsigned int)sensorAddress, value); break; case wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_UNITLESS_PERCENT: snprintf(buffer, 100, "[I2C: %x] Read: %0.3f%%\n", From 034d7c72f6e7277f467e1e32c0f78bba917b2f44 Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 20 Oct 2023 15:56:12 -0400 Subject: [PATCH 07/38] try onewireng instead of standard paul onewire bc its latest --- .github/workflows/build-clang-doxy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 17b3a5fd7..d2760bde1 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -43,7 +43,7 @@ jobs: - name: Install extra Arduino libraries run: | git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library - git clone --quiet https://github.com/PaulStoffregen/OneWire.git /home/runner/Arduino/libraries/OneWire + git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg git clone --quiet https://github.com/adafruit/Adafruit_HX8357_Library.git /home/runner/Arduino/libraries/Adafruit_HX8357_Library git clone --quiet https://github.com/adafruit/Adafruit_ILI9341.git /home/runner/Arduino/libraries/Adafruit_ILI9341 git clone --quiet https://github.com/adafruit/Adafruit_STMPE610.git /home/runner/Arduino/libraries/Adafruit_STMPE610 @@ -110,7 +110,7 @@ jobs: - name: Install extra Arduino libraries run: | git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library - git clone --quiet https://github.com/PaulStoffregen/OneWire.git /home/runner/Arduino/libraries/OneWire + git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg - name: Install Dependencies run: | pip3 install esptool From 852ab6593606b55c484acca0692a1ab9c2b39327 Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 23 Oct 2023 09:28:26 -0400 Subject: [PATCH 08/38] use brentru fork of lvgl --- .github/workflows/build-clang-doxy.yml | 2 +- src/Wippersnapper.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index d2760bde1..7dd782f6e 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -49,7 +49,7 @@ jobs: git clone --quiet https://github.com/adafruit/Adafruit_STMPE610.git /home/runner/Arduino/libraries/Adafruit_STMPE610 git clone --quiet https://github.com/adafruit/Adafruit-ST7735-Library.git /home/runner/Arduino/libraries/Adafruit-ST7735-Library git clone --quiet https://github.com/adafruit/Adafruit_TouchScreen.git /home/runner/Arduino/libraries/Adafruit_TouchScreen - git clone --depth 1 --branch v8.2.0 https://github.com/lvgl/lvgl.git /home/runner/Arduino/libraries/lvgl + git clone --depth 1 --branch wippersnapper https://github.com/brentru/lvgl.git /home/runner/Arduino/libraries/lvgl git clone --depth 1 --branch development https://github.com/brentru/Adafruit_LvGL_Glue.git /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library - name: List all files in Adafruit_LittlevGL_Glue_Library folder run: | diff --git a/src/Wippersnapper.cpp b/src/Wippersnapper.cpp index c24f9ee47..8ce241247 100644 --- a/src/Wippersnapper.cpp +++ b/src/Wippersnapper.cpp @@ -1210,7 +1210,7 @@ bool cbPWMDecodeMsg(pb_istream_t *stream, const pb_field_t *field, void **arg) { #ifdef USE_DISPLAY char buffer[100]; - snprintf(buffer, 100, "[PWM] Writing %u Hz to pin %s\n.", + snprintf(buffer, 100, "[PWM] Writing %d Hz to pin %s\n.", msgPWMWriteFreqRequest.frequency, msgPWMWriteFreqRequest.pin); WS._ui_helper->add_text_to_terminal(buffer); #endif From 29ee9534b8aa9d4ad33c00b2285319955c8291bb Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 23 Oct 2023 09:45:39 -0400 Subject: [PATCH 09/38] format specifier --- src/Wippersnapper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Wippersnapper.cpp b/src/Wippersnapper.cpp index 8ce241247..3402502eb 100644 --- a/src/Wippersnapper.cpp +++ b/src/Wippersnapper.cpp @@ -1210,7 +1210,7 @@ bool cbPWMDecodeMsg(pb_istream_t *stream, const pb_field_t *field, void **arg) { #ifdef USE_DISPLAY char buffer[100]; - snprintf(buffer, 100, "[PWM] Writing %d Hz to pin %s\n.", + snprintf(buffer, 100, "[PWM] Writing %ld Hz to pin %s\n.", msgPWMWriteFreqRequest.frequency, msgPWMWriteFreqRequest.pin); WS._ui_helper->add_text_to_terminal(buffer); #endif From 5d9ef80e334ae8fef5f715f9623427d2d2ddfce5 Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 23 Oct 2023 10:32:14 -0400 Subject: [PATCH 10/38] fix format specifier --- src/components/pixels/ws_pixels.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/pixels/ws_pixels.cpp b/src/components/pixels/ws_pixels.cpp index daf663f49..fce00a36c 100644 --- a/src/components/pixels/ws_pixels.cpp +++ b/src/components/pixels/ws_pixels.cpp @@ -434,7 +434,7 @@ void ws_pixels::fillStrand( #ifdef USE_DISPLAY char buffer[100]; snprintf(buffer, 100, "[Pixel] Filling strand on pin %s with color %u\n", - pixelsWriteMsg->pixels_pin_data, pixelsWriteMsg->pixels_color); + pixelsWriteMsg->pixels_pin_data, (unsigned int)pixelsWriteMsg->pixels_color); WS._ui_helper->add_text_to_terminal(buffer); #endif From 72990fd4c317575368e6465531cb42c7fcf1453d Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 23 Oct 2023 12:00:23 -0400 Subject: [PATCH 11/38] brent fork for partition table inc. --- .github/workflows/build-clang-doxy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 7dd782f6e..16d05d7a0 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -36,7 +36,7 @@ jobs: echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags) - uses: actions/checkout@v2 with: - repository: adafruit/ci-arduino + repository: brentru/ci-arduino path: ci - name: Install CI-Arduino run: bash ci/actions_install.sh From a3910ce6920070f5092c6e344499204a12a8d0a0 Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 23 Oct 2023 12:40:01 -0400 Subject: [PATCH 12/38] add ws pixels clang --- src/components/pixels/ws_pixels.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/pixels/ws_pixels.cpp b/src/components/pixels/ws_pixels.cpp index fce00a36c..73db519af 100644 --- a/src/components/pixels/ws_pixels.cpp +++ b/src/components/pixels/ws_pixels.cpp @@ -434,7 +434,8 @@ void ws_pixels::fillStrand( #ifdef USE_DISPLAY char buffer[100]; snprintf(buffer, 100, "[Pixel] Filling strand on pin %s with color %u\n", - pixelsWriteMsg->pixels_pin_data, (unsigned int)pixelsWriteMsg->pixels_color); + pixelsWriteMsg->pixels_pin_data, + (unsigned int)pixelsWriteMsg->pixels_color); WS._ui_helper->add_text_to_terminal(buffer); #endif From 0eb5df77378dbaedce2f5973c7ba38beb6e57151 Mon Sep 17 00:00:00 2001 From: Brent Rubell Date: Thu, 9 Nov 2023 10:53:01 -0500 Subject: [PATCH 13/38] add UART BSP3 changes --- src/components/uart/ws_uart.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/components/uart/ws_uart.cpp b/src/components/uart/ws_uart.cpp index d5cef5ed3..89d839ac2 100644 --- a/src/components/uart/ws_uart.cpp +++ b/src/components/uart/ws_uart.cpp @@ -26,6 +26,14 @@ ws_uart::~ws_uart(void) { #else _hwSerial = nullptr; #endif + +// setPins() will detach any previous pins that have been changed. +#ifdef USE_SW_UART + _swSerial->setPins(); +#else +#ifndef ARDUINO_ARCH_SAMD + _hwSerial->setPins(); +#endif } /*******************************************************************************/ From eb6838ae916b0d31302ae7e11d054e741b8fa4f1 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 9 Nov 2023 11:01:57 -0500 Subject: [PATCH 14/38] Revert --- src/components/uart/ws_uart.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/components/uart/ws_uart.cpp b/src/components/uart/ws_uart.cpp index 89d839ac2..d5cef5ed3 100644 --- a/src/components/uart/ws_uart.cpp +++ b/src/components/uart/ws_uart.cpp @@ -26,14 +26,6 @@ ws_uart::~ws_uart(void) { #else _hwSerial = nullptr; #endif - -// setPins() will detach any previous pins that have been changed. -#ifdef USE_SW_UART - _swSerial->setPins(); -#else -#ifndef ARDUINO_ARCH_SAMD - _hwSerial->setPins(); -#endif } /*******************************************************************************/ From 95df198c70b2baddb46b81a0c461b629ad8f46a0 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 9 Nov 2023 11:21:29 -0500 Subject: [PATCH 15/38] add lib --- library.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library.properties b/library.properties index 3b53ebab0..2921ac3fc 100644 --- a/library.properties +++ b/library.properties @@ -2,7 +2,7 @@ name=Adafruit WipperSnapper version=1.0.0-beta.74 author=Adafruit maintainer=Adafruit -sentence=Arduino client for Adafruit.io WipperSnapper +sentence=Arduino application for Adafruit.io WipperSnapper paragraph=Arduino client for Adafruit.io WipperSnapper category=Communication url=https://github.com/adafruit/Adafruit_IO_Arduino From 05794cde5d7ff86a12f2cfc1675fc8423656d31d Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 13 Nov 2023 17:06:23 -0500 Subject: [PATCH 16/38] description and use new partition for fh --- library.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library.properties b/library.properties index 2921ac3fc..1d7c9fe9d 100644 --- a/library.properties +++ b/library.properties @@ -3,7 +3,7 @@ version=1.0.0-beta.74 author=Adafruit maintainer=Adafruit sentence=Arduino application for Adafruit.io WipperSnapper -paragraph=Arduino client for Adafruit.io WipperSnapper +paragraph=Arduino application for Adafruit.io WipperSnapper category=Communication url=https://github.com/adafruit/Adafruit_IO_Arduino architectures=* From 41c8f2facad131a7fab86fc2588bcd11f84c9918 Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 13 Nov 2023 18:09:11 -0500 Subject: [PATCH 17/38] build fh with less strings maybe --- src/display/ws_display_tooltips.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/display/ws_display_tooltips.h b/src/display/ws_display_tooltips.h index afe01454f..d88cce368 100644 --- a/src/display/ws_display_tooltips.h +++ b/src/display/ws_display_tooltips.h @@ -17,12 +17,12 @@ #define WS_LOADING_TIP_1 \ "Name components in IO using emojis to differentiate them!" ///< Loading tip -#define WS_LOADING_TIP_2 \ +/* #define WS_LOADING_TIP_2 \ "WipperSnapper now supports TFT displays on some boards (more to come)." ///< Loading tip 2 #define WS_LOADING_TIP_3 \ "Getting throttle errors? Try reducing a sensor's polling time." ///< Loading ///< tip 3 #define WS_LOADING_TIP_4 \ - "\"Be quick, but don't hurry\" - John Wooden " ///< Loading tip 4 + "\"Be quick, but don't hurry\" - John Wooden " ///< Loading tip 4 */ #endif // WS_LOADING_TOOLTIPS_H \ No newline at end of file From 759552ae54252a4ad9193f58a0bc314567de43c9 Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 13 Nov 2023 18:43:56 -0500 Subject: [PATCH 18/38] put back, it's not the file size! --- src/display/ws_display_tooltips.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/display/ws_display_tooltips.h b/src/display/ws_display_tooltips.h index d88cce368..afe01454f 100644 --- a/src/display/ws_display_tooltips.h +++ b/src/display/ws_display_tooltips.h @@ -17,12 +17,12 @@ #define WS_LOADING_TIP_1 \ "Name components in IO using emojis to differentiate them!" ///< Loading tip -/* #define WS_LOADING_TIP_2 \ +#define WS_LOADING_TIP_2 \ "WipperSnapper now supports TFT displays on some boards (more to come)." ///< Loading tip 2 #define WS_LOADING_TIP_3 \ "Getting throttle errors? Try reducing a sensor's polling time." ///< Loading ///< tip 3 #define WS_LOADING_TIP_4 \ - "\"Be quick, but don't hurry\" - John Wooden " ///< Loading tip 4 */ + "\"Be quick, but don't hurry\" - John Wooden " ///< Loading tip 4 #endif // WS_LOADING_TOOLTIPS_H \ No newline at end of file From ede01b49cd655ba019feec1a888fd869e162e606 Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 17 Nov 2023 12:48:15 -0500 Subject: [PATCH 19/38] run CI --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f221cfe9a..d72345c81 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Pre-compiled binaries and UF2 files for supported hardware are provided on the [ |Platform| MCU(s) | |--|--| -|[ESP32](https://github.com/espressif/arduino-esp32)| ESP32, ESP32-S2, ESP32-S3, ESP32-C3 | +|[ESP32-x](https://github.com/espressif/arduino-esp32)| ESP32, ESP32-S2, ESP32-S3, ESP32-C3 | |[ESP8266](https://github.com/esp8266/Arduino)| ESP8266 | |[RP2040](https://github.com/earlephilhower/arduino-pico)| RP2040 MCU w/WiFi (i.e: Pico W) | |[ATSAMD](https://github.com/adafruit/ArduinoCore-samd/)| SAMD51 MCU w/separate WiFi Co-Processor (i.e: Adafruit "AirLift")| From f33af0efd58a88d14e9eae6039e23a6450214b57 Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 17 Nov 2023 13:27:13 -0500 Subject: [PATCH 20/38] cat neopixel lib --- .github/workflows/build-clang-doxy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 16d05d7a0..216a69738 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -59,6 +59,9 @@ jobs: cp /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library/lv_conf.h /home/runner/Arduino/libraries - name: Build for ESP32-SX run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 + - name: list version of neopixl lib + run: | + cat /home/runner/Arduino/libraries/Adafruit_NeoPixel/library.properties - name: list run: | ls From e2767c49ba5d44ac60972f9e2c351f551b1e880b Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 17 Nov 2023 14:25:09 -0500 Subject: [PATCH 21/38] add debug build for Feather ESP32 v2 --- .github/workflows/build-clang-doxy.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 216a69738..659ad648d 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -59,9 +59,6 @@ jobs: cp /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library/lv_conf.h /home/runner/Arduino/libraries - name: Build for ESP32-SX run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - - name: list version of neopixl lib - run: | - cat /home/runner/Arduino/libraries/Adafruit_NeoPixel/library.properties - name: list run: | ls @@ -84,7 +81,7 @@ jobs: strategy: fail-fast: false matrix: - arduino-platform: ["feather_esp32", "qtpy_esp32", "feather_esp32_v2", "qtpy_esp32c3"] + arduino-platform: ["feather_esp32", "qtpy_esp32", "feather_esp32_v2", "qtpy_esp32c3", "feather_esp32_v2_debug"] include: - offset: "0x1000" - offset: "0x0" From 94b3d08da08036e44a996370f95ed5a27e368a3b Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 17 Nov 2023 14:27:42 -0500 Subject: [PATCH 22/38] ci-arduino brentru pointer --- .github/workflows/build-clang-doxy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 659ad648d..fb801363f 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -98,7 +98,7 @@ jobs: echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags) - uses: actions/checkout@v2 with: - repository: adafruit/ci-arduino + repository: brentru/ci-arduino path: ci - name: Checkout Board Definitions uses: actions/checkout@v2 From aadc9f58d27f8a2520d872f2176e10a98a9b11d0 Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 17 Nov 2023 14:39:43 -0500 Subject: [PATCH 23/38] add debug skip --- examples/Wippersnapper_NoFS/.feather_esp32_v2_debug.skip | 1 + 1 file changed, 1 insertion(+) create mode 100644 examples/Wippersnapper_NoFS/.feather_esp32_v2_debug.skip diff --git a/examples/Wippersnapper_NoFS/.feather_esp32_v2_debug.skip b/examples/Wippersnapper_NoFS/.feather_esp32_v2_debug.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_NoFS/.feather_esp32_v2_debug.skip @@ -0,0 +1 @@ + From 4c5aac0ef834dec7f6a72a45b5e23a1b3b58191d Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 17 Nov 2023 14:48:37 -0500 Subject: [PATCH 24/38] fix .test.skip and remove daily (unused?!) --- examples/Wippersnapper_NoFS/.feather_esp32_v2_debug.skip | 1 - ...sp32_v2_daily.test.skip => .feather_esp32_v2_debug.test.skip} | 0 2 files changed, 1 deletion(-) delete mode 100644 examples/Wippersnapper_NoFS/.feather_esp32_v2_debug.skip rename examples/Wippersnapper_NoFS/{.feather_esp32_v2_daily.test.skip => .feather_esp32_v2_debug.test.skip} (100%) diff --git a/examples/Wippersnapper_NoFS/.feather_esp32_v2_debug.skip b/examples/Wippersnapper_NoFS/.feather_esp32_v2_debug.skip deleted file mode 100644 index 8b1378917..000000000 --- a/examples/Wippersnapper_NoFS/.feather_esp32_v2_debug.skip +++ /dev/null @@ -1 +0,0 @@ - diff --git a/examples/Wippersnapper_NoFS/.feather_esp32_v2_daily.test.skip b/examples/Wippersnapper_NoFS/.feather_esp32_v2_debug.test.skip similarity index 100% rename from examples/Wippersnapper_NoFS/.feather_esp32_v2_daily.test.skip rename to examples/Wippersnapper_NoFS/.feather_esp32_v2_debug.test.skip From 726868edf835d5d22813593f8d7e767c74765962 Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 17 Nov 2023 15:01:21 -0500 Subject: [PATCH 25/38] check the output from the build script --- .github/workflows/build-clang-doxy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index fb801363f..9f1eb3244 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -116,6 +116,9 @@ jobs: pip3 install esptool - name: build ESP32 platforms run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 + - name: Check artifacts + run: | + ls examples/Wippersnapper_demo/build/* - name: Rename build artifacts to reflect the platform name run: | mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bin From c2ae52cc135e5a69054d5aaf18dea888dfeff23a Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 17 Nov 2023 15:10:34 -0500 Subject: [PATCH 26/38] debug generate --- ...r_esp32_v2_daily.generate => .feather_esp32_v2_debug.generate} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename examples/Wippersnapper_demo/{.feather_esp32_v2_daily.generate => .feather_esp32_v2_debug.generate} (100%) diff --git a/examples/Wippersnapper_demo/.feather_esp32_v2_daily.generate b/examples/Wippersnapper_demo/.feather_esp32_v2_debug.generate similarity index 100% rename from examples/Wippersnapper_demo/.feather_esp32_v2_daily.generate rename to examples/Wippersnapper_demo/.feather_esp32_v2_debug.generate From 0244ab0ee7916a0fbe9e17d2e580fc4121085874 Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 17 Nov 2023 15:31:03 -0500 Subject: [PATCH 27/38] hardcode board name for dev build --- .github/workflows/build-clang-doxy.yml | 91 +++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 9f1eb3244..5030a7549 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -81,7 +81,7 @@ jobs: strategy: fail-fast: false matrix: - arduino-platform: ["feather_esp32", "qtpy_esp32", "feather_esp32_v2", "qtpy_esp32c3", "feather_esp32_v2_debug"] + arduino-platform: ["feather_esp32", "qtpy_esp32", "feather_esp32_v2", "qtpy_esp32c3"] include: - offset: "0x1000" - offset: "0x0" @@ -332,6 +332,95 @@ jobs: path: | wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip + build-esp32-dev: + name: Build WipperSnapper ESP32 (Development Build) + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + arduino-platform: ["feather_esp32_v2_debug"] + steps: + - uses: actions/setup-python@v1 + with: + python-version: '3.x' + - uses: actions/checkout@v2 + - name: Get WipperSnapper version + run: | + git fetch --prune --unshallow --tags + git describe --dirty --tags + echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags) + - uses: actions/checkout@v2 + with: + repository: brentru/ci-arduino + path: ci + - name: Checkout Board Definitions + uses: actions/checkout@v2 + with: + repository: adafruit/Wippersnapper_Boards + path: ws-boards + - name: Install CI-Arduino + run: bash ci/actions_install.sh + - name: Install extra Arduino libraries + run: | + git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library + git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg + - name: Install Dependencies + run: | + pip3 install esptool + - name: build ESP32 platforms + run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 + - name: Check artifacts + run: | + ls examples/Wippersnapper_demo/build/* + - name: Rename build artifacts to reflect the platform name + run: | + mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bin + mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.elf wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.elf + mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.map wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.map + mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.bootloader.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin + mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.partitions.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin + - name: Check boot_app0 file existence (esp32 built from core, not-source) + id: check_files + uses: andstor/file-existence-action@v1 + with: + files: "/home/runner/.arduino15/packages/esp32/hardware/esp32/*/tools/partitions/boot_app0.bin" + - name: boot_app0 file from arduino-cli core + if: steps.check_files.outputs.files_exists == 'true' + run: mv /home/runner/.arduino15/packages/esp32/hardware/esp32/*/tools/partitions/boot_app0.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.boot_app0.bin + - name: boot_app0 file from esp32 source bsp + if: steps.check_files.outputs.files_exists == 'false' + run: mv /home/runner/Arduino/hardware/espressif/esp32/tools/partitions/boot_app0.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.boot_app0.bin + - name: Get Board Flash Parameters + id: get_board_json + run: | + board_name="feather_esp32_v2" + content=$(cat ws-boards/boards/${board_name//_/-}/definition.json) + content="${content//'%'/'%25'}" + content="${content//$'\n'/'%0A'}" + content="${content//$'\r'/'%0D'}" + echo "::set-output name=boardJson::$content" + - name: Create combined binary using Esptool merge_bin + run: | + python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge_bin \ + --flash_mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \ + --flash_freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \ + --flash_size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \ + -o wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.combined.bin \ + ${{ matrix.offset }} wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin \ + 0x8000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin \ + 0xe000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.boot_app0.bin \ + 0x10000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bin + - name: Zip build artifacts + run: | + zip -r wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.* + - name: upload build artifacts zip + uses: actions/upload-artifact@v2 + with: + name: build-files + path: | + wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip + + clang_and_doxy: runs-on: ubuntu-latest From c72f3e803cb04bb43f449c7d6918158194cd5cc9 Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 17 Nov 2023 16:01:36 -0500 Subject: [PATCH 28/38] hardcore board_name for esptool merge bin --- .github/workflows/build-clang-doxy.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 5030a7549..ab7a5dff2 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -405,14 +405,14 @@ jobs: --flash_mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \ --flash_freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \ --flash_size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \ - -o wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.combined.bin \ - ${{ matrix.offset }} wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin \ - 0x8000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin \ - 0xe000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.boot_app0.bin \ - 0x10000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bin + -o wippersnapper.feather_esp32_v2.littlefs.${{ env.WS_VERSION }}.combined.bin \ + ${{ matrix.offset }} wippersnapper.feather_esp32_v2.littlefs.${{ env.WS_VERSION }}.bootloader.bin \ + 0x8000 wippersnapper.feather_esp32_v2.littlefs.${{ env.WS_VERSION }}.partitions.bin \ + 0xe000 wippersnapper.feather_esp32_v2.littlefs.${{ env.WS_VERSION }}.boot_app0.bin \ + 0x10000 wippersnapper.feather_esp32_v2.littlefs.${{ env.WS_VERSION }}.bin - name: Zip build artifacts run: | - zip -r wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.* + zip -r wippersnapper.feather_esp32_v2.littlefs.${{ env.WS_VERSION }}.zip wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.* - name: upload build artifacts zip uses: actions/upload-artifact@v2 with: From c048afa47083a14f958aceb225e04eae23204d0c Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 20 Nov 2023 11:46:53 -0500 Subject: [PATCH 29/38] put back previous build --- .github/workflows/build-clang-doxy.yml | 90 -------------------------- 1 file changed, 90 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index ab7a5dff2..3a42397a9 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -332,96 +332,6 @@ jobs: path: | wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip - build-esp32-dev: - name: Build WipperSnapper ESP32 (Development Build) - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - arduino-platform: ["feather_esp32_v2_debug"] - steps: - - uses: actions/setup-python@v1 - with: - python-version: '3.x' - - uses: actions/checkout@v2 - - name: Get WipperSnapper version - run: | - git fetch --prune --unshallow --tags - git describe --dirty --tags - echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags) - - uses: actions/checkout@v2 - with: - repository: brentru/ci-arduino - path: ci - - name: Checkout Board Definitions - uses: actions/checkout@v2 - with: - repository: adafruit/Wippersnapper_Boards - path: ws-boards - - name: Install CI-Arduino - run: bash ci/actions_install.sh - - name: Install extra Arduino libraries - run: | - git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library - git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg - - name: Install Dependencies - run: | - pip3 install esptool - - name: build ESP32 platforms - run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - - name: Check artifacts - run: | - ls examples/Wippersnapper_demo/build/* - - name: Rename build artifacts to reflect the platform name - run: | - mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bin - mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.elf wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.elf - mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.map wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.map - mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.bootloader.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin - mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.partitions.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin - - name: Check boot_app0 file existence (esp32 built from core, not-source) - id: check_files - uses: andstor/file-existence-action@v1 - with: - files: "/home/runner/.arduino15/packages/esp32/hardware/esp32/*/tools/partitions/boot_app0.bin" - - name: boot_app0 file from arduino-cli core - if: steps.check_files.outputs.files_exists == 'true' - run: mv /home/runner/.arduino15/packages/esp32/hardware/esp32/*/tools/partitions/boot_app0.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.boot_app0.bin - - name: boot_app0 file from esp32 source bsp - if: steps.check_files.outputs.files_exists == 'false' - run: mv /home/runner/Arduino/hardware/espressif/esp32/tools/partitions/boot_app0.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.boot_app0.bin - - name: Get Board Flash Parameters - id: get_board_json - run: | - board_name="feather_esp32_v2" - content=$(cat ws-boards/boards/${board_name//_/-}/definition.json) - content="${content//'%'/'%25'}" - content="${content//$'\n'/'%0A'}" - content="${content//$'\r'/'%0D'}" - echo "::set-output name=boardJson::$content" - - name: Create combined binary using Esptool merge_bin - run: | - python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge_bin \ - --flash_mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \ - --flash_freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \ - --flash_size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \ - -o wippersnapper.feather_esp32_v2.littlefs.${{ env.WS_VERSION }}.combined.bin \ - ${{ matrix.offset }} wippersnapper.feather_esp32_v2.littlefs.${{ env.WS_VERSION }}.bootloader.bin \ - 0x8000 wippersnapper.feather_esp32_v2.littlefs.${{ env.WS_VERSION }}.partitions.bin \ - 0xe000 wippersnapper.feather_esp32_v2.littlefs.${{ env.WS_VERSION }}.boot_app0.bin \ - 0x10000 wippersnapper.feather_esp32_v2.littlefs.${{ env.WS_VERSION }}.bin - - name: Zip build artifacts - run: | - zip -r wippersnapper.feather_esp32_v2.littlefs.${{ env.WS_VERSION }}.zip wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.* - - name: upload build artifacts zip - uses: actions/upload-artifact@v2 - with: - name: build-files - path: | - wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip - - - clang_and_doxy: runs-on: ubuntu-latest needs: [build-samd, build-esp32, build-esp32sx, build-esp8266, build-samd-non-fs, build-rp2040] From a3f7b5916caaad940b0ad971c4e4450aedd4a417 Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 20 Nov 2023 11:58:16 -0500 Subject: [PATCH 30/38] add debug BUILD --- .../.feather_esp32.test.skip | 1 + ....feather_esp32_s3_reverse_tft_dev.generate | 1 + .../.feather_esp32_v2.test.skip | 1 + .../.feather_esp32_v2_debug.test.skip | 1 + .../.feather_esp32s2.test.skip | 1 + .../.feather_esp32s2_dev.generate | 1 + .../.feather_esp32s2_reverse_tft.test.skip | 1 + .../.feather_esp32s2_reverse_tft_dev.generate | 1 + .../.feather_esp32s2_tft.test.skip | 1 + .../.feather_esp32s2_tft_dev.generate | 1 + .../.feather_esp32s3.test.skip | 1 + ...eather_esp32s3_4mbflash_2mbpsram.test.skip | 1 + ...her_esp32s3_4mbflash_2mbpsram_dev.generate | 1 + .../.feather_esp32s3_dev.generate | 1 + .../.feather_esp32s3_reverse_tft.test.skip | 1 + .../.feather_esp32s3_reverse_tft_dev.generate | 1 + .../.feather_esp32s3_tft.test.skip | 1 + .../.feather_esp32s3_tft_dev.generate | 1 + .../.feather_esp8266.test.skip | 1 + .../.feather_s2_tinyusb.test.skip | 1 + .../wippersnapper_debug/.funhouse.test.skip | 2 ++ .../wippersnapper_debug/.magtag.test.skip | 1 + .../.metro_m4_airliftlite_tinyusb.test.skip | 2 ++ .../.metroesp32s2.test.skip | 1 + .../.picow_rp2040_tinyusb.test.skip | 1 + .../.pyportal_tinyusb.test.skip | 3 +++ .../wippersnapper_debug/.qtpy_esp32.test.skip | 1 + .../.qtpy_esp32c3.test.skip | 1 + .../.qtpy_esp32s2.test.skip | 1 + .../.qtpy_esp32s3.test.skip | 1 + .../.qtpy_esp32s3_n4r2.test.skip | 1 + .../wippersnapper_debug.ino | 24 +++++++++++++++++++ 32 files changed, 59 insertions(+) create mode 100644 examples/wippersnapper_debug/.feather_esp32.test.skip create mode 100644 examples/wippersnapper_debug/.feather_esp32_s3_reverse_tft_dev.generate create mode 100644 examples/wippersnapper_debug/.feather_esp32_v2.test.skip create mode 100644 examples/wippersnapper_debug/.feather_esp32_v2_debug.test.skip create mode 100644 examples/wippersnapper_debug/.feather_esp32s2.test.skip create mode 100644 examples/wippersnapper_debug/.feather_esp32s2_dev.generate create mode 100644 examples/wippersnapper_debug/.feather_esp32s2_reverse_tft.test.skip create mode 100644 examples/wippersnapper_debug/.feather_esp32s2_reverse_tft_dev.generate create mode 100644 examples/wippersnapper_debug/.feather_esp32s2_tft.test.skip create mode 100644 examples/wippersnapper_debug/.feather_esp32s2_tft_dev.generate create mode 100644 examples/wippersnapper_debug/.feather_esp32s3.test.skip create mode 100644 examples/wippersnapper_debug/.feather_esp32s3_4mbflash_2mbpsram.test.skip create mode 100644 examples/wippersnapper_debug/.feather_esp32s3_4mbflash_2mbpsram_dev.generate create mode 100644 examples/wippersnapper_debug/.feather_esp32s3_dev.generate create mode 100644 examples/wippersnapper_debug/.feather_esp32s3_reverse_tft.test.skip create mode 100644 examples/wippersnapper_debug/.feather_esp32s3_reverse_tft_dev.generate create mode 100644 examples/wippersnapper_debug/.feather_esp32s3_tft.test.skip create mode 100644 examples/wippersnapper_debug/.feather_esp32s3_tft_dev.generate create mode 100644 examples/wippersnapper_debug/.feather_esp8266.test.skip create mode 100644 examples/wippersnapper_debug/.feather_s2_tinyusb.test.skip create mode 100644 examples/wippersnapper_debug/.funhouse.test.skip create mode 100644 examples/wippersnapper_debug/.magtag.test.skip create mode 100644 examples/wippersnapper_debug/.metro_m4_airliftlite_tinyusb.test.skip create mode 100644 examples/wippersnapper_debug/.metroesp32s2.test.skip create mode 100644 examples/wippersnapper_debug/.picow_rp2040_tinyusb.test.skip create mode 100644 examples/wippersnapper_debug/.pyportal_tinyusb.test.skip create mode 100644 examples/wippersnapper_debug/.qtpy_esp32.test.skip create mode 100644 examples/wippersnapper_debug/.qtpy_esp32c3.test.skip create mode 100644 examples/wippersnapper_debug/.qtpy_esp32s2.test.skip create mode 100644 examples/wippersnapper_debug/.qtpy_esp32s3.test.skip create mode 100644 examples/wippersnapper_debug/.qtpy_esp32s3_n4r2.test.skip create mode 100644 examples/wippersnapper_debug/wippersnapper_debug.ino diff --git a/examples/wippersnapper_debug/.feather_esp32.test.skip b/examples/wippersnapper_debug/.feather_esp32.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.feather_esp32.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.feather_esp32_s3_reverse_tft_dev.generate b/examples/wippersnapper_debug/.feather_esp32_s3_reverse_tft_dev.generate new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.feather_esp32_s3_reverse_tft_dev.generate @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.feather_esp32_v2.test.skip b/examples/wippersnapper_debug/.feather_esp32_v2.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.feather_esp32_v2.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.feather_esp32_v2_debug.test.skip b/examples/wippersnapper_debug/.feather_esp32_v2_debug.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.feather_esp32_v2_debug.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.feather_esp32s2.test.skip b/examples/wippersnapper_debug/.feather_esp32s2.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.feather_esp32s2.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.feather_esp32s2_dev.generate b/examples/wippersnapper_debug/.feather_esp32s2_dev.generate new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.feather_esp32s2_dev.generate @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.feather_esp32s2_reverse_tft.test.skip b/examples/wippersnapper_debug/.feather_esp32s2_reverse_tft.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.feather_esp32s2_reverse_tft.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.feather_esp32s2_reverse_tft_dev.generate b/examples/wippersnapper_debug/.feather_esp32s2_reverse_tft_dev.generate new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.feather_esp32s2_reverse_tft_dev.generate @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.feather_esp32s2_tft.test.skip b/examples/wippersnapper_debug/.feather_esp32s2_tft.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.feather_esp32s2_tft.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.feather_esp32s2_tft_dev.generate b/examples/wippersnapper_debug/.feather_esp32s2_tft_dev.generate new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.feather_esp32s2_tft_dev.generate @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.feather_esp32s3.test.skip b/examples/wippersnapper_debug/.feather_esp32s3.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.feather_esp32s3.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.feather_esp32s3_4mbflash_2mbpsram.test.skip b/examples/wippersnapper_debug/.feather_esp32s3_4mbflash_2mbpsram.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.feather_esp32s3_4mbflash_2mbpsram.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.feather_esp32s3_4mbflash_2mbpsram_dev.generate b/examples/wippersnapper_debug/.feather_esp32s3_4mbflash_2mbpsram_dev.generate new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.feather_esp32s3_4mbflash_2mbpsram_dev.generate @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.feather_esp32s3_dev.generate b/examples/wippersnapper_debug/.feather_esp32s3_dev.generate new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.feather_esp32s3_dev.generate @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.feather_esp32s3_reverse_tft.test.skip b/examples/wippersnapper_debug/.feather_esp32s3_reverse_tft.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.feather_esp32s3_reverse_tft.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.feather_esp32s3_reverse_tft_dev.generate b/examples/wippersnapper_debug/.feather_esp32s3_reverse_tft_dev.generate new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.feather_esp32s3_reverse_tft_dev.generate @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.feather_esp32s3_tft.test.skip b/examples/wippersnapper_debug/.feather_esp32s3_tft.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.feather_esp32s3_tft.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.feather_esp32s3_tft_dev.generate b/examples/wippersnapper_debug/.feather_esp32s3_tft_dev.generate new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.feather_esp32s3_tft_dev.generate @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.feather_esp8266.test.skip b/examples/wippersnapper_debug/.feather_esp8266.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.feather_esp8266.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.feather_s2_tinyusb.test.skip b/examples/wippersnapper_debug/.feather_s2_tinyusb.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.feather_s2_tinyusb.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.funhouse.test.skip b/examples/wippersnapper_debug/.funhouse.test.skip new file mode 100644 index 000000000..139597f9c --- /dev/null +++ b/examples/wippersnapper_debug/.funhouse.test.skip @@ -0,0 +1,2 @@ + + diff --git a/examples/wippersnapper_debug/.magtag.test.skip b/examples/wippersnapper_debug/.magtag.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.magtag.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.metro_m4_airliftlite_tinyusb.test.skip b/examples/wippersnapper_debug/.metro_m4_airliftlite_tinyusb.test.skip new file mode 100644 index 000000000..139597f9c --- /dev/null +++ b/examples/wippersnapper_debug/.metro_m4_airliftlite_tinyusb.test.skip @@ -0,0 +1,2 @@ + + diff --git a/examples/wippersnapper_debug/.metroesp32s2.test.skip b/examples/wippersnapper_debug/.metroesp32s2.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.metroesp32s2.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.picow_rp2040_tinyusb.test.skip b/examples/wippersnapper_debug/.picow_rp2040_tinyusb.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.picow_rp2040_tinyusb.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.pyportal_tinyusb.test.skip b/examples/wippersnapper_debug/.pyportal_tinyusb.test.skip new file mode 100644 index 000000000..b28b04f64 --- /dev/null +++ b/examples/wippersnapper_debug/.pyportal_tinyusb.test.skip @@ -0,0 +1,3 @@ + + + diff --git a/examples/wippersnapper_debug/.qtpy_esp32.test.skip b/examples/wippersnapper_debug/.qtpy_esp32.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.qtpy_esp32.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.qtpy_esp32c3.test.skip b/examples/wippersnapper_debug/.qtpy_esp32c3.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.qtpy_esp32c3.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.qtpy_esp32s2.test.skip b/examples/wippersnapper_debug/.qtpy_esp32s2.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.qtpy_esp32s2.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.qtpy_esp32s3.test.skip b/examples/wippersnapper_debug/.qtpy_esp32s3.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.qtpy_esp32s3.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.qtpy_esp32s3_n4r2.test.skip b/examples/wippersnapper_debug/.qtpy_esp32s3_n4r2.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.qtpy_esp32s3_n4r2.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/wippersnapper_debug.ino b/examples/wippersnapper_debug/wippersnapper_debug.ino new file mode 100644 index 000000000..339ce0b6b --- /dev/null +++ b/examples/wippersnapper_debug/wippersnapper_debug.ino @@ -0,0 +1,24 @@ +// Adafruit IO WipperSnapper Beta (DEBUG BUILD ONLY!) +// Brent Rubell for Adafruit Industries, 2021 - 2023 + +#include "Wippersnapper_Networking.h" +Wippersnapper_WiFi wipper; + +// Enable debug output for beta builds +#define WS_DEBUG + +void setup() { + // Provisioning must occur prior to serial init. + wipper.provision(); + + Serial.begin(115200); // wippersnapper serial + Serial1.begin(115200); // ESP-IDF messages serial + Serial1.setDebugOutput(true); // Enable ESP-IDF messages over Serial1 + //while (!Serial) delay(10); + + wipper.connect(); +} + +void loop() { + wipper.run(); +} \ No newline at end of file From 6d4652d976356412ccfca62369a289bedc3f5457 Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 20 Nov 2023 12:01:29 -0500 Subject: [PATCH 31/38] dev build --- .github/workflows/build-clang-doxy.yml | 63 ++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 3a42397a9..97b6d942c 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -332,6 +332,69 @@ jobs: path: | wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip + build-esp32sx-dev: + name: Build WipperSnapper ESP32-Sx DEV BUILDS + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + arduino-platform: ["feather_esp32s2_dev", "feather_esp32s2_tft_dev", + "feather_esp32s2_reverse_tft_dev", "feather_esp32s3_dev", + "feather_esp32s3_4mbflash_2mbpsram_dev", "feather_esp32s3_tft_dev", + "feather_esp32s3_reverse_tft_dev"] + steps: + - uses: actions/setup-python@v1 + with: + python-version: '3.x' + - uses: actions/checkout@v2 + - name: Get WipperSnapper version + run: | + git fetch --prune --unshallow --tags + git describe --dirty --tags + echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags) + - uses: actions/checkout@v2 + with: + repository: brentru/ci-arduino + path: ci + - name: Install CI-Arduino + run: bash ci/actions_install.sh + - name: Install extra Arduino libraries + run: | + git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library + git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg + git clone --quiet https://github.com/adafruit/Adafruit_HX8357_Library.git /home/runner/Arduino/libraries/Adafruit_HX8357_Library + git clone --quiet https://github.com/adafruit/Adafruit_ILI9341.git /home/runner/Arduino/libraries/Adafruit_ILI9341 + git clone --quiet https://github.com/adafruit/Adafruit_STMPE610.git /home/runner/Arduino/libraries/Adafruit_STMPE610 + git clone --quiet https://github.com/adafruit/Adafruit-ST7735-Library.git /home/runner/Arduino/libraries/Adafruit-ST7735-Library + git clone --quiet https://github.com/adafruit/Adafruit_TouchScreen.git /home/runner/Arduino/libraries/Adafruit_TouchScreen + git clone --depth 1 --branch wippersnapper https://github.com/brentru/lvgl.git /home/runner/Arduino/libraries/lvgl + git clone --depth 1 --branch development https://github.com/brentru/Adafruit_LvGL_Glue.git /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library + - name: List all files in Adafruit_LittlevGL_Glue_Library folder + run: | + ls /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library + - name: Copy lv_conf.h file in Adafruit_LittlevGL_Glue_Library to the arduino library folder + run: | + cp /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library/lv_conf.h /home/runner/Arduino/libraries + - name: Build for ESP32-SX + run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 + - name: list + run: | + ls + ls examples/*/build/ + - name: Rename build artifacts to reflect the platform name + run: | + mv examples/*/build/*/wippersnapper_debug.ino.uf2 wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2 + mv examples/*/build/*/wippersnapper_debug.ino.bin wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.bin + - name: upload build artifacts + uses: actions/upload-artifact@v2 + with: + name: build-files + path: | + wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2 + wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.bin + + + clang_and_doxy: runs-on: ubuntu-latest needs: [build-samd, build-esp32, build-esp32sx, build-esp8266, build-samd-non-fs, build-rp2040] From e5672c6829adb71a2c57dc6fcb0481d881c52846 Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 20 Nov 2023 12:08:46 -0500 Subject: [PATCH 32/38] dev build on debug only --- examples/Wippersnapper_NoFS/.DS_Store | Bin 6148 -> 6148 bytes ...eather_esp32_s3_reverse_tft_dev.test.skip} | 0 .../.feather_esp32s2_dev.test.skip | 1 + ....feather_esp32s2_reverse_tft_dev.test.skip | 1 + .../.feather_esp32s2_tft_dev.test.skip | 1 + ...er_esp32s3_4mbflash_2mbpsram_dev.test.skip | 1 + .../.feather_esp32s3_dev.test.skip | 1 + ....feather_esp32s3_reverse_tft_dev.test.skip | 1 + .../.feather_esp32s3_tft_dev.test.skip | 1 + ...feather_esp32_s3_reverse_tft_dev.test.skip | 1 + .../.feather_esp32s2_dev.test.skip | 1 + ....feather_esp32s2_reverse_tft_dev.test.skip | 1 + .../.feather_esp32s2_tft_dev.test.skip | 1 + ...er_esp32s3_4mbflash_2mbpsram_dev.test.skip | 1 + .../.feather_esp32s3_dev.test.skip | 1 + ....feather_esp32s3_reverse_tft_dev.test.skip | 1 + .../.feather_esp32s3_tft_dev.test.skip | 1 + 17 files changed, 15 insertions(+) rename examples/{Wippersnapper_demo/.feather_esp32_v2_debug.generate => Wippersnapper_NoFS/.feather_esp32_s3_reverse_tft_dev.test.skip} (100%) create mode 100644 examples/Wippersnapper_NoFS/.feather_esp32s2_dev.test.skip create mode 100644 examples/Wippersnapper_NoFS/.feather_esp32s2_reverse_tft_dev.test.skip create mode 100644 examples/Wippersnapper_NoFS/.feather_esp32s2_tft_dev.test.skip create mode 100644 examples/Wippersnapper_NoFS/.feather_esp32s3_4mbflash_2mbpsram_dev.test.skip create mode 100644 examples/Wippersnapper_NoFS/.feather_esp32s3_dev.test.skip create mode 100644 examples/Wippersnapper_NoFS/.feather_esp32s3_reverse_tft_dev.test.skip create mode 100644 examples/Wippersnapper_NoFS/.feather_esp32s3_tft_dev.test.skip create mode 100644 examples/Wippersnapper_demo/.feather_esp32_s3_reverse_tft_dev.test.skip create mode 100644 examples/Wippersnapper_demo/.feather_esp32s2_dev.test.skip create mode 100644 examples/Wippersnapper_demo/.feather_esp32s2_reverse_tft_dev.test.skip create mode 100644 examples/Wippersnapper_demo/.feather_esp32s2_tft_dev.test.skip create mode 100644 examples/Wippersnapper_demo/.feather_esp32s3_4mbflash_2mbpsram_dev.test.skip create mode 100644 examples/Wippersnapper_demo/.feather_esp32s3_dev.test.skip create mode 100644 examples/Wippersnapper_demo/.feather_esp32s3_reverse_tft_dev.test.skip create mode 100644 examples/Wippersnapper_demo/.feather_esp32s3_tft_dev.test.skip diff --git a/examples/Wippersnapper_NoFS/.DS_Store b/examples/Wippersnapper_NoFS/.DS_Store index 8f7026824783bb4152ab96dd1a1ed6fbf1b0dd22..d812294d07bff00b1bbcf7cfb4c613bfec74c975 100644 GIT binary patch delta 210 zcmZoMXfc=|#>B`mu~2NHo}w@-0|Nsi1A_nqLrPA%VQ_MOZo$NjE9*hRtPDvEr3{%2 zIS47BCCJzu~2NHo}w@#0|NsP3otOGlm!>%<>cq3Pb}1AWZc}tSk1Qh0Fc4X i!OsCyzj-6$cjn3bBD$O)EeC*@VX_U6^yV0mCCmVn9u)Ba diff --git a/examples/Wippersnapper_demo/.feather_esp32_v2_debug.generate b/examples/Wippersnapper_NoFS/.feather_esp32_s3_reverse_tft_dev.test.skip similarity index 100% rename from examples/Wippersnapper_demo/.feather_esp32_v2_debug.generate rename to examples/Wippersnapper_NoFS/.feather_esp32_s3_reverse_tft_dev.test.skip diff --git a/examples/Wippersnapper_NoFS/.feather_esp32s2_dev.test.skip b/examples/Wippersnapper_NoFS/.feather_esp32s2_dev.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_NoFS/.feather_esp32s2_dev.test.skip @@ -0,0 +1 @@ + diff --git a/examples/Wippersnapper_NoFS/.feather_esp32s2_reverse_tft_dev.test.skip b/examples/Wippersnapper_NoFS/.feather_esp32s2_reverse_tft_dev.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_NoFS/.feather_esp32s2_reverse_tft_dev.test.skip @@ -0,0 +1 @@ + diff --git a/examples/Wippersnapper_NoFS/.feather_esp32s2_tft_dev.test.skip b/examples/Wippersnapper_NoFS/.feather_esp32s2_tft_dev.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_NoFS/.feather_esp32s2_tft_dev.test.skip @@ -0,0 +1 @@ + diff --git a/examples/Wippersnapper_NoFS/.feather_esp32s3_4mbflash_2mbpsram_dev.test.skip b/examples/Wippersnapper_NoFS/.feather_esp32s3_4mbflash_2mbpsram_dev.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_NoFS/.feather_esp32s3_4mbflash_2mbpsram_dev.test.skip @@ -0,0 +1 @@ + diff --git a/examples/Wippersnapper_NoFS/.feather_esp32s3_dev.test.skip b/examples/Wippersnapper_NoFS/.feather_esp32s3_dev.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_NoFS/.feather_esp32s3_dev.test.skip @@ -0,0 +1 @@ + diff --git a/examples/Wippersnapper_NoFS/.feather_esp32s3_reverse_tft_dev.test.skip b/examples/Wippersnapper_NoFS/.feather_esp32s3_reverse_tft_dev.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_NoFS/.feather_esp32s3_reverse_tft_dev.test.skip @@ -0,0 +1 @@ + diff --git a/examples/Wippersnapper_NoFS/.feather_esp32s3_tft_dev.test.skip b/examples/Wippersnapper_NoFS/.feather_esp32s3_tft_dev.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_NoFS/.feather_esp32s3_tft_dev.test.skip @@ -0,0 +1 @@ + diff --git a/examples/Wippersnapper_demo/.feather_esp32_s3_reverse_tft_dev.test.skip b/examples/Wippersnapper_demo/.feather_esp32_s3_reverse_tft_dev.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_demo/.feather_esp32_s3_reverse_tft_dev.test.skip @@ -0,0 +1 @@ + diff --git a/examples/Wippersnapper_demo/.feather_esp32s2_dev.test.skip b/examples/Wippersnapper_demo/.feather_esp32s2_dev.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_demo/.feather_esp32s2_dev.test.skip @@ -0,0 +1 @@ + diff --git a/examples/Wippersnapper_demo/.feather_esp32s2_reverse_tft_dev.test.skip b/examples/Wippersnapper_demo/.feather_esp32s2_reverse_tft_dev.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_demo/.feather_esp32s2_reverse_tft_dev.test.skip @@ -0,0 +1 @@ + diff --git a/examples/Wippersnapper_demo/.feather_esp32s2_tft_dev.test.skip b/examples/Wippersnapper_demo/.feather_esp32s2_tft_dev.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_demo/.feather_esp32s2_tft_dev.test.skip @@ -0,0 +1 @@ + diff --git a/examples/Wippersnapper_demo/.feather_esp32s3_4mbflash_2mbpsram_dev.test.skip b/examples/Wippersnapper_demo/.feather_esp32s3_4mbflash_2mbpsram_dev.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_demo/.feather_esp32s3_4mbflash_2mbpsram_dev.test.skip @@ -0,0 +1 @@ + diff --git a/examples/Wippersnapper_demo/.feather_esp32s3_dev.test.skip b/examples/Wippersnapper_demo/.feather_esp32s3_dev.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_demo/.feather_esp32s3_dev.test.skip @@ -0,0 +1 @@ + diff --git a/examples/Wippersnapper_demo/.feather_esp32s3_reverse_tft_dev.test.skip b/examples/Wippersnapper_demo/.feather_esp32s3_reverse_tft_dev.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_demo/.feather_esp32s3_reverse_tft_dev.test.skip @@ -0,0 +1 @@ + diff --git a/examples/Wippersnapper_demo/.feather_esp32s3_tft_dev.test.skip b/examples/Wippersnapper_demo/.feather_esp32s3_tft_dev.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_demo/.feather_esp32s3_tft_dev.test.skip @@ -0,0 +1 @@ + From e64bae9e86bdb2c80a719ab9aacb4e63c7c47633 Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 20 Nov 2023 12:31:53 -0500 Subject: [PATCH 33/38] skip arduino boards for debug --- examples/wippersnapper_debug/.mkrwifi1010.test.skip | 1 + examples/wippersnapper_debug/.nano_33_iot.test.skip | 1 + 2 files changed, 2 insertions(+) create mode 100644 examples/wippersnapper_debug/.mkrwifi1010.test.skip create mode 100644 examples/wippersnapper_debug/.nano_33_iot.test.skip diff --git a/examples/wippersnapper_debug/.mkrwifi1010.test.skip b/examples/wippersnapper_debug/.mkrwifi1010.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.mkrwifi1010.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.nano_33_iot.test.skip b/examples/wippersnapper_debug/.nano_33_iot.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.nano_33_iot.test.skip @@ -0,0 +1 @@ + From 2dfe193c785ac33887d93642398129dd1f97a3d8 Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 20 Nov 2023 13:28:29 -0500 Subject: [PATCH 34/38] use new rgb builtin macro? --- src/Wippersnapper_Boards.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Wippersnapper_Boards.h b/src/Wippersnapper_Boards.h index 0c3273f4c..8645471da 100644 --- a/src/Wippersnapper_Boards.h +++ b/src/Wippersnapper_Boards.h @@ -78,13 +78,13 @@ #define BOARD_ID "feather-esp32s3" #define USE_TINYUSB #define USE_STATUS_NEOPIXEL -#define STATUS_NEOPIXEL_PIN PIN_NEOPIXEL +#define STATUS_NEOPIXEL_PIN RGB_BUILTIN #define STATUS_NEOPIXEL_NUM NEOPIXEL_NUM #elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3) #define BOARD_ID "feather-esp32s3-4mbflash-2mbpsram" #define USE_TINYUSB #define USE_STATUS_NEOPIXEL -#define STATUS_NEOPIXEL_PIN PIN_NEOPIXEL +#define STATUS_NEOPIXEL_PIN RGB_BUILTIN #define STATUS_NEOPIXEL_NUM NEOPIXEL_NUM #define USE_PSRAM ///< Board has PSRAM, use it for dynamic memory allocation #elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_TFT) From 143b9c74e63a90064bab8de514716f681719b57d Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 20 Nov 2023 15:49:17 -0500 Subject: [PATCH 35/38] old macro --- src/Wippersnapper_Boards.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Wippersnapper_Boards.h b/src/Wippersnapper_Boards.h index 8645471da..0ec93c07e 100644 --- a/src/Wippersnapper_Boards.h +++ b/src/Wippersnapper_Boards.h @@ -78,7 +78,7 @@ #define BOARD_ID "feather-esp32s3" #define USE_TINYUSB #define USE_STATUS_NEOPIXEL -#define STATUS_NEOPIXEL_PIN RGB_BUILTIN +#define STATUS_NEOPIXEL_PIN PIN_NEOPIXEL #define STATUS_NEOPIXEL_NUM NEOPIXEL_NUM #elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3) #define BOARD_ID "feather-esp32s3-4mbflash-2mbpsram" From ea31fb2fd0601d9642cd55f661f103fcbe1a0637 Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 20 Nov 2023 16:02:35 -0500 Subject: [PATCH 36/38] old macro, re-run with new FQBN --- src/Wippersnapper_Boards.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Wippersnapper_Boards.h b/src/Wippersnapper_Boards.h index 0ec93c07e..0c3273f4c 100644 --- a/src/Wippersnapper_Boards.h +++ b/src/Wippersnapper_Boards.h @@ -84,7 +84,7 @@ #define BOARD_ID "feather-esp32s3-4mbflash-2mbpsram" #define USE_TINYUSB #define USE_STATUS_NEOPIXEL -#define STATUS_NEOPIXEL_PIN RGB_BUILTIN +#define STATUS_NEOPIXEL_PIN PIN_NEOPIXEL #define STATUS_NEOPIXEL_NUM NEOPIXEL_NUM #define USE_PSRAM ///< Board has PSRAM, use it for dynamic memory allocation #elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_TFT) From 49025a2ec5f82e7b4ef886342c87103f05a34c7b Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 20 Nov 2023 17:13:42 -0500 Subject: [PATCH 37/38] upload to new artifact? --- .github/workflows/build-clang-doxy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 97b6d942c..077bfd59d 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -386,9 +386,9 @@ jobs: mv examples/*/build/*/wippersnapper_debug.ino.uf2 wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2 mv examples/*/build/*/wippersnapper_debug.ino.bin wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.bin - name: upload build artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: - name: build-files + name: build-files-dev path: | wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2 wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.bin From 62c7d1f3aa3c48f647151a7b0ada585dedb04123 Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 20 Nov 2023 17:48:20 -0500 Subject: [PATCH 38/38] change to alpha for pre-release --- library.properties | 2 +- src/Wippersnapper.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library.properties b/library.properties index 1d7c9fe9d..ed4cae81f 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Adafruit WipperSnapper -version=1.0.0-beta.74 +version=1.0.0-alpha.74 author=Adafruit maintainer=Adafruit sentence=Arduino application for Adafruit.io WipperSnapper diff --git a/src/Wippersnapper.h b/src/Wippersnapper.h index 2450dd142..2c06c3ee1 100644 --- a/src/Wippersnapper.h +++ b/src/Wippersnapper.h @@ -71,7 +71,7 @@ #endif #define WS_VERSION \ - "1.0.0-beta.74" ///< WipperSnapper app. version (semver-formatted) + "1.0.0-alpha.74" ///< WipperSnapper app. version (semver-formatted) // Reserved Adafruit IO MQTT topics #define TOPIC_IO_THROTTLE "/throttle" ///< Adafruit IO Throttle MQTT Topic