Merge branch 'hydro'

# Conflicts: # esp32/PlantControl.code-workspace # esp32/include/ControllerConfiguration.h # esp32/platformio.ini # esp32/src/main.cpp
2022-04-27 19:19:26 +00:00
parent 6c475a2ade 27cd6af02d
commit c43da98245
15 changed files with 566 additions and 570 deletions
--- a/esp32/PlantControl.code-workspace
+++ b/esp32/PlantControl.code-workspace
@@ -25,6 +25,7 @@
 			"fstream": "cpp",
 			"ostream": "cpp",
 			"sstream": "cpp"
+			"system_error": "cpp"
 		}
 	}
 }