sleep after fatal read meter error

Author: vad7

WEBFiles/protect/setmeter.htm

@@ -39,6 +39,10 @@ <h2 class="title">Настройка</h2>
 					<td class="label">Кол-во повторов после ошибки:</td>
 					<td><input name='cfg_glo_pwmt_cerr' maxlength='10' value='~cfg_glo_pwmt_cerr~'></td>
 				</tr>
+				<tr>
+					<td class="label">Пауза после неустранимой ошибки:</td>
+					<td><input name='cfg_glo_sleep_err' maxlength='10' value='~cfg_glo_sleep_err~'> сек</td>
+				</tr>
 				<tr>
 					<td class="label">Кол-во повторяющихся ошибок для отключения питания (GPIO0+GPIO2=0):</td>
 					<td><input title='используется внешний мк для сброса питания (WatchdogESP01), 255 - выкл.' name='cfg_glo_pwmt_rbt' maxlength='10' value='~cfg_glo_pwmt_rbt~'></td>

app/include/power_meter.h

@@ -51,6 +51,7 @@ typedef struct {
 	char 	sntp_server[20];
 	uint32	Fram_Pos;			// start pos of
 	uint8	repeated_errors_thr;// power restart required after threshold is reached
+	uint16  sleep_after_series_errors; // sec
 } CFG_GLO;
 CFG_GLO __attribute__((aligned(4))) cfg_glo;
 
@@ -83,6 +84,7 @@ uint32 Web_ChMD;			// ~ChMD~, Chart max days for historyall.htm
 uint8  Web_ShowBy; 			// ~ShowBy~ : 0 - all, 1 - by day, 2 - by hour
 uint32 Fram_SaveCountdown;
 uint8  Fram_halted;
+uint16 sleep_after_errors_cnt; // sec
 //
 void user_initialize(uint8 index) ICACHE_FLASH_ATTR;
 void FRAM_Store_Init(void) ICACHE_FLASH_ATTR;

app/include/tcp2uart.h

@@ -56,6 +56,7 @@ uint32_t UART0_IrDA_RX_CLK; // will be set after TX all data
 void uart0_set_flow(bool flow_en) ICACHE_FLASH_ATTR;
 void update_rts0(void) ICACHE_FLASH_ATTR;
 void update_mux_uart0(void) ICACHE_FLASH_ATTR;
+void disable_mux_uart0(void) ICACHE_FLASH_ATTR;
 #endif
 void update_mux_txd1(void) ICACHE_FLASH_ATTR;
 void set_uartx_invx(uint8 uartn, uint8 set, uint32 bit_mask) ICACHE_FLASH_ATTR;

app/user/mercury.c

@@ -310,9 +310,9 @@ void ICACHE_FLASH_ATTR pwmt_read_time_array(uint8 arr)
 	pwmt_send_to_uart();
 }
 
-void ICACHE_FLASH_ATTR uart_receive_timer_func(void) // call every PWMT_READ_TIMEOUT
+void ICACHE_FLASH_ATTR uart_receive_timer_func(void) // call every cfg_glo.pwmt_read_timeout
 {
-	if(uart_queue_len) {
+	if(uart_queue_len && !sleep_after_errors_cnt) {
 		uint32 dt = system_get_time() - uart_queue[0].time;
 		uint8 fl = uart_queue[0].flag;
 		if(fl == UART_SEND_WAITING) {
@@ -366,17 +366,20 @@ void ICACHE_FLASH_ATTR uart_receive_timer_func(void) // call every PWMT_READ_TIM
 						uart_queue[0].flag = UART_SEND_WAITING;
 						uart_queue[0].time = system_get_time();
 					} else {
+						pwmt_repeat_on_error_cnt = cfg_glo.pwmt_on_error_repeat_cnt;
 						dbg_printf("Eu%u,%u:%d,%d=", dbg_next_time(), dt, pwmt_last_response, UART_Buffer_idx);
 						uint8 jjj;
 						for(jjj = 0; jjj < uart_queue[0].len; jjj++) {
 							dbg_printf("%02X", uart_queue[0].buffer[jjj]);
 						}
 						//dbg_printf("\n");
-
 						dbg_printf(", del\n");
 						uart_queue[0].flag = UART_DELETED;
-						pwmt_send_to_uart();
-						pwmt_repeat_on_error_cnt = cfg_glo.pwmt_on_error_repeat_cnt;
+						if(cfg_glo.sleep_after_series_errors) { // UART0 off
+							sleep_after_errors_cnt = cfg_glo.sleep_after_series_errors;
+							uart_drv_close();
+							disable_mux_uart0();
+						} else pwmt_send_to_uart();
 					}
 				}
 			}
@@ -517,6 +520,7 @@ void ICACHE_FLASH_ATTR uart_receive_timer_func(void) // call every PWMT_READ_TIM
 
 void ICACHE_FLASH_ATTR pwmt_request_timer_func(void) // call every: cfg_glo.request_period
 {
+	if(sleep_after_errors_cnt) return;
 	uint8 autosend = !uart_queue_len;
 	if((uart_queue_len == 0 && pwmt_connect_status == PWMT_NOT_CONNECTED)
 			|| (pwmt_last_response == 6 && pwmt_connect_status != PWMT_CONNECTING)) {

app/user/power_meter.c

@@ -20,6 +20,7 @@
 #include "sdk/libmain.h"
 #include "driver/eeprom.h"
 #include "hw/gpio_register.h"
+#include "tcp2uart.h"
 #include "wifi.h"
 #include "wifi_events.h"
 #include "power_meter.h"
@@ -124,6 +125,10 @@ void ICACHE_FLASH_ATTR update_cnt_timer_func(void) // repeat every 1 sec
 			}
 		}
 	}
