Compare commits
No commits in common. "0ac4f9b1818dafddc144f76f80e3c04c499d39ab" and "b5bb0feccf47fa78ae50b285ad69489499bf5ff5" have entirely different histories.
0ac4f9b181
...
b5bb0feccf
BIN
data/child.pia
BIN
data/child.pia
Binary file not shown.
@ -53,5 +53,4 @@ public:
|
||||
void blur_row(uint8_t y, fract8 intensity);
|
||||
void blur_columns(fract8 intensity);
|
||||
void blur_column(uint8_t x, fract8 intensity);
|
||||
void fill_with_checkerboard();
|
||||
};
|
||||
|
@ -37,7 +37,6 @@
|
||||
#define MQTT_REPORT_METRICS // Whether to report metrics via MQTT. Disable if unwanted.
|
||||
#define MQTT_TOPIC_WEATHER "accuweather/pitrix/" // MQTT topic to listen for weather data. Must not start with a slash, but must end with one.
|
||||
#define MQTT_TOPIC_TIMER "alexa/timer"
|
||||
#define MQTT_TOPIC_HOMEASSISTANT "homeassistant"
|
||||
|
||||
#define HOSTNAME "pitrix-%08X" // Hostname of the ESP to use for OTA and MQTT client id. %08X will be replaced by the chip id.
|
||||
#define OTA_STARTUP_DELAY 10 // How many seconds to wait at startup. This is useful to prevent being unable to flash OTA by a bug in the code. Set to 0 to disable.
|
||||
|
@ -1,30 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include "Effect.h"
|
||||
#include "prototypes.h"
|
||||
#include "my_fastled.h"
|
||||
#include "Window.h"
|
||||
#include "config.h"
|
||||
#include <WiFiUdp.h>
|
||||
|
||||
class Tpm2NetEffect : public Effect {
|
||||
protected:
|
||||
Window* window = &Window::window_full;
|
||||
WiFiUDP _udp;
|
||||
uint16_t _pixel_index = 0;
|
||||
|
||||
void _parse_command(uint16_t size, uint8_t packet_number);
|
||||
void _parse_data(uint16_t size, uint8_t packet_number);
|
||||
void _respond(uint8_t* data, uint8_t len);
|
||||
void _respond_ack();
|
||||
void _respond_with_data(uint8_t* data, uint8_t len);
|
||||
void _respond_unknown_command();
|
||||
unsigned long _last_packet_at = 0;
|
||||
|
||||
public:
|
||||
Tpm2NetEffect();
|
||||
virtual ~Tpm2NetEffect();
|
||||
virtual void loop(uint16_t ms);
|
||||
bool can_be_shown_with_clock();
|
||||
String get_name() override { return "tpm2.net"; }
|
||||
};
|
@ -272,14 +272,3 @@ void Window::_subpixel_render(uint8_t x, uint8_t y, CRGB* color, SubpixelRenderi
|
||||
case SUBPIXEL_RENDERING_SET: setPixel(x, y, color); break;
|
||||
}
|
||||
}
|
||||
|
||||
void Window::fill_with_checkerboard() {
|
||||
CRGB pink(0xFF00FF);
|
||||
CRGB black(0x000000);
|
||||
uint8_t s = (uint8_t)(millis() / 1000);
|
||||
for(int x=0; x<this->width; x++) {
|
||||
for(int y=0; y<this->height; y++) {
|
||||
this->setPixel(x, y, ((x+y+s) % 2)?&pink:&black);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,181 +0,0 @@
|
||||
#include "effect_tpm2_net.h"
|
||||
#include "my_fastled.h"
|
||||
|
||||
void Tpm2NetEffect::loop(uint16_t ms) {
|
||||
int packetsize = _udp.parsePacket();
|
||||
uint8_t data[255];
|
||||
uint8_t type = 0x00;
|
||||
if (packetsize > 0) {
|
||||
_last_packet_at = millis();
|
||||
DBG("TPM2.Net * Received %d bytes from %s", packetsize, _udp.remoteIP().toString().c_str());
|
||||
if (packetsize < 7) {
|
||||
LOGln("TPM2.Net * Packet is too short. Ignoring it.");
|
||||
return;
|
||||
}
|
||||
_udp.read(data, 6);
|
||||
if (data[0] != 0x9C) {
|
||||
LOGln("TPM2.Net * Block start byte is 0x%02X, expected 0x9C", data[0]);
|
||||
return;
|
||||
}
|
||||
if (data[1] == 0xC0) {
|
||||
DBG("TPM2.Net * Received a command packet.");
|
||||
type = 0xC0;
|
||||
} else if (data[1] == 0xDA) {
|
||||
DBG("TPM2.Net * Received a data packet.");
|
||||
type = 0xDA;
|
||||
} else {
|
||||
LOGln("TPM2.Net * Unexpected packet type 0x%02X, expected 0xC0 or 0xDA.", data[1]);
|
||||
}
|
||||
uint16_t framesize = (data[2]<<8) | data[3];
|
||||
uint8_t packet_number = data[4];
|
||||
//uint8_t packet_count = data[5];
|
||||
|
||||
if (packetsize != framesize + 7) {
|
||||
LOGln("TPM2.Net * Invalid packet size. Expected %d bytes, was %d bytes.", framesize+7, packetsize);
|
||||
return;
|
||||
}
|
||||
|
||||
if (type==0xC0) {
|
||||
_parse_command(framesize, packet_number);
|
||||
} else if (type==0xDA) {
|
||||
_parse_data(framesize, packet_number);
|
||||
}
|
||||
} else if (_last_packet_at + 5000 < millis()) {
|
||||
window->fill_with_checkerboard();
|
||||
}
|
||||
}
|
||||
|
||||
void Tpm2NetEffect::_parse_command(uint16_t size, uint8_t packet_number) {
|
||||
if (packet_number!=0) {
|
||||
LOGln("TPM2.Net * Command packet with packet_number > 0 (%d). Ignoring it.", packet_number);
|
||||
return;
|
||||
}
|
||||
if (size < 2) {
|
||||
LOGln("TPM2.Net * Command packet need at least 2 data bytes.");
|
||||
return;
|
||||
}
|
||||
uint8_t ctrl = _udp.read();
|
||||
bool write = ctrl & 0x80;
|
||||
bool respond = ctrl & 0x40;
|
||||
uint8_t cmd = _udp.read();
|
||||
uint8_t data = 0;
|
||||
if (write) {
|
||||
if (size<3) {
|
||||
LOGln("TPM2.Net * Got a write command, but no data to write.");
|
||||
return;
|
||||
}
|
||||
data = _udp.read();
|
||||
}
|
||||
|
||||
if (cmd == 0x0A) { // Master Brightness
|
||||
if (write) {
|
||||
FastLED.setBrightness(data);
|
||||
} else {
|
||||
uint8_t data[1] = {FastLED.getBrightness()};
|
||||
_respond_with_data(data, 1);
|
||||
}
|
||||
} else if (cmd == 0x10 && !write) {
|
||||
uint16_t pixels = window->width * window->height;
|
||||
uint8_t data[2] = {(uint8_t)(pixels >> 8), (uint8_t)(pixels & 0xFF)};
|
||||
_respond_with_data(data, 2);
|
||||
} else {
|
||||
LOGln("TPM2.Net * Unknown command. write:%d, command:0x%02X", write, cmd);
|
||||
if (respond) {
|
||||
_respond_unknown_command();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Tpm2NetEffect::_parse_data(uint16_t framesize, uint8_t packet_number) {
|
||||
if (packet_number==0) {
|
||||
_pixel_index=0;
|
||||
}
|
||||
uint8_t len;
|
||||
uint8_t data[3];
|
||||
CRGB color;
|
||||
while ((len = _udp.read(data, 3))==3) {
|
||||
// We got 3 bytes
|
||||
color.setRGB(data[0], data[1], data[2]);
|
||||
window->setPixelByIndex(_pixel_index, &color);
|
||||
_pixel_index++;
|
||||
}
|
||||
|
||||
/*
|
||||
bool dir_changed = false;
|
||||
|
||||
_x += _x_dir * settings.effects.dvd.speed;
|
||||
_y += _y_dir * settings.effects.dvd.speed;
|
||||
|
||||
if (_x <= 0) {
|
||||
_x = -_x;
|
||||
_x_dir = -_x_dir;
|
||||
dir_changed = true;
|
||||
//LOGln("speed: %d", settings.effects.dvd.speed);
|
||||
} else if (_x + (settings.effects.dvd.width << 8) >= (window->width << 8)) {
|
||||
_x -= 2*settings.effects.dvd.speed;
|
||||
_x_dir = -_x_dir;
|
||||
dir_changed = true;
|
||||
}
|
||||
|
||||
if (_y <= 0) {
|
||||
_y = -_y;
|
||||
_y_dir = -_y_dir;
|
||||
dir_changed = true;
|
||||
} else if (_y + (settings.effects.dvd.height << 8) >= (window->height << 8)) {
|
||||
_y -= 2*settings.effects.dvd.speed;
|
||||
_y_dir = -_y_dir;
|
||||
dir_changed = true;
|
||||
}
|
||||
|
||||
window->clear();
|
||||
|
||||
if (dir_changed) _color = (CRGB)CHSV(random8(), 255, 255);
|
||||
|
||||
for (int x=0; x<settings.effects.dvd.width; x++) for (int y=0; y<settings.effects.dvd.height; y++) {
|
||||
window->setSubPixel(_x + (x<<8), _y + (y<<8), (CRGB*)&_color);
|
||||
}
|
||||
for (int x=1; x<settings.effects.dvd.width; x++) for (int y=1; y<settings.effects.dvd.height; y++) {
|
||||
window->setPixel((_x>>8) + x, (_y>>8) + y, (CRGB*)&_color);
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
void Tpm2NetEffect::_respond(uint8_t* data, uint8_t len) {
|
||||
_udp.beginPacket(_udp.remoteIP(), 65442);
|
||||
_udp.write(data, len);
|
||||
_udp.endPacket();
|
||||
}
|
||||
|
||||
void Tpm2NetEffect::_respond_ack() {
|
||||
uint8_t data[8] = {0x9C, 0xAC, 0x00, 0x01, 0x00, 0x01, 0x00, 0x36};
|
||||
_respond(data, 8);
|
||||
}
|
||||
|
||||
void Tpm2NetEffect::_respond_unknown_command() {
|
||||
uint8_t data[8] = {0x9C, 0xAC, 0x00, 0x01, 0x00, 0x01, 0x02, 0x36};
|
||||
_respond(data, 8);
|
||||
}
|
||||
|
||||
void Tpm2NetEffect::_respond_with_data(uint8_t* dat, uint8_t len) {
|
||||
uint8_t data[8 + len];
|
||||
data[0] = 0x9C;
|
||||
data[1] = 0xAD;
|
||||
data[2] = (len+1)>>8;
|
||||
data[3] = (len+1)&0xFF;
|
||||
data[4] = 0x00;
|
||||
data[5] = 0x01;
|
||||
data[6] = 0x00;
|
||||
memcpy(&(data[7]), dat, len);
|
||||
data[8 + len - 1] = 0x36;
|
||||
_respond(data, 8 + len);
|
||||
}
|
||||
|
||||
bool Tpm2NetEffect::can_be_shown_with_clock() { return false; }
|
||||
|
||||
Tpm2NetEffect::Tpm2NetEffect() {
|
||||
_udp.begin(65506);
|
||||
}
|
||||
|
||||
Tpm2NetEffect::~Tpm2NetEffect() {
|
||||
_udp.stop();
|
||||
}
|
@ -25,7 +25,6 @@
|
||||
#include "effect_tv_static.h"
|
||||
#include "effect_lightspeed.h"
|
||||
#include "effect_diamond.h"
|
||||
#include "effect_tpm2_net.h"
|
||||
|
||||
Effect* current_effect;
|
||||
|
||||
@ -65,11 +64,10 @@ EffectEntry effects[] = {
|
||||
/* 28 */ {"lightspeed", true, [](){ return new LightspeedEffect(); }},
|
||||
/* 29 */ {"koopa", 0, [](){ return new AnimationEffect("/koopa.pia"); }},
|
||||
/* 30 */ {"cake", 0, [](){ return new AnimationEffect("/cake.pia"); }},
|
||||
/* 31 */ {"child", 0, [](){ return AnimationEffect::Blinker("/child.pia", 300, 0xFFFF00); }},
|
||||
/* 31 */ {"kid", 0, [](){ return new AnimationEffect("/kid.pia"); }},
|
||||
/* 32 */ {"diamond", true, [](){ return new DiamondEffect(); }},
|
||||
/* 33 */ {"tpm2.net", 0, [](){ return new Tpm2NetEffect(); }},
|
||||
};
|
||||
const uint8_t effects_size = 34;
|
||||
const uint8_t effects_size = 33;
|
||||
|
||||
|
||||
Effect* select_effect(const char* name) {
|
||||
|
22
src/mqtt.cpp
22
src/mqtt.cpp
@ -23,7 +23,7 @@ void mqtt_callback(char* original_topic, byte* pl, unsigned int length) {
|
||||
pl[length] = '\0';
|
||||
String payload((char*)pl);
|
||||
String topic (original_topic);
|
||||
if (topic.equals(MQTT_TOPIC "log") || topic.equals(MQTT_TOPIC "status") || topic.equals(MQTT_TOPIC "status_details") || topic.startsWith(MQTT_TOPIC "metrics")) {
|
||||
if (topic.equals(MQTT_TOPIC "log") || topic.equals(MQTT_TOPIC "status") || topic.startsWith(MQTT_TOPIC "metrics")) {
|
||||
// Return our own messages
|
||||
return;
|
||||
}
|
||||
@ -98,33 +98,15 @@ void mqtt_callback(char* original_topic, byte* pl, unsigned int length) {
|
||||
|
||||
boolean mqtt_connect() {
|
||||
LOGln("MQTT * Connecting to MQTT server with client id %s", hostname);
|
||||
mqtt_client.setBufferSize(350);
|
||||
if (mqtt_client.connect(hostname, MQTT_USER, MQTT_PASS, MQTT_TOPIC "status", 0, true, "OFFLINE", true)) {
|
||||
LOGln("MQTT * Connected.");
|
||||
LOGln("Core * Flash chip id: 0x%X. Size: %d bytes. 'Real' size: %d bytes.", ESP.getFlashChipId(), ESP.getFlashChipSize(), ESP.getFlashChipRealSize());
|
||||
char buffer[40];
|
||||
snprintf(buffer, 40, "ONLINE %s %s", hostname, WiFi.localIP().toString().c_str());
|
||||
mqtt_client.publish(MQTT_TOPIC "status", "ONLINE", true);
|
||||
mqtt_client.publish(MQTT_TOPIC "status_details", buffer, true);
|
||||
mqtt_client.publish(MQTT_TOPIC "status", buffer, true);
|
||||
mqtt_client.subscribe(MQTT_TOPIC "+");
|
||||
mqtt_client.subscribe(MQTT_TOPIC_WEATHER "#");
|
||||
mqtt_client.subscribe(MQTT_TOPIC_TIMER);
|
||||
|
||||
#ifdef MQTT_TOPIC_HOMEASSISTANT
|
||||
// Set MQTT values for homeassistant auto device discovery
|
||||
String topic = MQTT_TOPIC_HOMEASSISTANT "/light/";
|
||||
topic += hostname;
|
||||
topic += "/config";
|
||||
String message = "{\"~\":\"" MQTT_TOPIC "\",\"opt\":1,\"avty_t\":\"~status\",\"pl_avail\":\"ONLINE\",\"pl_not_avail\":\"OFFLINE\",";
|
||||
message += "\"bri_cmd_t\": \"~brightness\",\"bri_scl\":255,\"fx_cmd_t\":\"~modus\",\"name\":\"Pitrix\",\"uniq_id\":\"";
|
||||
message += hostname;
|
||||
message += "\",";
|
||||
message += "\"stat_t\":\"~modus\",\"cmd_t\":\"~modus\",\"pl_on\":\"cycle\",\"pl_off\":\"night_clock\"}";
|
||||
mqtt_client.publish(topic.c_str(), message.c_str(), true);
|
||||
DBG("MQTT * Homeassistant data:");
|
||||
DBG("MQTT * Topic: %s", topic.c_str());
|
||||
DBG("MQTT * Data: %s", message.c_str());
|
||||
#endif
|
||||
}
|
||||
return mqtt_client.connected();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user