diff --git a/arduino/CMakeLists.txt b/arduino/CMakeLists.txt index 737e6b3..d8160b0 100644 --- a/arduino/CMakeLists.txt +++ b/arduino/CMakeLists.txt @@ -16,7 +16,4 @@ generate_arduino_firmware(WeatherStationLogger SKETCH WeatherStationLogger) generate_arduino_firmware(WeatherStationWeb - SKETCH WeatherStationWeb - BOARD uno - PORT /dev/ttyUSB1 - SERIAL "picocom @INPUT_PORT@ -b 9600 -l") + SKETCH WeatherStationWeb) diff --git a/arduino/WeatherStationWeb/WeatherStationWeb.ino b/arduino/WeatherStationWeb/WeatherStationWeb.ino index 65e1573..e805075 100644 --- a/arduino/WeatherStationWeb/WeatherStationWeb.ino +++ b/arduino/WeatherStationWeb/WeatherStationWeb.ino @@ -40,15 +40,7 @@ static uint8_t mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED }; static IPAddress ip = IPAddress(192, 168, 1, 210); static IPAddress timeserver = IPAddress(192, 43, 244, 18); -P(indexHtml) = "Station Météo" - "" - "" - "

Station Météo

" - "" - "
TempsT [°C]P [Pa]Alt [m]Hr [%]Lx [lux]
000000
" - "

" - "" - ""; +P(indexHtml) = "Station Météo

Station Météo

TempsT [°C]P [Pa]Alt [m]Hr [%]Lx [lux]
000000

"; // no-cost stream operator as described at // http://sundial.org/arduino/?page_id=119 @@ -75,6 +67,8 @@ void sensorsJsonCmd(WebServer &server, WebServer::ConnectionType type, char *url int32_t pressure = bmp.readPressure(); float altitude = bmp.readAltitude(); + float humidity = dht.readHumidity(); + uint32_t lum = tsl.getFullLuminosity(); uint16_t lightIr = lum >> 16; uint16_t lightFull = lum & 0xFFFF; diff --git a/latex/TM.tex b/latex/TM.tex index 02ea455..1838329 100644 --- a/latex/TM.tex +++ b/latex/TM.tex @@ -30,6 +30,8 @@ \renewcommand{\appendixtocname}{Annexes} \renewcommand{\appendixpagename}{Annexes} +\definecolor{gray}{rgb}{0.5,0.5,0.5} + \lstset{ language=C++, basicstyle=\footnotesize,