From 3eb70d2450c5e025851b13abaf17ef8cf2e15740 Mon Sep 17 00:00:00 2001 From: Pierre Cornu <161845979+PierreCornu@users.noreply.github.com> Date: Sun, 8 Dec 2024 10:51:44 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Ajout=20de=20donn=C3=A9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/capteur/AM107/AM107-12/2024-12-08_10-28-33 | 1 + .../application/capteur/AM107/AM107-14/2024-12-08_10-30-34 | 1 + .../application/capteur/AM107/AM107-16/2024-12-08_10-32-02 | 1 + .../application/capteur/AM107/AM107-18/2024-12-08_10-34-04 | 1 + .../application/capteur/AM107/AM107-2/2024-12-08_10-30-05 | 1 + .../application/capteur/AM107/AM107-23/2024-12-08_10-31-36 | 1 + .../application/capteur/AM107/AM107-24/2024-12-08_10-29-33 | 1 + .../application/capteur/AM107/AM107-27/2024-12-08_10-31-00 | 1 + .../application/capteur/AM107/AM107-29/2024-12-08_10-34-01 | 1 + .../application/capteur/AM107/AM107-30/2024-12-08_10-27-33 | 1 + .../application/capteur/AM107/AM107-31/2024-12-08_10-29-02 | 1 + .../application/capteur/AM107/AM107-32/2024-12-08_10-30-01 | 1 + .../application/capteur/AM107/AM107-36/2024-12-08_10-31-00 | 1 + .../application/capteur/AM107/AM107-37/2024-12-08_10-29-31 | 1 + .../application/capteur/AM107/AM107-38/2024-12-08_10-28-02 | 1 + .../application/capteur/AM107/AM107-39/2024-12-08_10-34-22 | 1 + .../application/capteur/AM107/AM107-4/2024-12-08_10-31-53 | 1 + .../application/capteur/AM107/AM107-41/2024-12-08_10-28-48 | 1 + .../application/capteur/AM107/AM107-42/2024-12-08_10-28-21 | 1 + .../application/capteur/AM107/AM107-45/2024-12-08_10-31-35 | 1 + .../application/capteur/AM107/AM107-46/2024-12-08_10-31-32 | 1 + .../application/capteur/AM107/AM107-49/2024-12-08_10-30-05 | 1 + .../application/capteur/AM107/AM107-5/2024-12-08_10-31-33 | 1 + .../application/capteur/AM107/AM107-50/2024-12-08_10-29-35 | 1 + .../application/capteur/AM107/AM107-51/2024-12-08_10-28-02 | 1 + .../application/capteur/AM107/AM107-53/2024-12-08_10-27-30 | 1 + .../application/capteur/AM107/AM107-55/2024-12-08_10-32-02 | 1 + .../application/capteur/AM107/AM107-6/2024-12-08_10-28-02 | 1 + .../application/capteur/AM107/AM107-7/2024-12-08_10-30-52 | 1 + .../application/capteur/AM107/AM107-8/2024-12-08_10-32-23 | 1 + .../application/capteur/AM107/B001/2024-12-08_10-30-52 | 1 + .../application/capteur/AM107/B002/2024-12-08_10-32-23 | 1 + .../application/capteur/AM107/B103/2024-12-08_10-28-33 | 1 + .../application/capteur/AM107/B106/2024-12-08_10-30-35 | 1 + .../application/capteur/AM107/B109/2024-12-08_10-32-02 | 1 + .../application/capteur/AM107/B110/2024-12-08_10-30-05 | 1 + .../application/capteur/AM107/B113/2024-12-08_10-34-04 | 1 + .../application/capteur/AM107/B201/2024-12-08_10-31-53 | 1 + .../application/capteur/AM107/B202/2024-12-08_10-31-33 | 1 + .../application/capteur/AM107/B203/2024-12-08_10-28-02 | 1 + .../application/capteur/AM107/C001/2024-12-08_10-32-02 | 1 + .../application/capteur/AM107/C004/2024-12-08_10-31-36 | 1 + .../application/capteur/AM107/C006/2024-12-08_10-29-33 | 1 + .../application/capteur/AM107/C102/2024-12-08_10-27-30 | 1 + .../application/capteur/AM107/E004/2024-12-08_10-31-00 | 1 + .../application/capteur/AM107/E006/2024-12-08_10-34-02 | 1 + .../application/capteur/AM107/E007/2024-12-08_10-27-33 | 1 + .../application/capteur/AM107/E100/2024-12-08_10-29-31 | 1 + .../application/capteur/AM107/E101/2024-12-08_10-29-02 | 1 + .../application/capteur/AM107/E102/2024-12-08_10-30-01 | 1 + .../application/capteur/AM107/E106/2024-12-08_10-31-01 | 1 + .../application/capteur/AM107/E207/2024-12-08_10-28-48 | 1 + .../application/capteur/AM107/E208/2024-12-08_10-28-02 | 1 + .../application/capteur/AM107/E209/2024-12-08_10-34-22 | 1 + .../application/capteur/AM107/E210/2024-12-08_10-28-21 | 1 + .../capteur/AM107/Foyer-personnels/2024-12-08_10-31-32 | 1 + .../application/capteur/AM107/Local-velo/2024-12-08_10-31-35 | 1 + .../application/capteur/AM107/amphi1/2024-12-08_10-28-03 | 1 + .../application/capteur/AM107/hall-amphi/2024-12-08_10-29-35 | 1 + .../AM107/hall-entr\303\251e-principale/2024-12-08_10-30-05" | 1 + .../application/capteur/alerte/AM107-12/2024-12-08_10-28-33 | 1 + .../application/capteur/alerte/AM107-45/2024-12-08_10-31-35 | 1 + .../application/capteur/alerte/AM107-8/2024-12-08_10-32-23 | 1 + .../application/capteur/alerte/B002/2024-12-08_10-32-23 | 1 + .../application/capteur/alerte/B103/2024-12-08_10-28-33 | 1 + .../application/capteur/alerte/Local-velo/2024-12-08_10-31-35 | 1 + .../application/capteur/solaredge/2024-12-08_10-26-48 | 1 + Code/java/dependency-reduced-pom.xml | 4 ++-- 68 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-12/2024-12-08_10-28-33 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-14/2024-12-08_10-30-34 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-16/2024-12-08_10-32-02 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-18/2024-12-08_10-34-04 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-2/2024-12-08_10-30-05 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-23/2024-12-08_10-31-36 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-24/2024-12-08_10-29-33 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-27/2024-12-08_10-31-00 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-29/2024-12-08_10-34-01 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-30/2024-12-08_10-27-33 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-31/2024-12-08_10-29-02 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-32/2024-12-08_10-30-01 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-36/2024-12-08_10-31-00 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-37/2024-12-08_10-29-31 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-38/2024-12-08_10-28-02 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-39/2024-12-08_10-34-22 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-4/2024-12-08_10-31-53 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-41/2024-12-08_10-28-48 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-42/2024-12-08_10-28-21 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-45/2024-12-08_10-31-35 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-46/2024-12-08_10-31-32 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-49/2024-12-08_10-30-05 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-5/2024-12-08_10-31-33 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-50/2024-12-08_10-29-35 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-51/2024-12-08_10-28-02 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-53/2024-12-08_10-27-30 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-55/2024-12-08_10-32-02 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-6/2024-12-08_10-28-02 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-7/2024-12-08_10-30-52 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-8/2024-12-08_10-32-23 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/B001/2024-12-08_10-30-52 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/B002/2024-12-08_10-32-23 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/B103/2024-12-08_10-28-33 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/B106/2024-12-08_10-30-35 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/B109/2024-12-08_10-32-02 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/B110/2024-12-08_10-30-05 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/B113/2024-12-08_10-34-04 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/B201/2024-12-08_10-31-53 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/B202/2024-12-08_10-31-33 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/B203/2024-12-08_10-28-02 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/C001/2024-12-08_10-32-02 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/C004/2024-12-08_10-31-36 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/C006/2024-12-08_10-29-33 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/C102/2024-12-08_10-27-30 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/E004/2024-12-08_10-31-00 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/E006/2024-12-08_10-34-02 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/E007/2024-12-08_10-27-33 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/E100/2024-12-08_10-29-31 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/E101/2024-12-08_10-29-02 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/E102/2024-12-08_10-30-01 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/E106/2024-12-08_10-31-01 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/E207/2024-12-08_10-28-48 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/E208/2024-12-08_10-28-02 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/E209/2024-12-08_10-34-22 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/E210/2024-12-08_10-28-21 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/Foyer-personnels/2024-12-08_10-31-32 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/Local-velo/2024-12-08_10-31-35 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/amphi1/2024-12-08_10-28-03 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/hall-amphi/2024-12-08_10-29-35 create mode 100644 "Code/Java/src/main/resources/application/capteur/AM107/hall-entr\303\251e-principale/2024-12-08_10-30-05" create mode 100644 Code/Java/src/main/resources/application/capteur/alerte/AM107-12/2024-12-08_10-28-33 create mode 100644 Code/Java/src/main/resources/application/capteur/alerte/AM107-45/2024-12-08_10-31-35 create mode 100644 Code/Java/src/main/resources/application/capteur/alerte/AM107-8/2024-12-08_10-32-23 create mode 100644 Code/Java/src/main/resources/application/capteur/alerte/B002/2024-12-08_10-32-23 create mode 100644 Code/Java/src/main/resources/application/capteur/alerte/B103/2024-12-08_10-28-33 create mode 100644 Code/Java/src/main/resources/application/capteur/alerte/Local-velo/2024-12-08_10-31-35 create mode 100644 Code/Java/src/main/resources/application/capteur/solaredge/2024-12-08_10-26-48 diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-12/2024-12-08_10-28-33 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-12/2024-12-08_10-28-33 new file mode 100644 index 000000000..051824f83 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-12/2024-12-08_10-28-33 @@ -0,0 +1 @@ +{'temperature': 19, 'humidity': 39, 'co2': 1649} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-14/2024-12-08_10-30-34 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-14/2024-12-08_10-30-34 new file mode 100644 index 000000000..2fe6dbd75 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-14/2024-12-08_10-30-34 @@ -0,0 +1 @@ +{'temperature': 19.1, 'humidity': 43, 'co2': 416} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-16/2024-12-08_10-32-02 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-16/2024-12-08_10-32-02 new file mode 100644 index 000000000..77704ff6d --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-16/2024-12-08_10-32-02 @@ -0,0 +1 @@ +{'temperature': 17.6, 'humidity': 40.5, 'co2': 481} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-18/2024-12-08_10-34-04 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-18/2024-12-08_10-34-04 new file mode 100644 index 000000000..886b0aa36 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-18/2024-12-08_10-34-04 @@ -0,0 +1 @@ +{'temperature': 19, 'humidity': 45.5, 'co2': 415} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-2/2024-12-08_10-30-05 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-2/2024-12-08_10-30-05 new file mode 100644 index 000000000..0e1525065 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-2/2024-12-08_10-30-05 @@ -0,0 +1 @@ +{'temperature': 16.8, 'humidity': 42, 'co2': 410} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-23/2024-12-08_10-31-36 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-23/2024-12-08_10-31-36 new file mode 100644 index 000000000..664e05e0f --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-23/2024-12-08_10-31-36 @@ -0,0 +1 @@ +{'temperature': 17.2, 'humidity': 48.5, 'co2': 419} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-24/2024-12-08_10-29-33 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-24/2024-12-08_10-29-33 new file mode 100644 index 000000000..3f32994f4 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-24/2024-12-08_10-29-33 @@ -0,0 +1 @@ +{'temperature': 18.1, 'humidity': 48.5, 'co2': 414} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-27/2024-12-08_10-31-00 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-27/2024-12-08_10-31-00 new file mode 100644 index 000000000..ed1cc9be1 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-27/2024-12-08_10-31-00 @@ -0,0 +1 @@ +{'temperature': 16.6, 'humidity': 43, 'co2': 435} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-29/2024-12-08_10-34-01 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-29/2024-12-08_10-34-01 new file mode 100644 index 000000000..207e1c340 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-29/2024-12-08_10-34-01 @@ -0,0 +1 @@ +{'temperature': 18.7, 'humidity': 40.5, 'co2': 414} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-30/2024-12-08_10-27-33 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-30/2024-12-08_10-27-33 new file mode 100644 index 000000000..e0c929725 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-30/2024-12-08_10-27-33 @@ -0,0 +1 @@ +{'temperature': 18.1, 'humidity': 41, 'co2': 417} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-31/2024-12-08_10-29-02 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-31/2024-12-08_10-29-02 new file mode 100644 index 000000000..1c7795d94 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-31/2024-12-08_10-29-02 @@ -0,0 +1 @@ +{'temperature': 16.9, 'humidity': 41, 'co2': 421} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-32/2024-12-08_10-30-01 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-32/2024-12-08_10-30-01 new file mode 100644 index 000000000..b652ffba7 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-32/2024-12-08_10-30-01 @@ -0,0 +1 @@ +{'temperature': 16.7, 'humidity': 41.5, 'co2': 423} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-36/2024-12-08_10-31-00 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-36/2024-12-08_10-31-00 new file mode 100644 index 000000000..4f683595c --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-36/2024-12-08_10-31-00 @@ -0,0 +1 @@ +{'temperature': 19.4, 'humidity': 39, 'co2': 415} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-37/2024-12-08_10-29-31 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-37/2024-12-08_10-29-31 new file mode 100644 index 000000000..e94eb6e4d --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-37/2024-12-08_10-29-31 @@ -0,0 +1 @@ +{'temperature': 23.5, 'humidity': 29, 'co2': 402} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-38/2024-12-08_10-28-02 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-38/2024-12-08_10-28-02 new file mode 100644 index 000000000..4dc06952f --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-38/2024-12-08_10-28-02 @@ -0,0 +1 @@ +{'temperature': 18, 'humidity': 40.5, 'co2': 416} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-39/2024-12-08_10-34-22 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-39/2024-12-08_10-34-22 new file mode 100644 index 000000000..4cf4b0134 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-39/2024-12-08_10-34-22 @@ -0,0 +1 @@ +{'temperature': 19, 'humidity': 39, 'co2': 437} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-4/2024-12-08_10-31-53 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-4/2024-12-08_10-31-53 new file mode 100644 index 000000000..8ff0d6f31 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-4/2024-12-08_10-31-53 @@ -0,0 +1 @@ +{'temperature': 11.3, 'humidity': 56, 'co2': 450} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-41/2024-12-08_10-28-48 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-41/2024-12-08_10-28-48 new file mode 100644 index 000000000..f1de5c744 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-41/2024-12-08_10-28-48 @@ -0,0 +1 @@ +{'temperature': 18.5, 'humidity': 38.5, 'co2': 423} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-42/2024-12-08_10-28-21 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-42/2024-12-08_10-28-21 new file mode 100644 index 000000000..f178f6c98 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-42/2024-12-08_10-28-21 @@ -0,0 +1 @@ +{'temperature': 17.3, 'humidity': 42, 'co2': 419} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-45/2024-12-08_10-31-35 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-45/2024-12-08_10-31-35 new file mode 100644 index 000000000..3a0c8514a --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-45/2024-12-08_10-31-35 @@ -0,0 +1 @@ +{'temperature': 7, 'humidity': 79.5, 'co2': 438} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-46/2024-12-08_10-31-32 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-46/2024-12-08_10-31-32 new file mode 100644 index 000000000..ddd753916 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-46/2024-12-08_10-31-32 @@ -0,0 +1 @@ +{'temperature': 17.4, 'humidity': 40.5, 'co2': 410} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-49/2024-12-08_10-30-05 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-49/2024-12-08_10-30-05 new file mode 100644 index 000000000..3a9e358a9 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-49/2024-12-08_10-30-05 @@ -0,0 +1 @@ +{'temperature': 18.6, 'humidity': 42, 'co2': 437} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-5/2024-12-08_10-31-33 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-5/2024-12-08_10-31-33 new file mode 100644 index 000000000..e2ac10d01 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-5/2024-12-08_10-31-33 @@ -0,0 +1 @@ +{'temperature': 18.5, 'humidity': 43, 'co2': 431} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-50/2024-12-08_10-29-35 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-50/2024-12-08_10-29-35 new file mode 100644 index 000000000..2e76aa2e5 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-50/2024-12-08_10-29-35 @@ -0,0 +1 @@ +{'temperature': 18.3, 'humidity': 43.5, 'co2': 439} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-51/2024-12-08_10-28-02 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-51/2024-12-08_10-28-02 new file mode 100644 index 000000000..95f77aa9b --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-51/2024-12-08_10-28-02 @@ -0,0 +1 @@ +{'temperature': 15.9, 'humidity': 45, 'co2': 422} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-53/2024-12-08_10-27-30 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-53/2024-12-08_10-27-30 new file mode 100644 index 000000000..3eb7977c0 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-53/2024-12-08_10-27-30 @@ -0,0 +1 @@ +{'temperature': 17, 'humidity': 45.5, 'co2': 447} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-55/2024-12-08_10-32-02 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-55/2024-12-08_10-32-02 new file mode 100644 index 000000000..c4ab7f2c3 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-55/2024-12-08_10-32-02 @@ -0,0 +1 @@ +{'temperature': 21.7, 'humidity': 40.5, 'co2': 479} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-6/2024-12-08_10-28-02 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-6/2024-12-08_10-28-02 new file mode 100644 index 000000000..6ca44ddec --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-6/2024-12-08_10-28-02 @@ -0,0 +1 @@ +{'temperature': 18.5, 'humidity': 43.5, 'co2': 436} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-7/2024-12-08_10-30-52 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-7/2024-12-08_10-30-52 new file mode 100644 index 000000000..194e91028 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-7/2024-12-08_10-30-52 @@ -0,0 +1 @@ +{'temperature': 19.1, 'humidity': 40.5, 'co2': 423} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-8/2024-12-08_10-32-23 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-8/2024-12-08_10-32-23 new file mode 100644 index 000000000..931f671af --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-8/2024-12-08_10-32-23 @@ -0,0 +1 @@ +{'temperature': 19, 'humidity': 45.5, 'co2': 1658} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/B001/2024-12-08_10-30-52 b/Code/Java/src/main/resources/application/capteur/AM107/B001/2024-12-08_10-30-52 new file mode 100644 index 000000000..194e91028 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/B001/2024-12-08_10-30-52 @@ -0,0 +1 @@ +{'temperature': 19.1, 'humidity': 40.5, 'co2': 423} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/B002/2024-12-08_10-32-23 b/Code/Java/src/main/resources/application/capteur/AM107/B002/2024-12-08_10-32-23 new file mode 100644 index 000000000..931f671af --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/B002/2024-12-08_10-32-23 @@ -0,0 +1 @@ +{'temperature': 19, 'humidity': 45.5, 'co2': 1658} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/B103/2024-12-08_10-28-33 b/Code/Java/src/main/resources/application/capteur/AM107/B103/2024-12-08_10-28-33 new file mode 100644 index 000000000..051824f83 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/B103/2024-12-08_10-28-33 @@ -0,0 +1 @@ +{'temperature': 19, 'humidity': 39, 'co2': 1649} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/B106/2024-12-08_10-30-35 b/Code/Java/src/main/resources/application/capteur/AM107/B106/2024-12-08_10-30-35 new file mode 100644 index 000000000..2fe6dbd75 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/B106/2024-12-08_10-30-35 @@ -0,0 +1 @@ +{'temperature': 19.1, 'humidity': 43, 'co2': 416} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/B109/2024-12-08_10-32-02 b/Code/Java/src/main/resources/application/capteur/AM107/B109/2024-12-08_10-32-02 new file mode 100644 index 000000000..77704ff6d --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/B109/2024-12-08_10-32-02 @@ -0,0 +1 @@ +{'temperature': 17.6, 'humidity': 40.5, 'co2': 481} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/B110/2024-12-08_10-30-05 b/Code/Java/src/main/resources/application/capteur/AM107/B110/2024-12-08_10-30-05 new file mode 100644 index 000000000..0e1525065 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/B110/2024-12-08_10-30-05 @@ -0,0 +1 @@ +{'temperature': 16.8, 'humidity': 42, 'co2': 410} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/B113/2024-12-08_10-34-04 b/Code/Java/src/main/resources/application/capteur/AM107/B113/2024-12-08_10-34-04 new file mode 100644 index 000000000..886b0aa36 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/B113/2024-12-08_10-34-04 @@ -0,0 +1 @@ +{'temperature': 19, 'humidity': 45.5, 'co2': 415} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/B201/2024-12-08_10-31-53 b/Code/Java/src/main/resources/application/capteur/AM107/B201/2024-12-08_10-31-53 new file mode 100644 index 000000000..8ff0d6f31 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/B201/2024-12-08_10-31-53 @@ -0,0 +1 @@ +{'temperature': 11.3, 'humidity': 56, 'co2': 450} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/B202/2024-12-08_10-31-33 b/Code/Java/src/main/resources/application/capteur/AM107/B202/2024-12-08_10-31-33 new file mode 100644 index 000000000..e2ac10d01 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/B202/2024-12-08_10-31-33 @@ -0,0 +1 @@ +{'temperature': 18.5, 'humidity': 43, 'co2': 431} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/B203/2024-12-08_10-28-02 b/Code/Java/src/main/resources/application/capteur/AM107/B203/2024-12-08_10-28-02 new file mode 100644 index 000000000..6ca44ddec --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/B203/2024-12-08_10-28-02 @@ -0,0 +1 @@ +{'temperature': 18.5, 'humidity': 43.5, 'co2': 436} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/C001/2024-12-08_10-32-02 b/Code/Java/src/main/resources/application/capteur/AM107/C001/2024-12-08_10-32-02 new file mode 100644 index 000000000..c4ab7f2c3 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/C001/2024-12-08_10-32-02 @@ -0,0 +1 @@ +{'temperature': 21.7, 'humidity': 40.5, 'co2': 479} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/C004/2024-12-08_10-31-36 b/Code/Java/src/main/resources/application/capteur/AM107/C004/2024-12-08_10-31-36 new file mode 100644 index 000000000..664e05e0f --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/C004/2024-12-08_10-31-36 @@ -0,0 +1 @@ +{'temperature': 17.2, 'humidity': 48.5, 'co2': 419} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/C006/2024-12-08_10-29-33 b/Code/Java/src/main/resources/application/capteur/AM107/C006/2024-12-08_10-29-33 new file mode 100644 index 000000000..3f32994f4 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/C006/2024-12-08_10-29-33 @@ -0,0 +1 @@ +{'temperature': 18.1, 'humidity': 48.5, 'co2': 414} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/C102/2024-12-08_10-27-30 b/Code/Java/src/main/resources/application/capteur/AM107/C102/2024-12-08_10-27-30 new file mode 100644 index 000000000..3eb7977c0 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/C102/2024-12-08_10-27-30 @@ -0,0 +1 @@ +{'temperature': 17, 'humidity': 45.5, 'co2': 447} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E004/2024-12-08_10-31-00 b/Code/Java/src/main/resources/application/capteur/AM107/E004/2024-12-08_10-31-00 new file mode 100644 index 000000000..ed1cc9be1 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/E004/2024-12-08_10-31-00 @@ -0,0 +1 @@ +{'temperature': 16.6, 'humidity': 43, 'co2': 435} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E006/2024-12-08_10-34-02 b/Code/Java/src/main/resources/application/capteur/AM107/E006/2024-12-08_10-34-02 new file mode 100644 index 000000000..207e1c340 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/E006/2024-12-08_10-34-02 @@ -0,0 +1 @@ +{'temperature': 18.7, 'humidity': 40.5, 'co2': 414} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E007/2024-12-08_10-27-33 b/Code/Java/src/main/resources/application/capteur/AM107/E007/2024-12-08_10-27-33 new file mode 100644 index 000000000..e0c929725 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/E007/2024-12-08_10-27-33 @@ -0,0 +1 @@ +{'temperature': 18.1, 'humidity': 41, 'co2': 417} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E100/2024-12-08_10-29-31 b/Code/Java/src/main/resources/application/capteur/AM107/E100/2024-12-08_10-29-31 new file mode 100644 index 000000000..e94eb6e4d --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/E100/2024-12-08_10-29-31 @@ -0,0 +1 @@ +{'temperature': 23.5, 'humidity': 29, 'co2': 402} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E101/2024-12-08_10-29-02 b/Code/Java/src/main/resources/application/capteur/AM107/E101/2024-12-08_10-29-02 new file mode 100644 index 000000000..1c7795d94 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/E101/2024-12-08_10-29-02 @@ -0,0 +1 @@ +{'temperature': 16.9, 'humidity': 41, 'co2': 421} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E102/2024-12-08_10-30-01 b/Code/Java/src/main/resources/application/capteur/AM107/E102/2024-12-08_10-30-01 new file mode 100644 index 000000000..b652ffba7 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/E102/2024-12-08_10-30-01 @@ -0,0 +1 @@ +{'temperature': 16.7, 'humidity': 41.5, 'co2': 423} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E106/2024-12-08_10-31-01 b/Code/Java/src/main/resources/application/capteur/AM107/E106/2024-12-08_10-31-01 new file mode 100644 index 000000000..4f683595c --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/E106/2024-12-08_10-31-01 @@ -0,0 +1 @@ +{'temperature': 19.4, 'humidity': 39, 'co2': 415} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E207/2024-12-08_10-28-48 b/Code/Java/src/main/resources/application/capteur/AM107/E207/2024-12-08_10-28-48 new file mode 100644 index 000000000..f1de5c744 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/E207/2024-12-08_10-28-48 @@ -0,0 +1 @@ +{'temperature': 18.5, 'humidity': 38.5, 'co2': 423} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E208/2024-12-08_10-28-02 b/Code/Java/src/main/resources/application/capteur/AM107/E208/2024-12-08_10-28-02 new file mode 100644 index 000000000..4dc06952f --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/E208/2024-12-08_10-28-02 @@ -0,0 +1 @@ +{'temperature': 18, 'humidity': 40.5, 'co2': 416} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E209/2024-12-08_10-34-22 b/Code/Java/src/main/resources/application/capteur/AM107/E209/2024-12-08_10-34-22 new file mode 100644 index 000000000..4cf4b0134 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/E209/2024-12-08_10-34-22 @@ -0,0 +1 @@ +{'temperature': 19, 'humidity': 39, 'co2': 437} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E210/2024-12-08_10-28-21 b/Code/Java/src/main/resources/application/capteur/AM107/E210/2024-12-08_10-28-21 new file mode 100644 index 000000000..f178f6c98 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/E210/2024-12-08_10-28-21 @@ -0,0 +1 @@ +{'temperature': 17.3, 'humidity': 42, 'co2': 419} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/Foyer-personnels/2024-12-08_10-31-32 b/Code/Java/src/main/resources/application/capteur/AM107/Foyer-personnels/2024-12-08_10-31-32 new file mode 100644 index 000000000..ddd753916 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/Foyer-personnels/2024-12-08_10-31-32 @@ -0,0 +1 @@ +{'temperature': 17.4, 'humidity': 40.5, 'co2': 410} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/Local-velo/2024-12-08_10-31-35 b/Code/Java/src/main/resources/application/capteur/AM107/Local-velo/2024-12-08_10-31-35 new file mode 100644 index 000000000..3a0c8514a --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/Local-velo/2024-12-08_10-31-35 @@ -0,0 +1 @@ +{'temperature': 7, 'humidity': 79.5, 'co2': 438} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/amphi1/2024-12-08_10-28-03 b/Code/Java/src/main/resources/application/capteur/AM107/amphi1/2024-12-08_10-28-03 new file mode 100644 index 000000000..95f77aa9b --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/amphi1/2024-12-08_10-28-03 @@ -0,0 +1 @@ +{'temperature': 15.9, 'humidity': 45, 'co2': 422} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/hall-amphi/2024-12-08_10-29-35 b/Code/Java/src/main/resources/application/capteur/AM107/hall-amphi/2024-12-08_10-29-35 new file mode 100644 index 000000000..2e76aa2e5 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/hall-amphi/2024-12-08_10-29-35 @@ -0,0 +1 @@ +{'temperature': 18.3, 'humidity': 43.5, 'co2': 439} diff --git "a/Code/Java/src/main/resources/application/capteur/AM107/hall-entr\303\251e-principale/2024-12-08_10-30-05" "b/Code/Java/src/main/resources/application/capteur/AM107/hall-entr\303\251e-principale/2024-12-08_10-30-05" new file mode 100644 index 000000000..3a9e358a9 --- /dev/null +++ "b/Code/Java/src/main/resources/application/capteur/AM107/hall-entr\303\251e-principale/2024-12-08_10-30-05" @@ -0,0 +1 @@ +{'temperature': 18.6, 'humidity': 42, 'co2': 437} diff --git a/Code/Java/src/main/resources/application/capteur/alerte/AM107-12/2024-12-08_10-28-33 b/Code/Java/src/main/resources/application/capteur/alerte/AM107-12/2024-12-08_10-28-33 new file mode 100644 index 000000000..3044a845a --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/alerte/AM107-12/2024-12-08_10-28-33 @@ -0,0 +1 @@ +{'salle': AM107-12, 'seuil_co2': 1000, 'co2': 1649} diff --git a/Code/Java/src/main/resources/application/capteur/alerte/AM107-45/2024-12-08_10-31-35 b/Code/Java/src/main/resources/application/capteur/alerte/AM107-45/2024-12-08_10-31-35 new file mode 100644 index 000000000..dd7543313 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/alerte/AM107-45/2024-12-08_10-31-35 @@ -0,0 +1 @@ +{'salle': AM107-45, 'seuil_humidity': 60, 'humidity': 79.5} diff --git a/Code/Java/src/main/resources/application/capteur/alerte/AM107-8/2024-12-08_10-32-23 b/Code/Java/src/main/resources/application/capteur/alerte/AM107-8/2024-12-08_10-32-23 new file mode 100644 index 000000000..5f61c6a78 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/alerte/AM107-8/2024-12-08_10-32-23 @@ -0,0 +1 @@ +{'salle': AM107-8, 'seuil_co2': 1000, 'co2': 1658} diff --git a/Code/Java/src/main/resources/application/capteur/alerte/B002/2024-12-08_10-32-23 b/Code/Java/src/main/resources/application/capteur/alerte/B002/2024-12-08_10-32-23 new file mode 100644 index 000000000..98cb1701c --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/alerte/B002/2024-12-08_10-32-23 @@ -0,0 +1 @@ +{'salle': B002, 'seuil_co2': 1000, 'co2': 1658} diff --git a/Code/Java/src/main/resources/application/capteur/alerte/B103/2024-12-08_10-28-33 b/Code/Java/src/main/resources/application/capteur/alerte/B103/2024-12-08_10-28-33 new file mode 100644 index 000000000..5d8b49419 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/alerte/B103/2024-12-08_10-28-33 @@ -0,0 +1 @@ +{'salle': B103, 'seuil_co2': 1000, 'co2': 1649} diff --git a/Code/Java/src/main/resources/application/capteur/alerte/Local-velo/2024-12-08_10-31-35 b/Code/Java/src/main/resources/application/capteur/alerte/Local-velo/2024-12-08_10-31-35 new file mode 100644 index 000000000..0b691e8d7 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/alerte/Local-velo/2024-12-08_10-31-35 @@ -0,0 +1 @@ +{'salle': Local-velo, 'seuil_humidity': 60, 'humidity': 79.5} diff --git a/Code/Java/src/main/resources/application/capteur/solaredge/2024-12-08_10-26-48 b/Code/Java/src/main/resources/application/capteur/solaredge/2024-12-08_10-26-48 new file mode 100644 index 000000000..5fdbbc64f --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/solaredge/2024-12-08_10-26-48 @@ -0,0 +1 @@ +{'lastUpdateTime': '2024-12-08 10:25:02', 'lifeTimeData': {'energy': 3469401}, 'lastYearData': {'energy': 2988371}, 'lastMonthData': {'energy': 53965}, 'lastDayData': {'energy': 240}, 'currentPower': {'power': 271.40665}, 'measuredBy': 'INVERTER'} diff --git a/Code/java/dependency-reduced-pom.xml b/Code/java/dependency-reduced-pom.xml index 120bb5201..016cc93c4 100644 --- a/Code/java/dependency-reduced-pom.xml +++ b/Code/java/dependency-reduced-pom.xml @@ -12,7 +12,7 @@ javafx-maven-plugin ${javafx.maven.plugin.version} - application.DailyBankApp + application.IoTApp @@ -27,7 +27,7 @@ true - application.DailyBankApp + application.IoTApp From 869fe5298666bb8a93f45e7951fa00c90b93baa4 Mon Sep 17 00:00:00 2001 From: Pierre Cornu <161845979+PierreCornu@users.noreply.github.com> Date: Mon, 9 Dec 2024 18:44:58 +0100 Subject: [PATCH 2/3] Suppression des commentaires du fichier config.ini --- Code/Python/config.ini | 14 +------------- .../java/application/control/IoTMainFrame.java | 2 +- .../src/main/resources/application/view/menu.fxml | 2 +- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/Code/Python/config.ini b/Code/Python/config.ini index 283dd6207..dfe205c2b 100644 --- a/Code/Python/config.ini +++ b/Code/Python/config.ini @@ -1,22 +1,10 @@ [MQTT] -; Informations de la connexion : -; - où récupérer les données des capteurs broker_address = mqtt.iut-blagnac.fr -; - le port utilisé port = 1883 -;================================================================================================= -; Informations concernant les données à récupérer et leur traitement : -; Choix des topics entre AM107 et/ou solaredge (on sépare les informations par ', ') topics = AM107, solaredge -; Choix des salles ('all' pour toutes les salles OU les labels des salles souhaitées séparés par ', ') AM107_rooms = all -; Choix des informations en provenance des salles ('all' pour toutes les informations OU les informations souhaitées séparé(s) par ', ') AM107_info_types = temperature, humidity, co2 -; Choix des informations en provenance des panneaux solaires ('all' pour toutes les informations OU les informations souhaitées séparé(s) par ', ') solaredge_info_types = all -; Choix du chemin d'où les informations seront stockées -base_path = sae-3-01-devapp-G1A-3/Code/Java/src/main/resources/application/capteur/ -; Choix des seuils pour chaque information en provenances des salles (dans l'ordre) +base_path = Code/Java/src/main/resources/application/capteur/ seuil_alert = 30, 60, 1000 -; Choix de la période minimum entre chaque enregistrement de données d'un même capteur (en minute) period = 15 \ No newline at end of file diff --git a/Code/java/src/main/java/application/control/IoTMainFrame.java b/Code/java/src/main/java/application/control/IoTMainFrame.java index 8e8a6acca..864e85a87 100644 --- a/Code/java/src/main/java/application/control/IoTMainFrame.java +++ b/Code/java/src/main/java/application/control/IoTMainFrame.java @@ -8,8 +8,8 @@ import application.view.ChoixTypeDonneesAnterieuresController; import application.view.DonneesActuellesController; import application.view.DonneesAnterieuresController; -import application.view.SolaredgeAnterieurController; import application.view.MenuController; +import application.view.SolaredgeAnterieurController; import javafx.application.Application; import javafx.fxml.FXMLLoader; import javafx.scene.Scene; diff --git a/Code/java/src/main/resources/application/view/menu.fxml b/Code/java/src/main/resources/application/view/menu.fxml index b08420781..1b0eddf2e 100644 --- a/Code/java/src/main/resources/application/view/menu.fxml +++ b/Code/java/src/main/resources/application/view/menu.fxml @@ -38,7 +38,7 @@ -