Mercurial > brewboard / file diff

--- a/main/manual.c	Thu Jul 04 15:57:43 2019 +0200
+++ b/main/manual.c	Thu Jul 04 21:46:12 2019 +0200
@@ -32,7 +32,7 @@
 {
     switch (Main_Screen) {
 	case MAIN_MANUAL_INIT:
-		ESP_LOGI(TAG, "Start manual mode");
+		log_msg(TAG, "Start manual mode");
 		if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) {
 		    driver_state->enable = true;
 		    xSemaphoreGive(xSemaphoreDriver);
@@ -121,7 +121,7 @@
 		Buttons_Clear();
 
 		if (! _ManualHLT && ! _ManualMLT) {
-		    ESP_LOGI(TAG, "End manual mode");
+		    log_msg(TAG, "End manual mode");
 		    Main_Screen = MAIN_MODE_FREE;
 		    break;
 		}
@@ -143,6 +143,7 @@
 			xSemaphoreGive(xSemaphoreDriver);
 		    }
 		}
+		log_msg(TAG, "HLT:%s MLT:%s", (_ManualHLT)?"true":"false", (_ManualMLT)?"true":"false");
 		Main_Screen = MAIN_MANUAL_MAIN;
 		break;
 
@@ -155,7 +156,7 @@
 		}
 		switch (Buttons_Scan()) {
 		    case 0:	Main_Screen = MAIN_MODE_FREE;
-				ESP_LOGI(TAG, "End manual mode");
+				log_msg(TAG, "End manual mode");
 				if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) {
 				    runtime.ManualHLT = driver_state->hlt_sp;
 				    runtime.ManualMLT = driver_state->mlt_sp;
@@ -173,8 +174,10 @@
 		    case 1:	if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) {
 				    if (_ManualMLT) {
 				    	driver_state->mlt_sp += 0.25;
+					log_msg(TAG, "MLT sp %.2f", driver_state->mlt_sp);
 				    } else {
 					driver_state->hlt_sp += 0.25;
+					log_msg(TAG, "HLT sp %.2f", driver_state->hlt_sp);
 				    }
 				    xSemaphoreGive(xSemaphoreDriver);
 				}
@@ -183,8 +186,10 @@
 		    case 2:	if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) {
 				    if (_ManualMLT) {
 					driver_state->mlt_sp -= 0.25;
+					log_msg(TAG, "MLT sp %.2f", driver_state->mlt_sp);
 				    } else {
 					driver_state->hlt_sp -= 0.25;
+					log_msg(TAG, "HLT sp %.2f", driver_state->hlt_sp);
 				    }
 				    xSemaphoreGive(xSemaphoreDriver);
 				}
@@ -198,16 +203,17 @@
 					    driver_state->pump_run = 1;
 					xSemaphoreGive(xSemaphoreDriver);
 				    }
+				    log_msg(TAG, "Pump turned %s", driver_state->pump_run?"on":"off");
 				} else {
 				    if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) {
 					if (driver_state->hlt_mode == HLT_MODE_BANG) {
 					    driver_state->hlt_mode = HLT_MODE_OFF;
 					    Buttons_Add(255, 200, 60, 40, (char *)"Aan"  , 3);
-					    ESP_LOGI(TAG, "HLT turned off");
+					    log_msg(TAG, "HLT turned off");
 					} else {
 					    driver_state->hlt_mode = HLT_MODE_BANG;
 					    Buttons_Add(255, 200, 60, 40, (char *)"Uit"  , 3);
-					    ESP_LOGI(TAG, "HLT turned on");
+					    log_msg(TAG, "HLT turned on sp %.2f", driver_state->hlt_sp);
 					}
 					xSemaphoreGive(xSemaphoreDriver);
 				    }
@@ -219,11 +225,11 @@
 				    if (driver_state->mlt_mode == MLT_MODE_PID) {
 					driver_state->mlt_mode = MLT_MODE_OFF;
 					Buttons_Add(255,  76, 60, 40, (char *)"Aan"  , 4);
-					ESP_LOGI(TAG, "MLT turned off");
+					log_msg(TAG, "MLT turned off");
 				    } else {
 					driver_state->mlt_mode = MLT_MODE_PID;
 					Buttons_Add(255,  76, 60, 40, (char *)"Uit"  , 4);
-					ESP_LOGI(TAG, "MLT turned on");
+					log_msg(TAG, "MLT turned on sp %.2f", driver_state->mlt_sp);
 				    }
 				    xSemaphoreGive(xSemaphoreDriver);
 				}
@@ -234,23 +240,25 @@
 				    driver_state->hlt_sp += 0.25;
 				    xSemaphoreGive(xSemaphoreDriver);
 				}
+				log_msg(TAG, "HLT sp %.2f", driver_state->hlt_sp);
 				break;
 
 		    case 6:	if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) {
 				    driver_state->hlt_sp -= 0.25;
 				    xSemaphoreGive(xSemaphoreDriver);
 				}
+				log_msg(TAG, "HLT sp %.2f", driver_state->hlt_sp);
 				break;
 
 		    case 7:	if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) {
 				    if (driver_state->hlt_mode == HLT_MODE_BANG) {
 					driver_state->hlt_mode = HLT_MODE_OFF;
 					Buttons_Add(255, 200, 60, 40, (char *)"Aan"  , 7);
-					ESP_LOGI(TAG, "HLT turned off");
+					log_msg(TAG, "HLT turned off");
 				    } else {
 					driver_state->hlt_mode = HLT_MODE_BANG;
 					Buttons_Add(255, 200, 60, 40, (char *)"Uit"  , 7);
-					ESP_LOGI(TAG, "HLT turned on");
+					log_msg(TAG, "HLT turned on %.2f", driver_state->hlt_sp);
 				    }
 				    xSemaphoreGive(xSemaphoreDriver);
 				}