Skip to content

Commit

Permalink
Merge pull request #672 from ExpressLRS/fix-true-diversity
Browse files Browse the repository at this point in the history 
Fix true diversity receivers
  • Loading branch information
@jurgelenas
jurgelenas authored Sep 14, 2024
2 parents 895af60 + a533813 commit c4b40eb
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions src/api/src/services/BinaryFlashingStrategy/DeviceDescriptionsLoader/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,12 +327,17 @@ export default class DeviceDescriptionsLoader {
targetUserDefinesFactory.build(UserDefineKey.REGULATORY_DOMAIN_ISM_2400)
);
}
if (args.target.includes('dual')) {
// no support for LR1121 LBT yet. SPI commands are too slow
if (args.target.includes('tx_dual') || args.target.includes('rx_dual')) {
userDefines.push(
targetUserDefinesFactory.build(UserDefineKey.REGULATORY_DOMAIN_ISM_2400)
);
}
if (args.target.includes('_900.') || args.target.includes('dual')) {
if (
args.target.includes('_900.') ||
args.target.includes('tx_dual') ||
args.target.includes('rx_dual')
) {
userDefines.push(
targetUserDefinesFactory.build(UserDefineKey.REGULATORY_DOMAIN_AU_915)
);
Expand Down

1 comment on commit c4b40eb

@davetheghost
Copy link

@davetheghost davetheghost commented on c4b40eb Sep 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn’t this be more like below so you dont have redundant || ORs of tx/rx dual?!::

possibly causing backpack regulatory domain error in new version?!

if (args.target.includes('_2400.')
{
      if (!args.target.includes('tx_dual') || !args.target.includes('rx_dual'))
      {
         userDefines.push(targetUserDefinesFactory.build(UserDefineKey.REGULATORY_DOMAIN_EU_CE_2400));
      }
      userDefines.push(targetUserDefinesFactory.build(UserDefineKey.REGULATORY_DOMAIN_ISM_2400));
}
if (args.target.includes('_900.') || args.target.includes('tx_dual') || args.target.includes('rx_dual'))
    {

im no expert, and surely dnt feel like installing everything, but this seems ok? only show european domain if target does not include dual band tx or rx arguments at 2.4, else show ISM and carry on with 900 -- i guess?

Please sign in to comment.