diff --git a/examples/wvr_dev_board/wvr_dev_board.ino b/examples/wvr_dev_board/wvr_dev_board.ino index 642d012..5903c2c 100644 --- a/examples/wvr_dev_board/wvr_dev_board.ino +++ b/examples/wvr_dev_board/wvr_dev_board.ino @@ -2,7 +2,6 @@ #include #include #include -#include #include WVR wvr; @@ -47,14 +46,12 @@ void switchOneUp(void) { // log_i("switch one up"); wvr.unmute(); - // rgb_set_color(100 /* red */,100 /* green */,100 /* blue */); // makes white } void switchOneDown(void) { // log_i("switch one down"); wvr.mute(); - // rgb_set_color(0 ,0 ,0); // turn off RGB LED } void switchTwoUp(void) @@ -76,9 +73,6 @@ void setup() { wvr.encoderInit(D9, D10); pot_init(); - - // connect D13 to RGBLED pin on dev board, make sure pin D13 is set to edge:none in WEB GUI - // rgb_init(D13); gpio_reset_pin(gpioNumToGpioNum_T(D3)); gpio_reset_pin(gpioNumToGpioNum_T(D4)); diff --git a/examples/wvr_dev_board_usb/wvr_dev_board_usb.ino b/examples/wvr_dev_board_usb/wvr_dev_board_usb.ino index 9ca15c3..e97bb7d 100644 --- a/examples/wvr_dev_board_usb/wvr_dev_board_usb.ino +++ b/examples/wvr_dev_board_usb/wvr_dev_board_usb.ino @@ -2,7 +2,6 @@ #include #include #include -#include #include WVR wvr; @@ -69,10 +68,6 @@ void setup() { wvr.begin(); log_i("dev board"); - - // connect D13 to RGBLED pin on dev board, make sure pin D13 is set to edge:none in WEB GUI - // rgb_init(D13); - // rgb_set_color(10,10,10); // very dim white wvr.resetPin(D9); wvr.resetPin(D10); diff --git a/examples/wvr_thames/wvr_thames.ino b/examples/wvr_thames/wvr_thames.ino index 0979b3b..ddf8c63 100644 --- a/examples/wvr_thames/wvr_thames.ino +++ b/examples/wvr_thames/wvr_thames.ino @@ -13,7 +13,6 @@ #include #include #include -#include "rgb.h" #define KICK 40 #define SNARE 41 diff --git a/library.json b/library.json index 6b5a18f..ec30fb2 100644 --- a/library.json +++ b/library.json @@ -24,10 +24,6 @@ { "name": "ESPAsyncWebServer", "platforms": "espressif32" - }, - { - "name": "Adafruit_NeoPixel", - "platforms": "espressif32" } ] } diff --git a/notes.txt b/notes.txt index ee8e940..a693398 100644 --- a/notes.txt +++ b/notes.txt @@ -23,3 +23,7 @@ CPU freq: 240 [ 52][I][wvr_0.3.cpp:89] wvr_init(): wvr starting up *** VERSION 3.8.4 *** + +3.9.0 1017344 +3.8.2 1009248 +3.7.2 1008880 bytes \ No newline at end of file diff --git a/src/boot.cpp b/src/boot.cpp index 9aca99c..10adb1e 100644 --- a/src/boot.cpp +++ b/src/boot.cpp @@ -81,7 +81,7 @@ void bootFromEmmc(int index) log_e("Update.isFinished() : false"); } } else { - log_e("Update.end() : false"); + log_e("Update.end() failed : %s", String(Update.getError())); } free(buf); } diff --git a/src/rgb.cpp b/src/rgb.cpp deleted file mode 100644 index fbac970..0000000 --- a/src/rgb.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include "Arduino.h" -#include "wvr_pins.h" - -#define NUMPIXELS 1 -#define RGB_LED_PIN D2 - -Adafruit_NeoPixel *rgb; - -void rgb_init(uint16_t pin){ - rgb = new Adafruit_NeoPixel(NUMPIXELS, pin, NEO_GRB + NEO_KHZ800); - rgb->begin(); - rgb->clear(); -} - -void rgb_set_color(uint8_t red, uint8_t green, uint8_t blue) -{ - rgb->setPixelColor(0, rgb->Color(red, green, blue)); - rgb->show(); -} \ No newline at end of file diff --git a/src/rgb.h b/src/rgb.h deleted file mode 100644 index 417f6bc..0000000 --- a/src/rgb.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef RGB_H -#define RGB_H - -void rgb_init(uint16_t pin); -void rgb_set_color(uint8_t red, uint8_t green, uint8_t blue); - -#endif \ No newline at end of file diff --git a/src/wvr_0.3.cpp b/src/wvr_0.3.cpp index 0ac6f13..bf6baf3 100644 --- a/src/wvr_0.3.cpp +++ b/src/wvr_0.3.cpp @@ -36,7 +36,6 @@ void bootFromEmmc(int index); void boot_into_recovery_mode(void); int check_for_recovery_mode(); void dev_board_init(); -void rgb_init(void); void neopixel_test(void); void mkr_init(void); void midi_parser_init(void);