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

Fix zero cross special cases

Browse Source
This commit is contained in:
Theo Arends 2021-03-24 17:13:54 +01:00
parent 0be8bdee09
commit 75308ee1e0
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tasmota/support_tasmota.ino
View File

@ -155,39 +155,50 @@ char* GetStateText(uint32_t state)
return SettingsText(SET_STATE_TXT1 + state); return SettingsText(SET_STATE_TXT1 + state);
} }
/********************************************************************************************/ /*********************************************************************************************\
* Zero-cross support
\*********************************************************************************************/
//#define DEBUG_ZEROCROSS
void ZeroCrossMomentStart(void) { void ZeroCrossMomentStart(void) {
if (!TasmotaGlobal.zc_interval || !TasmotaGlobal.zc_time) { return; } if (!TasmotaGlobal.zc_interval) { return; }
// uint32_t dbg_interval = TasmotaGlobal.zc_interval; #ifdef DEBUG_ZEROCROSS
// uint32_t dbg_zctime = TasmotaGlobal.zc_time; uint32_t dbg_interval = TasmotaGlobal.zc_interval;
// uint32_t dbg_starttime = micros(); uint32_t dbg_zctime = TasmotaGlobal.zc_time;
uint32_t dbg_starttime = micros();
#endif
uint32_t timeout = millis() +22; // Catch at least 2 * 50Hz pulses
uint32_t trigger_moment = TasmotaGlobal.zc_time + TasmotaGlobal.zc_interval - TasmotaGlobal.zc_offset - TasmotaGlobal.zc_code_offset; uint32_t trigger_moment = TasmotaGlobal.zc_time + TasmotaGlobal.zc_interval - TasmotaGlobal.zc_offset - TasmotaGlobal.zc_code_offset;
while (!TimeReached(timeout) && !TimeReachedUsec(trigger_moment)) {} if (TimeReachedUsec(trigger_moment)) { // Trigger moment already passed so try next
trigger_moment += TasmotaGlobal.zc_interval;
}
uint32_t timeout = millis() +22; // Catch at most 2 * 50Hz pulses
while (!TimeReached(timeout) && !TimeReachedUsec(trigger_moment)) {} // Wait for trigger moment
// uint32_t dbg_endtime = micros(); #ifdef DEBUG_ZEROCROSS
// AddLog(LOG_LEVEL_DEBUG, PSTR("ZCD: CodeExecTime %d, StartTime %d, EndTime %d, ZcTime %d, Interval %d"), uint32_t dbg_endtime = micros();
// dbg_endtime - dbg_starttime, dbg_starttime, dbg_endtime, dbg_zctime, dbg_interval); AddLog(LOG_LEVEL_DEBUG, PSTR("ZCD: CodeExecTime %d, StartTime %u, EndTime %u, ZcTime %u, Interval %d"),
dbg_endtime - dbg_starttime, dbg_starttime, dbg_endtime, dbg_zctime, dbg_interval);
#endif
TasmotaGlobal.zc_code_offset = micros(); TasmotaGlobal.zc_code_offset = micros();
} }
void ZeroCrossMomentEnd(void) { void ZeroCrossMomentEnd(void) {
if (!TasmotaGlobal.zc_interval || !TasmotaGlobal.zc_time) { return; } if (!TasmotaGlobal.zc_interval) { return; }
TasmotaGlobal.zc_code_offset = (micros() - TasmotaGlobal.zc_code_offset) / 2; TasmotaGlobal.zc_code_offset = (micros() - TasmotaGlobal.zc_code_offset) / 2;
// AddLog(LOG_LEVEL_DEBUG, PSTR("ZCD: CodeExecTime %d"), TasmotaGlobal.zc_code_offset * 2); #ifdef DEBUG_ZEROCROSS
AddLog(LOG_LEVEL_DEBUG, PSTR("ZCD: CodeExecTime %d"), TasmotaGlobal.zc_code_offset * 2);
#endif
} }
void ICACHE_RAM_ATTR ZeroCrossIsr(void) { void ICACHE_RAM_ATTR ZeroCrossIsr(void) {
uint32_t time = micros(); uint32_t time = micros();
TasmotaGlobal.zc_interval = time - TasmotaGlobal.zc_time; TasmotaGlobal.zc_interval = ((int32_t) (time - TasmotaGlobal.zc_time));
TasmotaGlobal.zc_time = time; TasmotaGlobal.zc_time = time;
if (!TasmotaGlobal.zc_time) {TasmotaGlobal.zc_time = 1; }
} }
void ZeroCrossInit(uint32_t offset) { void ZeroCrossInit(uint32_t offset) {