minor changes, added ALL required externals

This commit is contained in:
2021-03-14 15:20:44 +01:00
parent 3da4722748
commit 5e8ba82e6e
22 changed files with 1853 additions and 30 deletions

View File

@@ -13,7 +13,7 @@
#include "Rainbow.h"
#include "RainbowBeat.h"
#define FIRMWARE_NR 5
#define FIRMWARE_NR 10
#define CODE(a, b, c, d) (a << 24 | b << 16 | c << 8 | d)
@@ -78,18 +78,18 @@ public:
const uint16_t vcc = ADC::getVcc();
os_printf("send: heartbeat, Vcc: %d\n", vcc);
char data[5+12+2+3];
char data[5+6+2+3];
os_memcpy(&data[0], "*PING", 5);
os_memcpy(&data[5], myMac.asPtr(), 12);
os_memcpy(&data[5], myMac.asPtr(), 6);
data[17] = '_';
data[18] = FIRMWARE_NR;
data[11] = '_';
data[12] = FIRMWARE_NR;
data[19] = '_';
data[20] = (vcc >> 8) & 0xFF;
data[21] = (vcc >> 0) & 0xFF;
data[13] = '_';
data[14] = (vcc >> 8) & 0xFF;
data[15] = (vcc >> 0) & 0xFF;
udp.send(remoteIP, remotePort, data, sizeof(data));
@@ -120,8 +120,8 @@ public:
static int cnt = 0; ++cnt;
// every 9 seconds
if (cnt % 9000 == 0) {
// every 3 seconds
if (cnt % 3000 == 0) {
buzzer.sendHeartbeat();
}
@@ -235,6 +235,7 @@ public:
/** disable LED */
void setOff() {
os_printf("setOff()\n");
ledMode = LEDMode::OFF;
leds.getColor(0).setRGB(0,0,255); // for testing
leds.setEnabled(0, false);
@@ -243,7 +244,8 @@ public:
/** set a fixed RGB color */
void setRGB(const uint8_t r, const uint8_t g, const uint8_t b) {
debugMod(NAME, "setting LEDS to fixed RGB color");
//debugMod(NAME, "setting LEDS to fixed RGB color");
os_printf("setRGB(%d,%d,%d)\n", r, g, b);
ledMode = LEDMode::FIXED_COLOR;
leds.getColor(0).setRGB(r,g,b);
leds.setEnabled(0, true);
@@ -260,6 +262,7 @@ public:
/** set LED rainbow fading */
void setRainbow() {
os_printf("setRainbow()\n");
rainbow.restart();
ledMode = LEDMode::RAINBOW_COLOR;
leds.setEnabled(0, true);
@@ -268,6 +271,7 @@ public:
/** set LED fading between two colors */
void setFade(const uint8_t r1, const uint8_t g1, const uint8_t b1, const uint8_t r2, const uint8_t g2, const uint8_t b2) {
os_printf("setFade((%d,%d,%d)(%d,%d,%d))\n", r1,g1,b1, r2,g2,b2);
fadeBetween.setColor1(Color::fromRGB(r1, g1, b1));
fadeBetween.setColor2(Color::fromRGB(r2, g2, b2));
fadeBetween.restart();