+	if(sleep_after_errors_cnt) if(--sleep_after_errors_cnt == 0) {
+		update_mux_uart0();
+		pwmt_send_to_uart();
+	}
 	if(pwmt_cur.Time == 0) return; else pwmt_cur.Time++;
 	if(!(pwmt_cur.Time >= fram_store.ByMin.LastTime + TIME_STEP_SEC) || FRAM_Status) return; // dont passed 1 min
 
@@ -310,6 +315,7 @@ void ICACHE_FLASH_ATTR user_initialize(uint8 index)
 		Web_ShowBy = 0;
 		Fram_SaveCountdown = FRAM_SAVE_PERIOD;
 		Fram_halted = 0;
+		sleep_after_errors_cnt = 0;
 		#if DEBUGSOO > 3
 			os_printf("FSize=%u, CntSize=%u\n", cfg_glo.Fram_Size, ArrayOfCntsSize);
 		#endif

app/web/uart_tcp.c

@@ -130,6 +130,15 @@ void ICACHE_FLASH_ATTR update_rts0(void)
 #endif
 	}
 }
+
+void ICACHE_FLASH_ATTR disable_mux_uart0(void)
+{
+	MUX_TX_UART0 = (1<<GPIO_MUX_FUN_BIT0) | (1<<GPIO_MUX_FUN_BIT1) | (1<<GPIO_MUX_PULLDOWN_BIT); // VAL_MUX_TX_UART0_OFF;
+	GPIO_OUT_W1TC = (1<<1); // GPIO1
+	MUX_RX_UART0 = VAL_MUX_RX_UART0_OFF;
+//	MUX_RTS_UART0 = VAL_MUX_RTS_UART0_OFF;
+//	MUX_CTS_UART0 = VAL_MUX_CTS_UART0_OFF;
+}
 //=============================================================================
 // Обновить mux выводов UART0
 // update_mux_txd1()

app/web/web_int_callbacks.c

@@ -1103,6 +1103,7 @@ void ICACHE_FLASH_ATTR web_int_callback(TCP_SERV_CONN *ts_conn, uint8 *cstr)
 			else ifcmp("time_maxmism") tcp_puts("%u", cfg_glo.TimeMaxMismatch);
 			else ifcmp("refresh_t") tcp_puts("%u", cfg_glo.page_refresh_time);
 			else ifcmp("req_period") tcp_puts("%u", cfg_glo.request_period);
+			else ifcmp("sleep_err") tcp_puts("%u", cfg_glo.sleep_after_series_errors);
 			else ifcmp("pwmt_") {
 				cstr += 5;
 				ifcmp("rtout") tcp_puts("%u", cfg_glo.pwmt_read_timeout);

app/web/web_int_vars.c

@@ -364,6 +364,7 @@ xfram_save:		if(!Fram_halted) eeprom_write_block(cfg_glo.Fram_Pos, (uint8 *)&fra
 				if(reinit) irda_init();
 			}
 			else ifcmp("time_maxmism") cfg_glo.TimeMaxMismatch = val;
+			else ifcmp("sleep_err") cfg_glo.sleep_after_series_errors = val;
 			else ifcmp("pwmt_") {
 				cstr += 5;
 				ifcmp("tout") cfg_glo.pwmt_response_timeout = val;

bin/0x00000.bin

@@ -337,6 +337,7 @@ cfg_glo_pwmt_rtout
 cfg_glo_pwmt_tout
 cfg_glo_pwmt_derr
 cfg_glo_pwmt_cerr
+cfg_glo_sleep_err
 cfg_glo_pwmt_rbt
 cfg_glo_T1St
 cfg_glo_T1En