Secure 3.5.3

.github/workflows/build.yml

@@ -147,7 +147,9 @@ jobs:
           merge-multiple: true
 
       - name: Copy hardware files to firmware folder
-        run: cp -r src/hardware dist/firmware
+        run: |
+          cp -r src/hardware dist/firmware
+          jq 'del(.generic)' src/hardware/targets.json > dist/firmware/hardware/targets.json
 
       - name: Copy Lua to to firmware folder
         run: |
@@ -165,7 +167,7 @@ jobs:
       - name: Build flasher "binary" with shiv
         run: |
           cd src/python
-          pip install shiv
+          pip install shiv==1.0.6
           shiv -c flash -o ../../dist/firmware/flasher.pyz pyserial .
 
       - name: Update firmware artifact
@@ -179,33 +181,5 @@ jobs:
           cd dist
           zip -r -9 ../firmware.zip ./firmware
 
-      - name: Upload firmware bundle to ExpressLRS artifactory
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_ENDPOINT_URL: ${{ secrets.AWS_ENDPOINT_URL }}
-          AWS_REGION: "auto"
-        run: |
-          if [[ -z $AWS_ACCESS_KEY_ID || -z $AWS_SECRET_ACCESS_KEY || -z $AWS_ENDPOINT_URL ]]; then
-            echo "Artifactory credentials are not defined. Most likely action is running from pull request. Not a bug."
-            exit 0
-          fi
-
-          echo "Uploading firmware to artifactory"
-          aws s3 cp --endpoint-url $AWS_ENDPOINT_URL firmware.zip s3://expresslrs/ExpressLRS/$GITHUB_SHA/firmware.zip
-
-          echo "Generating artifact index"
-          aws s3 ls --endpoint-url $AWS_ENDPOINT_URL s3://expresslrs/ExpressLRS/ | awk '{print $2}' | sed s/\\/// > /tmp/hashes
-          echo '{' > index.json
-          echo '"branches": {' >> index.json
-          git branch --list --remotes --format '"%(refname:short)": "%(objectname)",' | grep origin/ | sed s/origin.// | grep -f /tmp/hashes | head -c-2 >> index.json
-          echo '' >> index.json
-          echo '},' >> index.json
-          echo '"tags": {' >> index.json
-          git tag --list --format '"%(refname:short)": "%(objectname)",' | grep -f /tmp/hashes | head -c-2 >> index.json
-          echo '' >> index.json
-          echo '}' >> index.json
-          echo '}' >> index.json
-
-          echo "Uploading artifact index"
-          aws s3 cp --endpoint-url $AWS_ENDPOINT_URL index.json s3://expresslrs/ExpressLRS/index.json
+
+      # DELETED - name: Upload firmware bundle to ExpressLRS artifactory

README.md

@@ -45,11 +45,10 @@ security.
 
 ## About ExpressLRS
 
