MySmartHome/MyNotificationClock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some improvements.

Browse Source
This commit is contained in:
matzman
2018-03-17 21:53:38 +01:00
parent c8e0acf911
commit 8c7417dc7b
6 changed files with 287 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.cproject
+30 -35
View File
@@ -19,49 +19,40 @@
<builder buildPath="${workspace_loc:/MyNotificationLight}/Release" id="io.sloeber.sketch.builder.1906713543" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Arduino sketch builder" superClass="io.sloeber.sketch.builder"/> <builder buildPath="${workspace_loc:/MyNotificationLight}/Release" id="io.sloeber.sketch.builder.1906713543" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Arduino sketch builder" superClass="io.sloeber.sketch.builder"/>
<tool id="io.sloeber.tool.sketch.compiler.cpp.1045458791" name="Arduino C++ Compiler" superClass="io.sloeber.tool.sketch.compiler.cpp"> <tool id="io.sloeber.tool.sketch.compiler.cpp.1045458791" name="Arduino C++ Compiler" superClass="io.sloeber.tool.sketch.compiler.cpp">
<option id="io.sloeber.compiler.cpp.sketch.option.incpath.259978641" name="Include Paths (-I)" superClass="io.sloeber.compiler.cpp.sketch.option.incpath" valueType="includePath"> <option id="io.sloeber.compiler.cpp.sketch.option.incpath.259978641" name="Include Paths (-I)" superClass="io.sloeber.compiler.cpp.sketch.option.incpath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/core/core}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock/libraries/Adafruit_NeoPixel}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/core/variant}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock/libraries/MySensors}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/MyNodeManager}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock/core/core}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/MySensors}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock/core/variant}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/EEPROM}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock/libraries/SPI}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/EEPROM/src}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock/libraries/SPI/src}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/SPI}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock/libraries/NodeManager}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/SPI/src}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/Adafruit_GFX_Library}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/Adafruit_NeoPixel}&quot;"/>
</option> </option>
<inputType id="io.sloeber.compiler.cpp.sketch.input.1657978941" name="CPP source files" superClass="io.sloeber.compiler.cpp.sketch.input"/> <inputType id="io.sloeber.compiler.cpp.sketch.input.1657978941" name="CPP source files" superClass="io.sloeber.compiler.cpp.sketch.input"/>
</tool> </tool>
<tool id="io.sloeber.tool.compiler.c.375258991" name="Arduino C Compiler" superClass="io.sloeber.tool.compiler.c"> <tool id="io.sloeber.tool.compiler.c.375258991" name="Arduino C Compiler" superClass="io.sloeber.tool.compiler.c">
<option id="io.sloeber.compiler.c.sketch.option.incpath.284715339" name="Include Paths (-I)" superClass="io.sloeber.compiler.c.sketch.option.incpath" valueType="includePath"> <option id="io.sloeber.compiler.c.sketch.option.incpath.284715339" name="Include Paths (-I)" superClass="io.sloeber.compiler.c.sketch.option.incpath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/core/core}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock/libraries/Adafruit_NeoPixel}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/core/variant}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock/libraries/MySensors}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/MyNodeManager}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock/core/core}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/MySensors}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock/core/variant}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/EEPROM}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock/libraries/SPI}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/EEPROM/src}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock/libraries/SPI/src}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/SPI}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock/libraries/NodeManager}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/SPI/src}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/Adafruit_GFX_Library}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/Adafruit_NeoPixel}&quot;"/>
</option> </option>
<inputType id="io.sloeber.compiler.c.sketch.input.2017913156" name="C Source Files" superClass="io.sloeber.compiler.c.sketch.input"/> <inputType id="io.sloeber.compiler.c.sketch.input.2017913156" name="C Source Files" superClass="io.sloeber.compiler.c.sketch.input"/>
</tool> </tool>
<tool id="io.sloeber.tool.sketch.compiler.s.1694325362" name="Arduino Assembler" superClass="io.sloeber.tool.sketch.compiler.s"> <tool id="io.sloeber.tool.sketch.compiler.s.1694325362" name="Arduino Assembler" superClass="io.sloeber.tool.sketch.compiler.s">
<option id="io.sloeber.compiler.asm.sketch.option.incpath.1470678493" name="Include Paths (-I)" superClass="io.sloeber.compiler.asm.sketch.option.incpath" valueType="includePath"> <option id="io.sloeber.compiler.asm.sketch.option.incpath.1470678493" name="Include Paths (-I)" superClass="io.sloeber.compiler.asm.sketch.option.incpath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/core/core}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock/libraries/Adafruit_NeoPixel}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/core/variant}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock/libraries/MySensors}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/MyNodeManager}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock/core/core}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/MySensors}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock/core/variant}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/EEPROM}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock/libraries/SPI}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/EEPROM/src}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock/libraries/SPI/src}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/SPI}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationClock/libraries/NodeManager}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/SPI/src}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/Adafruit_GFX_Library}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/MyNotificationLight/libraries/Adafruit_NeoPixel}&quot;"/>
</option> </option>
<inputType id="io.sloeber.compiler.S.sketch.input.1051869875" name="Assembly source files" superClass="io.sloeber.compiler.S.sketch.input"/> <inputType id="io.sloeber.compiler.S.sketch.input.1051869875" name="Assembly source files" superClass="io.sloeber.compiler.S.sketch.input"/>
</tool> </tool>
@@ -72,7 +63,7 @@
</toolChain> </toolChain>
</folderInfo> </folderInfo>
<sourceEntries> <sourceEntries>
<entry excluding="libraries/Adafruit_GFX_Library/Fonts|libraries/MySensors/projects|libraries/MySensors/initscripts|libraries/MySensors/hal|libraries/MySensors/examples_linux|libraries/MySensors/drivers|libraries/MySensors/Documentation|libraries/MySensors/core|libraries/MySensors/.mystools|libraries/MySensors/.ci|libraries/?*/**/?xamples/**|libraries/?*/**/?xtras/**|libraries/?*/**/test*/**|libraries/?*/**/third-party/**|libraries/**/._*|libraries/?*/utility/*/*" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/> <entry excluding="libraries/MySensors/.git|libraries/Adafruit_GFX_Library/fontconvert|libraries/Adafruit_GFX_Library/Fonts|libraries/MySensors/projects|libraries/MySensors/initscripts|libraries/MySensors/hal|libraries/MySensors/examples_linux|libraries/MySensors/drivers|libraries/MySensors/Documentation|libraries/MySensors/core|libraries/MySensors/.mystools|libraries/MySensors/.ci|libraries/?*/**/?xamples/**|libraries/?*/**/?xtras/**|libraries/?*/**/test*/**|libraries/?*/**/third-party/**|libraries/**/._*|libraries/?*/utility/*/*" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
</sourceEntries> </sourceEntries>
</configuration> </configuration>
</storageModule> </storageModule>
@@ -87,5 +78,9 @@
</storageModule> </storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/> <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/> <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
<storageModule moduleId="refreshScope"/> <storageModule moduleId="refreshScope" versionNumber="2">
<configuration configurationName="Release">
<resource resourceType="PROJECT" workspacePath="/MyNotificationClock"/>
</configuration>
</storageModule>
</cproject> </cproject>
.project
+9 -19
View File
@@ -34,42 +34,32 @@
<link> <link>
<name>core/core</name> <name>core/core</name>
<type>2</type> <type>2</type>
<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/arduino/hardware/avr/1.6.18/cores/arduino</locationURI> <locationURI>ECLIPSE_HOME/arduinoPlugin/packages/arduino/hardware/avr/1.6.21/cores/arduino</locationURI>
</link> </link>
<link> <link>
<name>core/variant</name> <name>core/variant</name>
<type>2</type> <type>2</type>
<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/arduino/hardware/avr/1.6.18/variants/eightanaloginputs</locationURI> <locationURI>ECLIPSE_HOME/arduinoPlugin/packages/arduino/hardware/avr/1.6.21/variants/eightanaloginputs</locationURI>
</link>
<link>
<name>libraries/Adafruit_GFX_Library</name>
<type>2</type>
<locationURI>ECLIPSE_HOME/arduinoPlugin/libraries/Adafruit_GFX_Library/1.1.8</locationURI>
</link> </link>
<link> <link>
<name>libraries/Adafruit_NeoPixel</name> <name>libraries/Adafruit_NeoPixel</name>
<type>2</type> <type>2</type>
<locationURI>ECLIPSE_HOME/arduinoPlugin/libraries/Adafruit_NeoPixel/1.0.6</locationURI> <locationURI>ECLIPSE_HOME/arduinoPlugin/libraries/Adafruit_NeoPixel/1.1.6</locationURI>
</link>
<link>
<name>libraries/EEPROM</name>
<type>2</type>
<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/arduino/hardware/avr/1.6.18/libraries/EEPROM</locationURI>
</link>
<link>
<name>libraries/MyNodeManager</name>
<type>2</type>
<locationURI>ECLIPSE_HOME/arduinoPlugin/libraries/MyNodeManager/1.0.0</locationURI>
</link> </link>
<link> <link>
<name>libraries/MySensors</name> <name>libraries/MySensors</name>
<type>2</type> <type>2</type>
<locationURI>ECLIPSE_HOME/arduinoPlugin/libraries/MySensors/2.2.0</locationURI> <locationURI>ECLIPSE_HOME/arduinoPlugin/libraries/MySensors/2.2.0</locationURI>
</link> </link>
<link>
<name>libraries/NodeManager</name>
<type>2</type>
<locationURI>ECLIPSE_HOME/arduinoPlugin/libraries/NodeManager/1.0.0</locationURI>
</link>
<link> <link>
<name>libraries/SPI</name> <name>libraries/SPI</name>
<type>2</type> <type>2</type>
<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/arduino/hardware/avr/1.6.18/libraries/SPI</locationURI> <locationURI>ECLIPSE_HOME/arduinoPlugin/packages/arduino/hardware/avr/1.6.21/libraries/SPI</locationURI>
</link> </link>
</linkedResources> </linkedResources>
</projectDescription> </projectDescription>
NotificationLEDs.h
+120 -27
View File
@@ -8,6 +8,23 @@
#include <Adafruit_NeoPixel.h> #include <Adafruit_NeoPixel.h>
#define EEPROM_POS_STATUSTABLE 1
#define EEPROM_POS_HOUROFFSET 2
union _eeprom_NotificationLEDs_StatusTable {
struct {
int hourOffset : 1;
} status;
uint8_t data;
};
// mathematically correct modulo
#define MOD(a,b) ((((a)%(b))+(b))%(b))
template< template<
uint8_t _tpin, uint8_t _tpin,
uint8_t _trgbwId, uint8_t _trgbwId,
@@ -33,6 +50,10 @@ public:
void powerOn() noexcept; void powerOn() noexcept;
void returnToLastMode() noexcept; void returnToLastMode() noexcept;
void sendRGBWStatus() noexcept;
void sendDimmerStatus() noexcept;
void sendPowerSwitchStatus() noexcept;
void defaultScene_config(uint8_t id) noexcept; void defaultScene_config(uint8_t id) noexcept;
void defaultScene_init() noexcept; void defaultScene_init() noexcept;
void defaultScene_loop(unsigned long currentUnixTime, unsigned long currentMillis) noexcept; void defaultScene_loop(unsigned long currentUnixTime, unsigned long currentMillis) noexcept;
@@ -41,6 +62,7 @@ public:
void overrideScene_init() noexcept; void overrideScene_init() noexcept;
void overrideScene_loop(unsigned long currentUnixTime, unsigned long currentMillis) noexcept; void overrideScene_loop(unsigned long currentUnixTime, unsigned long currentMillis) noexcept;
void analogClock_setup() noexcept;
void analogClock_config() noexcept; void analogClock_config() noexcept;
void analogClock_init() noexcept; void analogClock_init() noexcept;
void analogClock_loop(unsigned long currentUnixTime, unsigned long currentMillis) noexcept; void analogClock_loop(unsigned long currentUnixTime, unsigned long currentMillis) noexcept;
@@ -57,6 +79,10 @@ public:
void pulse1_init() noexcept; void pulse1_init() noexcept;
void pulse1_loop(unsigned long currentUnixTime, unsigned long currentMillis) noexcept; void pulse1_loop(unsigned long currentUnixTime, unsigned long currentMillis) noexcept;
void follow1_config() noexcept;
void follow1_init() noexcept;
void follow1_loop(unsigned long currentUnixTime, unsigned long currentMillis) noexcept;
protected: protected:
unsigned long lastSendTime = 0; unsigned long lastSendTime = 0;
Adafruit_NeoPixel pixels = Adafruit_NeoPixel(_tpixelCount, _tpin, NEO_GRBW + NEO_KHZ800); Adafruit_NeoPixel pixels = Adafruit_NeoPixel(_tpixelCount, _tpin, NEO_GRBW + NEO_KHZ800);
@@ -110,6 +136,19 @@ protected:
uint8_t pulseValue = 0; uint8_t pulseValue = 0;
unsigned long lastMillis = 0; unsigned long lastMillis = 0;
} pulse1; } pulse1;
struct {
union {
uint8_t wrgb[4];
uint32_t color = 0x00FF0000;
} color;
uint8_t maxCycles = 5;
int8_t followDir = 1;
int8_t followPos = 0;
uint8_t waitTime = 50;
uint8_t currentCycles = 0;
bool finishing = false;
unsigned long lastMillis = 0;
} follow1;
} sceneData; } sceneData;
}; };
@@ -138,6 +177,7 @@ template<
> void NotificationLEDs<_tpin, _trgbwId, _tdimmerId, _tpowerSwitchId, _tcommandId, _tpixelCount, _msgSendInterval> > void NotificationLEDs<_tpin, _trgbwId, _tdimmerId, _tpowerSwitchId, _tcommandId, _tpixelCount, _msgSendInterval>
::setup() noexcept { ::setup() noexcept {
pixels.begin(); pixels.begin();
analogClock_setup();
defaultScene_init(); defaultScene_init();
} }
@@ -163,6 +203,62 @@ template<
} }
template<
uint8_t _tpin,
uint8_t _trgbwId,
uint8_t _tdimmerId,
uint8_t _tpowerSwitchId,
uint8_t _tcommandId,
uint16_t _tpixelCount,
unsigned long _msgSendInterval
> void NotificationLEDs<_tpin, _trgbwId, _tdimmerId, _tpowerSwitchId, _tcommandId, _tpixelCount, _msgSendInterval>
::sendRGBWStatus() noexcept {
if (mode > 0 && sceneMode == 1) {
_sendValue<bool>(true, _trgbwId, V_STATUS);
char rgbw[9] = "00000000";
// WRGB => RGBW
String tmp((staticColor.color & 0xFF000000) >> 24 | ((staticColor.color & 0x00FFFFFF) << 8));
memcpy(rgbw+(8-tmp.length()), tmp.c_str(), tmp.length());
_sendValue<char*>(rgbw, _trgbwId, V_RGBW);
} else {
_sendValue<bool>(false, _trgbwId, V_STATUS);
}
}
template<
uint8_t _tpin,
uint8_t _trgbwId,
uint8_t _tdimmerId,
uint8_t _tpowerSwitchId,
uint8_t _tcommandId,
uint16_t _tpixelCount,
unsigned long _msgSendInterval
> void NotificationLEDs<_tpin, _trgbwId, _tdimmerId, _tpowerSwitchId, _tcommandId, _tpixelCount, _msgSendInterval>
::sendDimmerStatus() noexcept {
if (sceneMode == 0) {
_sendValue<uint8_t>(brightness, _tdimmerId, V_PERCENTAGE);
} else {
uint16_t cb = max(staticColor.wrgb[0], max(staticColor.wrgb[1], max(staticColor.wrgb[2], staticColor.wrgb[3]))) * 100 / 255;
_sendValue<uint8_t>(cb, _tdimmerId, V_PERCENTAGE);
}
}
template<
uint8_t _tpin,
uint8_t _trgbwId,
uint8_t _tdimmerId,
uint8_t _tpowerSwitchId,
uint8_t _tcommandId,
uint16_t _tpixelCount,
unsigned long _msgSendInterval
> void NotificationLEDs<_tpin, _trgbwId, _tdimmerId, _tpowerSwitchId, _tcommandId, _tpixelCount, _msgSendInterval>
::sendPowerSwitchStatus() noexcept {
_sendValue<uint8_t>(mode == 0 ? 0 : 1, _tpowerSwitchId, V_STATUS);
}
template< template<
uint8_t _tpin, uint8_t _tpin,
uint8_t _trgbwId, uint8_t _trgbwId,
@@ -184,22 +280,11 @@ template<
if (lastSendTime == 0 || currentMillis - lastSendTime >= _msgSendInterval) { if (lastSendTime == 0 || currentMillis - lastSendTime >= _msgSendInterval) {
// RGBW Sensor // RGBW Sensor
char rgbw[9] = "00000000"; sendRGBWStatus();
// WRGB => RGBW
String tmp((staticColor.color & 0xFF000000) >> 24 | ((staticColor.color & 0x00FFFFFF) << 8));
memcpy(rgbw+(8-tmp.length()), tmp.c_str(), tmp.length());
_sendValue<char*>(rgbw, _trgbwId, V_RGBW);
//Dimmer //Dimmer
if (sceneMode == 0) { sendDimmerStatus();
_sendValue<uint8_t>(brightness, _tdimmerId, V_STATUS);
} else {
uint16_t cb = max(staticColor.wrgb[0], max(staticColor.wrgb[1], max(staticColor.wrgb[2], staticColor.wrgb[3]))) * 100 / 255;
_sendValue<uint8_t>(cb, _tdimmerId, V_STATUS);
}
//Power Switch //Power Switch
_sendValue<uint8_t>(mode == 0 ? 0 : 1, _tpowerSwitchId, V_STATUS); sendPowerSwitchStatus();
lastSendTime = currentMillis; lastSendTime = currentMillis;
} }
@@ -223,7 +308,7 @@ template<
// Set Message // Set Message
if (msg.getCommand() == C_SET) { if (msg.getCommand() == C_SET) {
if (msg.type == V_STATUS) { if (msg.type == V_STATUS) {
auto onOff = msg.getByte(); auto onOff = msg.getBool();
if (onOff) { if (onOff) {
enableStaticColor(); enableStaticColor();
} else { } else {
@@ -248,13 +333,14 @@ template<
setStaticColor((color & 0xFFFFFF00) >> 8 | ((color & 0xFF) << 24)); setStaticColor((color & 0xFFFFFF00) >> 8 | ((color & 0xFF) << 24));
retval = true; retval = true;
} }
if (retval) {
sendPowerSwitchStatus();
sendRGBWStatus();
sendDimmerStatus();
}
// Request Message // Request Message
} else if (msg.getCommand() == C_REQ) { } else if (msg.getCommand() == C_REQ) {
char rgbw[9] = "00000000"; sendRGBWStatus();
// WRGB => RGBW
String tmp((staticColor.color & 0xFF000000) >> 24 | ((staticColor.color & 0x00FFFFFF) << 8));
memcpy(rgbw+(8-tmp.length()), tmp.c_str(), tmp.length());
_sendValue<char*>(rgbw, _trgbwId, V_RGBW);
retval = true; retval = true;
} }
} }
@@ -281,15 +367,11 @@ template<
setStaticColor(staticColor.color); setStaticColor(staticColor.color);
} }
retval = true; retval = true;
sendDimmerStatus();
} }
// Request Message // Request Message
} else if (msg.getCommand() == C_REQ) { } else if (msg.getCommand() == C_REQ) {
if (sceneMode == 0) { sendDimmerStatus();
_sendValue<uint8_t>(brightness, _tdimmerId, V_STATUS);
} else {
uint16_t cb = max(staticColor.wrgb[0], max(staticColor.wrgb[1], max(staticColor.wrgb[2], staticColor.wrgb[3]))) * 100 / 255;
_sendValue<uint8_t>(cb, _tdimmerId, V_STATUS);
}
retval = true; retval = true;
} }
} }
@@ -306,10 +388,13 @@ template<
powerOn(); powerOn();
} }
retval = true; retval = true;
sendPowerSwitchStatus();
sendRGBWStatus();
sendDimmerStatus();
} }
// Request Message // Request Message
} else if (msg.getCommand() == C_REQ) { } else if (msg.getCommand() == C_REQ) {
_sendValue<uint8_t>(mode == 0 ? 0 : 1, _tpowerSwitchId, V_STATUS); sendPowerSwitchStatus();
retval = true; retval = true;
} }
} }
@@ -578,6 +663,9 @@ template<
if (id == 0) { if (id == 0) {
overrideScene = id; overrideScene = id;
pulse1_config(); pulse1_config();
} else if (id == 1) {
overrideScene = id;
follow1_config();
} }
} }
@@ -594,6 +682,8 @@ template<
::overrideScene_init() noexcept { ::overrideScene_init() noexcept {
if (overrideScene == 0) { if (overrideScene == 0) {
pulse1_init(); pulse1_init();
} else if (overrideScene == 1) {
follow1_init();
} }
} }
@@ -610,12 +700,15 @@ template<
::overrideScene_loop(unsigned long currentUnixTime, unsigned long currentMillis) noexcept { ::overrideScene_loop(unsigned long currentUnixTime, unsigned long currentMillis) noexcept {
if (overrideScene == 0) { if (overrideScene == 0) {
pulse1_loop(currentUnixTime, currentMillis); pulse1_loop(currentUnixTime, currentMillis);
} else if (overrideScene == 1) {
follow1_loop(currentUnixTime, currentMillis);
} }
} }
#include "SceneAnalogClock.h" #include "SceneAnalogClock.h"
#include "SceneColorWheel.h" #include "SceneColorWheel.h"
#include "ScenePulse.h" #include "ScenePulse.h"
#include "SceneFollow.h"
SceneAnalogClock.h
+23
View File
@@ -8,6 +8,24 @@
#include "NotificationLEDs.h" #include "NotificationLEDs.h"
template<
uint8_t _tpin,
uint8_t _trgbwId,
uint8_t _tdimmerId,
uint8_t _tpowerSwitchId,
uint8_t _tcommandId,
uint16_t _tpixelCount,
unsigned long _msgSendInterval
> void NotificationLEDs<_tpin, _trgbwId, _tdimmerId, _tpowerSwitchId, _tcommandId, _tpixelCount, _msgSendInterval>
::analogClock_setup() noexcept {
_eeprom_NotificationLEDs_StatusTable statusTable;
statusTable.data = loadState(EEPROM_POS_STATUSTABLE);
if (statusTable.status.hourOffset == 1) {
sceneData.analogClock.hourOffset = (int8_t)loadState(EEPROM_POS_HOUROFFSET);
}
}
template< template<
uint8_t _tpin, uint8_t _tpin,
uint8_t _trgbwId, uint8_t _trgbwId,
@@ -22,6 +40,11 @@ template<
if (token && token[0] != ' ') { if (token && token[0] != ' ') {
auto offset = atoi(token); auto offset = atoi(token);
sceneData.analogClock.hourOffset = offset; sceneData.analogClock.hourOffset = offset;
_eeprom_NotificationLEDs_StatusTable statusTable;
statusTable.data = loadState(EEPROM_POS_STATUSTABLE);
statusTable.status.hourOffset = 1;
saveState(EEPROM_POS_HOUROFFSET, offset);
saveState(EEPROM_POS_STATUSTABLE, statusTable.data);
} }
token = strtok(NULL, _configDelims); token = strtok(NULL, _configDelims);
if (token && token[0] != ' ') { if (token && token[0] != ' ') {
SceneColorWheel.h
-3
View File
@@ -26,9 +26,6 @@ void _colorWheel_mapIndex(uint16_t c, uint16_t& r, uint16_t& g, uint16_t& b) {
} }
} }
// mathematically correct modulo
#define MOD(a,b) ((((a)%(b))+(b))%(b))
template< template<
uint8_t _tpin, uint8_t _tpin,
uint8_t _trgbwId, uint8_t _trgbwId,
SceneFollow.h
+105
View File
@@ -0,0 +1,105 @@
#ifndef SCENEFOLLOW_H_
#define SCENEFOLLOW_H_
#include <nodemanager_config.h>
#include <MySensors.h>
#include <NodeManager.h>
#include <Adafruit_NeoPixel.h>
#include "NotificationLEDs.h"
template<
uint8_t _tpin,
uint8_t _trgbwId,
uint8_t _tdimmerId,
uint8_t _tpowerSwitchId,
uint8_t _tcommandId,
uint16_t _tpixelCount,
unsigned long _msgSendInterval
> void NotificationLEDs<_tpin, _trgbwId, _tdimmerId, _tpowerSwitchId, _tcommandId, _tpixelCount, _msgSendInterval>
::follow1_config() noexcept {
auto token = strtok(NULL, _configDelims);
if (token && token[0] != ' ') {
auto color = strtoul(token, NULL, 16);
sceneData.follow1.color.color = color;
}
token = strtok(NULL, _configDelims);
if (token && token[0] != ' ') {
auto maxCycles = atoi(token);
sceneData.follow1.maxCycles = maxCycles;
}
token = strtok(NULL, _configDelims);
if (token && token[0] != ' ') {
auto followDir = atoi(token);
sceneData.follow1.followDir = followDir;
}
token = strtok(NULL, _configDelims);
if (token && token[0] != ' ') {
auto waitTime = atoi(token);
sceneData.follow1.waitTime = waitTime;
}
}
template<
uint8_t _tpin,
uint8_t _trgbwId,
uint8_t _tdimmerId,
uint8_t _tpowerSwitchId,
uint8_t _tcommandId,
uint16_t _tpixelCount,
unsigned long _msgSendInterval
> void NotificationLEDs<_tpin, _trgbwId, _tdimmerId, _tpowerSwitchId, _tcommandId, _tpixelCount, _msgSendInterval>
::follow1_init() noexcept {
for (uint8_t i = 0; i < _tpixelCount; i++) {
pixels.setPixelColor(i, 0);
}
pixels.show();
if (sceneData.follow1.followDir > 0) {
sceneData.follow1.followPos = 0;
} else {
sceneData.follow1.followPos = 11;
}
sceneData.follow1.finishing = false;
sceneData.follow1.currentCycles = 0;
sceneData.follow1.lastMillis = 0;
}
template<
uint8_t _tpin,
uint8_t _trgbwId,
uint8_t _tdimmerId,
uint8_t _tpowerSwitchId,
uint8_t _tcommandId,
uint16_t _tpixelCount,
unsigned long _msgSendInterval
> void NotificationLEDs<_tpin, _trgbwId, _tdimmerId, _tpowerSwitchId, _tcommandId, _tpixelCount, _msgSendInterval>
::follow1_loop(unsigned long currentUnixTime, unsigned long currentMillis) noexcept {
if (currentMillis - sceneData.follow1.lastMillis >= sceneData.follow1.waitTime) {
if (sceneData.follow1.finishing) {
auto delPos = MOD(sceneData.follow1.followPos-sceneData.follow1.followDir*4, 12);
pixels.setPixelColor(delPos, 0);
pixels.show();
sceneData.follow1.followPos += sceneData.follow1.followDir;
if (sceneData.follow1.followPos > 4 && sceneData.follow1.followPos < 7) {
returnToLastMode();
}
} else {
pixels.setPixelColor(sceneData.follow1.followPos, sceneData.follow1.color.color);
auto delPos = MOD(sceneData.follow1.followPos-sceneData.follow1.followDir*4, 12);
pixels.setPixelColor(delPos, 0);
pixels.show();
sceneData.follow1.followPos += sceneData.follow1.followDir;
if (sceneData.follow1.followPos < 0 || sceneData.follow1.followPos > 11) {
sceneData.follow1.followPos = MOD(sceneData.follow1.followPos, 12);
if (sceneData.follow1.maxCycles > 0 && sceneData.follow1.currentCycles > sceneData.follow1.maxCycles) {
sceneData.follow1.finishing = true;
}
}
}
sceneData.follow1.lastMillis = currentMillis;
}
}
#endif /* SCENEFOLLOW_H_ */