illustrations for the Prime3 wiki [skip ci]

lyusupov · Aug 30, 2023 · c7611b3 · c7611b3
1 parent 03ce57d
commit c7611b3
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 2 deletions.
diff --git a/documents/images/Prime3-30.jpg b/documents/images/Prime3-30.jpg
diff --git a/documents/images/Prime3-31.jpg b/documents/images/Prime3-31.jpg
diff --git a/documents/images/bom/4ph1mm254mm.jpg b/documents/images/bom/4ph1mm254mm.jpg
diff --git a/software/app/Settings/basic.html b/software/app/Settings/basic.html
@@ -272,6 +272,7 @@ <h1 align=center>Base settings</h1>
 <option value=5>FANET</option>
 <option value=4>UAT</option>
 <option value=3>1090ES</option>
+<option value=6>PRoL</option>
 </select>
 </td>
 </tr>
@@ -448,5 +449,13 @@ <h3 align=center>NMEA control sentence:</h3>
 <hr>
 <h4 align=center><tt><span id="output" style="font-family: monospace;"></span><br><br></tt></h4>
 </form>
+<hr>
+<table width=100%%>
+<tr>
+<th align=left>Useful links:</th>
+<td align=left><a href="https://googlechromelabs.github.io/serial-terminal/">Web Serial Terminal</a></td>
+<td align=left><a href="https://loginov-rocks.github.io/Web-Bluetooth-Terminal/">Web Bluetooth LE Terminal</a></td>
+</tr>
+</table>
 </body>
 </html>
diff --git a/software/app/Settings/security.html b/software/app/Settings/security.html
@@ -89,5 +89,13 @@ <h3 align=center>NMEA control sentence:</h3>
 <hr>
 <h4 align=center><tt><span id="output" style="font-family: monospace;"></span><br><br></tt></h4>
 </form>
+<hr>
+<table width=100%%>
+<tr>
+<th align=left>Useful links:</th>
+<td align=left><a href="https://googlechromelabs.github.io/serial-terminal/">Web Serial Terminal</a></td>
+<td align=left><a href="https://loginov-rocks.github.io/Web-Bluetooth-Terminal/">Web Bluetooth LE Terminal</a></td>
+</tr>
+</table>
 </body>
 </html>
diff --git a/software/app/Settings/ui.html b/software/app/Settings/ui.html
@@ -280,5 +280,13 @@ <h3 align=center>NMEA control sentence:</h3>
 <hr>
 <h4 align=center><tt><span id="output" style="font-family: monospace;"></span><br><br></tt></h4>
 </form>
+<hr>
+<table width=100%%>
+<tr>
+<th align=left>Useful links:</th>
+<td align=left><a href="https://googlechromelabs.github.io/serial-terminal/">Web Serial Terminal</a></td>
+<td align=left><a href="https://loginov-rocks.github.io/Web-Bluetooth-Terminal/">Web Bluetooth LE Terminal</a></td>
+</tr>
+</table>
 </body>
 </html>
diff --git a/software/app/interface/SoftRF.h b/software/app/interface/SoftRF.h
@@ -60,7 +60,7 @@
 
  Version: 1
  Mode: Normal, UAV
- Protocol: Legacy, OGNTP, P3I, FANET, UAT, 1090ES
+ Protocol: Legacy, OGNTP, P3I, FANET, UAT, 1090ES, PRoL
  Band: EU, US/CA, AU, NZ, RU, CN, UK, IN, IL, KR
  Aircraft: Glider, Towplane, Powered, Helicopter, UAV, Hangglider,
  Paraglider, Balloon, Static
@@ -140,7 +140,7 @@ enum
  SOFTRF_PROTOCOL_ADSB_1090, /* ADS-B 1090ES */
  SOFTRF_PROTOCOL_ADSB_UAT, /* ADS-B UAT */
  SOFTRF_PROTOCOL_FANET, /* Skytraxx */
- SOFTRF_PROTOCOL_APRS, /* Ham Radio */
+ SOFTRF_PROTOCOL_APRS, /* Ham's 'classic' APRS and 'APRS over LoRa' */
  /* Volunteer contributors are welcome */
  SOFTRF_PROTOCOL_EID, /* UAS eID */
  SOFTRF_PROTOCOL_GOTENNA, /* goTenna Mesh */

diff --git a/software/firmware/source/SoftRF/src/platform/ESP32.cpp b/software/firmware/source/SoftRF/src/platform/ESP32.cpp
@@ -1092,6 +1092,9 @@ static void ESP32_setup()
 
  axp_2xxx.enableBLDO1();
 
+ axp_2xxx.disableALDO3();
+ axp_2xxx.disableDC3();
+
  axp_2xxx.setChargingLedMode(XPOWERS_CHG_LED_ON);
 
  pinMode(SOC_GPIO_PIN_TWR2_PMU_IRQ, INPUT /* INPUT_PULLUP */);

diff --git a/software/firmware/source/SoftRF/src/platform/nRF52.h b/software/firmware/source/SoftRF/src/platform/nRF52.h
@@ -291,6 +291,7 @@ struct rst_info {
 //#define EXCLUDE_NUS
 //#define EXCLUDE_IMU
 #define USE_OGN_ENCRYPTION
+//#define ENABLE_PROL
 
 /* FTD-012 data port protocol version 8 and 9 */
 #define PFLAA_EXT1_FMT ",%d,%d,%d"