code cleanup and ping and cq area

This commit is contained in:
DJ2LS 2021-07-19 19:38:45 +02:00 committed by GitHub
parent 13045facd8
commit 174725a891
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -5,65 +5,29 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Security-Policy" content="script-src 'self';">
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="../node_modules/bootstrap/dist/css/bootstrap.min.css">
<!-- Waterfall CSS -->
<link rel="stylesheet" type="text/css" href="waterfall/waterfall.css" />
<title>codec2 | FreeDATA</title>
</head>
<body>
<!-- MAIN NAVBAR -->
<nav class="navbar fixed-top bg-dark navbar-dark">
<div class="container-fluid">
<a class="navbar-brand"><b>codec2</b> | FreeDATA</a>
<!--
<button class="btn btn-secondary" id="settingsBUTTON" type="button" data-toggle="modal" data-target="#settingsModal" onclick="loadSettings();return false">
<svg width="1.5em" height="1.5em" viewBox="0 0 16 16" class="bi bi-gear-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" d="M9.405 1.05c-.413-1.4-2.397-1.4-2.81 0l-.1.34a1.464 1.464 0 0 1-2.105.872l-.31-.17c-1.283-.698-2.686.705-1.987 1.987l.169.311c.446.82.023 1.841-.872 2.105l-.34.1c-1.4.413-1.4 2.397 0 2.81l.34.1a1.464 1.464 0 0 1 .872 2.105l-.17.31c-.698 1.283.705 2.686 1.987 1.987l.311-.169a1.464 1.464 0 0 1 2.105.872l.1.34c.413 1.4 2.397 1.4 2.81 0l.1-.34a1.464 1.464 0 0 1 2.105-.872l.31.17c1.283.698 2.686-.705 1.987-1.987l-.169-.311a1.464 1.464 0 0 1 .872-2.105l.34-.1c1.4-.413 1.4-2.397 0-2.81l-.34-.1a1.464 1.464 0 0 1-.872-2.105l.17-.31c.698-1.283-.705-2.686-1.987-1.987l-.311.169a1.464 1.464 0 0 1-2.105-.872l-.1-.34zM8 10.93a2.929 2.929 0 1 0 0-5.86 2.929 2.929 0 0 0 0 5.858z"/>
</svg>
</button>
-->
<button class="btn btn-primary" id="openDataModule" type="button">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-folder-symlink" viewBox="0 0 16 16">
<path d="m11.798 8.271-3.182 1.97c-.27.166-.616-.036-.616-.372V9.1s-2.571-.3-4 2.4c.571-4.8 3.143-4.8 4-4.8v-.769c0-.336.346-.538.616-.371l3.182 1.969c.27.166.27.576 0 .742z"/>
<path d="m.5 3 .04.87a1.99 1.99 0 0 0-.342 1.311l.637 7A2 2 0 0 0 2.826 14h10.348a2 2 0 0 0 1.991-1.819l.637-7A2 2 0 0 0 13.81 3H9.828a2 2 0 0 1-1.414-.586l-.828-.828A2 2 0 0 0 6.172 1H2.5a2 2 0 0 0-2 2zm.694 2.09A1 1 0 0 1 2.19 4h11.62a1 1 0 0 1 .996 1.09l-.636 7a1 1 0 0 1-.996.91H2.826a1 1 0 0 1-.995-.91l-.637-7zM6.172 2a1 1 0 0 1 .707.293L7.586 3H2.19c-.24 0-.47.042-.683.12L1.5 2.98a1 1 0 0 1 1-.98h3.672z"/>
</svg>
</button>
</div>
</nav>
<!-- SECONDARY NAVBAR -->
<nav class="navbar bg-light navbar-underline mt-5 shadow">
<div class="container-fluid mt-1">
<div class="btn-toolbar" role="toolbar" aria-label="Toolbar with button groups">
<!--
<div class="input-group me-2">
<input type="text" class="form-control" style="max-width: 6rem" placeholder="callsign" id="myCall" maxlength="6" aria-label="Input group example" aria-describedby="btnGroupAddon">
<button class="btn btn-success" id="saveMyCall" type="button">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-check2" viewBox="0 0 16 16">
<path d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
</svg>
</button>
</div>
<div class="input-group">
<input type="text" class="form-control mr-1" style="max-width: 6rem" placeholder="locator" id="dxCALL" maxlength="6" aria-label="Input group example" aria-describedby="btnGroupAddon">
<button class="btn btn-success" id="connectBUTTON" type="button" onclick="CONNECTDISCONNECT();return false">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-check2" viewBox="0 0 16 16">
<path d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
</svg>
</button>
</div>
-->
<div class="input-group input-group-sm">
<span class="input-group-text" id="basic-addon1">TNC</span>
<input type="text" class="form-control" placeholder="ip adress" id="tnc_adress" value="192.168.178.163" maxlength="17" style="width: 8rem" aria-label="Username" aria-describedby="basic-addon1" >
@ -75,38 +39,11 @@
</svg>
</button>
</div>
</div>
<!--
<div class="btn-toolbar" role="toolbar" aria-label="Toolbar with button groups">
<div class="input-group me-2">
<input type="text" class="form-control" style="max-width: 6rem" placeholder="frequenzy" id="dxCALL" maxlength="6" aria-label="Input group example" aria-describedby="btnGroupAddon">
<button class="btn btn-primary" id="connectBUTTON" type="button" onclick="CONNECTDISCONNECT();return false">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-check2" viewBox="0 0 16 16">
<path d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
</svg>
</button>
</div>
<div class="btn-group" role="group" aria-label="Basic radio toggle button group">
<input type="radio" class="btn-check" name="btnradio" id="btnradio1" autocomplete="off" checked>
<label class="btn btn-outline-primary" for="btnradio1">LSB</label>
<input type="radio" class="btn-check" name="btnradio" id="btnradio2" autocomplete="off">
<label class="btn btn-outline-primary" for="btnradio2">USB</label>
</div>
</div>
-->
</div>
</nav>
<!---------------------------------------------------------------------- MAIN AREA ------------------------------------------------------------>
<!---------------------------------------------------------------------------------------------------------------------------------------------------->
<div class="container mt-3">
<div class="row">
<div class="col">
@ -136,7 +73,6 @@
</div>
</div>
</div>
<div class="col">
<div class="card text-dark bg-light mb-0">
<div class="card-header">
@ -437,28 +373,16 @@
<option value="115200">115200</option>
</select>
</div>
<!--
<div class="input-group input-group-sm ">
<span class="input-group-text" id="basic-addon1">Freq</span>
<input type="text" class="form-control" id="frequency" placeholder="--" aria-label="Username" aria-describedby="basic-addon1" disabled>
<span class="input-group-text" id="basic-addon1">Mode</span>
<input type="text" class="form-control" id="mode" placeholder="--" aria-label="Username" aria-describedby="basic-addon1" disabled>
<span class="input-group-text" id="basic-addon1">BW</span>
<input type="text" class="form-control" id="bandwith" placeholder="--" aria-label="Username" aria-describedby="basic-addon1" disabled>
</div>
-->
</div>
<div class="card-footer text-muted small">
Select radio model and PTT type
</div>
</div>
</div>
<div class="col">
<div class="card text-dark bg-light mb-2" >
<div class="card-header">3. TNC</div>
<div class="card-body">
<div class="input-group input-group-sm">
<button type="button" id="startTNC"class="btn btn-success">Start</button>
<span class="input-group-text" id="tnc_running_state">---</span>
@ -470,99 +394,16 @@
</div>
</div>
</div>
<!--
<div class="col">
<div class="card text-light bg-secondary mb-3">
<div class="card-header">STATION</div>
<div class="card-body">
<div class="input-group input-group-sm mb-3">
<input type="text" class="form-control" style="max-width: 6rem" placeholder="callsign" id="myCall" maxlength="6" aria-label="Input group example" aria-describedby="btnGroupAddon">
<button class="btn btn-success" id="saveMyCall" type="button">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-check2" viewBox="0 0 16 16">
<path d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
</svg>
</button>
</div>
<div class="input-group input-group-sm mb-3">
<input type="text" class="form-control mr-1" style="max-width: 6rem" placeholder="locator" id="myGrid" maxlength="6" aria-label="Input group example" aria-describedby="btnGroupAddon">
<button class="btn btn-success" id="saveMyGrid" type="button" >
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-check2" viewBox="0 0 16 16">
<path d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
</svg>
</button>
</div>
</div>
<div class="card-footer text-light small">
Station settings
</div>
</div>
</div>
-->
</div>
<!--
<div class="row">
<div class="col">
<div class="card text-white bg-secondary mb-3" style="width: 22rem;">
<div class="card-header">
TNC STATE
</div>
<div class="card-body">
<div class="input-group input-group-sm mb-3">
<span class="input-group-text" id="basic-addon1" style="width: 4rem">TNC</span>
<input type="text" class="form-control" id="tnc_state" style="width: 14rem" placeholder="" disabled>
</div>
<div class="input-group input-group-sm mb-3">
<span class="input-group-text" id="basic-addon1" style="width: 4rem">Channel</span>
<input type="text" class="form-control" id="channel_state" placeholder="" aria-label="Username" aria-describedby="basic-addon1" disabled>
</div>
</div>
</div>
</div>
<div class="col">
<div class="card text-white bg-secondary mb-3" style="width: 22rem;">
<div class="card-header">
ARQ STATE
</div>
<div class="card-body">
...
</div>
</div>
</div>
<div class="col">
<div class="card text-white bg-secondary mb-3" style="max-width: 22rem;">
<div class="card-header">
MODEM STATE
</div>
<div class="card-body">
...
</div>
</div>
</div>
</div>
-->
</div>
<div class="container mt-2">
<div class="row">
<div class="col">
<div class="card text-dark bg-light mb-1">
<div class="card-header">STATION</div>
<div class="card-header">MY STATION</div>
<div class="card-body">
<div class="row">
<div class="col">
<div class="col-md-auto">
<div class="input-group input-group-sm mb-0">
<input type="text" class="form-control" style="max-width: 6rem" placeholder="callsign" id="myCall" maxlength="6" aria-label="Input group example" aria-describedby="btnGroupAddon">
<button class="btn btn-success" id="saveMyCall" type="button">
@ -571,10 +412,8 @@
</svg>
</button>
</div>
</div>
<div class="col">
<div class="col-md-auto">
<div class="input-group input-group-sm mb-0">
<input type="text" class="form-control mr-1" style="max-width: 6rem" placeholder="locator" id="myGrid" maxlength="6" aria-label="Input group example" aria-describedby="btnGroupAddon">
<button class="btn btn-success" id="saveMyGrid" type="button" >
@ -583,32 +422,43 @@
</svg>
</button>
</div>
</div>
</div>
<!-- end of row-->
</div>
</div>
</div>
<div class="col">
<div class="card text-dark bg-light mb-1">
<div class="card-header">PING & CQ</div>
<div class="card-body">
<div class="row">
<div class="col-md-auto">
<div class="input-group input-group-sm mb-0">
<span class="input-group-text">Ping</span>
<input type="text" class="form-control" style="max-width: 6rem" placeholder="DXcall" id="dxCall" maxlength="6" aria-label="Input group example" aria-describedby="btnGroupAddon">
<button class="btn btn-success" id="startPing" type="button">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-check2" viewBox="0 0 16 16">
<path d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
</svg>
</button>
<span class="input-group-text">ACK</span>
<span class="input-group-text">0000 km</span>
<span class="input-group-text">0 dB</span>
</div>
</div>
<div class="col-md-auto">
<div class="input-group input-group-sm mb-0">
<button class="btn btn-success" id="startCQ" type="button" >CQ CQ CQ</button>
</div>
</div>
</div>
<!-- end of row-->
</div>
</div>
</div>
</div>
</div>
<div class="container mt-2">
<div class="row">
<div class="col-md-autio">
@ -621,7 +471,6 @@
</div>
</div>
</div>
</div>
<!--
<div class="container-fluid">
@ -629,13 +478,8 @@
</div>
-->
<!---------------------------------------------------------------------- FOOTER AREA ------------------------------------------------------------>
<nav class="navbar fixed-bottom navbar-light bg-light">
<div class="container-fluid">
<div class="btn-toolbar" role="toolbar" aria-label="Toolbar with button groups">
<div class="btn-group btn-group-sm me-2" role="group" aria-label="First group">
<button class="btn btn-secondary" id="ptt_state" type="button">
@ -651,7 +495,6 @@
</svg>
</button>
</div>
<div class="btn-group btn-group-sm me-2" role="group" aria-label="Second group">
<button class="btn btn-secondary" id="arq_state" type="button">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-left-right" viewBox="0 0 16 16">
@ -659,7 +502,6 @@
</svg>
</button>
</div>
<div class="btn-group btn-group-sm" role="group" aria-label="Third group">
<button class="btn btn-secondary" id="signalling_state" type="button">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-journal-code" viewBox="0 0 16 16">
@ -677,10 +519,6 @@
</button>
</div>
</div>
<div class="container-fluid" style="width:30rem">
<div class="input-group input-group-sm">
<span class="input-group-text" id="basic-addon1">Freq</span>
@ -691,29 +529,14 @@
<input type="text" class="form-control" id="bandwith" placeholder="--" aria-label="Username" aria-describedby="basic-addon1" disabled>
</div>
</div>
<!--
<div class="container-fluid">
<div class="progress" style="height: 20px;" >
<div class="progress-bar progress-bar-striped" role="progressbar" style="width: 0%" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">10%</div>
</div>
</div>
-->
</div>
</nav>
<script src="../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
<!--<script src="../ui.js"></script>-->
<!-- WATERFALL -->
<script src="waterfall/colormap.js"></script>
<script src="waterfall/spectrum.js"></script>
<script src="waterfall/spectrogram.js"></script>
<!--<script src="waterfall/script.js"></script>-->
</body>
</html>