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

reverted back some function and fix frequency storage (#19791)

Browse Source 
* optimize disc write delay during shutter movement

changed to dynamic write delay to ensure no disc write on multiple shutter movement with stepper shutters.

* optimize disc write delay

ensure disc write will be postponed until all shutters stopped

* reverted back to simple version

* removed duplicate obsolete compiler options
This commit is contained in:
stefanbode 2023-10-18 23:41:52 +02:00 committed by GitHub
parent 385408dcfd
commit d5f506b1e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
tasmota/tasmota_xdrv_driver/xdrv_27_esp32_shutter.ino
View File

@ -23,7 +23,6 @@
* Shutter or Blind support using two consecutive relays * Shutter or Blind support using two consecutive relays
* Shutters for ESP32 with max eight shutters using more RAM and Settings from filesystem * Shutters for ESP32 with max eight shutters using more RAM and Settings from filesystem
\*********************************************************************************************/ \*********************************************************************************************/
#include "soc/soc_caps.h"
#define XDRV_27 27 #define XDRV_27 27
#ifndef SHUTTER_STEPPER #ifndef SHUTTER_STEPPER
@ -179,8 +178,6 @@ struct SHUTTER {
uint16_t last_reported_time = 0; // get information on skipped 50ms loop() slots uint16_t last_reported_time = 0; // get information on skipped 50ms loop() slots
uint32_t last_stop_time = 0; // record the last time the relay was switched off uint32_t last_stop_time = 0; // record the last time the relay was switched off
uint8_t button_simu_pressed = 0; // record if both button where pressed simultanously uint8_t button_simu_pressed = 0; // record if both button where pressed simultanously
uint8_t ledc_channel = 0; // current used channel for PWM
uint32_t current_stop_way = 0;
} Shutter[MAX_SHUTTERS_ESP32]; } Shutter[MAX_SHUTTERS_ESP32];
struct SHUTTERGLOBAL { struct SHUTTERGLOBAL {
@ -411,7 +408,6 @@ void ShutterCalculateAccelerator(uint8_t i)
min_runtime_ms = current_pwm_velocity * 1000 / STEPS_PER_SECOND / velocity_change_per_step_max; min_runtime_ms = current_pwm_velocity * 1000 / STEPS_PER_SECOND / velocity_change_per_step_max;
// decellaration way from current velocity // 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); 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);
Shutter[i].current_stop_way = current_stop_way;
next_possible_stop_position = current_real_position + current_stop_way ; next_possible_stop_position = current_real_position + current_stop_way ;
// ensure that the accelerotor kicks in at the first overrun of the target position // 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 ( Shutter[i].accelerator < 0 || next_possible_stop_position * Shutter[i].direction > Shutter[i].target_position * Shutter[i].direction ) {
@ -473,6 +469,7 @@ int32_t ShutterCalculatePosition(uint32_t i)
void ShutterDecellerateForStop(uint8_t i) void ShutterDecellerateForStop(uint8_t i)
{ {
bool pwm_apply = false; // ESP32 only, do we need to apply PWM changes
switch (ShutterGlobal.position_mode) { switch (ShutterGlobal.position_mode) {
case SHT_PWM_VALUE: case SHT_PWM_VALUE:
case SHT_COUNTER: case SHT_COUNTER:
@ -493,9 +490,7 @@ void ShutterDecellerateForStop(uint8_t i)
while (RtcSettings.pulse_counter[i] < (uint32_t)(Shutter[i].target_position-Shutter[i].start_position)*Shutter[i].direction*ShutterGlobal.open_velocity_max/RESOLUTION/STEPS_PER_SECOND && missing_steps > 0) { while (RtcSettings.pulse_counter[i] < (uint32_t)(Shutter[i].target_position-Shutter[i].start_position)*Shutter[i].direction*ShutterGlobal.open_velocity_max/RESOLUTION/STEPS_PER_SECOND && missing_steps > 0) {
} }
TasmotaGlobal.pwm_value[i] = 0; TasmotaGlobal.pwm_value[i] = 0;
ledcWrite(Shutter[i].ledc_channel, 0); pwm_apply = true;
ledcAttachPin(Pin(GPIO_PWM1, i), SOC_LEDC_CHANNEL_NUM);
Shutter[i].ledc_channel = 0;
Shutter[i].real_position = ShutterCalculatePosition(i); Shutter[i].real_position = ShutterCalculatePosition(i);
//AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Remain steps %d"), missing_steps); //AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Remain steps %d"), missing_steps);
AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Real %d, Pulsecount %d, tobe %d, Start %d"), Shutter[i].real_position,RtcSettings.pulse_counter[i], (uint32_t)(Shutter[i].target_position-Shutter[i].start_position)*Shutter[i].direction*ShutterGlobal.open_velocity_max/RESOLUTION/STEPS_PER_SECOND, Shutter[i].start_position); AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Real %d, Pulsecount %d, tobe %d, Start %d"), Shutter[i].real_position,RtcSettings.pulse_counter[i], (uint32_t)(Shutter[i].target_position-Shutter[i].start_position)*Shutter[i].direction*ShutterGlobal.open_velocity_max/RESOLUTION/STEPS_PER_SECOND, Shutter[i].start_position);
@ -504,6 +499,7 @@ void ShutterDecellerateForStop(uint8_t i)
Shutter[i].pwm_velocity = 0; Shutter[i].pwm_velocity = 0;
break; break;
} }
if (pwm_apply) { PwmApplyGPIO(false); }
} }
uint16_t ShutterGetCycleTime(uint8_t i, uint8_t max_runtime) { uint16_t ShutterGetCycleTime(uint8_t i, uint8_t max_runtime) {
@ -534,23 +530,6 @@ uint16_t ShutterGetCycleTime(uint8_t i, uint8_t max_runtime) {
return cycle_time; return cycle_time;
} }
uint8_t ShutterGetFreeChannel() {
uint8_t nextFreeChannel = 0;
for (uint8_t i = 0; i < MAX_SHUTTERS_ESP32; i++) {
//SOC_LEDC_CHANNEL_NUM
nextFreeChannel = tmax(nextFreeChannel, Shutter[i].ledc_channel);
//AddLog(LOG_LEVEL_DEBUG, PSTR("SHT: %d -> channel %d"), i, Shutter[i].ledc_channel);
}
if (nextFreeChannel >= SOC_LEDC_CHANNEL_NUM) {
AddLog(LOG_LEVEL_ERROR, PSTR("SHT: All PWM channel busy. Open issue-ticket."));
return 0;
} else {
nextFreeChannel++;
AddLog(LOG_LEVEL_DEBUG, PSTR("SHT: Use channel %d"), nextFreeChannel);
}
return nextFreeChannel;
}
uint8_t ShutterGetOptions(uint8_t index) { uint8_t ShutterGetOptions(uint8_t index) {
return ShutterSettings.shutter_options[index]; return ShutterSettings.shutter_options[index];
} }
@ -827,9 +806,16 @@ void ShutterPowerOff(uint8_t i)
#endif #endif
break; break;
} }
if (Settings->save_data) {
TasmotaGlobal.save_data_counter = Settings->save_data; // restore save_data behavior if all shutters are in stopped state
bool shutter_all_stopped = true;
for (uint8_t j = 0 ; j < TasmotaGlobal.shutters_present ; j++) {
if (Shutter[j].direction != 0)
shutter_all_stopped = false;
} }
if (shutter_all_stopped)
TasmotaGlobal.save_data_counter = Settings->save_data;
Shutter[i].last_stop_time = millis(); Shutter[i].last_stop_time = millis();
} }
@ -976,7 +962,8 @@ void ShutterReportPosition(bool always, uint32_t index)
void ShutterRtc50mS(void) void ShutterRtc50mS(void)
{ {
// No Logging allowed. RTC Timer bool pwm_apply = false; // ESP32 only, do we need to apply PWM changes
// No Logging allowed. RTC Timer
for (uint8_t i = 0; i < TasmotaGlobal.shutters_present; i++) { for (uint8_t i = 0; i < TasmotaGlobal.shutters_present; i++) {
if (Shutter[i].direction) { if (Shutter[i].direction) {
// update position data before increasing counter // update position data before increasing counter
@ -996,15 +983,15 @@ void ShutterRtc50mS(void)
//AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Accelerator i=%d -> %d"),i, Shutter[i].accelerator); //AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Accelerator i=%d -> %d"),i, Shutter[i].accelerator);
ShutterUpdateVelocity(i); ShutterUpdateVelocity(i);
digitalWrite(Pin(GPIO_PWM1, i), LOW); digitalWrite(Pin(GPIO_PWM1, i), LOW);
analogWriteFreq(Shutter[i].pwm_velocity,Pin(GPIO_PWM1, i));
ledcWriteTone(Shutter[i].ledc_channel, Shutter[i].pwm_velocity); //
//ledcWrite(i, 512); // Setzt den PWM-Wert auf 0
TasmotaGlobal.pwm_value[i] = 512; TasmotaGlobal.pwm_value[i] = 512;
pwm_apply = true;
} }
break; break;
} }
} // if (Shutter[i].direction) } // if (Shutter[i].direction)
} }
if (pwm_apply) { PwmApplyGPIO(false); }
} }
void ShutterSetPosition(uint32_t device, uint32_t position) void ShutterSetPosition(uint32_t device, uint32_t position)
@ -1171,12 +1158,9 @@ void ShutterStartInit(uint32_t i, int32_t direction, int32_t target_pos)
switch (ShutterGlobal.position_mode) { switch (ShutterGlobal.position_mode) {
#ifdef SHUTTER_STEPPER #ifdef SHUTTER_STEPPER
case SHT_COUNTER: case SHT_COUNTER:
Shutter[i].ledc_channel = ShutterGetFreeChannel(); analogWriteFreq(PWM_MIN,Pin(GPIO_PWM1, i));
//AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Channel %d assigned to SHT %d"),Shutter[i].ledc_channel, i); TasmotaGlobal.pwm_value[i] = 0;
ledcSetup(Shutter[i].ledc_channel, Shutter[i].pwm_velocity, 8); PwmApplyGPIO(false);
ledcAttachPin(Pin(GPIO_PWM1, i), Shutter[i].ledc_channel);
ledcWriteTone(Shutter[i].ledc_channel, Shutter[i].pwm_velocity);
ledcWrite(Shutter[i].ledc_channel, 0); // Setzt den PWM-Wert auf 0
RtcSettings.pulse_counter[i] = 0; RtcSettings.pulse_counter[i] = 0;
break; break;
#endif #endif
@ -1201,11 +1185,9 @@ void ShutterStartInit(uint32_t i, int32_t direction, int32_t target_pos)
Shutter[i].venetian_delay, Shutter[i].tilt_real_pos,direction,(Shutter[i].tilt_config[1]-Shutter[i].tilt_config[0]), Shutter[i].tilt_config[2],Shutter[i].tilt_start_pos,Shutter[i].tilt_target_pos); Shutter[i].venetian_delay, Shutter[i].tilt_real_pos,direction,(Shutter[i].tilt_config[1]-Shutter[i].tilt_config[0]), Shutter[i].tilt_config[2],Shutter[i].tilt_start_pos,Shutter[i].tilt_target_pos);
} }
// avoid file system writes during move to minimize missing steps // avoid file system writes during move to minimize missing steps. 15min diabled. Will re renabled on full stop
if (Settings->save_data) { TasmotaGlobal.save_data_counter = 900;
uint32_t move_duration = (direction > 0) ? Shutter[i].open_time : Shutter[i].close_time;
TasmotaGlobal.save_data_counter = Settings->save_data + (move_duration / 10) +1;
}
} }
//AddLog(LOG_LEVEL_DEBUG, PSTR("SHT: Start shtr%d from %d to %d in dir: %d"), i, Shutter[i].start_position, Shutter[i].target_position, direction); //AddLog(LOG_LEVEL_DEBUG, PSTR("SHT: Start shtr%d from %d to %d in dir: %d"), i, Shutter[i].start_position, Shutter[i].target_position, direction);
@ -1282,9 +1264,9 @@ void ShutterUpdatePosition(void)
// Update time information // Update time information
int32_t deltatime = Shutter[i].time - Shutter[i].last_reported_time; int32_t deltatime = Shutter[i].time - Shutter[i].last_reported_time;
Shutter[i].last_reported_time = Shutter[i].time + 1; Shutter[i].last_reported_time = Shutter[i].time + 1;
AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Shtr%d Time %d(%d), cStop %d, cVelo %d, mVelo %d, aVelo %d, mRun %d, aPos %d, nStop %d, Trgt %d, mVelo %d, Dir %d, Tilt %d, TrgtTilt: %d, Tiltmove: %d"), AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Shtr%d Time %d(%d), cStop %d, cVelo %d, mVelo %d, aVelo %d, mRun %d, aPos %d, aPos2 %d, nStop %d, Trgt %d, mVelo %d, Dir %d, Tilt %d, TrgtTilt: %d, Tiltmove: %d"),
i+1, Shutter[i].time, deltatime, Shutter[i].current_stop_way, Shutter[i].pwm_velocity, velocity_max, Shutter[i].accelerator, min_runtime_ms, Shutter[i].real_position, i+1, Shutter[i].time, deltatime, current_stop_way, current_pwm_velocity, velocity_max, Shutter[i].accelerator, min_runtime_ms, current_real_position,Shutter[i].real_position,
Shutter[i].current_stop_way + Shutter[i].real_position, Shutter[i].target_position, velocity_change_per_step_max, Shutter[i].direction,Shutter[i].tilt_real_pos, Shutter[i].tilt_target_pos, next_possible_stop_position, Shutter[i].target_position, velocity_change_per_step_max, Shutter[i].direction,Shutter[i].tilt_real_pos, Shutter[i].tilt_target_pos,
Shutter[i].tiltmoving); Shutter[i].tiltmoving);
// Check calibration mode and energy information // Check calibration mode and energy information