Merge branch 'development' into development

This commit is contained in:
Cameron Thompson
2024-03-24 16:02:38 -04:00
committed by GitHub
3 changed files with 25 additions and 25 deletions

View File

@@ -44,7 +44,7 @@ get_secondary_bands() {
SCC_BANDS=$(echo "$OX" | grep '+QCAINFO: "SCC"' | grep -o '"LTE BAND [0-9]\+"' | tr -d '"' | sed '1d')
# Extract NR5G BANDs from SCC lines
NR_BAND=$(echo "$OX" | grep '+QCAINFO: "SCC"' | grep -o '"NR5G BAND [0-9]\+"' | tr -d '"')
NR_BAND=$(echo "$OX" | grep '+QCAINFO: "SCC"' | grep -o '"NR5G BAND [0-9]\+"' | tr -d '"'| sed '1d')
# Check if both SCC and NR bands are non-empty
if [ -n "$SCC_BANDS" ] && [ -n "$NR_BAND" ]; then
@@ -530,4 +530,4 @@ MODEZ=$(echo $MODE | tr -d '"')
} > /tmp/signal.txt
# Pregenerate JSON File
/usrdata/simpleadmin/scripts/tojson.sh /tmp/signal.txt > /tmp/modemstatus.json
/usrdata/simpleadmin/scripts/tojson.sh /tmp/signal.txt > /tmp/modemstatus.json

View File

@@ -256,28 +256,28 @@
},
};
}
// function getSignalData() {
// return {
// csqData: {},
// lastUpdate: new Date().toLocaleString(),
// getcsq() {
// fetch("/cgi-bin/get_csq")
// .then((res) => res.json())
// .then((data) => {
// this.csqData = data;
// this.lastUpdate = new Date(
// data.LASTUPDATE * 1000
// ).toLocaleString();
// });
// },
// init() {
// this.getcsq();
// setInterval(() => {
// this.getcsq();
// }, 30000);
// },
// };
// }
function getSignalData() {
return {
csqData: {},
lastUpdate: new Date().toLocaleString(),
getcsq() {
fetch("/cgi-bin/get_csq")
.then((res) => res.json())
.then((data) => {
this.csqData = data;
this.lastUpdate = new Date(
data.LASTUPDATE * 1000
).toLocaleString();
});
},
init() {
this.getcsq();
setInterval(() => {
this.getcsq();
}, 30000);
},
};
}
</script>
</body>
</html>