Skip to content

Commit

Permalink
Add ZCPP Query response
Browse files Browse the repository at this point in the history
  • Loading branch information
@keithsw1111
keithsw1111 committed Mar 23, 2019
1 parent d2d9348 commit 503bb7e
Show file tree
Hide file tree
Showing 3 changed files with 133 additions and 17 deletions.
24 changes: 21 additions & 3 deletions ESPAsyncZCPP.cpp
View file
Expand Up @@ -81,7 +81,8 @@ void ESPAsyncZCPP::parsePacket(AsyncUDPPacket _packet) {
error = ERROR_ZCPP_ID;

if (!error && sbuff->Discovery.Header.type != ZCPP_TYPE_DISCOVERY &&
sbuff->Discovery.Header.type != ZCPP_TYPE_CONFIG &&
sbuff->Discovery.Header.type != ZCPP_TYPE_CONFIG &&
sbuff->Discovery.Header.type != ZCPP_TYPE_QUERY_CONFIG &&
sbuff->Discovery.Header.type != ZCPP_TYPE_SYNC &&
sbuff->Discovery.Header.type != ZCPP_TYPE_DATA)
{
Expand All @@ -102,7 +103,9 @@ void ESPAsyncZCPP::parsePacket(AsyncUDPPacket _packet) {

if (!error && (!suspend || sbuff->Discovery.Header.type == ZCPP_TYPE_DISCOVERY)) {

if (sbuff->Discovery.Header.type == ZCPP_TYPE_DISCOVERY)
if (sbuff->Discovery.Header.type == ZCPP_TYPE_DISCOVERY ||
sbuff->Discovery.Header.type == ZCPP_TYPE_QUERY_CONFIG ||
(sbuff->Discovery.Header.type == ZCPP_TYPE_CONFIG && (sbuff->Configuration.flags & ZCPP_CONFIG_FLAG_QUERY_CONFIGURATION_RESPONSE_REQUIRED) != 0))
{
suspend = true;
}
Expand Down Expand Up @@ -146,6 +149,21 @@ void ESPAsyncZCPP::dumpError(ZCPP_error_t error) {
}
}

void ESPAsyncZCPP::sendConfigResponse(ZCPP_packet_t* packet)
{
if (udp.writeTo(packet->raw, sizeof(ZCPP_packet_t), stats.last_clientIP, stats.last_clientPort) != sizeof(ZCPP_packet_t))
{
Serial.println("Write of configuration response failed");
}
else
{
Serial.print("Configuration response wrote ");
Serial.print(sizeof(ZCPP_packet_t));
Serial.println(" bytes.");
}
suspend = false;
}

void ESPAsyncZCPP::sendDiscoveryResponse(ZCPP_packet_t* packet, const char* firmwareVersion, const uint8_t* mac, const char* controllerName, int pixelPorts, int serialPorts, uint32_t maxPixelPortChannels, uint32_t maxSerialPortChannels, uint32_t maximumChannels, uint32_t ipAddress, uint32_t ipMask)
{
memset(packet, 0x00, sizeof(ZCPP_packet_t));
Expand Down Expand Up @@ -191,4 +209,4 @@ void ESPAsyncZCPP::sendDiscoveryResponse(ZCPP_packet_t* packet, const char* firm
Serial.println(" bytes.");
}
suspend = false;
}
}
5 changes: 3 additions & 2 deletions ESPAsyncZCPP.h
View file
Expand Up @@ -83,9 +83,10 @@ class ESPAsyncZCPP {
// Ring buffer access
inline bool isEmpty() { return pbuff->isEmpty(pbuff); }
inline void *pull(ZCPP_packet_t *packet) { return pbuff->pull(pbuff, packet); }
void sendDiscoveryResponse(ZCPP_packet_t* packet, const char* firmwareVersion, const uint8_t* mac, const char* controllerName, int pixelPorts, int serialPorts, uint32_t maxPixelPortChannels, uint32_t maxSerialPortChannels, uint32_t maximumChannels, uint32_t ipAddress, uint32_t ipMask);
void sendDiscoveryResponse(ZCPP_packet_t* packet, const char* firmwareVersion, const uint8_t* mac, const char* controllerName, int pixelPorts, int serialPorts, uint32_t maxPixelPortChannels, uint32_t maxSerialPortChannels, uint32_t maximumChannels, uint32_t ipAddress, uint32_t ipMask);
void sendConfigResponse(ZCPP_packet_t* packet);

// Diag functions
void dumpError(ZCPP_error_t error);
};
#endif // ESPASYNCZCPP_H_
#endif // ESPASYNCZCPP_H_
121 changes: 109 additions & 12 deletions ESPixelStick.ino
View file
Expand Up @@ -1119,6 +1119,80 @@ void idleTimeout() {
}
}

void sendZCPPConfig(ZCPP_packet_t& packet)
{
LOG_PORT.println("Sending ZCPP Configuration query response.");

memset(&packet, 0x00, sizeof(packet));
memcpy(packet.QueryConfigurationResponse.Header.token, ZCPP_token, sizeof(ZCPP_token));
packet.QueryConfigurationResponse.Header.type = ZCPP_TYPE_QUERY_CONFIG_RESPONSE;
packet.QueryConfigurationResponse.Header.protocolVersion = ZCPP_CURRENT_PROTOCOL_VERSION;
packet.QueryConfigurationResponse.sequenceNumber = ntohs(lastZCPPConfig);
strncpy(packet.QueryConfigurationResponse.userControllerName, config.id.c_str(), std::min((int)strlen(config.id.c_str()), (int)sizeof(packet.QueryConfigurationResponse.userControllerName)));
if (config.channel_count == 0)
{
packet.QueryConfigurationResponse.ports = 0;
}
else
{
packet.QueryConfigurationResponse.ports = 1;
packet.QueryConfigurationResponse.PortConfig[0].port = 0;
#if defined(ESPS_MODE_SERIAL)
packet.QueryConfigurationResponse.PortConfig[0].port |= 0x80;
#endif
packet.QueryConfigurationResponse.PortConfig[0].string = 0;
packet.QueryConfigurationResponse.PortConfig[0].startChannel = ntohs(config.channel_start);
#if defined(ESPS_MODE_PIXEL)
switch(config.pixel_type)
#elif defined(ESPS_MODE_SERIAL)
switch(config.serial_type)
#endif
{
#if defined(ESPS_MODE_PIXEL)
case PixelType::WS2811:
packet.QueryConfigurationResponse.PortConfig[0].protocol = ZCPP_PROTOCOL_WS2811;
break;
case PixelType::GECE:
packet.QueryConfigurationResponse.PortConfig[0].protocol = ZCPP_PROTOCOL_GECE;
break;
#elif defined(ESPS_MODE_SERIAL)
case PixelType::DMX512:
packet.QueryConfigurationResponse.PortConfig[0].protocol = ZCPP_PROTOCOL_DMX;
break;
case PixelType::RENARD:
packet.QueryConfigurationResponse.PortConfig[0].protocol = ZCPP_PROTOCOL_RENARD;
break;
#endif
}
packet.QueryConfigurationResponse.PortConfig[0].channels = ntohs(config.channel_count);
packet.QueryConfigurationResponse.PortConfig[0].grouping = config.groupSize;
switch(config.pixel_color)
{
case PixelColor::RGB:
packet.QueryConfigurationResponse.PortConfig[0].directionColourOrder = ZCPP_COLOUR_ORDER_RGB;
break;
case PixelColor::RBG:
packet.QueryConfigurationResponse.PortConfig[0].directionColourOrder = ZCPP_COLOUR_ORDER_RBG;
break;
case PixelColor::GRB:
packet.QueryConfigurationResponse.PortConfig[0].directionColourOrder = ZCPP_COLOUR_ORDER_GRB;
break;
case PixelColor::GBR:
packet.QueryConfigurationResponse.PortConfig[0].directionColourOrder = ZCPP_COLOUR_ORDER_GBR;
break;
case PixelColor::BRG:
packet.QueryConfigurationResponse.PortConfig[0].directionColourOrder = ZCPP_COLOUR_ORDER_BRG;
break;
case PixelColor::BGR:
packet.QueryConfigurationResponse.PortConfig[0].directionColourOrder = ZCPP_COLOUR_ORDER_BGR;
break;
}
packet.QueryConfigurationResponse.PortConfig[0].brightness = config.briteVal * 100.0f;
packet.QueryConfigurationResponse.PortConfig[0].gamma = config.gammaVal * 10;
}

zcpp.sendConfigResponse(&packet);
}

/////////////////////////////////////////////////////////
//
Expand Down Expand Up @@ -1234,11 +1308,13 @@ void loop() {
case ZCPP_TYPE_CONFIG: // config
LOG_PORT.println("ZCPP Config received.");
if (htons(zcppPacket.Configuration.sequenceNumber) != lastZCPPConfig)
{
{
// a new config to apply
LOG_PORT.println(" The config is new.");

config.id = String(zcppPacket.Configuration.userControllerName);
LOG_PORT.print("Controller Name: ");
LOG_PORT.println(config.id);

ZCPP_PortConfig* p = zcppPacket.Configuration.PortConfig;
for (int i = 0; i < zcppPacket.Configuration.ports; i++)
Expand Down Expand Up @@ -1267,36 +1343,54 @@ void loop() {
LOG_PORT.print(p->protocol);
break;
}
LOG_PORT.print("Protocol: ");
#if defined(ESPS_MODE_PIXEL)
LOG_PORT.println((int)config.pixel_type);
#elif defined(ESPS_MODE_SERIAL)
LOG_PORT.println((int)config.serial_type);
#endif
config.channel_start = htons(p->startChannel);
LOG_PORT.print("Start Channel: ");
LOG_PORT.println(config.channel_start);
config.channel_count = htons(p->channels);
LOG_PORT.print("Channel Count: ");
LOG_PORT.println(config.channel_count);
config.groupSize = p->grouping;
LOG_PORT.print("Group Size: ");
LOG_PORT.println(config.groupSize);
switch(ZCPP_GetColourOrder(p->directionColourOrder))
{
case 0x00:
case ZCPP_COLOUR_ORDER_RGB:
config.pixel_color = PixelColor::RGB;
break;
case 0x01:
case ZCPP_COLOUR_ORDER_RBG:
config.pixel_color = PixelColor::RBG;
break;
case 0x02:
case ZCPP_COLOUR_ORDER_GRB:
config.pixel_color = PixelColor::GRB;
break;
case 0x03:
case ZCPP_COLOUR_ORDER_GBR:
config.pixel_color = PixelColor::GBR;
break;
case 0x04:
case ZCPP_COLOUR_ORDER_BRG:
config.pixel_color = PixelColor::BRG;
break;
case 0x05:
case ZCPP_COLOUR_ORDER_BGR:
config.pixel_color = PixelColor::BGR;
break;
default:
LOG_PORT.print("Attempt to configure invalid colour order ");
LOG_PORT.print(ZCPP_GetColourOrder(p->directionColourOrder));
break;
}
LOG_PORT.print("Colour Order: ");
LOG_PORT.println((int)config.pixel_color);
config.briteVal = (float)p->brightness / 100.0f;
LOG_PORT.print("Brightness: ");
LOG_PORT.println(config.briteVal);
config.gammaVal = ZCPP_GetGamma(p->gamma);
LOG_PORT.print("Gamma: ");
LOG_PORT.println(config.gammaVal);
}
else
{
Expand All @@ -1311,15 +1405,18 @@ void loop() {
{
lastZCPPConfig = htons(zcppPacket.Configuration.sequenceNumber);
updateConfig();
}

if (zcppPacket.Configuration.flags & ZCPP_CONFIG_FLAG_QUERY_CONFIGURATION_RESPONSE_REQUIRED)
{
// FIXME Add config response
if ((zcppPacket.Configuration.flags & ZCPP_CONFIG_FLAG_QUERY_CONFIGURATION_RESPONSE_REQUIRED) != 0)
{
sendZCPPConfig(zcppPacket);
}
}
}
break;
case ZCPP_TYPE_QUERY_CONFIG: // query config
sendZCPPConfig(zcppPacket);
break;
case ZCPP_TYPE_SYNC: // sync
LOG_PORT.println("ZCPP Sync received.");
doShow = true;
// exit read and send data to the pixels
abortPacketRead = true;
Expand Down

0 comments on commit 503bb7e

Please sign in to comment.