tyk/quectel-rgmii-toolkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #69 from dr-dolomite/feature-watchcat

Browse Source 
User AT command implementation
This commit is contained in:
Cameron Thompson
2024-07-14 01:55:20 -04:00
committed by GitHub
parent 1cd14a2225 39907e983a
commit f872efca51
3 changed files with 86 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
simpleadmin/www/cgi-bin/user_atcommand Normal file
View File

@@ -0,0 +1,26 @@
#!/bin/bash
QUERY_STRING=$(echo "${QUERY_STRING}" | sed 's/;//g')
function urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; }
if [ "${QUERY_STRING}" ]; then
export IFS="&"
for cmd in ${QUERY_STRING}; do
if [ "$(echo $cmd | grep '=')" ]; then
key=$(echo $cmd | awk -F '=' '{print $1}')
value=$(echo $cmd | awk -F '=' '{print $2}')
eval $key=$value
fi
done
fi
x=$(urldecode "$atcmd")
MYATCMD=$(printf '%b\n' "${atcmd//%/\\x}")
if [ -n "${MYATCMD}" ]; then
# Capture the response and remove ANSI color codes using awk
runcmd=$(atcmd "$x" | awk '{ gsub(/\x1B\[[0-9;]*[mG]/, "") }1')
fi
echo "Content-type: text/plain"
echo $x
echo ""
echo "$runcmd"

67
simpleadmin/www/js/populate-checkbox.js
View File

@@ -2,26 +2,51 @@ function populateCheckboxes(lte_band, nsa_nr5g_band, nr5g_band, locked_lte_bands
var checkboxesForm = document.getElementById("checkboxForm");
var selectedMode = document.getElementById("networkModeBand").value;
var bands;
var prefix;
// Determine bands based on selected network mode
// Determine bands and prefix based on selected network mode
if (selectedMode === "LTE") {
bands = lte_band;
prefix = "B";
} else if (selectedMode === "NSA") {
bands = nsa_nr5g_band;
prefix = "N";
} else if (selectedMode === "SA") {
bands = nr5g_band;
prefix = "N";
}
checkboxesForm.innerHTML = ""; // Clear existing checkboxes
var bandsArray;
// Store the locked bands in arrays
var locked_lte_bands_array = locked_lte_bands.split(":");
var locked_nsa_bands_array = locked_nsa_bands.split(":");
var locked_sa_bands_array = locked_sa_bands.split(":");
var isBandLocked = function(band) {
if (selectedMode === "LTE" && locked_lte_bands_array.includes(band)) {
return true;
}
if (selectedMode === "NSA" && locked_nsa_bands_array.includes(band)) {
return true;
}
if (selectedMode === "SA" && locked_sa_bands_array.includes(band)) {
return true;
}
return false;
};
var fragment = document.createDocumentFragment();
if (bands !== null && bands !== "0") {
bandsArray = bands.split(":");
var bandsArray = bands.split(":");
var currentRow;
bandsArray.forEach(function(band, index) {
if (index % 5 === 0) {
currentRow = document.createElement("div");
currentRow.className = "row mb-2 mx-auto"; // Add margin bottom for spacing
checkboxesForm.appendChild(currentRow);
fragment.appendChild(currentRow);
}
var checkboxDiv = document.createElement("div");
@@ -32,49 +57,25 @@ function populateCheckboxes(lte_band, nsa_nr5g_band, nr5g_band, locked_lte_bands
checkboxInput.id = "inlineCheckbox" + band;
checkboxInput.value = band;
checkboxInput.autocomplete = "off";
// Store the locked bands in an array
var locked_lte_bands_array = locked_lte_bands.split(":");
var locked_nsa_bands_array = locked_nsa_bands.split(":");
var locked_sa_bands_array = locked_sa_bands.split(":");
// Check if the current band is locked
var isLocked = false;
if (selectedMode === "LTE") {
if (locked_lte_bands_array.includes(band)) {
isLocked = true;
}
} else if (selectedMode === "NSA") {
if (locked_nsa_bands_array.includes(band)) {
isLocked = true;
}
} else if (selectedMode === "SA") {
if (locked_sa_bands_array.includes(band)) {
isLocked = true;
}
}
if (isLocked) {
checkboxInput.checked = true;
}
checkboxInput.checked = isBandLocked(band);
var checkboxLabel = document.createElement("label");
checkboxLabel.className = "form-check-label";
checkboxLabel.htmlFor = "inlineCheckbox" + band;
checkboxLabel.innerText = "B" + band;
checkboxLabel.innerText = prefix + band;
checkboxDiv.appendChild(checkboxInput);
checkboxDiv.appendChild(checkboxLabel);
currentRow.appendChild(checkboxDiv);
});
} else {
// Create a text saying that no bands are available
// Create a text saying that no bands are available
var noBandsText = document.createElement("p");
noBandsText.className = "text-center";
noBandsText.innerText = "No supported bands available";
checkboxesForm.appendChild(noBandsText);
fragment.appendChild(noBandsText);
}
var currentRow;
checkboxesForm.appendChild(fragment);
addCheckboxListeners(cellLock);
}

28
simpleadmin/www/settings.html
View File

@@ -104,7 +104,7 @@
placeholder="ATI"
aria-describedby="atCommandInput"
x-model="atcmd"
@keydown.enter="sendATCommand()"
@keydown.enter="sendUserATCommand()"
/>
<div id="atCommandInputHelper" class="form-text">
Seperate multiple commands with comma (,).
@@ -116,7 +116,7 @@
<button
class="btn btn-primary me-md-2"
type="button"
@click="sendATCommand()"
@click="sendUserATCommand()"
:disabled="isLoading"
>
Submit
@@ -443,6 +443,30 @@
});
},
sendUserATCommand() {
this.isLoading = true;
const encodedATCmd = encodeURIComponent(this.atcmd);
const url = `/cgi-bin/user_atcommand?atcmd=${encodedATCmd}`;
fetch(url)
.then((res) => {
if (!res.ok) {
throw new Error(`HTTP error! status: ${res.status}`);
}
return res.text();
})
.then((data) => {
this.atCommandResponse = data;
this.isLoading = false;
this.isClean = false;
})
.catch((error) => {
console.error("Error: ", error);
this.showError = true;
this.isLoading = false;
});
},
clearResponses() {
this.atCommandResponse = "";
this.isClean = true;