SkyView: print connection settings into boot console [skip ci]

berndmr · Jun 2, 2023 · 3d96bd7 · 3d96bd7
1 parent d68acae
commit 3d96bd7
Show file tree

Hide file tree

Showing 5 changed files with 128 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -17,18 +17,19 @@ DIY, multi-functional, compatible, sub-1 GHz ISM band radio based proximity awar
     * [**Standalone Edition**](https://github.com/lyusupov/SoftRF/wiki/Standalone-Edition) ![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/updated-icon.gif)
 * **Wireless** 2.7 inch E-Ink **display**
     * [**SkyView EZ**](https://github.com/lyusupov/SoftRF/wiki/SkyView-EZ) ![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/hot_icon.jpg)
+    * [**SkyView Pico**](https://github.com/lyusupov/SoftRF/wiki/SkyView-Pico)&nbsp;![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/new-icon.jpg)
 * **Certified** (CE/FCC)
     * [**Badge Edition**](https://github.com/lyusupov/SoftRF/wiki/Badge-Edition)
     * [**Prime Mark II**](https://github.com/lyusupov/SoftRF/wiki/Prime-Edition-MkII)
     * [**Uni Edition**](https://github.com/lyusupov/SoftRF/wiki/Uni-Edition)
     * [**Mini Edition**](https://github.com/lyusupov/SoftRF/wiki/Mini-Edition)
     * [**Lego Edition**](https://github.com/lyusupov/SoftRF/wiki/Lego-Edition)
-    * [**Balkan Edition**](https://github.com/lyusupov/SoftRF/wiki/Balkan-Edition)&nbsp;![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/new-icon.jpg)
+    * [**Balkan Edition**](https://github.com/lyusupov/SoftRF/wiki/Balkan-Edition)
 * can **receive ADS-B** air traffic
     * 978 UAT
         * [**Uni Edition**](https://github.com/lyusupov/SoftRF/wiki/Uni-Edition)
     * 1090 ES
-        * [**ES Edition**](https://github.com/lyusupov/SoftRF/wiki/ES-Edition)&nbsp;![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/new-icon.jpg)
+        * [**ES Edition**](https://github.com/lyusupov/SoftRF/wiki/ES-Edition)
     * 1090 ES and/or 978 UAT
         * [**Raspberry Edition**](https://github.com/lyusupov/SoftRF/wiki/Raspberry-Edition)
 * can operate **multiple protocols** at the same time
@@ -43,7 +44,7 @@ DIY, multi-functional, compatible, sub-1 GHz ISM band radio based proximity awar
 * for **education** purpose
     * [**Academy Edition**](https://github.com/lyusupov/SoftRF/wiki/Academy-Edition)
 * **made in** EU
-    * [**Balkan Edition**](https://github.com/lyusupov/SoftRF/wiki/Balkan-Edition)&nbsp;![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/new-icon.jpg)
+    * [**Balkan Edition**](https://github.com/lyusupov/SoftRF/wiki/Balkan-Edition)
 
 <br>
 
@@ -95,11 +96,11 @@ Model(s)|Platform|First appearance|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sta
 [**ES**](https://github.com/lyusupov/SoftRF/wiki/ES-Edition)&nbsp;![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/new-icon.jpg)|[NXP Semiconductors<br>LPC4320](https://en.wikipedia.org/wiki/NXP_LPC#LPC4000_series)|Q2 2021|![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/icon_may_need_imp.png)|Unique RF radio specs are useful for 1090ES **ADS-B** reception [ [1](https://user-images.githubusercontent.com/5849637/140610617-7c74582e-b0d7-4610-8ac2-d51f55c9086d.png) , [2](https://raw.githubusercontent.com/lyusupov/SoftRF/master/documents/images/ES-1.jpg) ]
 1&nbsp;[**Academy**](https://github.com/lyusupov/SoftRF/wiki/Academy-Edition)<br>2&nbsp;[USB2BT](https://github.com/lyusupov/SoftRF/wiki/USB-to-Bluetooth-adapter)&nbsp;![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/new-icon.jpg)|[Microchip&nbsp;(Atmel)<br>SAM&nbsp;D21](https://www.microchip.com/en-us/products/microcontrollers-and-microprocessors/32-bit-mcus/sam-32-bit-mcus/sam-d) <!-- and [ATmega2560](https://www.microchip.com/en-us/product/ATmega2560) -->|Q4 2021|![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/icon_good.png) <!-- ![](https://via.placeholder.com/140x40/c5f015/000000?text=May+need)<br>![](https://via.placeholder.com/140x40/c5f015/000000?text=improvements) -->|good for teaching students of air traffic proximity awareness
 [**Octave**](https://github.com/lyusupov/SoftRF/wiki/Octave-Concept)|[ASR Microelectronics<br>ASR6601](https://asriot.readthedocs.io/en/latest/ASR6601/index.html)|Q1 2022|![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/icon_good.png)| **the best 'price per radio protocol' ratio** on the market
-[**Lego**](https://github.com/lyusupov/SoftRF/wiki/Lego-Edition)|[Raspberry Pi<br>Foundation<br>**RP2040**](https://en.wikipedia.org/wiki/RP2040)|Q1 2022|![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/icon_good.png)|&nbsp;holds [**FCC/CE** mark](https://github.com/lyusupov/SoftRF/wiki/Lego-Edition#certificates)
-[**Balkan**](https://github.com/lyusupov/SoftRF/wiki/Balkan-Edition)&nbsp;![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/new-icon.jpg)|[STMicroelectronics](https://en.wikipedia.org/wiki/STMicroelectronics)<br>[STM32**WLE5**](https://www.st.com/en/microcontrollers-microprocessors/stm32wle5cc.html)|Q3 2022|![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/icon_may_need_imp.png)|&nbsp;holds [**CE** mark](https://github.com/lyusupov/SoftRF/wiki/Balkan-Edition#certificates)&nbsp;![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/new-icon.jpg)
+1&nbsp;[**Lego**](https://github.com/lyusupov/SoftRF/wiki/Lego-Edition)<br>2&nbsp;[**SkyView Pico**](https://github.com/lyusupov/SoftRF/wiki/SkyView-Pico)&nbsp;![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/new-icon.jpg)|[Raspberry Pi<br>Foundation<br>**RP2040**](https://en.wikipedia.org/wiki/RP2040)|Q1 2022|![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/icon_good.png)|&nbsp;holds [**FCC/CE** mark](https://github.com/lyusupov/SoftRF/wiki/Lego-Edition#certificates)
+[**Balkan**](https://github.com/lyusupov/SoftRF/wiki/Balkan-Edition)|[STMicroelectronics](https://en.wikipedia.org/wiki/STMicroelectronics)<br>[STM32**WLE5**](https://www.st.com/en/microcontrollers-microprocessors/stm32wle5cc.html)|Q3 2022|![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/icon_may_need_imp.png)|&nbsp;holds [**CE** mark](https://github.com/lyusupov/SoftRF/wiki/Balkan-Edition#certificates)
 [**WebTop USB**](https://github.com/lyusupov/SoftRF/wiki/WebTop-USB)![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/new-icon.jpg)|[Espressif<br>ESP32-S2](https://en.wikipedia.org/wiki/ESP32#ESP32-S2)|Q4 2022|![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/icon_may_need_imp.png)|
 [**Standalone**](https://github.com/lyusupov/SoftRF/wiki/Standalone-Edition)&nbsp;**upgrade**![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/new-icon.jpg)|[Espressif<br>ESP32-C3](https://en.wikipedia.org/wiki/ESP32#ESP32-C3)|Q1 2023|![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/icon_may_need_imp.png)|[RISC-V](https://en.wikipedia.org/wiki/RISC-V)
-[**Prime Mark III**](https://github.com/lyusupov/SoftRF/wiki/Prime-Edition-MkIII)![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/new-icon.jpg)|[Espressif<br>ESP32-S3](https://en.wikipedia.org/wiki/ESP32#ESP32-S3)|Q1 2023|![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/icon_may_need_imp.png)|
+1&nbsp;[**Prime Mark III**](https://github.com/lyusupov/SoftRF/wiki/Prime-Edition-MkIII)![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/new-icon.jpg)<br>2&nbsp;[**SkyView Pico**](https://github.com/lyusupov/SoftRF/wiki/SkyView-Pico#alternative-hardware-option)&nbsp;![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/new-icon.jpg)|[Espressif<br>ESP32-S3](https://en.wikipedia.org/wiki/ESP32#ESP32-S3)|Q1 2023|![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/icon_may_need_imp.png)|
 
 ## By sub-1 GHz radio
 Radio|Model(s)|First appearance|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Status&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|Notes
@@ -156,7 +157,7 @@ Generic<br>NMEA|[Standalone](https://github.com/lyusupov/SoftRF/wiki/Standalone-
     * [Enclosure](https://github.com/lyusupov/SoftRF/tree/master/case/v4)
     * [ESP32 adapter](https://github.com/lyusupov/ESP32-NODEMCU-ADAPTER)
     * [ESP32‐C3 upgrade](https://github.com/lyusupov/SoftRF/wiki/ESP32%E2%80%90C3-upgrade-for-Standalone-Edition) ![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/new-icon.jpg)
-* [ES Edition](https://github.com/lyusupov/SoftRF/wiki/ES-Edition)&nbsp;![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/new-icon.jpg)
+* [ES Edition](https://github.com/lyusupov/SoftRF/wiki/ES-Edition)
 * [Octave Concept](https://github.com/lyusupov/SoftRF/wiki/Octave-Concept)
 * [Uni Edition](https://github.com/lyusupov/SoftRF/wiki/Uni-Edition)
     * [Firmware installation](https://github.com/lyusupov/SoftRF/wiki/Uni-Edition.-Firmware-maintenance-procedures)
@@ -171,7 +172,7 @@ Generic<br>NMEA|[Standalone](https://github.com/lyusupov/SoftRF/wiki/Standalone-
     * [Settings](https://github.com/lyusupov/SoftRF/wiki/Dongle-settings)
     * [Enclosure](https://github.com/lyusupov/SoftRF/tree/master/case/Dongle)
 * [Lego Edition](https://github.com/lyusupov/SoftRF/wiki/Lego-Edition)
-* [Balkan Edition](https://github.com/lyusupov/SoftRF/wiki/Balkan-Edition)&nbsp;![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/new-icon.jpg)
+* [Balkan Edition](https://github.com/lyusupov/SoftRF/wiki/Balkan-Edition)
 * [Academy Edition](https://github.com/lyusupov/SoftRF/wiki/Academy-Edition)
 * [UAV Edition](https://github.com/lyusupov/SoftRF/wiki/UAV-Edition)
     * [Bill of materials](https://github.com/lyusupov/SoftRF/wiki/UAV-BOM)
@@ -233,7 +234,7 @@ Generic<br>NMEA|[Standalone](https://github.com/lyusupov/SoftRF/wiki/Standalone-
 
 ![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/SoftRF-Case-v5-Exterior.jpg)
 
-* [**ES Edition**](https://github.com/lyusupov/SoftRF/wiki/ES-Edition) ![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/new-icon.jpg)
+* [**ES Edition**](https://github.com/lyusupov/SoftRF/wiki/ES-Edition)
 
 ![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/ES-1.jpg)
 <!-- * [**Bracelet Edition**](https://github.com/lyusupov/SoftRF/wiki/Bracelet-Edition) ![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/new-icon.jpg)
@@ -270,7 +271,7 @@ Generic<br>NMEA|[Standalone](https://github.com/lyusupov/SoftRF/wiki/Standalone-
 
 ![](https://raw.githubusercontent.com/lyusupov/SoftRF/master/documents/images/Lego-11.png)
 
-* [**Balkan Edition**](https://github.com/lyusupov/SoftRF/wiki/Balkan-Edition)&nbsp;![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/new-icon.jpg)
+* [**Balkan Edition**](https://github.com/lyusupov/SoftRF/wiki/Balkan-Edition)
 
 ![](https://raw.githubusercontent.com/lyusupov/SoftRF/master/documents/images/Balkan-1.jpg)
 

diff --git a/documents/images/skyview-55.jpg b/documents/images/skyview-55.jpg
diff --git a/software/firmware/binaries/README.md b/software/firmware/binaries/README.md
@@ -36,7 +36,7 @@ Model|Instructions|Firmware folder
 Model|Instructions|Firmware folder
 ---|:---:|:---:
 [SkyView EZ](https://github.com/lyusupov/SoftRF/wiki/SkyView-EZ)|[ESP32](https://github.com/lyusupov/SoftRF/wiki/SkyView.-Quick-start)|[ESP32](https://github.com/lyusupov/SoftRF/tree/master/software/firmware/binaries/ESP32/SkyView)
-[SkyView Pico](https://github.com/lyusupov/SoftRF/wiki/SkyView-Pico)|[RP2040](https://github.com/lyusupov/SoftRF/wiki/SkyView-Pico.-Quick-start)<br>[ESP32-S3](https://github.com/lyusupov/SoftRF/wiki/SkyView-Pico.-Quick-start)|RP2040<!-- ](https://github.com/lyusupov/SoftRF/tree/master/software/firmware/binaries/RP2040/SkyView) --><br>ESP32S3<!-- ](https://github.com/lyusupov/SoftRF/tree/master/software/firmware/binaries/ESP32S3/SkyView) -->
+[SkyView Pico](https://github.com/lyusupov/SoftRF/wiki/SkyView-Pico)|[RP2040](https://github.com/lyusupov/SoftRF/wiki/SkyView-Pico.-Quick-start#raspberry-pico-w)<br>[ESP32-S3](https://github.com/lyusupov/SoftRF/wiki/SkyView-Pico.-Quick-start#banana-bpi-picow-s3)|RP2040<!-- ](https://github.com/lyusupov/SoftRF/tree/master/software/firmware/binaries/RP2040/SkyView) --><br>ESP32S3<!-- ](https://github.com/lyusupov/SoftRF/tree/master/software/firmware/binaries/ESP32S3/SkyView) -->
 [WebTop Serial](https://github.com/lyusupov/SoftRF/wiki/WebTop-Serial-adapter)|[NodeMCU](https://github.com/lyusupov/SoftRF/tree/master/software/firmware/binaries#nodemcu)|[NodeMCU](https://github.com/lyusupov/SoftRF/tree/master/software/firmware/binaries/NodeMCU/WebTop)
 [WebTop USB](https://github.com/lyusupov/SoftRF/wiki/WebTop-USB)|[ESP32-S2](https://github.com/lyusupov/SoftRF/blob/master/software/firmware/binaries/README.md#esp32-s2)|[ESP32S2](https://github.com/lyusupov/SoftRF/tree/master/software/firmware/binaries/ESP32S2/WebTop)
 [USB to Bluetooth](https://github.com/lyusupov/SoftRF/wiki/USB-to-Bluetooth-adapter)|[XIAO](https://github.com/lyusupov/SoftRF/wiki/USB-to-Bluetooth-adapter#quick-start)|[SAMD21](https://github.com/lyusupov/SoftRF/tree/master/software/firmware/binaries/SAMD21/USB_Bluetooth)

diff --git a/software/firmware/source/SkyView/Platform_ESP32.cpp b/software/firmware/source/SkyView/Platform_ESP32.cpp
@@ -576,7 +576,64 @@ static void ESP32_setup()
 
 static void ESP32_post_init()
 {
+  uint32_t SerialBaud;
 
+  switch (settings->baudrate)
+  {
+  case B4800:
+    SerialBaud = 4800;
+    break;
+  case B9600:
+    SerialBaud = 9600;
+    break;
+  case B19200:
+    SerialBaud = 19200;
+    break;
+  case B57600:
+    SerialBaud = 57600;
+    break;
+  case B115200:
+    SerialBaud = 115200;
+    break;
+  case B2000000:
+    SerialBaud = 2000000;
+    break;
+  case B38400:
+  default:
+    SerialBaud = 38400;
+    break;
+  }
+
+  Serial.println();
+
+  Serial.print(F("Input source : "));
+  switch (settings->connection)
+  {
+    case CON_SERIAL_MAIN   :  Serial.print  (F("UART MAIN "));
+                              Serial.println(SerialBaud);     break;
+    case CON_SERIAL_AUX    :  Serial.print  (F("UART AUX "));
+                              Serial.println(SerialBaud);     break;
+    case CON_USB           :  Serial.println(F("USB"));       break;
+    case CON_WIFI_UDP      :  Serial.println(F("WIFI UDP"));  break;
+    case CON_WIFI_TCP      :  Serial.println(F("WIFI TCP"));  break;
+    case CON_BLUETOOTH_SPP :  Serial.println(F("BT SPP"));    break;
+    case CON_BLUETOOTH_LE  :  Serial.println(F("BT LE"));     break;
+    case CON_NONE          :
+    default                :  Serial.println(F("NONE"));      break;
+  }
+
+  Serial.print(F("Protocol     : "));
+  switch (settings->protocol)
+  {
+    case PROTOCOL_NMEA     :  Serial.println(F("NMEA"));      break;
+    case PROTOCOL_GDL90    :  Serial.println(F("GDL90"));     break;
+    case PROTOCOL_D1090    :  Serial.println(F("D1090"));     break;
+    case PROTOCOL_NONE     :
+    default                :  Serial.println(F("NONE"));      break;
+  }
+
+  Serial.println();
+  Serial.flush();
 }
 
 static void ESP32_loop()

diff --git a/software/firmware/source/SkyView/Platform_RP2040.cpp b/software/firmware/source/SkyView/Platform_RP2040.cpp
@@ -328,6 +328,65 @@ static void RP2040_setup()
 
 static void RP2040_post_init()
 {
+  uint32_t SerialBaud;
+
+  switch (settings->baudrate)
+  {
+  case B4800:
+    SerialBaud = 4800;
+    break;
+  case B9600:
+    SerialBaud = 9600;
+    break;
+  case B19200:
+    SerialBaud = 19200;
+    break;
+  case B57600:
+    SerialBaud = 57600;
+    break;
+  case B115200:
+    SerialBaud = 115200;
+    break;
+  case B2000000:
+    SerialBaud = 2000000;
+    break;
+  case B38400:
+  default:
+    SerialBaud = 38400;
+    break;
+  }
+
+  Serial.println();
+
+  Serial.print(F("Input source : "));
+  switch (settings->connection)
+  {
+    case CON_SERIAL_MAIN   :  Serial.print  (F("UART MAIN "));
+                              Serial.println(SerialBaud);     break;
+    case CON_SERIAL_AUX    :  Serial.print  (F("UART AUX "));
+                              Serial.println(SerialBaud);     break;
+    case CON_USB           :  Serial.println(F("USB"));       break;
+    case CON_WIFI_UDP      :  Serial.println(F("WIFI UDP"));  break;
+    case CON_WIFI_TCP      :  Serial.println(F("WIFI TCP"));  break;
+    case CON_BLUETOOTH_SPP :  Serial.println(F("BT SPP"));    break;
+    case CON_BLUETOOTH_LE  :  Serial.println(F("BT LE"));     break;
+    case CON_NONE          :
+    default                :  Serial.println(F("NONE"));      break;
+  }
+
+  Serial.print(F("Protocol     : "));
+  switch (settings->protocol)
+  {
+    case PROTOCOL_NMEA     :  Serial.println(F("NMEA"));      break;
+    case PROTOCOL_GDL90    :  Serial.println(F("GDL90"));     break;
+    case PROTOCOL_D1090    :  Serial.println(F("D1090"));     break;
+    case PROTOCOL_NONE     :
+    default                :  Serial.println(F("NONE"));      break;
+  }
+
+  Serial.println();
+  Serial.flush();
+
   core0_booting = false;
 }