mudhorn/meshtastic
1
0
Fork 0
mirror of https://github.com/meshtastic/meshtastic.git synced 2025-03-05 21:00:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse source
This commit is contained in:
pdxlocations 2023-06-05 06:19:43 -07:00 committed by GitHub
parent 8aee61e6c9 82819e1445
commit 4e60da6994
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/components/tools/FrequencyCalculator.tsx
View file

@ -263,21 +263,24 @@ export const FrequencyCalculator = (): JSX.Element => {
useEffect(() => { useEffect(() => {
const selectedRegion = RegionData.get(region); const selectedRegion = RegionData.get(region);
const selectedModemPreset = modemPresets.get(modemPreset); const selectedModemPreset = modemPresets.get(modemPreset);
setNumChannels( const calculatedNumChannels = Math.floor(
Math.floor( (selectedRegion.freq_end - selectedRegion.freq_start) /
(selectedRegion.freq_end - selectedRegion.freq_start) / (selectedRegion.spacing + selectedModemPreset.bw / 1000),
(selectedRegion.spacing + selectedModemPreset.bw / 1000),
),
); );
if (channel >= numChannels) { setNumChannels(calculatedNumChannels);
setChannel(numChannels - 1);
let updatedChannel = channel;
if (updatedChannel >= calculatedNumChannels) {
updatedChannel = 0;
} }
setChannel(updatedChannel);
setChannelFrequency( setChannelFrequency(
selectedRegion.freq_start + selectedRegion.freq_start +
selectedModemPreset.bw / 2000 + selectedModemPreset.bw / 2000 +
channel * (selectedModemPreset.bw / 1000), updatedChannel * (selectedModemPreset.bw / 1000),
); );
}, [modemPreset, region, channel]); }, [modemPreset, region, channel]);