OpenIPC
/
firmware
mirror of https://github.com/OpenIPC/firmware.git
1
0
Fork 0
Code Activity

wifibroadcast-ng: check for process on startup

pull/1696/head
viktorxda 2025-02-01 15:30:13 +01:00
parent 30f33430e8
commit a07a4082e8
2 changed files with 317 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
general/package/wifibroadcast-ng/files/wifibroadcast
View File

@ -5,7 +5,8 @@ wfb_dev=wlan0
wfb_yaml() { wfb_yaml() {
if [ -e "$1" ]; then if [ -e "$1" ]; then
while IFS=: read -r key value; do while IFS=: read -r key value; do
value=$(eval echo $value) key=$(eval echo "$key")
value=$(eval echo "$value")
export "$key=$value" export "$key=$value"
done < "$1" done < "$1"
fi fi
@ -129,6 +130,7 @@ start() {
killall -1 majestic killall -1 majestic
fi fi
stop
start_broadcast start_broadcast
start_tunnel start_tunnel
start_telemetry start_telemetry
@ -136,7 +138,10 @@ start() {
stop() { stop() {
for process in wfb_rx wfb_tx wfb_tun msposd mavfwd; do for process in wfb_rx wfb_tx wfb_tun msposd mavfwd; do
killall -q "$process" if [ -n "$(pidof $process)" ]; then
echo "- Stopping $process"
killall -q "$process"
fi
done done
} }
@ -145,11 +150,6 @@ case "$1" in
$1 $1
;; ;;
restart|reload)
stop
start
;;
reset) reset)
cp -f /rom/etc/majestic.yaml /etc/majestic.yaml cp -f /rom/etc/majestic.yaml /etc/majestic.yaml
cp -f /rom/etc/wfb.yaml /etc/wfb.yaml cp -f /rom/etc/wfb.yaml /etc/wfb.yaml
@ -157,7 +157,7 @@ case "$1" in
;; ;;
*) *)
echo "Usage: $0 {start|stop|restart|reload|reset}" echo "Usage: $0 {start|stop|reset}"
exit 1 exit 1
;; ;;
esac esac

618
general/package/wifibroadcast-ng/www/index.html
View File

