diff --git a/code/pyClient/habdecClient.py b/code/pyClient/habdecClient.py old mode 100755 new mode 100644 index b8344c0..3601323 --- a/code/pyClient/habdecClient.py +++ b/code/pyClient/habdecClient.py @@ -137,7 +137,6 @@ def SendCommand(i_cmd): set:decimation=2 get:decimation set:afc=1 get:afc set:dc_remove=1 get:dc_remove - set:payload=9f25cc048d401ebed112479a2ecef4f8 power:res=512,zoom=0.5 demod:res=256 liveprint diff --git a/code/webClient/css/habdec.css b/code/webClient/css/habdec.css index 501d3bb..9a8212c 100644 --- a/code/webClient/css/habdec.css +++ b/code/webClient/css/habdec.css @@ -131,7 +131,6 @@ input[type=checkbox] z-index: 1; } -/* Payload Button */ .MenuDropMenu button { display: block; /* color: black; */ diff --git a/code/webClient/js/gui.js b/code/webClient/js/gui.js index bfe0a2b..a3587cc 100644 --- a/code/webClient/js/gui.js +++ b/code/webClient/js/gui.js @@ -208,132 +208,6 @@ function toggleFullscreen(elem) } -//////////////////////////////////////// -///////////// Flights Menu ///////////// -//////////////////////////////////////// - -function LoadFlightsData() -{ - var d = new Date(); - var now = d.getTime() / 1000; - var _url = 'http://habitat.habhub.org/habitat/_design/flight/_view/end_start_including_payloads?startkey=[' + now + ']&include_docs=True' - console.debug(_url); - - let xhr = new XMLHttpRequest(); - xhr.open('GET', _url); - xhr.onload = function () { - if (xhr.status != 200) { - console.debug("LoadFlightsData failed. Status: ", xhr.status); - } else { - LoadFlightsData_CB( JSON.parse(xhr.responseText) ) - } - }; - xhr.onerror = function () { alert("LoadFlightsData: Request to HTTP server failed."); }; - xhr.send(); -} - - -function LoadFlightsData_CB(i_data) -{ - var FLIGHTS = {}; - - var flights = i_data["rows"]; - - for(i in flights) - { - var _id = flights[i]["id"]; - var doc = flights[i]["doc"]; - - if(doc["type"] == "flight") - { - var payloads = doc["payloads"]; - if(payloads && payloads.length) - { - FLIGHTS[_id] = {}; - FLIGHTS[_id]["payloads"] = {}; - for(p in payloads) - { - var payload_id = doc["payloads"][p]; - FLIGHTS[_id]["payloads"][payload_id] = {}; - } - } - } - } - - for(i in flights) - { - var _id = flights[i]["id"]; - var doc = flights[i]["doc"]; - - if(doc["type"] == "payload_configuration") - { - var payload_id = doc["_id"]; - var transmissions = doc["transmissions"]; - - for(t_id in transmissions) - { - if(transmissions[t_id]["modulation"] == "RTTY") - { - FLIGHTS[_id]["payloads"][payload_id]["name"] = doc["name"]; - FLIGHTS[_id]["payloads"][payload_id]["name"] = doc["name"]; - FLIGHTS[_id]["payloads"][payload_id]["frequency"] = transmissions[t_id]["frequency"]; - FLIGHTS[_id]["payloads"][payload_id]["baud"] = transmissions[t_id]["baud"]; - FLIGHTS[_id]["payloads"][payload_id]["encoding"] = transmissions[t_id]["encoding"]; - FLIGHTS[_id]["payloads"][payload_id]["stop"] = transmissions[t_id]["stop"]; - } - } - } - } - - UpdatePayloadsButton( FLIGHTS ); -} - -function CreatePayloadsButton() -{ - var PayloadsWrapperDiv = document.getElementById("PayloadsWrapperDiv"); - PayloadsWrapperDiv.classList.add("MenuDropdownWrapper"); - - var PayloadsButton = document.createElement("button"); - PayloadsButton.classList.add("MenuDropButton"); - PayloadsButton.id = "HabDec_PayloadsButton"; - PayloadsButton.onclick = function() { document.getElementById("PayloadsDropMenuDiv").classList.toggle("show") }; - PayloadsButton.innerHTML = "HabHub Flights"; - PayloadsWrapperDiv.appendChild(PayloadsButton); - - var DropMenuDiv = document.createElement("div"); - DropMenuDiv.id = "PayloadsDropMenuDiv"; - DropMenuDiv.classList.add("MenuDropMenu"); - PayloadsWrapperDiv.appendChild(DropMenuDiv); - - LoadFlightsData(); -} - -function UpdatePayloadsButton(i_Flights) -{ - var DropMenuDiv = document.getElementById("PayloadsDropMenuDiv"); - - for(f_id in i_Flights) - { - for(p_id in i_Flights[f_id]["payloads"]) - ( - function(p_id) - { - var payload = i_Flights[f_id]["payloads"][p_id]; - var label = payload["name"] + ": " + payload["baud"] + "Bd " + payload["encoding"] + "/" + payload["stop"] + " " + (parseInt(payload["frequency"])/1000000) + "MHz"; - - var pl_button = document.createElement("button"); - pl_button.innerHTML = label; - pl_button.onclick = function(){ - SetPayload(p_id); - document.getElementById('HabDec_PayloadsButton').click(); - }; - - DropMenuDiv.appendChild(pl_button); - } - )(p_id) - } -} - //////////////////////////////////////// ///////////// Color Schemes //////////// //////////////////////////////////////// @@ -685,10 +559,6 @@ function HABDEC_BUILD_UI(parent_div) var div_server = HABDEC_BUILD_UI_Server(); // - // flights list - var div_payloads_wrapper = document.createElement("div"); - div_payloads_wrapper.id = "PayloadsWrapperDiv"; - // color schemes list var div_colors_wrapper = document.createElement("div"); div_colors_wrapper.id = "ColorSchemesWrapperDiv"; @@ -700,10 +570,9 @@ function HABDEC_BUILD_UI(parent_div) btnFullscreen.onclick = () => { toggleFullscreen() }; div_but_fs.appendChild(btnFullscreen); - // div for [flights, colors, fillscreen] - in row + // div for [colors, fillscreen] - in row var extra_options = document.createElement("div"); extra_options.style.display = 'flex'; - extra_options.appendChild(div_payloads_wrapper); extra_options.appendChild(div_colors_wrapper); extra_options.appendChild(div_but_fs); @@ -717,7 +586,6 @@ function HABDEC_BUILD_UI(parent_div) parent_div.appendChild(extra_options); CreateControls(); - CreatePayloadsButton(); CreateColorSchemesButton(); window.addEventListener('message', HB_WinMsgHandler); diff --git a/code/webClient/js/habdec_commands.js b/code/webClient/js/habdec_commands.js index 2f02b1f..363da8f 100644 --- a/code/webClient/js/habdec_commands.js +++ b/code/webClient/js/habdec_commands.js @@ -442,8 +442,3 @@ function SetDCRemove() button.style.color = "#000"; } } - -function SetPayload(i_payload_id) -{ - SendCommand("set:payload=" + i_payload_id); -}