Add time dependency for package drop

Author: steff393

src/autoClose.cpp

@@ -18,6 +18,7 @@ typedef enum {
 	AC_WAIT             = 3,
 	AC_CLOSE            = 4,
 	AC_ABORT_WAIT       = 5,
+	PD_CORRECT_ERROR    = 10,
 	PD_START            = 11,
 	PD_GOTO_VENTING     = 12,
 	PD_WAIT             = 13
@@ -37,9 +38,16 @@ void ac_trigger() {
 
 
 void pd_trigger() {
-	if (acState == AC_INIT) {
+	if (acState == AC_INIT && (uap_getBroadcast() & UAP_STATUS_CLOSED)) {
 		LOG(m, "Start Paketdienst", "");
-		acState = PD_START;
+		if (uap_getBroadcast() & UAP_STATUS_ERROR) {
+			// if an error is present, then it's not possible to go directly to venting. Send first a "close", wait and then start as usual
+			uap_triggerAction(UAP_ACTION_CLOSE, SRC_AUTOCLOSE);
+			acState = PD_CORRECT_ERROR;
+			acTimer = millis();
+		} else {
+			acState = PD_START;
+		}
 	}
 }
 
@@ -64,7 +72,6 @@ void ac_loop() {
 	lastCall = millis();
 
   uint32_t      seconds = log_getSecSinceMidnight();
-
 	if ((seconds >= (uint32_t)cfgAcTime * 3600) && (seconds <= (uint32_t)cfgAcTime * 3600 + AC_TRIGGER_INTERVAL / 1000)) {
 		// check for a 5s time-window to safely detect, but not trigger multiple times
 		ac_trigger();
@@ -115,6 +122,12 @@ void ac_loop() {
 		}
 
 
+		case PD_CORRECT_ERROR: {
+			if (millis() - acTimer > cfgPdWaitError) {
+				acState = PD_START;
+			}
+			break;
+		}
 		case PD_START: {
 			// start the first movement, e.g. a short closing to warn
 			uap_triggerAction(UAP_ACTION_VENTING, SRC_AUTOCLOSE);

src/globalConfig.cpp

@@ -9,7 +9,7 @@
 const uint8_t m = 1;
 
 char cfgHgdoVersion[]     = "v0.1.0";           // hgdo version
-char cfgBuildDate[]       = "2021-10-30";	      // hgdo build date
+char cfgBuildDate[]       = "2021-10-31";	      // hgdo build date
 
 char     cfgApSsid[32];	              // SSID of the initial Access Point
 char     cfgApPass[63];               // Password of the initial Access Point
@@ -21,8 +21,11 @@ uint16_t cfgBtnDebounce;              // Debounce time for button [ms]
 uint8_t  cfgAcTime;                   // Hour to start the auto-close [h]
 uint8_t  cfgAcDur1;                   // Duration of the auto-close PREWARN phase [s]
 uint8_t  cfgAcDur2;                   // Duration of the auto-close WAIT    phase [s]
+uint8_t  cfgPdTimeOn;                 // Hour to  enable package drop function
+uint8_t  cfgPdTimeOff;                // Hour to disable package drop function
 uint8_t  cfgPdWaitTime;               // Duration of the package drop  WAIT phase [s]
 uint8_t  cfgPdTimeout;                // Timeout of the package drop function, when venting position is missed [s]
+uint16_t cfgPdWaitError;              // Wait time for error correction before start [ms]
 uint8_t  cfgHwVersion;                // Selection of the used HW
 uint8_t  cfgLogMonths;                // Months to be logged
 uint8_t  cfgTrace;                    // 0: disable Trace Feature, 1: enable
@@ -106,8 +109,11 @@ void loadConfig() {
 	cfgAcTime                 = doc["cfgAcTime"]            | 24;
 	cfgAcDur1                 = doc["cfgAcDur1"]            | 2;
 	cfgAcDur2                 = doc["cfgAcDur2"]            | 30;
+	cfgPdTimeOn               = doc["cfgPdTimeOn"]          | 24;
+	cfgPdTimeOff              = doc["cfgPdTimeOff"]         | 0;
 	cfgPdWaitTime             = doc["cfgPdWaitTime"]        | 15;
 	cfgPdTimeout              = doc["cfgPdTimeout"]         | 10;
+	cfgPdWaitError            = doc["cfgPdWaitError"]       | 200;
 	cfgHwVersion              = doc["cfgHwVersion"]         | 20;
 	cfgLogMonths              = doc["cfgLogMonths"]         | 0;
 	cfgTrace                  = doc["cfgTrace"]             | 0;

src/globalConfig.h

@@ -25,8 +25,11 @@ extern uint16_t cfgBtnDebounce;              // Debounce time for button [ms]
 extern uint8_t  cfgAcTime;                   // Hour to start the auto-close [h]
 extern uint8_t  cfgAcDur1;                   // Duration of the auto-close PREWARN phase [s]
 extern uint8_t  cfgAcDur2;                   // Duration of the auto-close WAIT    phase [s]
+extern uint8_t  cfgPdTimeOn;                 // Hour to  enable package drop function
+extern uint8_t  cfgPdTimeOff;                // Hour to disable package drop function
 extern uint8_t  cfgPdWaitTime;               // Duration of the package drop  WAIT phase [s]
 extern uint8_t  cfgPdTimeout;                // Timeout of the package drop function, when venting position is missed [s]
+extern uint16_t cfgPdWaitError;              // Wait time for error correction before start [ms]
 extern uint8_t  cfgHwVersion;                // Selection of the used HW
 extern uint8_t  cfgLogMonths;                // Months to be logged
 extern uint8_t  cfgTrace;                    // 0: disable Trace Feature, 1: enable

src/keyPanel.cpp

@@ -110,8 +110,12 @@ static void checkCode(char * input) {
 				uap_triggerAction(UAP_ACTION_OPEN, SRC_KEYPAD); break; 
 			}
 			case 1: {
-				//start the package drop function
-				pd_trigger(); break;
+				//start the package drop function, if time is within the allowed range
+				uint32_t seconds = log_getSecSinceMidnight();
+				if ((seconds >= (uint32_t)cfgPdTimeOn * 3600) && (seconds < (uint32_t)cfgPdTimeOff * 3600)) {
+					pd_trigger(); 
+				}
+				break;
 			}
 			default: ; // nothing
 		}