diff --git a/app/telemetry/settings/frequencyhelper.cpp b/app/telemetry/settings/frequencyhelper.cpp index 5249a3c3a..92b5ae6ad 100644 --- a/app/telemetry/settings/frequencyhelper.cpp +++ b/app/telemetry/settings/frequencyhelper.cpp @@ -16,7 +16,7 @@ QList FrequencyHelper::get_frequencies(int filter) { QList ret; if(filter==0){ - auto tmp=openhd::get_openhd_channels_1_to_5(); + auto tmp=openhd::get_openhd_channels_1_to_7(); for(auto& channel:tmp){ ret.push_back(channel.frequency); } @@ -83,11 +83,11 @@ bool FrequencyHelper::get_frequency_radar(int frequency_mhz) int FrequencyHelper::get_frequency_openhd_race_band(int frequency_mhz) { - // 5700,5745,5785,5825,5865 + // 5700,5745,5785,5825,5865,5260,5280 if(frequency_mhz==5700){ return 1; } - if(frequency_mhz==5745){ + if(frequency_mhz== ){ return 2; } if(frequency_mhz==5785){ @@ -99,6 +99,12 @@ int FrequencyHelper::get_frequency_openhd_race_band(int frequency_mhz) if(frequency_mhz==5865){ return 5; } + if(frequency_mhz==5260){ + return 6; + } + if(frequency_mhz==5280){ + return 7; + } return -1; } diff --git a/app/telemetry/settings/wifi_channel.h b/app/telemetry/settings/wifi_channel.h index 7f03a8c37..ef786ffdb 100644 --- a/app/telemetry/settings/wifi_channel.h +++ b/app/telemetry/settings/wifi_channel.h @@ -263,8 +263,8 @@ static std::vector frequencies_to_channels( return ret; } -static std::vector get_openhd_channels_1_to_5() { - std::vector frequencies = {5700, 5745, 5785, 5825, 5865}; +static std::vector get_openhd_channels_1_to_7() { + std::vector frequencies = {5700, 5745, 5785, 5825, 5865, 5260, 5280}; return frequencies_to_channels(frequencies); } diff --git a/qml/ui/sidebar/EditFrequencyElement.qml b/qml/ui/sidebar/EditFrequencyElement.qml index 9cc7fe079..4e475b545 100644 --- a/qml/ui/sidebar/EditFrequencyElement.qml +++ b/qml/ui/sidebar/EditFrequencyElement.qml @@ -10,7 +10,7 @@ import OpenHD 1.0 BaseJoyEditElement{ m_title: "Frequency" - // 5700,5745,5785,5825,5865 + // 5700,5745,5785,5825,5865,5280,5260 ListModel{ id: frequencies_model ListElement {frequency: 5700; verbose:"5700Mhz\nOHD 1"} @@ -18,6 +18,8 @@ BaseJoyEditElement{ ListElement {frequency: 5785; verbose:"5785Mhz\nOHD 3"} ListElement {frequency: 5825; verbose:"5825Mhz\nOHD 4"} ListElement {frequency: 5865; verbose:"5865Mhz\nOHD 5"} + ListElement {frequency: 5280; verbose:"5280Mhz\nOHD 6"} + ListElement {frequency: 5260; verbose:"5260Mhz\nOHD 7"} } ListModel{ id: frequencies_model_with_5180mhz_lowband @@ -31,6 +33,8 @@ BaseJoyEditElement{ ListElement {frequency: 5785; verbose:"5785Mhz\nOHD 3"} ListElement {frequency: 5825; verbose:"5825Mhz\nOHD 4"} ListElement {frequency: 5865; verbose:"5865Mhz\nOHD 5"} + ListElement {frequency: 5260; verbose:"5260Mhz\nOHD 6"} + ListElement {frequency: 5280; verbose:"5280Mhz\nOHD 7"} } function get_model(){ if(settings.dev_show_5180mhz_lowband){ diff --git a/qml/ui/sidebar/MappedMavlinkChoices.qml b/qml/ui/sidebar/MappedMavlinkChoices.qml index dae1b5cff..3cbe6af9a 100644 --- a/qml/ui/sidebar/MappedMavlinkChoices.qml +++ b/qml/ui/sidebar/MappedMavlinkChoices.qml @@ -133,7 +133,7 @@ Item { } // Built dynamically depending on the settings - // 5700,5745,5785,5825,5865 + // 5700,5745,5785,5825,5865,5260,5280 ListModel{ id: frequencies_model ListElement {value: 5700; verbose:"5700Mhz\nOHD 1"} @@ -141,6 +141,8 @@ Item { ListElement {value: 5785; verbose:"5785Mhz\nOHD 3"} ListElement {value: 5825; verbose:"5825Mhz\nOHD 4"} ListElement {value: 5865; verbose:"5865Mhz\nOHD 5"} + ListElement {value: 5260; verbose:"5260Mhz\nOHD 6"} + ListElement {value: 5280; verbose:"5280Mhz\nOHD 7"} } ListModel{ id: frequencies_model_with_5180mhz_lowband @@ -154,6 +156,8 @@ Item { ListElement {value: 5785; verbose:"5785Mhz\nOHD 3"} ListElement {value: 5825; verbose:"5825Mhz\nOHD 4"} ListElement {value: 5865; verbose:"5865Mhz\nOHD 5"} + ListElement {value: 5260; verbose:"5260Mhz\nOHD 6"} + ListElement {value: 5280; verbose:"5280Mhz\nOHD 7"} } ListModel{ id: elements_model_channel_width