Fix antenna value for Diversity/Gemini receivers #2622
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pkendall64
approved these changes
Mar 31, 2024
wvarty
approved these changes
Apr 1, 2024
mha1
added a commit
to mha1/ExpressLRS
that referenced
this pull request
Apr 18, 2024
cleanup rebase first shot at LUA and WebUI user interface for selecting scondary serial pins and protocol fixes build checks cosmetics and added comment about DShot not working on GPIO0 PWM testing/fixes (ExpressLRS#2588) * Revert "Fix for 10KHz 0% and 100% on 8285 receviers (ExpressLRS#2496)" This reverts commit 12659fb. * Much simpler handling of 0 high/low times * Optimisation of timing in PWM timer interrupt t * Extend minimum time for next NMI * Rename pin/i to gpio as thats what it really is. cleanup name changes for WebUI and LUA fixed my serial1-config html extension (one </div> too many) added Serial2 feature badge increase-SX1276-SyncPktIntervalDisconnected-for-25Hz (ExpressLRS#2589) Ignore trailing items with 0 duration (ExpressLRS#2612) This fixes spurious channel data for inverted PPM and glitches cleanup rebase fixes build checks cleanup name changes for WebUI and LUA fixed my serial1-config html extension (one </div> too many) added Serial2 feature badge Fix "Not set" UID badge (ExpressLRS#2619) Allow choosing the SubGHz domain for LR1121 modules (ExpressLRS#2618) restrict selection of Serial2 RX/TX to specific pins if Serial2 pins are defined in hardware.html fixes feature selections not greyed out at initialization include fix ExpressLRS#2623 LUA: bind Serial2 RX/TX to pins if defined for target, else allow any pin WebUI: show Serial2 mode selection only if Serial2 TX is assigned proper solution to showing/hiding Serial2 protocol selection. WebUI: prevent multiple I2C SCL/SDA selections (ExpressLRS#2624) * fixes issue ExpressLRS#2623 * do it properly fix antenna value for Diversity/Gemini receivers (ExpressLRS#2622) Fix LR1121 binding (ExpressLRS#2617) * fix LR1121 binding * remove magic LUA script for assigning I2C and Serial2 modes: - added logic to prevent multiple assignments of SCL/SDA and RX2/TX2 add r flag to encode string as raw string to fix deprecation (ExpressLRS#2598) - SBUS Serial2 init with 8E2 instead of 8N2 - SBUS driver object needs to know which serial stream it is running on to allow SBUS on one and DJI on the other serial device cleanup updated to @pkendall64's review comments changes: - _('is-airport').onchange to call serial and serial1 onchange() - added serial1 protocol to SetDefaults() removed duplicate line of code
mha1
added a commit
to mha1/ExpressLRS
that referenced
this pull request
Apr 18, 2024
cleanup rebase first shot at LUA and WebUI user interface for selecting scondary serial pins and protocol fixes build checks cosmetics and added comment about DShot not working on GPIO0 PWM testing/fixes (ExpressLRS#2588) * Revert "Fix for 10KHz 0% and 100% on 8285 receviers (ExpressLRS#2496)" This reverts commit 12659fb. * Much simpler handling of 0 high/low times * Optimisation of timing in PWM timer interrupt t * Extend minimum time for next NMI * Rename pin/i to gpio as thats what it really is. cleanup name changes for WebUI and LUA fixed my serial1-config html extension (one </div> too many) added Serial2 feature badge increase-SX1276-SyncPktIntervalDisconnected-for-25Hz (ExpressLRS#2589) Ignore trailing items with 0 duration (ExpressLRS#2612) This fixes spurious channel data for inverted PPM and glitches cleanup rebase fixes build checks cleanup name changes for WebUI and LUA fixed my serial1-config html extension (one </div> too many) added Serial2 feature badge Fix "Not set" UID badge (ExpressLRS#2619) Allow choosing the SubGHz domain for LR1121 modules (ExpressLRS#2618) restrict selection of Serial2 RX/TX to specific pins if Serial2 pins are defined in hardware.html fixes feature selections not greyed out at initialization include fix ExpressLRS#2623 LUA: bind Serial2 RX/TX to pins if defined for target, else allow any pin WebUI: show Serial2 mode selection only if Serial2 TX is assigned proper solution to showing/hiding Serial2 protocol selection. WebUI: prevent multiple I2C SCL/SDA selections (ExpressLRS#2624) * fixes issue ExpressLRS#2623 * do it properly fix antenna value for Diversity/Gemini receivers (ExpressLRS#2622) Fix LR1121 binding (ExpressLRS#2617) * fix LR1121 binding * remove magic LUA script for assigning I2C and Serial2 modes: - added logic to prevent multiple assignments of SCL/SDA and RX2/TX2 add r flag to encode string as raw string to fix deprecation (ExpressLRS#2598) - SBUS Serial2 init with 8E2 instead of 8N2 - SBUS driver object needs to know which serial stream it is running on to allow SBUS on one and DJI on the other serial device cleanup updated to @pkendall64's review comments changes: - _('is-airport').onchange to call serial and serial1 onchange() - added serial1 protocol to SetDefaults() removed duplicate line of code
mha1
added a commit
to mha1/ExpressLRS
that referenced
this pull request
Apr 18, 2024
cleanup rebase first shot at LUA and WebUI user interface for selecting scondary serial pins and protocol fixes build checks cosmetics and added comment about DShot not working on GPIO0 PWM testing/fixes (ExpressLRS#2588) * Revert "Fix for 10KHz 0% and 100% on 8285 receviers (ExpressLRS#2496)" This reverts commit 12659fb. * Much simpler handling of 0 high/low times * Optimisation of timing in PWM timer interrupt t * Extend minimum time for next NMI * Rename pin/i to gpio as thats what it really is. cleanup name changes for WebUI and LUA fixed my serial1-config html extension (one </div> too many) added Serial2 feature badge increase-SX1276-SyncPktIntervalDisconnected-for-25Hz (ExpressLRS#2589) Ignore trailing items with 0 duration (ExpressLRS#2612) This fixes spurious channel data for inverted PPM and glitches cleanup rebase fixes build checks cleanup name changes for WebUI and LUA fixed my serial1-config html extension (one </div> too many) added Serial2 feature badge Fix "Not set" UID badge (ExpressLRS#2619) Allow choosing the SubGHz domain for LR1121 modules (ExpressLRS#2618) restrict selection of Serial2 RX/TX to specific pins if Serial2 pins are defined in hardware.html fixes feature selections not greyed out at initialization include fix ExpressLRS#2623 LUA: bind Serial2 RX/TX to pins if defined for target, else allow any pin WebUI: show Serial2 mode selection only if Serial2 TX is assigned proper solution to showing/hiding Serial2 protocol selection. WebUI: prevent multiple I2C SCL/SDA selections (ExpressLRS#2624) * fixes issue ExpressLRS#2623 * do it properly fix antenna value for Diversity/Gemini receivers (ExpressLRS#2622) Fix LR1121 binding (ExpressLRS#2617) * fix LR1121 binding * remove magic LUA script for assigning I2C and Serial2 modes: - added logic to prevent multiple assignments of SCL/SDA and RX2/TX2 add r flag to encode string as raw string to fix deprecation (ExpressLRS#2598) - SBUS Serial2 init with 8E2 instead of 8N2 - SBUS driver object needs to know which serial stream it is running on to allow SBUS on one and DJI on the other serial device cleanup updated to @pkendall64's review comments changes: - _('is-airport').onchange to call serial and serial1 onchange() - added serial1 protocol to SetDefaults() removed duplicate line of code
mha1
added a commit
to mha1/ExpressLRS
that referenced
this pull request
Apr 19, 2024
cleanup rebase first shot at LUA and WebUI user interface for selecting scondary serial pins and protocol fixes build checks cosmetics and added comment about DShot not working on GPIO0 PWM testing/fixes (ExpressLRS#2588) * Revert "Fix for 10KHz 0% and 100% on 8285 receviers (ExpressLRS#2496)" This reverts commit 12659fb. * Much simpler handling of 0 high/low times * Optimisation of timing in PWM timer interrupt t * Extend minimum time for next NMI * Rename pin/i to gpio as thats what it really is. cleanup name changes for WebUI and LUA fixed my serial1-config html extension (one </div> too many) added Serial2 feature badge increase-SX1276-SyncPktIntervalDisconnected-for-25Hz (ExpressLRS#2589) Ignore trailing items with 0 duration (ExpressLRS#2612) This fixes spurious channel data for inverted PPM and glitches cleanup rebase fixes build checks cleanup name changes for WebUI and LUA fixed my serial1-config html extension (one </div> too many) added Serial2 feature badge Fix "Not set" UID badge (ExpressLRS#2619) Allow choosing the SubGHz domain for LR1121 modules (ExpressLRS#2618) restrict selection of Serial2 RX/TX to specific pins if Serial2 pins are defined in hardware.html fixes feature selections not greyed out at initialization include fix ExpressLRS#2623 LUA: bind Serial2 RX/TX to pins if defined for target, else allow any pin WebUI: show Serial2 mode selection only if Serial2 TX is assigned proper solution to showing/hiding Serial2 protocol selection. WebUI: prevent multiple I2C SCL/SDA selections (ExpressLRS#2624) * fixes issue ExpressLRS#2623 * do it properly fix antenna value for Diversity/Gemini receivers (ExpressLRS#2622) Fix LR1121 binding (ExpressLRS#2617) * fix LR1121 binding * remove magic LUA script for assigning I2C and Serial2 modes: - added logic to prevent multiple assignments of SCL/SDA and RX2/TX2 add r flag to encode string as raw string to fix deprecation (ExpressLRS#2598) - SBUS Serial2 init with 8E2 instead of 8N2 - SBUS driver object needs to know which serial stream it is running on to allow SBUS on one and DJI on the other serial device cleanup updated to @pkendall64's review comments changes: - _('is-airport').onchange to call serial and serial1 onchange() - added serial1 protocol to SetDefaults() removed duplicate line of code
mha1
added a commit
to mha1/ExpressLRS
that referenced
this pull request
Apr 20, 2024
cleanup rebase first shot at LUA and WebUI user interface for selecting scondary serial pins and protocol fixes build checks cosmetics and added comment about DShot not working on GPIO0 PWM testing/fixes (ExpressLRS#2588) * Revert "Fix for 10KHz 0% and 100% on 8285 receviers (ExpressLRS#2496)" This reverts commit 12659fb. * Much simpler handling of 0 high/low times * Optimisation of timing in PWM timer interrupt t * Extend minimum time for next NMI * Rename pin/i to gpio as thats what it really is. cleanup name changes for WebUI and LUA fixed my serial1-config html extension (one </div> too many) added Serial2 feature badge increase-SX1276-SyncPktIntervalDisconnected-for-25Hz (ExpressLRS#2589) Ignore trailing items with 0 duration (ExpressLRS#2612) This fixes spurious channel data for inverted PPM and glitches cleanup rebase fixes build checks cleanup name changes for WebUI and LUA fixed my serial1-config html extension (one </div> too many) added Serial2 feature badge Fix "Not set" UID badge (ExpressLRS#2619) Allow choosing the SubGHz domain for LR1121 modules (ExpressLRS#2618) restrict selection of Serial2 RX/TX to specific pins if Serial2 pins are defined in hardware.html fixes feature selections not greyed out at initialization include fix ExpressLRS#2623 LUA: bind Serial2 RX/TX to pins if defined for target, else allow any pin WebUI: show Serial2 mode selection only if Serial2 TX is assigned proper solution to showing/hiding Serial2 protocol selection. WebUI: prevent multiple I2C SCL/SDA selections (ExpressLRS#2624) * fixes issue ExpressLRS#2623 * do it properly fix antenna value for Diversity/Gemini receivers (ExpressLRS#2622) Fix LR1121 binding (ExpressLRS#2617) * fix LR1121 binding * remove magic LUA script for assigning I2C and Serial2 modes: - added logic to prevent multiple assignments of SCL/SDA and RX2/TX2 add r flag to encode string as raw string to fix deprecation (ExpressLRS#2598) - SBUS Serial2 init with 8E2 instead of 8N2 - SBUS driver object needs to know which serial stream it is running on to allow SBUS on one and DJI on the other serial device cleanup updated to @pkendall64's review comments changes: - _('is-airport').onchange to call serial and serial1 onchange() - added serial1 protocol to SetDefaults() removed duplicate line of code
mha1
added a commit
to mha1/ExpressLRS
that referenced
this pull request
Apr 21, 2024
cleanup rebase first shot at LUA and WebUI user interface for selecting scondary serial pins and protocol fixes build checks cosmetics and added comment about DShot not working on GPIO0 PWM testing/fixes (ExpressLRS#2588) * Revert "Fix for 10KHz 0% and 100% on 8285 receviers (ExpressLRS#2496)" This reverts commit 12659fb. * Much simpler handling of 0 high/low times * Optimisation of timing in PWM timer interrupt t * Extend minimum time for next NMI * Rename pin/i to gpio as thats what it really is. cleanup name changes for WebUI and LUA fixed my serial1-config html extension (one </div> too many) added Serial2 feature badge increase-SX1276-SyncPktIntervalDisconnected-for-25Hz (ExpressLRS#2589) Ignore trailing items with 0 duration (ExpressLRS#2612) This fixes spurious channel data for inverted PPM and glitches cleanup rebase fixes build checks cleanup name changes for WebUI and LUA fixed my serial1-config html extension (one </div> too many) added Serial2 feature badge Fix "Not set" UID badge (ExpressLRS#2619) Allow choosing the SubGHz domain for LR1121 modules (ExpressLRS#2618) restrict selection of Serial2 RX/TX to specific pins if Serial2 pins are defined in hardware.html fixes feature selections not greyed out at initialization include fix ExpressLRS#2623 LUA: bind Serial2 RX/TX to pins if defined for target, else allow any pin WebUI: show Serial2 mode selection only if Serial2 TX is assigned proper solution to showing/hiding Serial2 protocol selection. WebUI: prevent multiple I2C SCL/SDA selections (ExpressLRS#2624) * fixes issue ExpressLRS#2623 * do it properly fix antenna value for Diversity/Gemini receivers (ExpressLRS#2622) Fix LR1121 binding (ExpressLRS#2617) * fix LR1121 binding * remove magic LUA script for assigning I2C and Serial2 modes: - added logic to prevent multiple assignments of SCL/SDA and RX2/TX2 add r flag to encode string as raw string to fix deprecation (ExpressLRS#2598) - SBUS Serial2 init with 8E2 instead of 8N2 - SBUS driver object needs to know which serial stream it is running on to allow SBUS on one and DJI on the other serial device cleanup updated to @pkendall64's review comments changes: - _('is-airport').onchange to call serial and serial1 onchange() - added serial1 protocol to SetDefaults() removed duplicate line of code
mha1
added a commit
to mha1/ExpressLRS
that referenced
this pull request
Apr 23, 2024
cleanup rebase first shot at LUA and WebUI user interface for selecting scondary serial pins and protocol fixes build checks cosmetics and added comment about DShot not working on GPIO0 PWM testing/fixes (ExpressLRS#2588) * Revert "Fix for 10KHz 0% and 100% on 8285 receviers (ExpressLRS#2496)" This reverts commit 12659fb. * Much simpler handling of 0 high/low times * Optimisation of timing in PWM timer interrupt t * Extend minimum time for next NMI * Rename pin/i to gpio as thats what it really is. cleanup name changes for WebUI and LUA fixed my serial1-config html extension (one </div> too many) added Serial2 feature badge increase-SX1276-SyncPktIntervalDisconnected-for-25Hz (ExpressLRS#2589) Ignore trailing items with 0 duration (ExpressLRS#2612) This fixes spurious channel data for inverted PPM and glitches cleanup rebase fixes build checks cleanup name changes for WebUI and LUA fixed my serial1-config html extension (one </div> too many) added Serial2 feature badge Fix "Not set" UID badge (ExpressLRS#2619) Allow choosing the SubGHz domain for LR1121 modules (ExpressLRS#2618) restrict selection of Serial2 RX/TX to specific pins if Serial2 pins are defined in hardware.html fixes feature selections not greyed out at initialization include fix ExpressLRS#2623 LUA: bind Serial2 RX/TX to pins if defined for target, else allow any pin WebUI: show Serial2 mode selection only if Serial2 TX is assigned proper solution to showing/hiding Serial2 protocol selection. WebUI: prevent multiple I2C SCL/SDA selections (ExpressLRS#2624) * fixes issue ExpressLRS#2623 * do it properly fix antenna value for Diversity/Gemini receivers (ExpressLRS#2622) Fix LR1121 binding (ExpressLRS#2617) * fix LR1121 binding * remove magic LUA script for assigning I2C and Serial2 modes: - added logic to prevent multiple assignments of SCL/SDA and RX2/TX2 add r flag to encode string as raw string to fix deprecation (ExpressLRS#2598) - SBUS Serial2 init with 8E2 instead of 8N2 - SBUS driver object needs to know which serial stream it is running on to allow SBUS on one and DJI on the other serial device cleanup updated to @pkendall64's review comments changes: - _('is-airport').onchange to call serial and serial1 onchange() - added serial1 protocol to SetDefaults() removed duplicate line of code
mha1
added a commit
to mha1/ExpressLRS
that referenced
this pull request
Apr 25, 2024
cleanup rebase first shot at LUA and WebUI user interface for selecting scondary serial pins and protocol fixes build checks cosmetics and added comment about DShot not working on GPIO0 PWM testing/fixes (ExpressLRS#2588) * Revert "Fix for 10KHz 0% and 100% on 8285 receviers (ExpressLRS#2496)" This reverts commit 12659fb. * Much simpler handling of 0 high/low times * Optimisation of timing in PWM timer interrupt t * Extend minimum time for next NMI * Rename pin/i to gpio as thats what it really is. cleanup name changes for WebUI and LUA fixed my serial1-config html extension (one </div> too many) added Serial2 feature badge increase-SX1276-SyncPktIntervalDisconnected-for-25Hz (ExpressLRS#2589) Ignore trailing items with 0 duration (ExpressLRS#2612) This fixes spurious channel data for inverted PPM and glitches cleanup rebase fixes build checks cleanup name changes for WebUI and LUA fixed my serial1-config html extension (one </div> too many) added Serial2 feature badge Fix "Not set" UID badge (ExpressLRS#2619) Allow choosing the SubGHz domain for LR1121 modules (ExpressLRS#2618) restrict selection of Serial2 RX/TX to specific pins if Serial2 pins are defined in hardware.html fixes feature selections not greyed out at initialization include fix ExpressLRS#2623 LUA: bind Serial2 RX/TX to pins if defined for target, else allow any pin WebUI: show Serial2 mode selection only if Serial2 TX is assigned proper solution to showing/hiding Serial2 protocol selection. WebUI: prevent multiple I2C SCL/SDA selections (ExpressLRS#2624) * fixes issue ExpressLRS#2623 * do it properly fix antenna value for Diversity/Gemini receivers (ExpressLRS#2622) Fix LR1121 binding (ExpressLRS#2617) * fix LR1121 binding * remove magic LUA script for assigning I2C and Serial2 modes: - added logic to prevent multiple assignments of SCL/SDA and RX2/TX2 add r flag to encode string as raw string to fix deprecation (ExpressLRS#2598) - SBUS Serial2 init with 8E2 instead of 8N2 - SBUS driver object needs to know which serial stream it is running on to allow SBUS on one and DJI on the other serial device cleanup updated to @pkendall64's review comments changes: - _('is-airport').onchange to call serial and serial1 onchange() - added serial1 protocol to SetDefaults() removed duplicate line of code
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Antenna should report the antenna that received the packet. Diversity receivers report both RSSI values and are available for the user to see which antenna is performing better. But there is value in seeing which antenna actually received the processed packet, in particularly with dual band systems. The RSSI for 900M will always outperform 2.4G, even though the 2.4 packet has been received. But currently antenna always reports the 900M antenna.