Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add multiple frequency plans to SX1301 config file #6710

Merged
merged 2 commits into from
Dec 6, 2023

Conversation

cvetkovski98
Copy link
Member

@cvetkovski98 cvetkovski98 commented Nov 15, 2023

Summary

Closes #6652

Changes

  • Iterate through all the frequency plans when generating the global_conf.json file.

Testing

  • Manual
  • Add multiple frequency plans to a gateway
  • Download the global_conf.json file for the gateway and ensure there is an sx1301 config entry for every frequency plan.
  • Ensure that the sx1301 field in the global_conf.json file is an array when multiple frequency plans are configured and an object otherwise.

Checklist

  • Scope: The referenced issue is addressed, there are no unrelated changes.
  • Compatibility: The changes are backwards compatible with existing API, storage, configuration and CLI, according to the compatibility commitments in README.md for the chosen target branch.
  • Documentation: Relevant documentation is added or updated.
  • The steps/process to test this feature are clearly explained including testing for regressions.
  • Changelog: Significant features, behavior changes, deprecations and fixes are added to CHANGELOG.md.
  • Commits: Commit messages follow guidelines in CONTRIBUTING.md, there are no fixup commits left.

@github-actions github-actions bot added the c/gateway conf server This is related to the Gateway Configuration Server label Nov 15, 2023
@cvetkovski98 cvetkovski98 force-pushed the feature/multi-freq-sx1301-config-file branch from a2a357f to d03137b Compare November 16, 2023 18:47
@cvetkovski98 cvetkovski98 self-assigned this Nov 16, 2023
@cvetkovski98 cvetkovski98 added this to the v3.28.1 milestone Nov 16, 2023
@cvetkovski98 cvetkovski98 marked this pull request as ready for review November 16, 2023 19:03
Copy link
Member

@KrishnaIyer KrishnaIyer left a comment

Choose a reason for hiding this comment

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

The code looks good. We need to test this with some gateways though. We'll get back to you on this.

@cvetkovski98 cvetkovski98 force-pushed the feature/multi-freq-sx1301-config-file branch from 86d11f8 to f9073c1 Compare November 19, 2023 10:43
@cvetkovski98 cvetkovski98 force-pushed the feature/multi-freq-sx1301-config-file branch from f9073c1 to fd88d49 Compare November 19, 2023 11:03
@KrishnaIyer KrishnaIyer modified the milestones: v3.28.1, v3.28.2 Nov 20, 2023
@KrishnaIyer
Copy link
Member

Moving this to v3.28.2

Copy link
Member

@KrishnaIyer KrishnaIyer left a comment

Choose a reason for hiding this comment

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

  • For a single gateway, the generated JSON is identical to the current output.
  • For multiple gateways, @adriansmares tested with a 16ch gateway and it looks like the gateway reconnected and is working.

@cvetkovski98 cvetkovski98 merged commit fe015cd into v3.28 Dec 6, 2023
13 checks passed
@cvetkovski98 cvetkovski98 deleted the feature/multi-freq-sx1301-config-file branch December 6, 2023 08:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c/gateway conf server This is related to the Gateway Configuration Server
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update Gateway global configuration file to contain information about all frequency plans
3 participants