jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-26 20:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for Armtronix dimmers

Browse Source 
Add support for Armtronix dimmers. See wiki for info (#4321)
This commit is contained in:
Theo Arends 2018-11-16 12:22:15 +01:00
parent 48fa0705e0
commit e284e78b4d
6 changed files with 81 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sonoff/_changelog.ino
View File

@ -1,6 +1,7 @@
/* 6.3.0.8 20181115 /* 6.3.0.8 20181115
* Stop enforcing flashmode dout but it is still mandatory * Stop enforcing flashmode dout but it is still mandatory
* Moved bootcount update (being first) flash write to 10 seconds after restart * Moved bootcount update (being first) flash write to 10 seconds after restart
* Add support for Armtronix dimmers. See wiki for info (#4321)
* *
* 6.3.0.7 20181111 * 6.3.0.7 20181111
* Fix wifi connection errors using wifi disconnect and ESP.reset instead of ESP.restart * Fix wifi connection errors using wifi disconnect and ESP.reset instead of ESP.restart

2
sonoff/my_user_config.h
View File

@ -356,7 +356,7 @@
#define MP3_VOLUME 10 // Set the startup volume on init, the range can be 0..30(max) #define MP3_VOLUME 10 // Set the startup volume on init, the range can be 0..30(max)
#define USE_TUYA_DIMMER // Add support for Tuya Serial Dimmer #define USE_TUYA_DIMMER // Add support for Tuya Serial Dimmer
#define TUYA_DIMMER_ID 0 // Default dimmer Id #define TUYA_DIMMER_ID 0 // Default dimmer Id
//#define USE_ARMTRONIX_DIMMERS //Add support for Armtronix Dimmers #define USE_ARMTRONIX_DIMMERS // Add support for Armtronix Dimmers (+1k4 code)
// Power monitoring sensors ----------------------- // Power monitoring sensors -----------------------
#define USE_PZEM004T // Add support for PZEM004T Energy monitor (+2k code) #define USE_PZEM004T // Add support for PZEM004T Energy monitor (+2k code)

7
sonoff/sonoff.h
View File

@ -227,8 +227,11 @@ enum DomoticzSensors {DZ_TEMP, DZ_TEMP_HUM, DZ_TEMP_HUM_BARO, DZ_POWER_ENERGY, D
enum Ws2812ClockIndex { WS_SECOND, WS_MINUTE, WS_HOUR, WS_MARKER }; enum Ws2812ClockIndex { WS_SECOND, WS_MINUTE, WS_HOUR, WS_MARKER };
enum Ws2812Color { WS_RED, WS_GREEN, WS_BLUE }; enum Ws2812Color { WS_RED, WS_GREEN, WS_BLUE };
enum LightTypes {LT_BASIC, LT_PWM1, LT_PWM2, LT_PWM3, LT_PWM4, LT_PWM5, LT_PWM6, LT_PWM7, LT_SERIAL, LT_SERIAL2, LT_NU10, LT_WS2812, LT_RGBW, LT_RGBWC};
enum LichtSubtypes {LST_NONE, LST_SINGLE, LST_COLDWARM, LST_RGB, LST_RGBW, LST_RGBWC}; enum LightSubtypes { LST_NONE, LST_SINGLE, LST_COLDWARM, LST_RGB, LST_RGBW, LST_RGBWC }; // Do not insert new fields
enum LightTypes { LT_BASIC, LT_PWM1, LT_PWM2, LT_PWM3, LT_PWM4, LT_PWM5, LT_PWM6, LT_PWM7,
LT_NU8, LT_SERIAL1, LT_SERIAL2, LT_WS2812, LT_RGBW, LT_RGBWC, LT_NU14, LT_NU15 }; // Do not insert new fields
enum LichtSchemes {LS_POWER, LS_WAKEUP, LS_CYCLEUP, LS_CYCLEDN, LS_RANDOM, LS_MAX}; enum LichtSchemes {LS_POWER, LS_WAKEUP, LS_CYCLEUP, LS_CYCLEDN, LS_RANDOM, LS_MAX};
enum XsnsFunctions {FUNC_SETTINGS_OVERRIDE, FUNC_MODULE_INIT, FUNC_PRE_INIT, FUNC_INIT, enum XsnsFunctions {FUNC_SETTINGS_OVERRIDE, FUNC_MODULE_INIT, FUNC_PRE_INIT, FUNC_INIT,

28
sonoff/xdrv_04_light.ino
View File

@ -311,7 +311,10 @@ void LightMy92x1Write(uint8_t data)
void LightMy92x1Init(void) void LightMy92x1Init(void)
{ {
uint8_t chips = light_type -11; // 1 (AiLight) or 2 (Sonoff B1) uint8_t chips = 1; // 1 (AiLight)
if (LT_RGBWC == light_type) {
chips = 2; // 2 (Sonoff B1)
}
LightDckiPulse(chips * 32); // Clear all duty register LightDckiPulse(chips * 32); // Clear all duty register
os_delay_us(12); // TStop > 12us. os_delay_us(12); // TStop > 12us.
@ -332,7 +335,12 @@ void LightMy92x1Init(void)
void LightMy92x1Duty(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b, uint8_t duty_w, uint8_t duty_c) void LightMy92x1Duty(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b, uint8_t duty_w, uint8_t duty_c)
{ {
uint8_t channels[2] = { 4, 6 }; uint8_t channels[2] = { 4, 6 };
uint8_t didx = light_type -12; // 0 or 1
uint8_t didx = 0; // 0 (AiLight)
if (LT_RGBWC == light_type) {
didx = 1; // 1 (Sonoff B1)
}
uint8_t duty[2][6] = {{ duty_r, duty_g, duty_b, duty_w, 0, 0 }, // Definition for RGBW channels uint8_t duty[2][6] = {{ duty_r, duty_g, duty_b, duty_w, 0, 0 }, // Definition for RGBW channels
{ duty_w, duty_c, 0, duty_g, duty_r, duty_b }}; // Definition for RGBWC channels { duty_w, duty_c, 0, duty_g, duty_r, duty_b }}; // Definition for RGBWC channels
@ -352,8 +360,11 @@ void LightInit(void)
uint8_t max_scheme = LS_MAX -1; uint8_t max_scheme = LS_MAX -1;
light_device = devices_present; light_device = devices_present;
light_subtype = light_type &7; light_subtype = light_type &7; // Always 0 - 7
if (LST_SINGLE == light_subtype) {
Settings.light_color[0] = 255; // One channel only supports Dimmer but needs max color
}
if (light_type < LT_PWM6) { // PWM if (light_type < LT_PWM6) { // PWM
for (byte i = 0; i < light_type; i++) { for (byte i = 0; i < light_type; i++) {
Settings.pwm_value[i] = 0; // Disable direct PWM control Settings.pwm_value[i] = 0; // Disable direct PWM control
@ -361,9 +372,6 @@ void LightInit(void)
pinMode(pin[GPIO_PWM1 +i], OUTPUT); pinMode(pin[GPIO_PWM1 +i], OUTPUT);
} }
} }
if (LT_PWM1 == light_type || LT_SERIAL == light_type) {
Settings.light_color[0] = 255; // One PWM channel only supports Dimmer but needs max color
}
if (SONOFF_LED == Settings.module) { // Fix Sonoff Led instabilities if (SONOFF_LED == Settings.module) { // Fix Sonoff Led instabilities
if (!my_module.gp.io[4]) { if (!my_module.gp.io[4]) {
pinMode(4, OUTPUT); // Stop floating outputs pinMode(4, OUTPUT); // Stop floating outputs
@ -393,12 +401,6 @@ void LightInit(void)
max_scheme = LS_MAX + WS2812_SCHEMES; max_scheme = LS_MAX + WS2812_SCHEMES;
} }
#endif // USE_WS2812 ************************************************************************ #endif // USE_WS2812 ************************************************************************
else if (LT_SERIAL == light_type) {
light_subtype = LST_SINGLE;
}
else if (LT_SERIAL2 == light_type) {
light_subtype = LST_COLDWARM;
}
else { else {
light_pdi_pin = pin[GPIO_DI]; light_pdi_pin = pin[GPIO_DI];
light_pdcki_pin = pin[GPIO_DCKI]; light_pdcki_pin = pin[GPIO_DCKI];
@ -830,7 +832,7 @@ void LightAnimate(void)
LightMy92x1Duty(cur_col[0], cur_col[1], cur_col[2], cur_col[3], cur_col[4]); LightMy92x1Duty(cur_col[0], cur_col[1], cur_col[2], cur_col[3], cur_col[4]);
} }
#ifdef USE_TUYA_DIMMER #ifdef USE_TUYA_DIMMER
if (light_type == LT_SERIAL) { if (light_type == LT_SERIAL1) {
LightSerialDuty(cur_col[0]); LightSerialDuty(cur_col[0]);
} }
#endif // USE_TUYA_DIMMER #endif // USE_TUYA_DIMMER

2
sonoff/xdrv_16_tuyadimmer.ino
View File

@ -276,7 +276,7 @@ boolean TuyaModuleSelected(void)
Settings.my_gp.io[3] = GPIO_TUYA_RX; Settings.my_gp.io[3] = GPIO_TUYA_RX;
restart_flag = 2; restart_flag = 2;
} }
light_type = LT_SERIAL; light_type = LT_SERIAL1;
return true; return true;
} }

112
sonoff/xdrv_18_armtronixDimmers.ino → sonoff/xdrv_18_armtronix_dimmers.ino
View File

@ -1,7 +1,7 @@
/* /*
xdrv_18_armtronixdimmer.ino - Armtronix dimmers support for Sonoff-Tasmota xdrv_18_armtronix_dimmers.ino - Armtronix dimmers support for Sonoff-Tasmota
Copyright (C) 2018 digiblur, Joel Stein and Theo Arends Copyright (C) 2018 wvdv2002 and Theo Arends
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -17,11 +17,13 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/*This code can be used for Armtronix dimmers. The dimmers contain a Atmega328 to do the actual dimming.
Checkout the Tasmota Wiki for information on how to flash this Atmega328 with the firmware to work together with this driver.
*/
#ifdef USE_ARMTRONIX_DIMMERS #ifdef USE_ARMTRONIX_DIMMERS
/*********************************************************************************************\
* This code can be used for Armtronix dimmers.
* The dimmers contain a Atmega328 to do the actual dimming.
* Checkout the Tasmota Wiki for information on how to flash this Atmega328 with the firmware
* to work together with this driver.
\*********************************************************************************************/
#define XDRV_18 18 #define XDRV_18 18
@ -31,27 +33,24 @@ TasmotaSerial *ArmtronixSerial = nullptr;
boolean armtronix_ignore_dim = false; // Flag to skip serial send to prevent looping when processing inbound states from the faceplate interaction boolean armtronix_ignore_dim = false; // Flag to skip serial send to prevent looping when processing inbound states from the faceplate interaction
int8_t armtronix_wifi_state = -2; // Keep MCU wifi-status in sync with WifiState() int8_t armtronix_wifi_state = -2; // Keep MCU wifi-status in sync with WifiState()
int8_t armtronix_dimState[2]; //Dimmer state values. int8_t armtronix_dimState[2]; // Dimmer state values.
int8_t armtronix_knobState[2]; //Dimmer state values. int8_t armtronix_knobState[2]; // Dimmer state values.
/*********************************************************************************************\ /*********************************************************************************************\
* Internal Functions * Internal Functions
\*********************************************************************************************/ \*********************************************************************************************/
void LightSerial2Duty(uint8_t duty1, uint8_t duty2) void LightSerial2Duty(uint8_t duty1, uint8_t duty2)
{ {
if (ArmtronixSerial && !armtronix_ignore_dim) { if (ArmtronixSerial && !armtronix_ignore_dim) {
duty1 = ((float)duty1)/2.575757; //max 99 duty1 = ((float)duty1)/2.575757; //max 99
duty2 = ((float)duty2)/2.575757; //max 99 duty2 = ((float)duty2)/2.575757; //max 99
armtronix_dimState[0] = duty1; armtronix_dimState[0] = duty1;
armtronix_dimState[1] = duty2; armtronix_dimState[1] = duty2;
ArmtronixSerial->print("Dimmer1:"); ArmtronixSerial->print("Dimmer1:");
ArmtronixSerial->print(duty1); ArmtronixSerial->print(duty1);
ArmtronixSerial->print("\nDimmer2:"); ArmtronixSerial->print("\nDimmer2:");
ArmtronixSerial->println(duty2); ArmtronixSerial->println(duty2);
snprintf_P(log_data, sizeof(log_data), PSTR( "ARM: Send Serial Packet Dim Values=%d,%d"), armtronix_dimState[0],armtronix_dimState[1]); snprintf_P(log_data, sizeof(log_data), PSTR( "ARM: Send Serial Packet Dim Values=%d,%d"), armtronix_dimState[0],armtronix_dimState[1]);
AddLog(LOG_LEVEL_DEBUG); AddLog(LOG_LEVEL_DEBUG);
@ -64,8 +63,9 @@ void LightSerial2Duty(uint8_t duty1, uint8_t duty2)
} }
} }
void ArmtronixRequestState(){ void ArmtronixRequestState(void)
if(ArmtronixSerial) { {
if (ArmtronixSerial) {
// Get current status of MCU // Get current status of MCU
snprintf_P(log_data, sizeof(log_data), "TYA: Request MCU state"); snprintf_P(log_data, sizeof(log_data), "TYA: Request MCU state");
AddLog(LOG_LEVEL_DEBUG); AddLog(LOG_LEVEL_DEBUG);
@ -78,13 +78,13 @@ void ArmtronixRequestState(){
* API Functions * API Functions
\*********************************************************************************************/ \*********************************************************************************************/
boolean ArmtronixModuleSelected() boolean ArmtronixModuleSelected(void)
{ {
light_type = LT_SERIAL2; light_type = LT_SERIAL2;
return true; return true;
} }
void ArmtronixInit() void ArmtronixInit(void)
{ {
armtronix_dimState[0] = -1; armtronix_dimState[0] = -1;
armtronix_dimState[1] = -1; armtronix_dimState[1] = -1;
@ -97,7 +97,7 @@ void ArmtronixInit()
} }
} }
void ArmtronixSerialInput() void ArmtronixSerialInput(void)
{ {
String answer; String answer;
int8_t newDimState[2]; int8_t newDimState[2];
@ -107,11 +107,11 @@ void ArmtronixSerialInput()
if (ArmtronixSerial->available()) { if (ArmtronixSerial->available()) {
yield(); yield();
answer = ArmtronixSerial->readStringUntil('\n'); answer = ArmtronixSerial->readStringUntil('\n');
if(answer.substring(0,7) == "Status:"){ if (answer.substring(0,7) == "Status:") {
commaIndex = 6; commaIndex = 6;
for(int i =0;i<2;i++){ for (int i =0; i<2; i++) {
newDimState[i] = answer.substring(commaIndex+1,answer.indexOf(',',commaIndex+1)).toInt(); newDimState[i] = answer.substring(commaIndex+1,answer.indexOf(',',commaIndex+1)).toInt();
if(newDimState[i] != armtronix_dimState[i]){ if (newDimState[i] != armtronix_dimState[i]) {
temp = ((float)newDimState[i])*1.01010101010101; //max 255 temp = ((float)newDimState[i])*1.01010101010101; //max 255
armtronix_dimState[i] = newDimState[i]; armtronix_dimState[i] = newDimState[i];
armtronix_ignore_dim = true; armtronix_ignore_dim = true;
@ -120,7 +120,7 @@ void ArmtronixSerialInput()
snprintf_P(log_data, sizeof(log_data), PSTR("ARM: Send CMND_CHANNEL=%s"), scmnd ); snprintf_P(log_data, sizeof(log_data), PSTR("ARM: Send CMND_CHANNEL=%s"), scmnd );
AddLog(LOG_LEVEL_DEBUG); AddLog(LOG_LEVEL_DEBUG);
} }
commaIndex = answer.indexOf(',',commaIndex+1); commaIndex = answer.indexOf(',',commaIndex+1);
} }
armtronix_knobState[0] = answer.substring(commaIndex+1,answer.indexOf(',',commaIndex+1)).toInt(); armtronix_knobState[0] = answer.substring(commaIndex+1,answer.indexOf(',',commaIndex+1)).toInt();
commaIndex = answer.indexOf(',',commaIndex+1); commaIndex = answer.indexOf(',',commaIndex+1);
@ -129,40 +129,40 @@ void ArmtronixSerialInput()
} }
} }
void ArmtronixSetWifiLed(){ void ArmtronixSetWifiLed(void)
uint8_t wifi_state = 0x02; {
switch(WifiState()){ uint8_t wifi_state = 0x02;
case WIFI_SMARTCONFIG:
wifi_state = 0x00;
break;
case WIFI_MANAGER:
case WIFI_WPSCONFIG:
wifi_state = 0x01;
break;
case WIFI_RESTART:
wifi_state = 0x03;
break;
}
snprintf_P(log_data, sizeof(log_data), "ARM: Set WiFi LED to state %d (%d)", wifi_state, WifiState()); switch (WifiState()) {
AddLog(LOG_LEVEL_DEBUG); case WIFI_SMARTCONFIG:
wifi_state = 0x00;
char state = '0' + (wifi_state & 1 > 0); break;
ArmtronixSerial->print("Setled:"); case WIFI_MANAGER:
ArmtronixSerial->write(state); case WIFI_WPSCONFIG:
ArmtronixSerial->write(','); wifi_state = 0x01;
state = '0' + (wifi_state & 2 > 0); break;
ArmtronixSerial->write(state); case WIFI_RESTART:
ArmtronixSerial->write(10); wifi_state = 0x03;
armtronix_wifi_state = WifiState(); break;
}
snprintf_P(log_data, sizeof(log_data), "ARM: Set WiFi LED to state %d (%d)", wifi_state, WifiState());
AddLog(LOG_LEVEL_DEBUG);
char state = '0' + (wifi_state & 1 > 0);
ArmtronixSerial->print("Setled:");
ArmtronixSerial->write(state);
ArmtronixSerial->write(',');
state = '0' + (wifi_state & 2 > 0);
ArmtronixSerial->write(state);
ArmtronixSerial->write(10);
armtronix_wifi_state = WifiState();
} }
/*********************************************************************************************\ /*********************************************************************************************\
* Interface * Interface
\*********************************************************************************************/ \*********************************************************************************************/
boolean Xdrv18(byte function) boolean Xdrv18(byte function)
{ {
boolean result = false; boolean result = false;
@ -179,9 +179,9 @@ boolean Xdrv18(byte function)
if (ArmtronixSerial) { ArmtronixSerialInput(); } if (ArmtronixSerial) { ArmtronixSerialInput(); }
break; break;
case FUNC_EVERY_SECOND: case FUNC_EVERY_SECOND:
if(ArmtronixSerial){ if (ArmtronixSerial) {
if (armtronix_wifi_state!=WifiState()) { ArmtronixSetWifiLed(); } if (armtronix_wifi_state!=WifiState()) { ArmtronixSetWifiLed(); }
if(uptime&1){ if (uptime &1) {
ArmtronixSerial->println("Status"); ArmtronixSerial->println("Status");
} }
} }