-ExpressLRS is an open source Radio Link for Radio Control applications. Designed to be the best FPV Racing link, it is based on the fantastic Semtech **SX127x**/**SX1280** LoRa hardware combined with an Espressif or STM32 Processor. Using LoRa modulation as well as reduced packet size it achieves best in class range and latency. It achieves this using a highly optimized over-the-air packet structure, giving simultaneous range and latency advantages. It supports both 900 MHz and 2.4 GHz links, each with their own benefits. 900 MHz supports a maximum of 200 Hz packet rate, with higher penetration. 2.4 GHz supports a blistering fast 1000 Hz on [EdgeTX](http://edgetx.org/). With over 60 different hardware targets and 13 hardware manufacturers, the choice of hardware is ever growing, with different hardware suited to different requirements.
+ExpressLRS is an open source Radio Link for Radio Control applications. Designed to be the best FPV Racing link, it is based on the fantastic Semtech **SX127x**/**SX1280** LoRa hardware combined with an Espressif or STM32 Processor. Using LoRa modulation as well as reduced packet size it achieves best in class range and latency. It achieves this using a highly optimized over-the-air packet structure, giving simultaneous range and latency advantages. It supports both 900 MHz and 2.4 GHz links, each with their own benefits. 900 MHz supports a maximum of 200 Hz packet rate, with higher penetration. 2.4 GHz supports a blistering fast 1000 Hz on [EdgeTX](http://edgetx.org/). With hundreds of different hardware targets from a wide range of hardware manufacturers, the choice of hardware is constantly growing, with different hardware suited to different requirements.
 
 ## Configurator
 To configure your ExpressLRS / PrivacyLRS hardware, the ExpressLRS Configurator can be used, which is found here:
 
 https://github.com/ExpressLRS/ExpressLRS-Configurator/releases/
 
-

src/html/cw.html

@@ -1,4 +1,4 @@
-@@require(PLATFORM, VERSION)
+@@require(PLATFORM, VERSION, chip)
 <!DOCTYPE HTML>
 <html>
 
@@ -19,10 +19,10 @@ <h1><b>ExpressLRS</b></h1>
 	<br>
 	<div class="mui-container-fluid mui-col-sm-10 mui-col-sm-offset-1">
 		<div class="mui-panel">
-			This page puts the SX1280 into a mode where it transmits a continuous wave with a center frequency of 2.440 GHz.
+			This page puts the Semtech LoRa chip into a mode where it transmits a continuous wave with a center frequency of <span id="frequency"></span> MHz.
 			<br>
 			You can then measure the actual continuous wave center frequency using a spectrum analyzer and enter the measured value below
-			and this will be used to calculate the accuracy of the 52MHz crystal used in the device and how far it differs from the ideal frequency.
+			and this will be used to calculate the accuracy of the crystal used in the device and how far it differs from the ideal frequency.
 			<form>
 				<div id="radioOption" class="mui-radio" style="display: none;">
 					<label>
@@ -41,6 +41,20 @@ <h1><b>ExpressLRS</b></h1>
 						Radio 2
 					</label>
 				</div>
+				<br>
+@@if chip == 'LR1121':
+				Basic support is available for the LR1121 and setting 915 MHz.
+				<br>
+				<div class="mui-checkbox">
+					<label>
+						<input type="checkbox"
+							name="setSubGHz"
+							id="optionsSetSubGHz">
+						Set 915 MHz
+					</label>
+				</div>
+@@end
+				<br>
 				<button id="start-cw" class="mui-btn mui-btn--primary" disabled>Start Continuous Wave</button>
 			</form>
 			<br>

src/html/cw.js

@@ -1,22 +1,54 @@
+@@require(chip)
 /* eslint-disable max-len, require-jsdoc */
 document.addEventListener('DOMContentLoaded', init, false);
 
 function _(el) {
   return document.getElementById(el);
 }
 
-const cwFreq = 2440000000;
-const xtalNominal = 52000000;
+var cwFreq = 2440000000;
+var xtalNominal = 52000000;
+var warn_offset;
+var bad_offset;
+
+function updateParams(data) {
+  cwFreq = data.center;
+@@if chip == 'SX128X':
+  xtalNominal = 52000000;
+  warn_offset = 90000;
+  bad_offset = 180000;
+@@end
+@@if chip == 'SX127X':
+  xtalNominal = 32000000;
+  warn_offset = 100000;
+  bad_offset = 125000;
+@@end
+@@if chip == 'LR1121':
+  xtalNominal = 32000000;
+  warn_offset = 100000;
+  bad_offset = 125000;
+  if (!_('optionsSetSubGHz').checked) {
+    cwFreq = data.center2;
+  }
+@@end
+  _('frequency').textContent = (cwFreq / 1000000).toString();
+  _('start-cw').disabled = false;
+}
 
 function init() {
   const xmlhttp = new XMLHttpRequest();
   xmlhttp.onreadystatechange = function() {
-    if (this.readyState == 4 && this.status == 200) {
+    if (this.readyState === 4 && this.status === 200) {
       const data = JSON.parse(this.responseText);
-      if (data.radios == 2) {
+      if (data.radios === 2) {
         _('radioOption').style.display = 'block';
       }
-      _('start-cw').disabled = false;
+@@if chip == 'LR1121':
+      _('optionsSetSubGHz').onclick = () => {
+        updateParams(data);
+      }
+@@end
+      updateParams(data);
     }
   };
   xmlhttp.open('GET', '/cw', true);
@@ -34,20 +66,24 @@ _('start-cw').onclick = (e) => {
   xmlhttp.onreadystatechange = function() {};
   const formdata = new FormData;
   formdata.append('radio', _('optionsRadios1').checked ? 1 : 2);
+@@if chip == 'LR1121':
+  formdata.append('subGHz', _('optionsSetSubGHz').checked ? 1 : 0);
+  _('optionsSetSubGHz').disabled = true;
+@@end
   xmlhttp.send(formdata);
 };
 
 _('measured').onchange = (e) => {
   const calc = (e.target.value/cwFreq)*xtalNominal;
   _('calculated').innerHTML = Math.round(calc);
   _('offset').innerHTML = Math.round(calc - xtalNominal) / 1000;
-  _('ppm').innerHTML = Math.abs(Math.round(calc - xtalNominal)) / 52;
+  _('ppm').innerHTML = Math.abs(Math.round(calc - xtalNominal)) / (xtalNominal /1000000);
   const rawShift = Math.round(e.target.value - cwFreq);
   _('raw').innerHTML = rawShift / 1000;
   let icon;
-  if (Math.abs(rawShift) < 90000) {
+  if (Math.abs(rawShift) < warn_offset) {
     icon = `<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="64" height="64" viewBox="0 0 96 96" enable-background="new 0 0 96 96" xml:space="preserve"><g><path fill-rule="evenodd" clip-rule="evenodd" fill="#6BBE66" d="M48,0c26.51,0,48,21.49,48,48S74.51,96,48,96S0,74.51,0,48 S21.49,0,48,0L48,0z M26.764,49.277c0.644-3.734,4.906-5.813,8.269-3.79c0.305,0.182,0.596,0.398,0.867,0.646l0.026,0.025 c1.509,1.446,3.2,2.951,4.876,4.443l1.438,1.291l17.063-17.898c1.019-1.067,1.764-1.757,3.293-2.101 c5.235-1.155,8.916,5.244,5.206,9.155L46.536,63.366c-2.003,2.137-5.583,2.332-7.736,0.291c-1.234-1.146-2.576-2.312-3.933-3.489 c-2.35-2.042-4.747-4.125-6.701-6.187C26.993,52.809,26.487,50.89,26.764,49.277L26.764,49.277z"/></g></svg>`;
-  } else if (Math.abs(rawShift) < 180000) {
+  } else if (Math.abs(rawShift) < bad_offset) {
     icon = `
     <svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 20 20">
       <style type="text/css">.cls-1{ fill: #fc3 }</style>

src/html/elrs.css

@@ -349,7 +349,6 @@ body, input, select, textarea {
 
     /* Custom code for ExpressLRS PWM Output table */
   .pwmpnl {
-	overflow-x: auto;
 	min-width: fit-content;
   }
   .pwmtbl table {
@@ -365,6 +364,7 @@ body, input, select, textarea {
   .pwmitm {
 	min-width: 6em;
 	white-space: nowrap;
+	width: fit-content;
   }
 
   /*==========================*/

src/html/hardware.html

@@ -1,4 +1,4 @@
-@@require(PLATFORM, VERSION, isTX, sx127x)
+@@require(PLATFORM, VERSION, isTX)
 <!DOCTYPE HTML>
 <html lang="en">
 
@@ -86,6 +86,10 @@ <h1><b>ExpressLRS</b></h1>
 					<tr><td width="30"></td><td>RX pin<img class="icon-input"/></td><td><input size='3' id='serial_rx' name='serial_rx' type='text'/></td><td>Pin used to receive CRSF signal from the handset</td></tr>
 					<tr><td></td><td>TX pin<img class="icon-output"/></td><td><input size='3' id='serial_tx' name='serial_tx' type='text'/></td><td>Pin used to transmit CRSF telemetry to the handset (may be the same as the RX PIN)</td></tr>
 
+					<tr><td colspan='2'><b>Serial2 Pins</td></tr>
+					<tr><td width="30"></td><td>RX pin<img class="icon-input"/></td><td><input size='3' id='serial1_rx' name='serial1_rx' type='text'/></td><td>Serial2 RX - ESP32 targets only</td></tr>
+					<tr><td></td><td>TX pin<img class="icon-output"/></td><td><input size='3' id='serial1_tx' name='serial1_tx' type='text'/></td><td>Serial2 TX - ESP32 targets only</td></tr>
+
 					<tr><td colspan='2'><b>Radio Chip Pins & Options</td></tr>
 					<tr><td></td><td>BUSY pin<img class="icon-input"/></td><td><input size='3' id='radio_busy' name='radio_busy' type='text'/></td><td>GPIO Input connected to SX128x busy pin</td></tr>
 					<tr><td></td><td>DIO0 pin<img class="icon-input"/></td><td><input size='3' id='radio_dio0' name='radio_dio0' type='text'/></td><td>Unused on SX128x, Interrupt pin for SX127x</td></tr>
@@ -103,6 +107,7 @@ <h1><b>ExpressLRS</b></h1>
 					<tr><td></td><td>RST_2 pin<img class="icon-output"/></td><td><input size='3' id='radio_rst_2' name='radio_rst_2' type='text'/></td><td>Reset pin connected to second SX1280/127x</td></tr>
 					<tr><td></td><td>DCDC enabled</td><td><input size='3' id='radio_dcdc' name='radio_dcdc' type='checkbox'/></td><td>Use the SX1280 DC-DC converter rather than LDO voltage regulator (15uH inductor must be present)</td></tr>
 					<tr><td></td><td>RFO_HF enabled</td><td><input size='3' id='radio_rfo_hf' name='radio_rfo_hf' type='checkbox'/></td><td>SX127x PA to use, either the RFO_HF or PA_BOOST (depends on circuit design)</td></tr>
+					<tr><td></td><td>LR1121 RF Switch Controls</td><td><input size='40' id='radio_rfsw_ctrl' name='radio_rfsw_ctrl' type='text' class='array'/></td><td>Comma-separated list of 8 values used for setting the LR1121 RF switch controls</td></tr>
 
 					<tr><td colspan='2'><b>Radio Antenna</td></tr>
 					<tr><td></td><td>CTRL pin<img class="icon-output"/></td><td><input size='3' id='ant_ctrl' name='ant_ctrl' type='text'/></td><td>Pin connected to Antenna select pin on power amplifier</td></tr>
@@ -175,6 +180,7 @@ <h1><b>ExpressLRS</b></h1>
 					<tr><td></td><td>Power Value(s)</td><td><input size='40' id='power_values' name='power_values' type='text' class='array'/></td><td>Comma-separated list of values that set the power output (if using a DAC these are the DAC values)</td></tr>
 					<tr><td></td><td>Secondary Power Value(s)</td><td><input size='40' id='power_values2' name='power_values2' type='text' class='array'/></td><td>Comma-separated list of values that set the power output (if using a DAC then these set the Semtech power output)</td></tr>
 					<tr><td></td><td>Dual Power Value(s)</td><td><input size='40' id='power_values_dual' name='power_values_dual' type='text' class='array'/></td><td>Comma-separated list of values that set the higher frequency power output of a dual band Tx/Rx</td></tr>
+					<tr><td></td><td>PA LNA Gain</td><td><input size='20' id='power_lna_gain' name='power_lna_gain' type='text'/></td><td>The amount of dB gain provided by the LNA</td></tr>
 
 					<tr><td colspan='2'><b>Radio Power Detection</td></tr>
 					<tr><td></td><td>PDET pin<img class="icon-analog"/></td><td><input size='3' id='power_pdet' name='power_pdet' type='text'/></td><td>Analog input (up to 1.1V) connected to 'power detect' pin on PA for adjustment of the power output</td></tr>

src/html/hardware.js

@@ -99,6 +99,7 @@ function fileDragHover(e) {
 function fileSelectHandler(e) {
   fileDragHover(e);
   const files = e.target.files || e.dataTransfer.files;
+  _('upload_hardware').reset();
   for (const f of files) {
     parseFile(f);
   }

src/html/index.html

@@ -1,4 +1,4 @@
-@@require(PLATFORM, VERSION, isTX, sx127x)
+@@require(PLATFORM, VERSION, isTX, hasSubGHz, is8285)
 <!DOCTYPE HTML>
 <html lang="en">
 
@@ -53,7 +53,7 @@ <h2>Runtime Options</h2>
 					<br/><br/>
 					<form id='upload_options' method='POST' action="/options">
 @@end
-@@if sx127x:
+@@if hasSubGHz:
 						<div class="mui-select">
 							<select id='domain' name='domain'>
 								<option value='0'>AU915</option>
@@ -138,10 +138,13 @@ <h2>Import/Export</h2>
 			<div class="mui-tabs__pane" id="pane-justified-2">
 				<div class="mui-panel">
 					<h2>Firmware Update</h2>
-					Choose a file to update module firmware. Select the correct .bin file for @@{PLATFORM} otherwise a bad flash may occur.
-					If this happens you will need to recover via USB/Serial. You may also download the
-					<a href="firmware.bin" title="Click to download firmware">currently running firmware</a>.
+					Select the correct <strong>firmware.bin@@{ ".gz" if (is8285 and not isTX) else "" }</strong> for @@{PLATFORM} otherwise a bad flash may occur.
+					If this happens you will need to recover via USB/Serial. You may also download the <a href="firmware.bin" title="Click to download firmware">currently running firmware</a>.
 					<br/><br/>
+@@if (is8285 and not isTX):
+					<div class="mui-panel" style="background-color: #fcecae;text-align:center;">Do NOT decompress/unzip/extract the firmware.bin.gz file. Upload the file as it is.</div>
+					<br/>
+@@end
 					<button id="upload_btn" class="mui-btn mui-btn--primary upload" style="margin: 0 auto; display:block;">
 						<label>
 							Select firmware file
@@ -218,9 +221,13 @@ <h2>PWM Output</h2>
 					</div>
 					<form class="mui-form" action='/config' id='config' method='POST'>
 						<h2>Binding Phrase</h2>
-						<div class="mui-checkbox">
-							<input id="vbind" name="vbind" type="checkbox" value="1"/>
-							<label for="vbind">Never store bind information across reboots (volatile binding)</label>
+						<div class="mui-select">
+							<select id="vbind" name="vbind">
+								<option value="0">Persistent (Default) - Bind information is stored across reboots</option>
+								<option value="1">Volatile - Never store bind information across reboots</option>
+								<option value="2">Returnable - Unbinding a receiver reverts to flashed binding phrase</option>
+							</select>
+							<label for="vbind">Binding storage</label>
 						</div>
 						<div id="bindphrase">
 							Enter a new binding phrase to replace the current binding information.
@@ -250,10 +257,28 @@ <h2>Serial Protocol</h2>
 									<option value='4'>SUMD</option>
 									<option value='5'>DJI RS Pro</option>
 									<option value='6'>HoTT Telemetry</option>
+									<option value='7'>MAVLINK</option>
 								</select>
 								<label for='serial-protocol'>Serial Protocol</label>
 							</div>
 						</div>
+						<div id="serial1-config">
+							<div class="mui-select">
+								<select id='serial1-protocol' name='serial1-protocol'>
+									<option value='0'>Off</option>
+									<option value='1'>CRSF</option>
+									<option value='2'>Inverted CRSF</option>
+									<option value='3'>SBUS</option>
+									<option value='4'>Inverted SBUS</option>
+									<option value='5'>SUMD</option>
+									<option value='6'>DJI RS Pro</option>
+									<option value='7'>HoTT Telemetry</option>
+									<option value='8'>Tramp</option>
+									<option value='9'>SmartAudio</option>
+								</select>
+								<label for='serial1-protocol'>Serial2 Protocol</label>
+							</div>
+						</div>
 						<div id="sbus-config" style="display: none;">
 							<h2>SBUS Failsafe</h2>
 							Set the failsafe behaviour when using the SBUS protocol:<br/>
@@ -279,7 +304,7 @@ <h2>Model Match</h2>
 							<input id='model-match' name='model-match' type='checkbox'/>
 							<label for="model-match">Enable Model Match</label>
 						</div>
-						<div class="mui-textfield">
+						<div class="mui-textfield" id="modelNum">
 							<input id='modelid' type='text' name='modelid' value="255" required/>
 							<label for="modelid">Model ID</label>
 						</div>