mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Proposed Dimmer change

This commit is contained in:
stefanbode 2022-02-25 20:25:16 +01:00 committed by GitHub
parent 9ef95b4db5
commit 3ffa536b9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tasmota/xsns_01_counter.ino
View File

@ -2,6 +2,7 @@
xsns_01_counter.ino - Counter sensors (water meters, electricity meters etc.) sensor support for Tasmota xsns_01_counter.ino - Counter sensors (water meters, electricity meters etc.) sensor support for Tasmota
Copyright (C) 2021 Maarten Damen and Theo Arends Copyright (C) 2021 Maarten Damen and Theo Arends
Stefan Bode (Zero-Cross Dimmer)
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
@ -90,7 +91,7 @@ void IRAM_ATTR CounterIsrArg(void *arg) {
// restart PWM each second (german 50Hz has to up to 0.01% deviation) // restart PWM each second (german 50Hz has to up to 0.01% deviation)
// restart initiated by setting Counter.startReSync = true; // restart initiated by setting Counter.startReSync = true;
#ifdef USE_AC_ZERO_CROSS_DIMMER #ifdef USE_AC_ZERO_CROSS_DIMMER
if (Settings->flag4.zerocross_dimmer && ac_zero_cross_dimmer.currentPWMCycleCount[index] < ac_zero_cross_dimmer.currentPWMCycleCount[3]) { if (Settings->flag4.zerocross_dimmer && ac_zero_cross_dimmer.startMeasurePhase[index] == true) {
ac_zero_cross_dimmer.currentPWMCycleCount[index] = ESP.getCycleCount(); ac_zero_cross_dimmer.currentPWMCycleCount[index] = ESP.getCycleCount();
ac_zero_cross_dimmer.startMeasurePhase[index] = false; ac_zero_cross_dimmer.startMeasurePhase[index] = false;
} }
@ -99,8 +100,6 @@ void IRAM_ATTR CounterIsrArg(void *arg) {
// 1000µs to ensure not to fire on the next sinus wave // 1000µs to ensure not to fire on the next sinus wave
if (ac_zero_cross_dimmer.lastCycleCount > 0) { if (ac_zero_cross_dimmer.lastCycleCount > 0) {
ac_zero_cross_dimmer.startReSync = true; ac_zero_cross_dimmer.startReSync = true;
//byte k = MAX_COUNTERS; // good to 255 elements
//while ( k-- ) *( ac_zero_cross_dimmer.startMeasurePhase + k ) = *( trueArray + k ); // dest and src are your 2 array names
for (uint8_t k=0; k < MAX_COUNTERS-1; k++ ) { for (uint8_t k=0; k < MAX_COUNTERS-1; k++ ) {
ac_zero_cross_dimmer.startMeasurePhase[k] = true; ac_zero_cross_dimmer.startMeasurePhase[k] = true;
} }