patrick/OpenDTU
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

webapp: Remove hard coded min/max frequencies for CMT module

Browse Source
This commit is contained in:
Thomas Basler 2024-01-13 12:48:28 +01:00
parent ee78698e37
commit 2c92750100
5 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Hoymiles/src/HoymilesRadio_CMT.cpp
View File

@ -201,6 +201,11 @@ uint32_t HoymilesRadio_CMT::getMaxFrequency()
return MAX_FREQ; return MAX_FREQ;
} }
uint32_t HoymilesRadio_CMT::getChannelWidth()
{
return FH_OFFSET * CMT2300A_ONE_STEP_SIZE;
}
void ARDUINO_ISR_ATTR HoymilesRadio_CMT::handleInt1() void ARDUINO_ISR_ATTR HoymilesRadio_CMT::handleInt1()
{ {
_packetSent = true; _packetSent = true;

1
lib/Hoymiles/src/HoymilesRadio_CMT.h
View File

@ -28,6 +28,7 @@ public:
static uint32_t getMinFrequency(); static uint32_t getMinFrequency();
static uint32_t getMaxFrequency(); static uint32_t getMaxFrequency();
static uint32_t getChannelWidth();
static uint32_t getFrequencyFromChannel(const uint8_t channel); static uint32_t getFrequencyFromChannel(const uint8_t channel);
static uint8_t getChannelFromFrequency(const uint32_t frequency); static uint8_t getChannelFromFrequency(const uint32_t frequency);

3
src/WebApi_dtu.cpp
View File

@ -45,6 +45,9 @@ void WebApiDtuClass::onDtuAdminGet(AsyncWebServerRequest* request)
root["cmt_enabled"] = Hoymiles.getRadioCmt()->isInitialized(); root["cmt_enabled"] = Hoymiles.getRadioCmt()->isInitialized();
root["cmt_palevel"] = config.Dtu.Cmt.PaLevel; root["cmt_palevel"] = config.Dtu.Cmt.PaLevel;
root["cmt_frequency"] = config.Dtu.Cmt.Frequency; root["cmt_frequency"] = config.Dtu.Cmt.Frequency;
root["cmt_min_freq"] = Hoymiles.getRadioCmt()->getMinFrequency();
root["cmt_max_freq"] = Hoymiles.getRadioCmt()->getMaxFrequency();
root["cmt_chan_width"] = Hoymiles.getRadioCmt()->getChannelWidth();
response->setLength(); response->setLength();
request->send(response); request->send(response);

3
webapp/src/types/DtuConfig.ts
View File

@ -6,4 +6,7 @@ export interface DtuConfig {
cmt_enabled: boolean; cmt_enabled: boolean;
cmt_palevel: number; cmt_palevel: number;
cmt_frequency: number; cmt_frequency: number;
cmt_min_freq: number;
cmt_max_freq: number;
cmt_chan_width: number;
} }

2
webapp/src/views/DtuAdminView.vue
View File

@ -56,7 +56,7 @@
<div class="input-group mb-3"> <div class="input-group mb-3">
<input type="range" class="form-control form-range" <input type="range" class="form-control form-range"
v-model="dtuConfigList.cmt_frequency" v-model="dtuConfigList.cmt_frequency"
min="860250000" max="923500000" step="250000" :min="dtuConfigList.cmt_min_freq" :max="dtuConfigList.cmt_max_freq" :step="dtuConfigList.cmt_chan_width"
id="cmtFrequency" aria-describedby="basic-addon2" id="cmtFrequency" aria-describedby="basic-addon2"
style="height: unset;" /> style="height: unset;" />
<span class="input-group-text" id="basic-addon2">{{ cmtFrequencyText }}</span> <span class="input-group-text" id="basic-addon2">{{ cmtFrequencyText }}</span>