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

Revert "Merge pull request #41 from dr-dolomite/development-socat"

Browse Source 
This reverts commit d916c987b5, reversing
changes made to 17a846fb12.
This commit is contained in:
iamromulan
2024-05-05 05:34:44 -04:00
parent d916c987b5
commit 0543a18a40
9 changed files with 68 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
simpleadmin/www/cgi-bin/get_atcommand
View File

@@ -16,8 +16,8 @@ fi
MYATCMD=$(printf '%b\n' "${atcmd//%/\\x}")
if [ -n "${MYATCMD}" ]; then
x=$(urldecode "$atcmd")
# Initialize wait time to 200 ms
wait_time=200
# Initialize wait time to 1 second
wait_time=1000
while true; do
runcmd=$(echo -en "$x\r\n" | microcom -t $wait_time /dev/ttyOUT2)
# Check if "OK" or "ERROR" is present in the response

20
simpleadmin/www/cgi-bin/get_ttl_status.old
View File

@@ -1,20 +0,0 @@
#!/bin/bash
# Check iptables for ttlvalue
ttlvalue=$(iptables -t mangle -vnL | awk '/TTL/ {print $13; exit}')
ttlenabled=true;
# Set Variables
if [ -z "${ttlvalue}" ]; then
ttlvalue=0
ttlenabled=false
fi
echo "Content-type: text/json"
echo ""
cat <<EOT
{
"isEnabled": $ttlenabled,
"ttl": $ttlvalue
}
EOT

61
simpleadmin/www/cgi-bin/set_ttl.old
View File

@@ -1,61 +0,0 @@
#!/bin/bash
# Get query
QUERY_STRING=$(echo "${QUERY_STRING}" | sed 's/;//g')
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
setTTL=$(printf '%b\n' "${ttlvalue//%/\\x}")
if [ -n "${setTTL}" ]; then
# Stop Service To Remove Rules
/usrdata/simplefirewall/ttl-override stop
# Check iptables is still set
ttlcheck=$(iptables -t mangle -vnL | grep TTL | awk '{print $13}')
# If TTL is still set manually remove values
if [ !-z "${ttlcheck}" ]; then
iptables -t mangle -D POSTROUTING -o rmnet+ -j TTL --ttl-set ${ttlcheck} &>/dev/null || true
ip6tables -t mangle -D POSTROUTING -o rmnet+ -j HL --hl-set ${ttlcheck} &>/dev/null || true
fi
# Echo TTL to file
echo $setTTL > /usrdata/simplefirewall/ttlvalue
# Set Start Service
/usrdata/simplefirewall/ttl-override start
fi
# Check iptables for ttlvalue
ttlvalue=$(iptables -t mangle -vnL | grep TTL | awk '{print $13}')
ttlenabled=true;
# Set Variables
if [ -z "${ttlvalue}" ]; then
ttlvalue=0
ttlenabled=false
fi
echo "Content-type: text/json"
echo ""
cat <<EOT
{
"isEnabled": $ttlenabled,
"ttl": $ttlvalue
}

17
simpleadmin/www/deviceinfo.html
View File

@@ -52,19 +52,18 @@
<a class="nav-link" href="/sms.html">SMS</a>
</li>
<li class="nav-item">
<a
class="nav-link active"
href="/deviceinfo.html"
aria-current="page"
>Device Information</a
>
<a class="nav-link" href="/console">Console</a>
</li>
<li class="nav-item">
<a class="nav-link active" href="/deviceinfo.html" aria-current="page" >Device Information</a>
</li>
</ul>
<span class="navbar-text">
<button class="btn btn-link text-reset" id="darkModeToggle">
Dark Mode
</button>
<button class="btn btn-link text-reset" id="darkModeToggle">Dark Mode</button>
</span>
<span class="navbar-text">
<button class="btn btn-link" href="logout.html">Log Out</button>
</span>
</div>
</div>
</nav>

107
simpleadmin/www/index.html
View File

