diff --git a/application/models/Bands.php b/application/models/Bands.php index b8bbf594..d3aac99c 100644 --- a/application/models/Bands.php +++ b/application/models/Bands.php @@ -57,7 +57,7 @@ class Bands extends CI_Model { $results = array(); foreach($result as $band) { - $results['b'.strtoupper($band->band)] = array('cw' => $band->cw, 'ssb' => $band->ssb, 'digi' => $band->data); + $results['b'.strtoupper($band->band)] = array('CW' => $band->cw, 'SSB' => $band->ssb, 'DIGI' => $band->data); } return $results; diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index 7fc368e6..27321c3e 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -1,6 +1,7 @@
diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 7d112b6e..f7545972 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -123,6 +123,7 @@ function handleInput() { var rst_r = null; items = row.startsWith("day ") ? [row] : row.split(" "); var itemNumber = 0; + var freq = 0; items.forEach((item) => { if (item === "") { return; @@ -415,11 +416,15 @@ function getBandFromFreq(freq) { } function getFreqFromBand(band, mode) { - const settingsMode = getSettingsMode(mode.toUpperCase()); - const id = "#" + band + settingsMode; - if ($(id).length) { - return $(id).val(); - } + var settingsMode = getSettingsMode(mode.toUpperCase()); + var settingsBand = "b" + band.toUpperCase(); + var bandData = Bands[settingsBand]; + + if (bandData) { + return bandData[settingsMode] / 1000000; + } + + } function getSettingsMode(mode) {