diff --git a/app.js b/app.js index 2353976..2fac2bd 100644 --- a/app.js +++ b/app.js @@ -79,13 +79,6 @@ var configurations = [{ acquisitionCycles: 1, oversampleRate: 4, current: 18.1 -}, { - sampleRate: 240000, - clockBand: AM_HFRCO_28MHZ, - clockDivider: 2, - acquisitionCycles: 1, - oversampleRate: 4, - current: 20.0 }, { sampleRate: 320000, clockBand: AM_HFXO, @@ -290,4 +283,4 @@ setTimeout(getAudioMothPacket, 1000); configureButton.addEventListener('click', function () { ui.checkInputs(configureDevice); -}); +}); \ No newline at end of file diff --git a/index.html b/index.html index 1ab41b1..bd8dead 100644 --- a/index.html +++ b/index.html @@ -97,7 +97,6 @@ 48 96 192 - 240 320 400 @@ -111,14 +110,12 @@ - - + - Low Med @@ -129,7 +126,6 @@ Gain: - diff --git a/package.json b/package.json index 2134aef..01902ed 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "AudioMoth", - "version": "1.0.3", + "version": "1.0.4", "description": "The configuration app for the AudioMoth acoustic monitoring device.", "main": "main.js", "scripts": { diff --git a/saveLoad.js b/saveLoad.js index aab6443..9c29a3a 100644 --- a/saveLoad.js +++ b/saveLoad.js @@ -126,9 +126,11 @@ function useLoadedConfiguration(err, data) { sampleRateRadios = document.getElementsByName("sample-rate-radio"); sampleRateRadios[jsonObj.sampleRateIndex].checked = true; - if(jsonObj.sampleRateIndex > 6){ + + if (jsonObj.sampleRateIndex >= 6) { ui.enableHighSamplingRate(); } + gainRadios = document.getElementsByName("gain-radio"); gainRadios[jsonObj.gainIndex].checked = true; diff --git a/ui.js b/ui.js index 55d4ef7..1522126 100644 --- a/ui.js +++ b/ui.js @@ -29,13 +29,11 @@ var endTimeInput = document.getElementById('end-time-input'); var recordingDurationInput = document.getElementById('recording-duration-input'); var sleepDurationInput = document.getElementById('sleep-duration-input'); -var sampleRate240Label = document.getElementById('sample-rate-240-label'); var sampleRate320Label = document.getElementById('sample-rate-320-label'); var sampleRate400Label = document.getElementById('sample-rate-400-label'); -var sampleRate240RadioButton = document.getElementById('sample-rate-radio6'); -var sampleRate320RadioButton = document.getElementById('sample-rate-radio7'); -var sampleRate400RadioButton = document.getElementById('sample-rate-radio8'); +var sampleRate320RadioButton = document.getElementById('sample-rate-radio6'); +var sampleRate400RadioButton = document.getElementById('sample-rate-radio7'); var configureButton = document.getElementById('configure-button'); @@ -202,11 +200,9 @@ exports.enableDisplayAndShowTime = function (date) { exports.enableHighSamplingRate = function () { - sampleRate240Label.style.color = 'black'; sampleRate320Label.style.color = 'black'; sampleRate400Label.style.color = 'black'; - sampleRate240RadioButton.removeAttribute("disabled"); sampleRate320RadioButton.removeAttribute("disabled"); sampleRate400RadioButton.removeAttribute("disabled"); @@ -447,4 +443,4 @@ sleepDurationInput.addEventListener('change', function () { recordingDurationInput.addEventListener('change', function () { checkInputs(lifeDisplay.updateLifeDisplay); -}); +}); \ No newline at end of file