@@ -40,9 +40,7 @@
<div class="collapse navbar-collapse" id="navbarText">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link active" aria-current="page" href="/"
>Home</a
>
<a class="nav-link active" aria-current="page" href="/">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="network.html">Simple Network</a>
@@ -54,16 +52,18 @@
<a class="nav-link" href="/sms.html">SMS</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/deviceinfo.html"
>Device Information</a
>
</li>
<a class="nav-link" href="/console">Console</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/deviceinfo.html">Device Information</a>
</li>
</ul>
<span class="navbar-text">
<button class="btn btn-link text-reset" id="darkModeToggle">
Dark Mode
</button>
<button class="btn btn-link text-reset" id="darkModeToggle">Dark Mode</button>
</span>
<span class="navbar-text">
<button class="btn btn-link" href="logout.html">Log Out</button>
</span>
</div>
</div>
</nav>
@@ -272,6 +272,7 @@
}
} }"
>
<div
x-show="rsrqLTE != '-'"
class="progress w-100"
@@ -286,9 +287,7 @@
:class="getProgressBarClass()"
:style="'width: ' + rsrqLTEPercentage + '%'"
>
<span
x-text="rsrqLTE + ' / ' + rsrqLTEPercentage + '%'"
></span>
<span x-text="rsrqLTE + ' / ' + rsrqLTEPercentage + '%'"></span>
</div>
</div>
</td>
@@ -323,9 +322,7 @@
:class="getProgressBarClass()"
:style="'width: ' + rsrqNRPercentage + '%'"
>
<span
x-text="rsrqNR + ' / ' + rsrqNRPercentage + '%'"
></span>
<span x-text="rsrqNR + ' / ' + rsrqNRPercentage + '%'"></span>
</div>
</div>
</td>
@@ -363,9 +360,7 @@
:class="getProgressBarClass()"
:style="'width: ' + rsrpLTEPercentage + '%'"
>
<span
x-text="rsrpLTE + ' / ' + rsrpLTEPercentage + '%'"
></span>
<span x-text="rsrpLTE + ' / ' + rsrpLTEPercentage + '%'"></span>
</div>
</div>
</td>
@@ -403,9 +398,7 @@
:class="getProgressBarClass()"
:style="'width: ' + rsrpNRPercentage + '%'"
>
<span
x-text="rsrpNR + ' / ' + rsrpNRPercentage + '%'"
></span>
<span x-text="rsrpNR + ' / ' + rsrpNRPercentage + '%'"></span>
</div>
</div>
</td>
@@ -443,9 +436,7 @@
:class="getProgressBarClass()"
:style="'width: ' + sinrLTEPercentage +'%'"
>
<span
x-text="sinrLTE + ' / ' + sinrLTEPercentage +'%'"
></span>
<span x-text="sinrLTE + ' / ' + sinrLTEPercentage +'%'"></span>
</div>
</div>
</td>
@@ -483,9 +474,7 @@
:class="getProgressBarClass()"
:style="'width: ' + sinrNRPercentage +'%'"
>
<span
x-text="sinrNR + ' / ' + sinrNRPercentage +'%'"
></span>
<span x-text="sinrNR + ' / ' + sinrNRPercentage +'%'"></span>
</div>
</div>
</td>
@@ -554,7 +543,7 @@
internetConnection: "Disconnected",
lastUpdate: new Date().toLocaleString(),
newRefreshRate: null,
refreshRate: 30,
refreshRate: 3,
intervalId: null,
fetchNetworkInfo() {
this.atcmd =
@@ -621,38 +610,18 @@
} else {
let networkMode2, networkMode3;
networkMode2 = lines[28].split(":")[1].replace(/"/g, "");
networkMode2 = networkMode2.split(",")[0];
if (
lines[27] !== undefined &&
lines[27] !== "OK" &&
lines[27] !== "" &&
lines[27] !== "/r"
lines[29] !== undefined &&
lines[29] !== "OK" &&
lines[29] !== ""
) {
// Check if lines[27] doesnt have NOCONN
if (lines[27].match(/servingcell/) === null) {
networkMode2 = lines[27].split(",")[2].replace(/"/g, "");
networkMode2 = networkMode2.split(",")[0].trim();
console.log(networkMode2);
}
if (networkMode2 !== "LTE") {
networkMode2 = lines[28].split(":")[1].replace(/"/g, "");
networkMode2 = networkMode2.split(",")[0];
if (
lines[29] !== undefined &&
lines[29] !== "OK" &&
lines[29] !== ""
) {
networkMode3 = lines[29]
.split(":")[1]
.split(",")[0]
.replace(/"/g, "");
networkMode3 = networkMode3.split(",")[0];
}
}
networkMode3 = lines[29].split(":")[1].replace(/"/g, "");
networkMode3 = networkMode3.split(",")[0];
}
console.log(networkMode2, networkMode3);
// Check if networkMode3 is not empty
if (networkMode3 !== undefined) {
this.network_mode = networkMode2 + ", " + networkMode3;
@@ -902,9 +871,6 @@
this.signalPercentage =
(this.signalPercentage + nrSignalPercentage) / 2;
// Round the signalPercentage value
this.signalPercentage = Math.round(this.signalPercentage);
// Get the Signal Assessment
this.signalAssessment = this.signalQuality(
this.signalPercentage
@@ -1032,9 +998,8 @@
const rawdata = data;
const lines = rawdata.split("\n");
console.log("CSQ: ", lines);
this.csq = lines[1].split(":")[1].split(",")[0].trim();
this.csq = lines[0].split(":")[1].split(",")[0].trim();
});
});
}
@@ -1066,22 +1031,11 @@
this.refreshRate = this.newRefreshRate;
console.log("Refresh Rate Updated to " + this.refreshRate);
// Store the refresh rate in local storage or session storage
localStorage.setItem("refreshRate", this.refreshRate);
// Initialize with the new refresh rate
this.init();
},
init() {
// Retrieve the refresh rate from local storage or session storage
const storedRefreshRate = localStorage.getItem("refreshRate");
// If a refresh rate is stored, use it; otherwise, use a default value
this.refreshRate = storedRefreshRate
? parseInt(storedRefreshRate)
: 5; // Change 5 to your desired default value
this.fetchNetworkInfo();
// sleep for 2 seconds
setTimeout(() => {
@@ -1090,8 +1044,7 @@
this.requestPing()
.then((data) => {
const response = data.trim();
// Trim any leading/trailing spaces
const response = data.trim(); // Trim any leading/trailing spaces
if (response === "OK") {
this.internetConnection = "Connected";
} else {
@@ -1116,8 +1069,7 @@
this.requestPing()
.then((data) => {
const response = data.trim();
// Trim any leading/trailing spaces
const response = data.trim(); // Trim any leading/trailing spaces
if (response === "OK") {
this.internetConnection = "Connected";
} else {
@@ -1130,6 +1082,7 @@
});
this.lastUpdate = new Date().toLocaleString();
console.log("Refreshed");
}, this.refreshRate * 1000);
},

6
simpleadmin/www/js/parse-settings.js
View File

@@ -15,16 +15,14 @@ function parseCurrentSettings(rawdata) {
let bands = [];
// Append the values if there is separated by comma with a space.
// i.e. LTE BAND 3, LTE BAND 1
// Append the values if there is separated by comma
for (let i = 13; i < 17; i++) {
if (lines[i].split(",").length > 1) {
bands.push(lines[i].split(",")[3].replace(/\"/g, " "));
bands.push(lines[i].split(",")[3].replace(/\"/g, ""));
}
}
this.bands = bands;
if (this.cellLock4GStatus == 1 && this.cellLock5GStatus == 1) {
this.cellLockStatus = "Locked to 4G and 5G";

23
simpleadmin/www/network.html
View File

@@ -43,12 +43,7 @@
<a class="nav-link" href="/">Home</a>
</li>
<li class="nav-item">
<a
class="nav-link active"
href="network.html"
aria-current="page"
>Simple Network</a
>
<a class="nav-link active" href="network.html" aria-current="page">Simple Network</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/settings.html">Simple Settings</a>
@@ -57,16 +52,18 @@
<a class="nav-link" href="/sms.html">SMS</a>
</li>
<li class="nav-item">
<a class="nav-link" href="deviceinfo.html"
>Device Information</a
>
<a class="nav-link" href="/console">Console</a>
</li>
<li class="nav-item">
<a class="nav-link" href="deviceinfo.html">Device Information</a>
</li>
</ul>
<span class="navbar-text">
<button class="btn btn-link text-reset" id="darkModeToggle">
Dark Mode
</button>
<button class="btn btn-link text-reset" id="darkModeToggle">Dark Mode</button>
</span>
<span class="navbar-text">
<button class="btn btn-link" href="logout.html">Log Out</button>
</span>
</div>
</div>
</nav>
@@ -555,7 +552,7 @@
updatedLockedBands: null,
sim: "-",
newSim: null,
cellLockStatus: "Unknown",
cellLockStatus: null,
bands: "Fetching Bands...",
init() {
// Function to populate checkboxes

17
simpleadmin/www/settings.html
View File

@@ -39,16 +39,14 @@
<a class="nav-link" href="/network.html">Simple Network</a>
</li>
<li class="nav-item">
<a
class="nav-link active"
href="/settings.html"
aria-current="page"
>Simple Settings</a
>
<a class="nav-link active" href="/settings.html" aria-current="page">Simple Settings</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/sms.html">SMS</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/console">Console</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/deviceinfo.html"
>Device Information</a
@@ -56,10 +54,11 @@
</li>
</ul>
<span class="navbar-text">
<button class="btn btn-link text-reset" id="darkModeToggle">
Dark Mode
</button>
<button class="btn btn-link text-reset" id="darkModeToggle">Dark Mode</button>
</span>
<span class="navbar-text">
<button class="btn btn-link" href="logout.html">Log Out</button>
</span>
</div>
</div>
</nav>

17
simpleadmin/www/sms.html
View File

@@ -50,13 +50,11 @@
<a class="nav-link" href="/settings.html">Simple Settings</a>
</li>
<li class="nav-item">
<a
class="nav-link active"
href="/sms.html"
aria-current="page"
>SMS</a
>
<a class="nav-link active" href="/sms.html" aria-current="page">SMS</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/console">Console</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/deviceinfo.html"
>Device Information</a
@@ -64,10 +62,11 @@
</li>
</ul>
<span class="navbar-text">
<button class="btn btn-link text-reset" id="darkModeToggle">
Dark Mode
</button>
<button class="btn btn-link text-reset" id="darkModeToggle">Dark Mode</button>
</span>
<span class="navbar-text">
<button class="btn btn-link" href="logout.html">Log Out</button>
</span>
</div>
</div>
</nav>