Skip to content

Commit

Permalink
Sync to Tasmota
Browse files Browse the repository at this point in the history
  • Loading branch information
@ascillato
ascillato committed Mar 24, 2021
2 parents 92ef0f6 + 75308ee commit 8dd24dc
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 21 deletions.
41 changes: 26 additions & 15 deletions tasmota/support_tasmota.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,39 +155,50 @@ char* GetStateText(uint32_t state)
return SettingsText(SET_STATE_TXT1 + state);
}

/********************************************************************************************/
/*********************************************************************************************\
* Zero-cross support
\*********************************************************************************************/

//#define DEBUG_ZEROCROSS

void ZeroCrossMomentStart(void) {
if (!TasmotaGlobal.zc_interval || !TasmotaGlobal.zc_time) { return; }
if (!TasmotaGlobal.zc_interval) { return; }

// uint32_t dbg_interval = TasmotaGlobal.zc_interval;
// uint32_t dbg_zctime = TasmotaGlobal.zc_time;
// uint32_t dbg_starttime = micros();
#ifdef DEBUG_ZEROCROSS
uint32_t dbg_interval = TasmotaGlobal.zc_interval;
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;
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();
// AddLog(LOG_LEVEL_DEBUG, PSTR("ZCD: CodeExecTime %d, StartTime %d, EndTime %d, ZcTime %d, Interval %d"),
// dbg_endtime - dbg_starttime, dbg_starttime, dbg_endtime, dbg_zctime, dbg_interval);
#ifdef DEBUG_ZEROCROSS
uint32_t dbg_endtime = micros();
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();
}

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;

// 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) {
uint32_t time = micros();
TasmotaGlobal.zc_interval = time - TasmotaGlobal.zc_time;
TasmotaGlobal.zc_interval = ((int32_t) (time - TasmotaGlobal.zc_time));
TasmotaGlobal.zc_time = time;
if (!TasmotaGlobal.zc_time) {TasmotaGlobal.zc_time = 1; }
}

void ZeroCrossInit(uint32_t offset) {
Expand Down
24 changes: 18 additions & 6 deletions tasmota/xdrv_27_shutter.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ void ShutterInit(void)
for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
// set startrelay to 1 on first init, but only to shutter 1. 90% usecase
Settings.shutter_startrelay[i] = (Settings.shutter_startrelay[i] == 0 && i == 0? 1 : Settings.shutter_startrelay[i]);
if (Settings.shutter_startrelay[i] && (Settings.shutter_startrelay[i] < 9)) {
if (Settings.shutter_startrelay[i] && (Settings.shutter_startrelay[i] <= MAX_RELAYS )) {
TasmotaGlobal.shutters_present++;

// Add the two relays to the mask to knaw they belong to shutters
Expand Down Expand Up @@ -389,9 +389,21 @@ void ShutterCalculateAccelerator(uint8_t i)
// decellaration way from current velocity
current_stop_way = min_runtime_ms * STEPS_PER_SECOND * (current_pwm_velocity + velocity_change_per_step_max) * Shutter[i].direction / 2 / ShutterGlobal.open_velocity_max - (Shutter[i].accelerator<0?Shutter[i].direction*1000*current_pwm_velocity/ShutterGlobal.open_velocity_max:0);
next_possible_stop_position = current_real_position + current_stop_way ;
// ensure that the accelerotor kicks in at least one step BEFORE it is to late and a hard stop required.
if (next_possible_stop_position * Shutter[i].direction > Shutter[i].target_position * Shutter[i].direction ) {
Shutter[i].accelerator = -velocity_change_per_step_max;
// ensure that the accelerotor kicks in at the first overrun of the target position
if ( Shutter[i].accelerator < 0 || next_possible_stop_position * Shutter[i].direction > Shutter[i].target_position * Shutter[i].direction ) {
// if startet to early because of 0.05sec maximum accuracy and final position is to far away (200) accelerate a bit less
if (next_possible_stop_position * Shutter[i].direction+200 < Shutter[i].target_position * Shutter[i].direction) {
Shutter[i].accelerator = -velocity_change_per_step_max*9/10;
} else {
// in any case increase accelleration if overrun is detected during decelleration
if (next_possible_stop_position * Shutter[i].direction > Shutter[i].target_position * Shutter[i].direction && Shutter[i].accelerator < 0) {
Shutter[i].accelerator = -velocity_change_per_step_max*11/10;
} else {
// as long as the calculated end position is ok stay with proposed decelleration
Shutter[i].accelerator = -velocity_change_per_step_max;
}
}
// detect during the acceleration phase the point final speed is reached
} else if ( Shutter[i].accelerator > 0 && current_pwm_velocity == velocity_max) {
Shutter[i].accelerator = 0;
}
Expand All @@ -412,7 +424,7 @@ void ShutterDecellerateForStop(uint8_t i)
delay(50);
AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Velocity %ld, Delta %d"), Shutter[i].pwm_velocity, Shutter[i].accelerator );
// Control will be done in RTC Ticker.

}
if (ShutterGlobal.position_mode == SHT_COUNTER){
missing_steps = ((Shutter[i].target_position-Shutter[i].start_position)*Shutter[i].direction*ShutterGlobal.open_velocity_max/RESOLUTION/STEPS_PER_SECOND) - RtcSettings.pulse_counter[i];
Expand Down Expand Up @@ -462,7 +474,7 @@ void ShutterPowerOff(uint8_t i) {
switch (ShutterGlobal.position_mode) {
case SHT_PWM_VALUE:
char scmnd[20];
#ifdef SHUTTER_CLEAR_PWM_ONSTOP
#ifdef SHUTTER_CLEAR_PWM_ONSTOP
// free the PWM servo lock on stop.
snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_PWM "%d 0" ), i+1);
#else
Expand Down

0 comments on commit 8dd24dc

Please sign in to comment.