diff --git a/embedded/.gitignore b/embedded/.gitignore index 89cc49c..6045fd3 100644 --- a/embedded/.gitignore +++ b/embedded/.gitignore @@ -3,3 +3,4 @@ .vscode/c_cpp_properties.json .vscode/launch.json .vscode/ipch +.env \ No newline at end of file diff --git a/embedded/platformio.ini b/embedded/platformio.ini index 32bd1eb..6f09bfb 100644 --- a/embedded/platformio.ini +++ b/embedded/platformio.ini @@ -17,3 +17,5 @@ lib_deps = bbx10/DNSServer@^1.1.0 ArduinoJson olikraus/U8g2@^2.35.7 +extra_scripts = + pre:scripts/dotenv-var.py \ No newline at end of file diff --git a/embedded/readme.MD b/embedded/readme.MD new file mode 100644 index 0000000..4cf28b6 --- /dev/null +++ b/embedded/readme.MD @@ -0,0 +1,4 @@ +# .env file + +SSID_CLOVER='"SSID"' +PSWD_CLOVER='"PASSWORD"' \ No newline at end of file diff --git a/embedded/scripts/dotenv-var.py b/embedded/scripts/dotenv-var.py new file mode 100644 index 0000000..f0f8134 --- /dev/null +++ b/embedded/scripts/dotenv-var.py @@ -0,0 +1,14 @@ +from os.path import isfile +Import("env") +assert isfile(".env") +try: + f = open(".env", "r") + lines = f.readlines() + envs = [] + for line in lines: + envs.append("-D{}".format(line.strip())) + env.Append(BUILD_FLAGS=envs) +except IOError: + print("File .env not accessible",) +finally: + f.close() \ No newline at end of file diff --git a/embedded/src/main.cpp b/embedded/src/main.cpp index ab540cc..a1167ea 100644 --- a/embedded/src/main.cpp +++ b/embedded/src/main.cpp @@ -7,6 +7,13 @@ #include "Component.hpp" #include "Display.hpp" +#ifdef SSID_CLOVER + const char* ssid = SSID_CLOVER; +#endif +#ifdef PSWD_CLOVER + const char* pswd = PSWD_CLOVER; +#endif + DataHandler dataHandler; ServerHandler serverHandler(&dataHandler); // Référence à dataHandler Component humidity(ComponentType::Analog, PIN_A0); @@ -15,16 +22,17 @@ Display screen; void setup() { Serial.begin(9600); - serverHandler.setup("Iphone de Nicole", "cesthonteux"); + serverHandler.setup(ssid, pswd); } void loop() { screen.loop(); dataHandler.updateTemperatureData(random(1800, 2200) / 100.0); + // 0 -> air(0), 0-300 -> dry(20), 300-700 -> humid (580), 700-950 -> water(940) dataHandler.updateHumidityData(static_cast(std::any_cast(humidity.getValue()))); Serial.println(dataHandler.getJsonData()); delay(1000); serverHandler.loop(); -} +} \ No newline at end of file