Fix shutter watchdogs

Fix shutter watchdogs (#8721)
This commit is contained in:
Theo Arends 2020-06-23 17:30:06 +02:00
parent 6e8928b8a1
commit 1f80336ae4

View File

@ -206,7 +206,8 @@ void ShutterInit(void)
Shutter.pwm_frequency[i] = 0; Shutter.pwm_frequency[i] = 0;
Shutter.accelerator[i] = 0; Shutter.accelerator[i] = 0;
analogWriteFreq(Shutter.pwm_frequency[i]); analogWriteFreq(Shutter.pwm_frequency[i]);
ExecuteCommandPower(Settings.shutter_startrelay[i]+2, 0, SRC_SHUTTER); analogWrite(Pin(GPIO_PWM1, i), 0);
// ExecuteCommandPower(Settings.shutter_startrelay[i]+2, 0, SRC_SHUTTER);
} }
} }
@ -364,8 +365,8 @@ void ShutterUpdatePosition(void)
while (RtcSettings.pulse_counter[i] < (uint32_t)(Shutter.target_position[i]-Shutter.start_position[i])*Shutter.direction[i]*Shutter.max_pwm_frequency/2000) { while (RtcSettings.pulse_counter[i] < (uint32_t)(Shutter.target_position[i]-Shutter.start_position[i])*Shutter.direction[i]*Shutter.max_pwm_frequency/2000) {
delay(1); delay(1);
} }
//analogWrite(Pin(GPIO_PWM1, i), 0); // removed with 8.3 because of reset caused by watchog analogWrite(Pin(GPIO_PWM1, i), 0); // removed with 8.3 because of reset caused by watchog
ExecuteCommandPower(Settings.shutter_startrelay[i]+2, 0, SRC_SHUTTER); // ExecuteCommandPower(Settings.shutter_startrelay[i]+2, 0, SRC_SHUTTER);
Shutter.real_position[i] = ShutterCounterBasedPosition(i); Shutter.real_position[i] = ShutterCounterBasedPosition(i);
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Real %d, pulsecount %d, start %d"), Shutter.real_position[i],RtcSettings.pulse_counter[i], Shutter.start_position[i]); AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Real %d, pulsecount %d, start %d"), Shutter.real_position[i],RtcSettings.pulse_counter[i], Shutter.start_position[i]);
@ -461,7 +462,7 @@ void ShutterWaitForMotorStop(uint32_t i)
delay(50); delay(50);
} }
analogWrite(Pin(GPIO_PWM1, i), 0); analogWrite(Pin(GPIO_PWM1, i), 0);
ExecuteCommandPower(Settings.shutter_startrelay[i]+2, 0, SRC_SHUTTER); // ExecuteCommandPower(Settings.shutter_startrelay[i]+2, 0, SRC_SHUTTER);
Shutter.real_position[i] = ShutterCounterBasedPosition(i); Shutter.real_position[i] = ShutterCounterBasedPosition(i);
} else { } else {
ExecuteCommandPower(Settings.shutter_startrelay[i], 0, SRC_SHUTTER); ExecuteCommandPower(Settings.shutter_startrelay[i], 0, SRC_SHUTTER);