README.md aktualisiert

README.md

@@ -1,20 +1,22 @@
 [![build status](https://gitea.rabe11.de/FCS/Winden-Telemetry/actions/workflows/build_release.yaml/badge.svg?event=push)](https://gitea.rabe11.de/FCS/Winden-Telemetry/releases)
+![Gitea Release](https://img.shields.io/gitea/v/release/FCS/Winden-Telemetry?gitea_url=https%3A%2F%2Fgitea.rabe11.de)
+
 
 # Winden-Telemetry
 
 
 Übertragung der IAS des Segelflugzeuges an die Winde 
 
-Hardware:
+### Hardware:
 - [Heltec LoRa 32 (V3)](https://heltec.org/project/wifi-lora-32-v3/)
 - SG90 Servo
 - MS4525 differenz Drucksensor
-- 12 LED Ring WS2812b
+- 12 LED Ring WS2812b 50mm
 - BMP180 Temperatur und Luftdrucksensor
 - DC-DC Step Down Wandler 3A MP1584
 - Relais
 
-Features:
+### Features:
 - [x] LORA zum Übertragen
 - [x] Airspeed via differenz Drucksensor
 - [ ] Webinterface
@@ -26,3 +28,74 @@ Features:
 - [ ] Übertragungszeit einstellbar
 - [ ] Übertragung Rundumleuchten Signal an Start
 - [x] Luftdrucksensor für Höhe und Vario
+
+## Aufbau
+
+Pin Layout Heltec WiFi LoRa (v3)
+
+![Heltec WiFi LoRa (v3)](https://heltec.org/wp-content/uploads/2023/09/pin.png)
+
+
+### Anschlusszuordnung
+| Heltec WiFi LoRa (v3) Pin | MP1584 |SG90 Pin | BMP180 Pin |  MS4525 Pin | LED Ring Pin |
+| --- | --- | --- | --- | --- | --- |
+| GND  | OUT -| GND | GND | GND | GND |
+ | 3.3 V| | | VCC | VCC | VCC |
+| GPIO 6| | |  | | IN |
+| GPIO 7| | 1 PWM (Orange)| | |
+| GPIO19| | | SDA| SDA |
+| GPIO20| | | SCL| SCL|
+| 5V | OUT + | VCC | | |
+
+
+
+## PCB
+Die Platine ist so gestaltet das sie Induvidul bestückt werden kann, je nach Verwendung
+
+![Platine bestückt](img/Winden_Telemetry_PCB.png)
+
+![Platinen Vorderseite](img/Winden_Telemetry_PCB_front.png)![Platinen Rückseite](img/Winden_Telemetry_PCB_back.png)
+
+[Schaltplan](img/Winden_Telemetry_Schematic.pdf)
+
+| Bauteil | Modul Segelflugzeug | Modul Winde | Modul SKP |
+| ---	|---	|---	|---	|
+| J1 | x | x | x | optional|
+| A1 | x | x | x | optional|	
+| I2C_1 | MS4525 | optional| optional|	
+| I2C_2 | BMP180 | optional| optional|
+| I2C_3 | optional| optional| optional|
+| I2C_4 | optional| optional| optional|
+| GPIO3 | optional| optional| optional|
+| GPIO4 | optional| optional| optional|
+| GPIO5 | optional| Eingang Warnleuchte |optional|
+| GPIO6 | optional| LED Ring | optional|
+| GPIO7 | optional| Servo | für Relais|
+
+
+
+## Programmablauf Segelflugzeug
+
+```mermaid
+flowchart TD
+    A(["Start"])
+    A --> B{"ist Senden an?"}
+    B --> | Ja  | C{"Sende Timer <90 sec"}
+    B --> | Nein | E{"low speed timer <90 sec"}
+   
+    C --> | Nein | F["Sende Schleppen komplett"] -->G["Starte Low Speed Timer"]
+    C --> | Ja | D["Sende Speed"]
+   
+    
+    D --> Z["Warte 1 Sekunde"]
+    G ----> H["Senden aus"] -->Z
+    
+    Z --> B
+    
+    E --> | nein | I{"Speed < 30 km/h"} 
+    I --> | nein |J["Senden an"] --> D
+    I --> | ja|Z
+    E --> | ja|Z
+
+    
+```

components/Tacho/README.md

@@ -0,0 +1,10 @@
+# Tacho mit LED Ring
+
+Das Grundmodell ist von [alvaroalea auf Thingiverse](https://www.thingiverse.com/thing:2489322)
+
+
+Erweitert wurde:
+- Ziffernblatt 0 - 220 km/h
+- Rückplatte mit Auslass für die Kabel des LED Rings [hier](back_with_hole.stl)
+- Platte mit Vertiefung für LED Ring [hier](bezel_LED_Tacho.stl)
+

platformio.ini

@@ -28,34 +28,35 @@ build_flags =
 lib_deps = 
 	olikraus/U8g2@^2.36.15
 	jgromes/RadioLib@^7.4.0
+	bblanchon/ArduinoJson@^7.4.2
 monitor_speed = 115200
 extra_scripts = pre:extra_script.py
 
 [env:heltec_wifi_lora_32_V3_sailplane]
 extends = common
 board = heltec_wifi_lora_32_V3
-lib_deps = ${common.lib_deps}
+lib_deps = 
+	${common.lib_deps}
 	bolderflight/Bolder Flight Systems MS4525@^1.1.3
 	bolderflight/Bolder Flight Systems Unit Conversions@^5.0.0
 	bolderflight/Bolder Flight Systems Airdata Calculations@^4.0.0
 	adafruit/Adafruit BMP085 Library @ ^1.2.4
 lib_ignore = 
 	winde
-
-
 build_flags = ${common.build_flags}
 	-D DEVICE_SAILPLANE
-
+upload_port = COM8
-
+monitor_port = COM8
 [env:heltec_wifi_lora_32_V3_winde]
 extends = common
 board = heltec_wifi_lora_32_V3
-lib_deps = ${common.lib_deps}
+lib_deps = 
+	${common.lib_deps}
 	adafruit/Adafruit NeoPixel@^1.15.2
 	madhephaestus/ESP32Servo@^3.0.9	
-
 lib_ignore = 
 	sailplane
 build_flags = ${common.build_flags}
 	-D DEVICE_WINDE
-
+upload_port = COM9
+monitor_port = COM9

src/main.cpp

@@ -2,13 +2,14 @@
 #include <Arduino.h>
 #include <U8g2lib.h>
 #include <RadioLib.h>
-
+#include <ArduinoJson.h>
 #ifdef DEVICE_WINDE
 #include <tacho.h>
 #endif
 
 #ifdef DEVICE_SAILPLANE
 #include <airspeed.h>
+JsonDocument sailplane_data;
 #endif
 
 SX1262 radio = new Module(LORA_NSS, LORA_DIO1, LORA_NRST, LORA_BUSY);
@@ -89,6 +90,37 @@ void setup()
   u8g2.sendBuffer();
 }
 
+void draw_rssi(int Rssi){
+    u8g2.drawFrame(102,8,4,3);
+    u8g2.drawFrame(107,6,4,5);
+    u8g2.drawFrame(112,4,4,7);
+    u8g2.drawFrame(117,2,4,9);
+    u8g2.drawFrame(122,0,4,11);
+
+    if ((Rssi > -120) && Rssi < 0 )
+      {
+       u8g2.drawBox(102,8,4,3); 
+      }
+
+    if ((Rssi > -100) && Rssi < 0 )
+      {
+       u8g2.drawBox(107,6,4,5); 
+      }
+    if ((Rssi > -85) && Rssi < 0 )
+      {
+       u8g2.drawBox(112,4,4,7); 
+      }
+    if ((Rssi > -70) && Rssi < 0 )
+      {
+       u8g2.drawBox(117,2,4,9); 
+      }
+    if ((Rssi > -55) && Rssi < 0 )
+      {
+       u8g2.drawBox(122,0,4,11); 
+     }
+
+  
+}
 void loop()
 {
 #ifdef DEVICE_SAILPLANE
@@ -103,7 +135,13 @@ void loop()
   u8g2.sendBuffer();
   if (vel_kmh > 30)
   { 
-    String data = String(vel_kmh);
+    sailplane_data["from"]= "D-1234";
+    sailplane_data["telemetry"]["speed"]=vel_kmh;
+    sailplane_data["telemetry"]["min"]=70;
+    sailplane_data["telemetry"]["max"]=150;
+    String data;
+    serializeJson(sailplane_data,data);
+    //String data = String(vel_kmh);
     int state = radio.transmit(data);
     if (state == RADIOLIB_ERR_NONE)
     {
@@ -157,6 +195,8 @@ void loop()
     // you can read received data as an Arduino String
     String str;
     int state = radio.readData(str);
+    JsonDocument received;
+    deserializeJson(received,str);
 
     // you can also read received data as byte array
     /*
@@ -167,15 +207,27 @@ void loop()
 
     if (state == RADIOLIB_ERR_NONE)
     { 
+      String data_from=received["from"];
+      int data_speed=received["telemetry"]["speed"];
+      int data_min=received["telemetry"]["min"];
+      int data_max=received["telemetry"]["max"];
       // packet was successfully received
       u8g2.clearBuffer();
-      u8g2.setFont(u8g2_font_logisoso42_tr);
+      u8g2.setFont(u8g2_font_ncenB10_tr);
-      u8g2.setCursor(0, 60);
+      u8g2.setCursor(0, 10);
-      u8g2.print(str);
+      u8g2.print(data_from);
+      u8g2.setCursor(0, 64);
+      u8g2.print(data_min);
+      u8g2.setCursor(64, 64);
+      u8g2.print(data_max);
+      u8g2.setFont(u8g2_font_logisoso32_tr);
+      u8g2.setCursor(0, 50);
+      u8g2.print(data_speed);
+      draw_rssi(radio.getRSSI());
       u8g2.sendBuffer();
       Serial.println(str);
       int speed = str.toInt();
-      set_tacho(speed, 70, 150);
+      set_tacho(data_speed, data_min, data_max);
     }
   }
 #endif