Merge pull request #992 from dotspencer/master

Fix frequency calculator default and update field order
This commit is contained in:
rcarteraz 2024-02-10 00:29:29 -07:00 committed by GitHub
commit ef88f50161
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1,5 +1,5 @@
import { Protobuf, Types } from "@meshtastic/js"; import { Protobuf, Types } from "@meshtastic/js";
import React, { useEffect } from "react"; import React, { useEffect, useState } from "react";
interface Region { interface Region {
freqStart: number; freqStart: number;
@ -273,18 +273,18 @@ const modemPresets = new Map<
export const FrequencyCalculator = (): JSX.Element => { export const FrequencyCalculator = (): JSX.Element => {
const [modemPreset, setModemPreset] = const [modemPreset, setModemPreset] =
React.useState<Protobuf.Config.Config_LoRaConfig_ModemPreset>( useState<Protobuf.Config.Config_LoRaConfig_ModemPreset>(
Protobuf.Config.Config_LoRaConfig_ModemPreset.LONG_FAST, Protobuf.Config.Config_LoRaConfig_ModemPreset.LONG_FAST,
); );
const [region, setRegion] = const [region, setRegion] =
React.useState<Protobuf.Config.Config_LoRaConfig_RegionCode>( useState<Protobuf.Config.Config_LoRaConfig_RegionCode>(
Protobuf.Config.Config_LoRaConfig_RegionCode.US, Protobuf.Config.Config_LoRaConfig_RegionCode.US,
); );
const [channel, setChannel] = React.useState<Types.ChannelNumber>( const [channel, setChannel] = useState<Types.ChannelNumber>(
Types.ChannelNumber.PRIMARY, Types.ChannelNumber.Primary,
); );
const [numChannels, setNumChannels] = React.useState<number>(0); const [numChannels, setNumChannels] = useState<number>(0);
const [channelFrequency, setChannelFrequency] = React.useState<number>(0); const [channelFrequency, setChannelFrequency] = useState<number>(0);
useEffect(() => { useEffect(() => {
const selectedRegion = RegionData.get(region); const selectedRegion = RegionData.get(region);
@ -344,6 +344,12 @@ export const FrequencyCalculator = (): JSX.Element => {
))} ))}
</select> </select>
</div> </div>
<div className="flex gap-2 mb-4">
<label className="font-semibold">Number of channels:</label>
<input type="number" disabled={true} value={numChannels} />
</div>
<div className="flex gap-2"> <div className="flex gap-2">
<label>Channel:</label> <label>Channel:</label>
<select <select
@ -358,10 +364,6 @@ export const FrequencyCalculator = (): JSX.Element => {
</select> </select>
</div> </div>
<div className="flex gap-2">
<label className="font-semibold">Number of channels:</label>
<input type="number" disabled={true} value={numChannels} />
</div>
<div className="flex gap-2"> <div className="flex gap-2">
<label className="font-semibold">Channel Frequency:</label> <label className="font-semibold">Channel Frequency:</label>
<input type="number" disabled={true} value={channelFrequency} /> <input type="number" disabled={true} value={channelFrequency} />