From fe428c61adac7b9aa281ad63251a40b0f733c3c6 Mon Sep 17 00:00:00 2001 From: CARNEIRO--GILLET Alexandre <alexandre.carneiro-gillet@imt-atlantique.net> Date: Tue, 29 Apr 2025 12:02:57 +0200 Subject: [PATCH] nettoyage GW-custom --- GW-custom/{ => Archive}/DHT.h | 0 .../ESP32_GENERIC-20241129-v1.24.1.bin | Bin GW-custom/Archive/PingPong/.DS_Store | Bin 0 -> 6148 bytes GW-custom/{ => Archive}/PingPong/Ping/boot.py | 0 GW-custom/{ => Archive}/PingPong/Ping/main.py | 0 .../{ => Archive}/PingPong/Ping/pymakr.conf | 0 .../PingPong/Pong/Pong.code-workspace | 0 GW-custom/{ => Archive}/PingPong/Pong/boot.py | 0 GW-custom/{ => Archive}/PingPong/Pong/main.py | 0 .../{ => Archive}/PingPong/Pong/pymakr.conf | 0 GW-custom/{ => Archive}/PyLoRa/LICENSE | 0 GW-custom/{ => Archive}/PyLoRa/README.md | 0 GW-custom/{ => Archive}/PyLoRa/main.py | 0 GW-custom/{ => Archive}/PyLoRa/pymakr.conf | 0 .../{ => Archive}/PyLoRa/sx127x/__init__.py | 0 .../PyLoRa/sx127x/configurations.py | 0 .../{ => Archive}/PyLoRa/sx127x/sx127x.py | 0 .../capteur-autonome-penn-avel.code-workspace | 20 +++++++++ GW-custom/{ => Archive}/dht22-wifi.ino | 0 GW-custom/{ => Archive}/test_envoi_senscom.py | 0 .../{ => Archive}/test_recept_loramac_ard.ino | 0 .../test_recept_loramac_\302\265py.py" | 0 GW-custom/{ => Archive}/uPyLoRaWAN/LICENSE | 0 GW-custom/{ => Archive}/uPyLoRaWAN/README.md | 0 GW-custom/{ => Archive}/uPyLoRaWAN/config.py | 0 .../{ => Archive}/uPyLoRaWAN/config_lora.py | 0 .../uPyLoRaWAN/dev-requirements.txt | 0 .../uPyLoRaWAN/examples/LoRaReceiver.py | 0 .../uPyLoRaWAN/examples/LoRaSender.py | 0 GW-custom/{ => Archive}/uPyLoRaWAN/main.py | 0 .../{ => Archive}/uPyLoRaWAN/micropy.json | 0 .../{ => Archive}/uPyLoRaWAN/pymakr.conf | 0 .../{ => Archive}/uPyLoRaWAN/requirements.txt | 0 GW-custom/{ => Archive}/uPyLoRaWAN/sx127x.py | 0 .../uPyLoRaWAN/uPySensors/LICENSE | 0 .../uPyLoRaWAN/uPySensors/README.md | 0 .../uPyLoRaWAN/uPySensors/ST7735.py | 0 .../uPyLoRaWAN/uPySensors/bme680.py | 0 .../uPyLoRaWAN/uPySensors/bmx280.py | 0 .../uPyLoRaWAN/uPySensors/fonts/glcdfont.py | 0 .../uPyLoRaWAN/uPySensors/fonts/tt14.py | 0 .../uPyLoRaWAN/uPySensors/fonts/tt24.py | 0 .../uPyLoRaWAN/uPySensors/fonts/tt32.py | 0 .../uPyLoRaWAN/uPySensors/hcsr04.py | 0 .../uPyLoRaWAN/uPySensors/ili934xnew.py | 0 .../uPyLoRaWAN/uPySensors/imu.py | 0 .../uPyLoRaWAN/uPySensors/mpu9250.py | 0 .../uPyLoRaWAN/uPySensors/pmsa003.py | 0 .../uPyLoRaWAN/uPySensors/sdcard.py | 0 .../uPyLoRaWAN/uPySensors/ssd1306.py | 0 .../uPyLoRaWAN/uPySensors/ssd1306_i2c.py | 0 .../uPyLoRaWAN/uPySensors/stepper.py | 0 .../uPyLoRaWAN/uPySensors/sysfont.py | 0 .../uPyLoRaWAN/uPySensors/ublox_gps.py | 0 .../uPyLoRaWAN/uPySensors/vector3d.py | 0 .../uPyLoRaWAN/uPySensors/vl53l0x.py | 0 GW-custom/LoRa_homemade/recpt_to_senscom.py | 42 +++++++++--------- .../capteur-autonome-penn-avel.code-workspace | 23 +++------- 58 files changed, 46 insertions(+), 39 deletions(-) rename GW-custom/{ => Archive}/DHT.h (100%) rename GW-custom/{ => Archive}/ESP32_GENERIC-20241129-v1.24.1.bin (100%) create mode 100644 GW-custom/Archive/PingPong/.DS_Store rename GW-custom/{ => Archive}/PingPong/Ping/boot.py (100%) rename GW-custom/{ => Archive}/PingPong/Ping/main.py (100%) rename GW-custom/{ => Archive}/PingPong/Ping/pymakr.conf (100%) rename GW-custom/{ => Archive}/PingPong/Pong/Pong.code-workspace (100%) rename GW-custom/{ => Archive}/PingPong/Pong/boot.py (100%) rename GW-custom/{ => Archive}/PingPong/Pong/main.py (100%) rename GW-custom/{ => Archive}/PingPong/Pong/pymakr.conf (100%) rename GW-custom/{ => Archive}/PyLoRa/LICENSE (100%) rename GW-custom/{ => Archive}/PyLoRa/README.md (100%) rename GW-custom/{ => Archive}/PyLoRa/main.py (100%) rename GW-custom/{ => Archive}/PyLoRa/pymakr.conf (100%) rename GW-custom/{ => Archive}/PyLoRa/sx127x/__init__.py (100%) rename GW-custom/{ => Archive}/PyLoRa/sx127x/configurations.py (100%) rename GW-custom/{ => Archive}/PyLoRa/sx127x/sx127x.py (100%) create mode 100644 GW-custom/Archive/capteur-autonome-penn-avel.code-workspace rename GW-custom/{ => Archive}/dht22-wifi.ino (100%) rename GW-custom/{ => Archive}/test_envoi_senscom.py (100%) rename GW-custom/{ => Archive}/test_recept_loramac_ard.ino (100%) rename "GW-custom/test_recept_loramac_\302\265py.py" => "GW-custom/Archive/test_recept_loramac_\302\265py.py" (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/LICENSE (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/README.md (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/config.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/config_lora.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/dev-requirements.txt (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/examples/LoRaReceiver.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/examples/LoRaSender.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/main.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/micropy.json (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/pymakr.conf (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/requirements.txt (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/sx127x.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/LICENSE (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/README.md (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/ST7735.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/bme680.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/bmx280.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/fonts/glcdfont.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/fonts/tt14.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/fonts/tt24.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/fonts/tt32.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/hcsr04.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/ili934xnew.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/imu.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/mpu9250.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/pmsa003.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/sdcard.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/ssd1306.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/ssd1306_i2c.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/stepper.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/sysfont.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/ublox_gps.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/vector3d.py (100%) rename GW-custom/{ => Archive}/uPyLoRaWAN/uPySensors/vl53l0x.py (100%) diff --git a/GW-custom/DHT.h b/GW-custom/Archive/DHT.h similarity index 100% rename from GW-custom/DHT.h rename to GW-custom/Archive/DHT.h diff --git a/GW-custom/ESP32_GENERIC-20241129-v1.24.1.bin b/GW-custom/Archive/ESP32_GENERIC-20241129-v1.24.1.bin similarity index 100% rename from GW-custom/ESP32_GENERIC-20241129-v1.24.1.bin rename to GW-custom/Archive/ESP32_GENERIC-20241129-v1.24.1.bin diff --git a/GW-custom/Archive/PingPong/.DS_Store b/GW-custom/Archive/PingPong/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..82a3fe5c31d0b2de64ad0864b9d6679cb1c01770 GIT binary patch literal 6148 zcmZQzU|@7AO)+F(5MW?n;9!8zOq>i@0Z1N%F(jFwA|Odduo;;QsSHI73Jk>ziBP#w zYH)`DDDH$9QW)|XiW!O-kmE0pp_oB|p@bomp@gA`AvGu6FgQ6sw*bjIMCr@TcX3I| z$xi|$wA8Eh8b@v)b7Wv(AX0A%*?J2yFx<<+5WtYhkjIdY#V>F<WcP~aO5Z#TaW9fQ z!cExZvDk|gWTVW{5Eu=C(GVCEA;1W61qU~T9wkRZU^E0qLjWEEpz=Wh)K_3&U~qua z4G<b6#lXnG0PX@XGBB{fG(q|S3?Mm>RuB!+3Zg+;85lt<uo+;j42)2%jNonvNFS(6 z0;0j%85qGfgZN<W42)o#85kHL+8G$3HZy`6vLJII+8G!j+8G$Zw!>UEN{@!XXb8YU zfEmIN0M-Al3=FvX{}5H9<Y)+thQP240Y(;=U>7G)<%z?4pt=@RpC&-%L3J>wI%Wjb r%Lp-WRm=n#P?UfQgQ|OwRuB!YiWwOgKw3u|0<ZuYrAI?x073u&5kgs2 literal 0 HcmV?d00001 diff --git a/GW-custom/PingPong/Ping/boot.py b/GW-custom/Archive/PingPong/Ping/boot.py similarity index 100% rename from GW-custom/PingPong/Ping/boot.py rename to GW-custom/Archive/PingPong/Ping/boot.py diff --git a/GW-custom/PingPong/Ping/main.py b/GW-custom/Archive/PingPong/Ping/main.py similarity index 100% rename from GW-custom/PingPong/Ping/main.py rename to GW-custom/Archive/PingPong/Ping/main.py diff --git a/GW-custom/PingPong/Ping/pymakr.conf b/GW-custom/Archive/PingPong/Ping/pymakr.conf similarity index 100% rename from GW-custom/PingPong/Ping/pymakr.conf rename to GW-custom/Archive/PingPong/Ping/pymakr.conf diff --git a/GW-custom/PingPong/Pong/Pong.code-workspace b/GW-custom/Archive/PingPong/Pong/Pong.code-workspace similarity index 100% rename from GW-custom/PingPong/Pong/Pong.code-workspace rename to GW-custom/Archive/PingPong/Pong/Pong.code-workspace diff --git a/GW-custom/PingPong/Pong/boot.py b/GW-custom/Archive/PingPong/Pong/boot.py similarity index 100% rename from GW-custom/PingPong/Pong/boot.py rename to GW-custom/Archive/PingPong/Pong/boot.py diff --git a/GW-custom/PingPong/Pong/main.py b/GW-custom/Archive/PingPong/Pong/main.py similarity index 100% rename from GW-custom/PingPong/Pong/main.py rename to GW-custom/Archive/PingPong/Pong/main.py diff --git a/GW-custom/PingPong/Pong/pymakr.conf b/GW-custom/Archive/PingPong/Pong/pymakr.conf similarity index 100% rename from GW-custom/PingPong/Pong/pymakr.conf rename to GW-custom/Archive/PingPong/Pong/pymakr.conf diff --git a/GW-custom/PyLoRa/LICENSE b/GW-custom/Archive/PyLoRa/LICENSE similarity index 100% rename from GW-custom/PyLoRa/LICENSE rename to GW-custom/Archive/PyLoRa/LICENSE diff --git a/GW-custom/PyLoRa/README.md b/GW-custom/Archive/PyLoRa/README.md similarity index 100% rename from GW-custom/PyLoRa/README.md rename to GW-custom/Archive/PyLoRa/README.md diff --git a/GW-custom/PyLoRa/main.py b/GW-custom/Archive/PyLoRa/main.py similarity index 100% rename from GW-custom/PyLoRa/main.py rename to GW-custom/Archive/PyLoRa/main.py diff --git a/GW-custom/PyLoRa/pymakr.conf b/GW-custom/Archive/PyLoRa/pymakr.conf similarity index 100% rename from GW-custom/PyLoRa/pymakr.conf rename to GW-custom/Archive/PyLoRa/pymakr.conf diff --git a/GW-custom/PyLoRa/sx127x/__init__.py b/GW-custom/Archive/PyLoRa/sx127x/__init__.py similarity index 100% rename from GW-custom/PyLoRa/sx127x/__init__.py rename to GW-custom/Archive/PyLoRa/sx127x/__init__.py diff --git a/GW-custom/PyLoRa/sx127x/configurations.py b/GW-custom/Archive/PyLoRa/sx127x/configurations.py similarity index 100% rename from GW-custom/PyLoRa/sx127x/configurations.py rename to GW-custom/Archive/PyLoRa/sx127x/configurations.py diff --git a/GW-custom/PyLoRa/sx127x/sx127x.py b/GW-custom/Archive/PyLoRa/sx127x/sx127x.py similarity index 100% rename from GW-custom/PyLoRa/sx127x/sx127x.py rename to GW-custom/Archive/PyLoRa/sx127x/sx127x.py diff --git a/GW-custom/Archive/capteur-autonome-penn-avel.code-workspace b/GW-custom/Archive/capteur-autonome-penn-avel.code-workspace new file mode 100644 index 0000000..0d821ba --- /dev/null +++ b/GW-custom/Archive/capteur-autonome-penn-avel.code-workspace @@ -0,0 +1,20 @@ +{ + "folders": [ + { + "path": ".." + }, + { + "name": "Recept_LoRaMAC_0322", + "path": "../../../../../PlatformIO/Projects/Recept_LoRaMAC_0322" + }, + { + "name": "LoRa_Mac_TEST1", + "path": "../Capteur-autonome/Projects/LoRa_Mac_TEST1" + }, + { + "name": "LoRaMAC_sender", + "path": "../../../../../PlatformIO/Projects/LoRaMAC_sender" + } + ], + "settings": {} +} \ No newline at end of file diff --git a/GW-custom/dht22-wifi.ino b/GW-custom/Archive/dht22-wifi.ino similarity index 100% rename from GW-custom/dht22-wifi.ino rename to GW-custom/Archive/dht22-wifi.ino diff --git a/GW-custom/test_envoi_senscom.py b/GW-custom/Archive/test_envoi_senscom.py similarity index 100% rename from GW-custom/test_envoi_senscom.py rename to GW-custom/Archive/test_envoi_senscom.py diff --git a/GW-custom/test_recept_loramac_ard.ino b/GW-custom/Archive/test_recept_loramac_ard.ino similarity index 100% rename from GW-custom/test_recept_loramac_ard.ino rename to GW-custom/Archive/test_recept_loramac_ard.ino diff --git "a/GW-custom/test_recept_loramac_\302\265py.py" "b/GW-custom/Archive/test_recept_loramac_\302\265py.py" similarity index 100% rename from "GW-custom/test_recept_loramac_\302\265py.py" rename to "GW-custom/Archive/test_recept_loramac_\302\265py.py" diff --git a/GW-custom/uPyLoRaWAN/LICENSE b/GW-custom/Archive/uPyLoRaWAN/LICENSE similarity index 100% rename from GW-custom/uPyLoRaWAN/LICENSE rename to GW-custom/Archive/uPyLoRaWAN/LICENSE diff --git a/GW-custom/uPyLoRaWAN/README.md b/GW-custom/Archive/uPyLoRaWAN/README.md similarity index 100% rename from GW-custom/uPyLoRaWAN/README.md rename to GW-custom/Archive/uPyLoRaWAN/README.md diff --git a/GW-custom/uPyLoRaWAN/config.py b/GW-custom/Archive/uPyLoRaWAN/config.py similarity index 100% rename from GW-custom/uPyLoRaWAN/config.py rename to GW-custom/Archive/uPyLoRaWAN/config.py diff --git a/GW-custom/uPyLoRaWAN/config_lora.py b/GW-custom/Archive/uPyLoRaWAN/config_lora.py similarity index 100% rename from GW-custom/uPyLoRaWAN/config_lora.py rename to GW-custom/Archive/uPyLoRaWAN/config_lora.py diff --git a/GW-custom/uPyLoRaWAN/dev-requirements.txt b/GW-custom/Archive/uPyLoRaWAN/dev-requirements.txt similarity index 100% rename from GW-custom/uPyLoRaWAN/dev-requirements.txt rename to GW-custom/Archive/uPyLoRaWAN/dev-requirements.txt diff --git a/GW-custom/uPyLoRaWAN/examples/LoRaReceiver.py b/GW-custom/Archive/uPyLoRaWAN/examples/LoRaReceiver.py similarity index 100% rename from GW-custom/uPyLoRaWAN/examples/LoRaReceiver.py rename to GW-custom/Archive/uPyLoRaWAN/examples/LoRaReceiver.py diff --git a/GW-custom/uPyLoRaWAN/examples/LoRaSender.py b/GW-custom/Archive/uPyLoRaWAN/examples/LoRaSender.py similarity index 100% rename from GW-custom/uPyLoRaWAN/examples/LoRaSender.py rename to GW-custom/Archive/uPyLoRaWAN/examples/LoRaSender.py diff --git a/GW-custom/uPyLoRaWAN/main.py b/GW-custom/Archive/uPyLoRaWAN/main.py similarity index 100% rename from GW-custom/uPyLoRaWAN/main.py rename to GW-custom/Archive/uPyLoRaWAN/main.py diff --git a/GW-custom/uPyLoRaWAN/micropy.json b/GW-custom/Archive/uPyLoRaWAN/micropy.json similarity index 100% rename from GW-custom/uPyLoRaWAN/micropy.json rename to GW-custom/Archive/uPyLoRaWAN/micropy.json diff --git a/GW-custom/uPyLoRaWAN/pymakr.conf b/GW-custom/Archive/uPyLoRaWAN/pymakr.conf similarity index 100% rename from GW-custom/uPyLoRaWAN/pymakr.conf rename to GW-custom/Archive/uPyLoRaWAN/pymakr.conf diff --git a/GW-custom/uPyLoRaWAN/requirements.txt b/GW-custom/Archive/uPyLoRaWAN/requirements.txt similarity index 100% rename from GW-custom/uPyLoRaWAN/requirements.txt rename to GW-custom/Archive/uPyLoRaWAN/requirements.txt diff --git a/GW-custom/uPyLoRaWAN/sx127x.py b/GW-custom/Archive/uPyLoRaWAN/sx127x.py similarity index 100% rename from GW-custom/uPyLoRaWAN/sx127x.py rename to GW-custom/Archive/uPyLoRaWAN/sx127x.py diff --git a/GW-custom/uPyLoRaWAN/uPySensors/LICENSE b/GW-custom/Archive/uPyLoRaWAN/uPySensors/LICENSE similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/LICENSE rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/LICENSE diff --git a/GW-custom/uPyLoRaWAN/uPySensors/README.md b/GW-custom/Archive/uPyLoRaWAN/uPySensors/README.md similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/README.md rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/README.md diff --git a/GW-custom/uPyLoRaWAN/uPySensors/ST7735.py b/GW-custom/Archive/uPyLoRaWAN/uPySensors/ST7735.py similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/ST7735.py rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/ST7735.py diff --git a/GW-custom/uPyLoRaWAN/uPySensors/bme680.py b/GW-custom/Archive/uPyLoRaWAN/uPySensors/bme680.py similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/bme680.py rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/bme680.py diff --git a/GW-custom/uPyLoRaWAN/uPySensors/bmx280.py b/GW-custom/Archive/uPyLoRaWAN/uPySensors/bmx280.py similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/bmx280.py rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/bmx280.py diff --git a/GW-custom/uPyLoRaWAN/uPySensors/fonts/glcdfont.py b/GW-custom/Archive/uPyLoRaWAN/uPySensors/fonts/glcdfont.py similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/fonts/glcdfont.py rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/fonts/glcdfont.py diff --git a/GW-custom/uPyLoRaWAN/uPySensors/fonts/tt14.py b/GW-custom/Archive/uPyLoRaWAN/uPySensors/fonts/tt14.py similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/fonts/tt14.py rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/fonts/tt14.py diff --git a/GW-custom/uPyLoRaWAN/uPySensors/fonts/tt24.py b/GW-custom/Archive/uPyLoRaWAN/uPySensors/fonts/tt24.py similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/fonts/tt24.py rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/fonts/tt24.py diff --git a/GW-custom/uPyLoRaWAN/uPySensors/fonts/tt32.py b/GW-custom/Archive/uPyLoRaWAN/uPySensors/fonts/tt32.py similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/fonts/tt32.py rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/fonts/tt32.py diff --git a/GW-custom/uPyLoRaWAN/uPySensors/hcsr04.py b/GW-custom/Archive/uPyLoRaWAN/uPySensors/hcsr04.py similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/hcsr04.py rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/hcsr04.py diff --git a/GW-custom/uPyLoRaWAN/uPySensors/ili934xnew.py b/GW-custom/Archive/uPyLoRaWAN/uPySensors/ili934xnew.py similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/ili934xnew.py rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/ili934xnew.py diff --git a/GW-custom/uPyLoRaWAN/uPySensors/imu.py b/GW-custom/Archive/uPyLoRaWAN/uPySensors/imu.py similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/imu.py rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/imu.py diff --git a/GW-custom/uPyLoRaWAN/uPySensors/mpu9250.py b/GW-custom/Archive/uPyLoRaWAN/uPySensors/mpu9250.py similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/mpu9250.py rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/mpu9250.py diff --git a/GW-custom/uPyLoRaWAN/uPySensors/pmsa003.py b/GW-custom/Archive/uPyLoRaWAN/uPySensors/pmsa003.py similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/pmsa003.py rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/pmsa003.py diff --git a/GW-custom/uPyLoRaWAN/uPySensors/sdcard.py b/GW-custom/Archive/uPyLoRaWAN/uPySensors/sdcard.py similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/sdcard.py rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/sdcard.py diff --git a/GW-custom/uPyLoRaWAN/uPySensors/ssd1306.py b/GW-custom/Archive/uPyLoRaWAN/uPySensors/ssd1306.py similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/ssd1306.py rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/ssd1306.py diff --git a/GW-custom/uPyLoRaWAN/uPySensors/ssd1306_i2c.py b/GW-custom/Archive/uPyLoRaWAN/uPySensors/ssd1306_i2c.py similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/ssd1306_i2c.py rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/ssd1306_i2c.py diff --git a/GW-custom/uPyLoRaWAN/uPySensors/stepper.py b/GW-custom/Archive/uPyLoRaWAN/uPySensors/stepper.py similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/stepper.py rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/stepper.py diff --git a/GW-custom/uPyLoRaWAN/uPySensors/sysfont.py b/GW-custom/Archive/uPyLoRaWAN/uPySensors/sysfont.py similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/sysfont.py rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/sysfont.py diff --git a/GW-custom/uPyLoRaWAN/uPySensors/ublox_gps.py b/GW-custom/Archive/uPyLoRaWAN/uPySensors/ublox_gps.py similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/ublox_gps.py rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/ublox_gps.py diff --git a/GW-custom/uPyLoRaWAN/uPySensors/vector3d.py b/GW-custom/Archive/uPyLoRaWAN/uPySensors/vector3d.py similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/vector3d.py rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/vector3d.py diff --git a/GW-custom/uPyLoRaWAN/uPySensors/vl53l0x.py b/GW-custom/Archive/uPyLoRaWAN/uPySensors/vl53l0x.py similarity index 100% rename from GW-custom/uPyLoRaWAN/uPySensors/vl53l0x.py rename to GW-custom/Archive/uPyLoRaWAN/uPySensors/vl53l0x.py diff --git a/GW-custom/LoRa_homemade/recpt_to_senscom.py b/GW-custom/LoRa_homemade/recpt_to_senscom.py index 7af9ba9..10d8a0e 100644 --- a/GW-custom/LoRa_homemade/recpt_to_senscom.py +++ b/GW-custom/LoRa_homemade/recpt_to_senscom.py @@ -9,7 +9,7 @@ uart = UART(2, baudrate=9600, tx=17, rx=16) led = Pin(2, Pin.OUT) # GPIO 2 pour la LED bleue intégrée def send_at_command(command): - uart.write((command + "\r\n").encode()) # Envoie la commande AT au module LoRa + uart.write(("AT" + command + "\r\n").encode()) # Envoie la commande AT au module LoRa time.sleep(0.3) # Attendre la réponse du module while uart.any(): response = uart.read().decode('utf-8') # Lire la réponse @@ -23,17 +23,26 @@ def blink_led(times, interval): time.sleep(interval) # Attendre un certain temps def configure_lora(frequency, sf, bw, TXPR, RXPR, TX_power): - send_at_command("AT") - send_at_command("AT+MODE=TEST") + send_at_command("") + send_at_command("+MODE=TEST") # Configurer le module LoRa avec les paramètres donnés - send_at_command(f"AT+TEST=RFCFG,{frequency},SF{sf},{bw},{TXPR},{RXPR},{TX_power}") + # send_at_command(f"AT+TEST=RFCFG,{frequency},SF{sf},{bw},{TXPR},{RXPR},{TX_power}") + +def receive_uart(): + '''Polls the uart until all data is dequeued''' + rxData=bytes() + while uart.any()>0: + rxData += uart.read(1) + time.sleep(0.002) + return rxData.decode('utf-8') + def send_to_sensor_community(value1, value2): # Envoi des données sur sensor community url = "https://api.sensor.community/v1/push-sensor-data/" headers = { "Content-Type": "application/json", - "X-Pin": "1", + "X-Pin": "1", # 1 = SDS011 "X-Sensor": "esp32-900881266" } data = { @@ -51,28 +60,19 @@ def send_to_sensor_community(value1, value2): def try_receive(): if uart.any(): # Si des données sont disponibles sur le port série - message = uart.read().decode('utf-8').strip() # Lire le message reçu + message = receive_uart() # Lire le message reçu print(f"Message reçu : {message}") - + data = message.split("\"")[1] + print(f"Data : {data}\n") + # Clignotement de la LED une fois pour indiquer la réception - led.value(0) # Éteindre la LED - time.sleep(0.1) # Attendre un peu - led.value(1) # Rallumer la LED - - # Traitement du message reçu (extraction des valeurs P1 et P2) - try: - values = message.split(",") - value1 = float(values[0]) - value2 = float(values[1]) - send_to_sensor_community(value1, value2) # Envoyer les valeurs à Sensor Community - except (IndexError, ValueError): - print("Erreur lors de l'extraction des valeurs du message.") + blink_led(1, 0.2) # Clignoter la LED une fois # Initialisation du module LoRa blink_led(3, 0.5) # Clignoter la LED 3 fois au démarrage -print("Initialisation du module LoRa-E5...") +print("\n\nInitialisation du module LoRa-E5...\n") configure_lora(868000000, 12, 125, 12, 15, 14) # Configurer le module LoRa avec les paramètres souhaités -send_at_command("AT+TEST=RXLRPKT") # Commencer la réception des paquets LoRa +send_at_command("+TEST=RXLRPKT") # Commencer la réception des paquets LoRa led.value(1) # Rallumer la LED après l'initialisation print("Module LoRa-E5 initialisé. En attente de messages...") diff --git a/GW-custom/capteur-autonome-penn-avel.code-workspace b/GW-custom/capteur-autonome-penn-avel.code-workspace index 0d821ba..9e68e72 100644 --- a/GW-custom/capteur-autonome-penn-avel.code-workspace +++ b/GW-custom/capteur-autonome-penn-avel.code-workspace @@ -1,20 +1,7 @@ { - "folders": [ - { - "path": ".." - }, - { - "name": "Recept_LoRaMAC_0322", - "path": "../../../../../PlatformIO/Projects/Recept_LoRaMAC_0322" - }, - { - "name": "LoRa_Mac_TEST1", - "path": "../Capteur-autonome/Projects/LoRa_Mac_TEST1" - }, - { - "name": "LoRaMAC_sender", - "path": "../../../../../PlatformIO/Projects/LoRaMAC_sender" - } - ], - "settings": {} + "folders": [ + { + "path": ".." + } + ] } \ No newline at end of file -- GitLab