@ -1,309 +1,309 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Camera</title> <title>Camera</title>
<style> <style>
body { body {
font-family: Helvetica; font-family: Helvetica;
background-color: #1e1e1e; background-color: #1e1e1e;
margin: 0; margin: 0;
padding: 0; padding: 0;
color: #dcdcdc; color: #dcdcdc;
text-align: center; text-align: center;
} }
header { header {
background-color: #252526; background-color: #252526;
color: white; color: white;
padding: 15px 0; padding: 15px 0;
} }
h3 { h3 {
font-size: 1.5rem; font-size: 1.5rem;
margin-top: 1rem; margin-top: 1rem;
color: #dee2e6bf; color: #dee2e6bf;
} }
.container { .container {
padding: 20px; padding: 20px;
} }
.form-section { .form-section {
background-color: #2d2d2d; background-color: #2d2d2d;
border-radius: 8px; border-radius: 8px;
box-shadow: 0 2px 10px #00000080; box-shadow: 0 2px 10px #00000080;
max-width: 40%; max-width: 40%;
padding: 20px; padding: 20px;
margin: 20px auto; margin: 20px auto;
} }
.form-section label { .form-section label {
display: inline-block; display: inline-block;
font-weight: bold; font-weight: bold;
margin: 10px 0 5px; margin: 10px 0 5px;
width: 150px; width: 150px;
vertical-align: top; vertical-align: top;
color: #dee2e6; color: #dee2e6;
} }
.form-section input, select { .form-section input, select {
width: 180px; width: 180px;
padding: 10px; padding: 10px;
margin-bottom: 15px; margin-bottom: 15px;
border-radius: 4px; border-radius: 4px;
border: 1px solid #555; border: 1px solid #555;
background-color: #3c3c3c; background-color: #3c3c3c;
color: #dcdcdc; color: #dcdcdc;
display: inline-block; display: inline-block;
box-sizing: border-box; box-sizing: border-box;
} }
.form-section button { .form-section button {
background-color: #0d6efd80; background-color: #0d6efd80;
box-shadow: 0 2px 10px #00000040; box-shadow: 0 2px 10px #00000040;
color: white; color: white;
padding: 10px 60px; padding: 10px 60px;
border: none; border: none;
border-radius: 4px; border-radius: 4px;
cursor: pointer; cursor: pointer;
font-size: 1rem; font-size: 1rem;
} }
.form-section button:hover { .form-section button:hover {
background-color: #0b5ed7; background-color: #0b5ed7;
} }
#preview { #preview {
width: 100%; width: 100%;
max-width: 1200px; max-width: 1200px;
aspect-ratio: 16/9; aspect-ratio: 16/9;
border-radius: 8px; border-radius: 8px;
box-shadow: 0 2px 10px #00000080; box-shadow: 0 2px 10px #00000080;
} }
.row { .row {
margin-bottom: 15px; margin-bottom: 15px;
} }
</style> </style>
</head> </head>
<body> <body>
<header> <header>
<img src="logo.svg" width="220px"> <img src="logo.svg" width="220px">
</header> </header>
<div class="container"> <div class="container">
<section> <section>
<video id="preview" poster="/mjpeg" style="background:url(stream.svg); background-size:cover;"></video> <video id="preview" poster="/mjpeg" style="background:url(stream.svg); background-size:cover;"></video>
</section> </section>
<section class="form-section"> <section class="form-section">
<h3>Video</h3> <h3>Video</h3>
<form id="majestic-form"> <form id="majestic-form">
<div class="row"> <div class="row">
<label for="video0_fps">FPS:</label> <label for="video0_fps">FPS:</label>
<select id="video0_fps" name="majestic.video0.fps"> <select id="video0_fps" name="majestic.video0.fps">
<option value="30">30</option> <option value="30">30</option>
<option value="60">60</option> <option value="60">60</option>
<option value="90">90</option> <option value="90">90</option>
<option value="120">120</option> <option value="120">120</option>
</select> </select>
</div> </div>
<div class="row"> <div class="row">
<label for="video0_codec">Codec:</label> <label for="video0_codec">Codec:</label>
<select id="video0_codec" name="majestic.video0.codec"> <select id="video0_codec" name="majestic.video0.codec">
<option value="h264">H264</option> <option value="h264">H264</option>
<option value="h265">H265</option> <option value="h265">H265</option>
</select> </select>
</div> </div>
<div class="row"> <div class="row">
<label for="video0_bitrate">Bitrate:</label> <label for="video0_bitrate">Bitrate:</label>
<select id="video0_bitrate" name="majestic.video0.bitrate"> <select id="video0_bitrate" name="majestic.video0.bitrate">
<option value="1024">1024</option> <option value="1024">1024</option>
<option value="2048">2048</option> <option value="2048">2048</option>
<option value="3072">3072</option> <option value="3072">3072</option>
<option value="4096">4096</option> <option value="4096">4096</option>
<option value="5120">5120</option> <option value="5120">5120</option>
<option value="6144">6144</option> <option value="6144">6144</option>
<option value="7168">7168</option> <option value="7168">7168</option>
<option value="8192">8192</option> <option value="8192">8192</option>
</select> </select>
</div> </div>
</form> </form>
<button id="apply-majestic-button">Apply</button> <button id="apply-majestic-button">Apply</button>
</section> </section>
<section class="form-section"> <section class="form-section">
<h3>Wireless</h3> <h3>Wireless</h3>
<form id="wfb-form"> <form id="wfb-form">
<div class="row"> <div class="row">
<label for="txpower">TX Power:</label> <label for="txpower">TX Power:</label>
<input type="number" id="txpower" name="wfb.wireless.txpower"> <input type="number" id="txpower" name="wfb.wireless.txpower">
</div> </div>
<div class="row"> <div class="row">
<label for="channel">Channel:</label> <label for="channel">Channel:</label>
<select id="channel" name="wfb.wireless.channel"> <select id="channel" name="wfb.wireless.channel">
<option value="36">36</option> <option value="36">36</option>
<option value="40">40</option> <option value="40">40</option>
<option value="44">44</option> <option value="44">44</option>
<option value="48">48</option> <option value="48">48</option>
<option value="52">52</option> <option value="52">52</option>
<option value="56">56</option> <option value="56">56</option>
<option value="60">60</option> <option value="60">60</option>
<option value="64">64</option> <option value="64">64</option>
<option value="100">100</option> <option value="100">100</option>
<option value="104">104</option> <option value="104">104</option>
<option value="108">108</option> <option value="108">108</option>
<option value="112">112</option> <option value="112">112</option>
<option value="116">116</option> <option value="116">116</option>
<option value="120">120</option> <option value="120">120</option>
<option value="124">124</option> <option value="124">124</option>
<option value="128">128</option> <option value="128">128</option>
<option value="132">132</option> <option value="132">132</option>
<option value="136">136</option> <option value="136">136</option>
<option value="140">140</option> <option value="140">140</option>
<option value="144">144</option> <option value="144">144</option>
<option value="149">149</option> <option value="149">149</option>
<option value="153">153</option> <option value="153">153</option>
<option value="157">157</option> <option value="157">157</option>
<option value="161">161</option> <option value="161">161</option>
<option value="165">165</option> <option value="165">165</option>
</select> </select>
</div> </div>
<div class="row"> <div class="row">
<label for="mode">Mode:</label> <label for="mode">Mode:</label>
<select id="mode" name="wfb.wireless.mode"> <select id="mode" name="wfb.wireless.mode">
<option value="HT20">HT20</option> <option value="HT20">HT20</option>
<option value="HT40-">HT40-</option> <option value="HT40-">HT40-</option>
<option value="HT40+">HT40+</option> <option value="HT40+">HT40+</option>
</select> </select>
</div> </div>
<h3>Broadcast</h3> <h3>Broadcast</h3>
<div class="row"> <div class="row">
<label for="wfb_index">WFB Index:</label> <label for="wfb_index">WFB Index:</label>
<select id="wfb_index" name="wfb.broadcast.wfb_index"> <select id="wfb_index" name="wfb.broadcast.wfb_index">
<option value="1">1</option> <option value="1">1</option>
<option value="2">2</option> <option value="2">2</option>
<option value="3">3</option> <option value="3">3</option>
<option value="4">4</option> <option value="4">4</option>
<option value="5">5</option> <option value="5">5</option>
<option value="6">6</option> <option value="6">6</option>
<option value="7">7</option> <option value="7">7</option>
<option value="8">8</option> <option value="8">8</option>
</select> </select>
</div> </div>
<div class="row"> <div class="row">
<label for="tun_index">TUN Index:</label> <label for="tun_index">TUN Index:</label>
<select id="tun_index" name="wfb.broadcast.tun_index"> <select id="tun_index" name="wfb.broadcast.tun_index">
<option value="1">1</option> <option value="1">1</option>
<option value="2">2</option> <option value="2">2</option>
<option value="3">3</option> <option value="3">3</option>
<option value="4">4</option> <option value="4">4</option>
<option value="5">5</option> <option value="5">5</option>
<option value="6">6</option> <option value="6">6</option>
<option value="7">7</option> <option value="7">7</option>
<option value="8">8</option> <option value="8">8</option>
</select> </select>
</div> </div>
<h3>Telemetry</h3> <h3>Telemetry</h3>
<div class="row"> <div class="row">
<label for="router">Router:</label> <label for="router">Router:</label>
<select id="router" name="wfb.telemetry.router"> <select id="router" name="wfb.telemetry.router">
<option value="msposd">msposd</option> <option value="msposd">msposd</option>
<option value="mavfwd">mavfwd</option> <option value="mavfwd">mavfwd</option>
</select> </select>
</div> </div>
<div class="row"> <div class="row">
<label for="serial">Serial:</label> <label for="serial">Serial:</label>
<select id="serial" name="wfb.telemetry.serial"> <select id="serial" name="wfb.telemetry.serial">
<option value="/dev/ttyS0">/dev/ttyS0</option> <option value="/dev/ttyS0">/dev/ttyS0</option>
<option value="/dev/ttyS2">/dev/ttyS2</option> <option value="/dev/ttyS2">/dev/ttyS2</option>
</select> </select>
</div> </div>
</form> </form>
<button id="apply-wfb-button">Apply</button> <button id="apply-wfb-button">Apply</button>
</section> </section>
<section class="form-section"> <section class="form-section">
<h3>Configuration</h3> <h3>Configuration</h3>
<button id="reset-button">Reset</button> <button id="reset-button">Reset</button>
</section> </section>
</div> </div>
<script src="js-yaml.min.js"></script> <script src="js-yaml.min.js"></script>
<script> <script>
let configData = { majestic: {}, wfb: {} }; let configData = { majestic: {}, wfb: {} };
async function loadYAML(url, setter) { async function loadYAML(url, setter) {
const response = await fetch(url); const response = await fetch(url);
const text = await response.text(); const text = await response.text();
setter(jsyaml.load(text)); setter(jsyaml.load(text));
} }
async function uploadYAML(data, location) { async function uploadYAML(data, location) {
const yamlData = jsyaml.dump(data); const yamlData = jsyaml.dump(data);
await fetch('/upload', { await fetch('/upload', {
method: 'POST', method: 'POST',
headers: { 'File-Location': location }, headers: { 'File-Location': location },
body: yamlData body: yamlData
}); });
} }
async function runCommand(command) { async function runCommand(command) {
await fetch('/command', { await fetch('/command', {
method: 'POST', method: 'POST',
headers: { 'Run-Command': command } headers: { 'Run-Command': command }
}); });
} }
function syncForm(data, formPrefix, mode) { function syncForm(data, formPrefix, mode) {
Object.keys(data).forEach((section) => { Object.keys(data).forEach((section) => {
Object.keys(data[section]).forEach((key) => { Object.keys(data[section]).forEach((key) => {
const field = document.querySelector(`[name="${formPrefix}.${section}.${key}"]`); const field = document.querySelector(`[name="${formPrefix}.${section}.${key}"]`);
if (field) { if (field) {
if (mode === "setup") { if (mode === "setup") {
field.value = data[section][key]; field.value = data[section][key];
} else if (mode === "update") { } else if (mode === "update") {
data[section][key] = field.value; data[section][key] = field.value;
} }
} }
}); });
}); });
} }
function executeDelay(button, command) { function executeDelay(button, command) {
button.disabled = true; button.disabled = true;
runCommand(command); runCommand(command);
setTimeout(() => { setTimeout(() => {
button.disabled = false; button.disabled = false;
location.reload(); location.reload();
}, 1000); }, 1000);
} }
document.getElementById('apply-majestic-button').addEventListener('click', function() { document.getElementById('apply-majestic-button').addEventListener('click', function() {
if (configData.majestic) { if (configData.majestic) {
syncForm(configData.majestic, 'majestic', "update"); syncForm(configData.majestic, 'majestic', "update");
uploadYAML(configData.majestic, '/etc/majestic.yaml'); uploadYAML(configData.majestic, '/etc/majestic.yaml');
executeDelay(this, 'killall -1 majestic'); executeDelay(this, 'killall -1 majestic');
} }
}); });
document.getElementById('apply-wfb-button').addEventListener('click', function() { document.getElementById('apply-wfb-button').addEventListener('click', function() {
if (configData.wfb) { if (configData.wfb) {
syncForm(configData.wfb, 'wfb', "update"); syncForm(configData.wfb, 'wfb', "update");
uploadYAML(configData.wfb, '/etc/wfb.yaml'); uploadYAML(configData.wfb, '/etc/wfb.yaml');
executeDelay(this, 'wifibroadcast restart'); executeDelay(this, 'wifibroadcast start');
} }
}); });
document.getElementById('reset-button').addEventListener('click', function() { document.getElementById('reset-button').addEventListener('click', function() {
executeDelay(this, 'wifibroadcast reset'); executeDelay(this, 'wifibroadcast reset');
}); });
loadYAML('/etc/majestic.yaml', (data) => { loadYAML('/etc/majestic.yaml', (data) => {
configData.majestic = data; configData.majestic = data;
syncForm(configData.majestic, 'majestic', "setup"); syncForm(configData.majestic, 'majestic', "setup");
}); });
loadYAML('/etc/wfb.yaml', (data) => { loadYAML('/etc/wfb.yaml', (data) => {
configData.wfb = data; configData.wfb = data;
syncForm(configData.wfb, 'wfb', "setup"); syncForm(configData.wfb, 'wfb', "setup");
}); });
</script> </script>
</body> </body>
</html> </html>