update
This commit is contained in:
@@ -118,6 +118,13 @@
|
|||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="form-check mb-3">
|
||||||
|
<input class="form-check-input" type="checkbox" value="" id="check_uSpot" onchange="update_config_sqlite('send_uSpot', this.checked)" disabled>
|
||||||
|
<label class="form-check-label" for="check_uSpot">
|
||||||
|
uSpot
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="input-group mb-3" id="sondes_envea_div"></div>
|
<div class="input-group mb-3" id="sondes_envea_div"></div>
|
||||||
|
|
||||||
@@ -263,6 +270,9 @@ window.onload = function() {
|
|||||||
//windMeter (as a config not a script -> it's running with a systemd service)
|
//windMeter (as a config not a script -> it's running with a systemd service)
|
||||||
const checkbox_wind = document.getElementById("check_WindMeter");
|
const checkbox_wind = document.getElementById("check_WindMeter");
|
||||||
checkbox_wind.checked = response["windMeter"];
|
checkbox_wind.checked = response["windMeter"];
|
||||||
|
//send uSpot
|
||||||
|
const checkbox_uSpot = document.getElementById("check_uSpot");
|
||||||
|
checkbox_uSpot.checked = response["send_uSpot"];
|
||||||
|
|
||||||
},
|
},
|
||||||
error: function(xhr, status, error) {
|
error: function(xhr, status, error) {
|
||||||
@@ -290,6 +300,7 @@ window.onload = function() {
|
|||||||
checkbox_envea.checked = response["envea/read_value_v2.py"];
|
checkbox_envea.checked = response["envea/read_value_v2.py"];
|
||||||
checkbox_solar.checked = response["MPPT/read.py"];
|
checkbox_solar.checked = response["MPPT/read.py"];
|
||||||
|
|
||||||
|
|
||||||
//si sonde envea is true
|
//si sonde envea is true
|
||||||
if (response["envea/read_value_v2.py"]) {
|
if (response["envea/read_value_v2.py"]) {
|
||||||
add_sondeEnveaContainer();
|
add_sondeEnveaContainer();
|
||||||
|
|||||||
@@ -408,6 +408,7 @@ def modem_complete_reboot_and_reinitialize(modem_version, aircarto_profile_id):
|
|||||||
print("⚠️ Modem reboot command failed")
|
print("⚠️ Modem reboot command failed")
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
reset_uSpot_url = True
|
||||||
# Step 2: Wait for the modem to restart (adjust time as needed)
|
# Step 2: Wait for the modem to restart (adjust time as needed)
|
||||||
print("Waiting for modem to restart...")
|
print("Waiting for modem to restart...")
|
||||||
time.sleep(15) # 15 seconds should be enough for most modems to restart
|
time.sleep(15) # 15 seconds should be enough for most modems to restart
|
||||||
@@ -738,7 +739,12 @@ try:
|
|||||||
|
|
||||||
|
|
||||||
'''
|
'''
|
||||||
SEND TO AIRCARTO
|
____ _____ _ _ ____ _ ___ ____ ____ _ ____ _____ ___
|
||||||
|
/ ___|| ____| \ | | _ \ / \ |_ _| _ \ / ___| / \ | _ \_ _/ _ \
|
||||||
|
\___ \| _| | \| | | | | / _ \ | || |_) | | / _ \ | |_) || || | | |
|
||||||
|
___) | |___| |\ | |_| | / ___ \ | || _ <| |___ / ___ \| _ < | || |_| |
|
||||||
|
|____/|_____|_| \_|____/ /_/ \_\___|_| \_\\____/_/ \_\_| \_\|_| \___/
|
||||||
|
|
||||||
'''
|
'''
|
||||||
|
|
||||||
print('➡️<p class="fw-bold">SEND TO AIRCARTO SERVERS</p>')
|
print('➡️<p class="fw-bold">SEND TO AIRCARTO SERVERS</p>')
|
||||||
@@ -881,9 +887,9 @@ try:
|
|||||||
#Software Reboot
|
#Software Reboot
|
||||||
software_reboot_success = modem_complete_reboot_and_reinitialize(modem_version, aircarto_profile_id)
|
software_reboot_success = modem_complete_reboot_and_reinitialize(modem_version, aircarto_profile_id)
|
||||||
if software_reboot_success:
|
if software_reboot_success:
|
||||||
print("Modem successfully rebooted and reinitialized")
|
print("✅Modem successfully rebooted and reinitialized")
|
||||||
else:
|
else:
|
||||||
print("There were issues with the modem reboot/reinitialize process")
|
print("⛔There were issues with the modem reboot/reinitialize process")
|
||||||
|
|
||||||
|
|
||||||
# 2.2 code 1 (✅✅HHTP / UUHTTPCR succeded✅✅)
|
# 2.2 code 1 (✅✅HHTP / UUHTTPCR succeded✅✅)
|
||||||
@@ -1044,7 +1050,12 @@ try:
|
|||||||
|
|
||||||
|
|
||||||
'''
|
'''
|
||||||
SEND TO uSPOT
|
_ ____ _
|
||||||
|
___ ___ _ __ __| | _ _/ ___| _ __ ___ | |_
|
||||||
|
/ __|/ _ \ '_ \ / _` | | | | \___ \| '_ \ / _ \| __|
|
||||||
|
\__ \ __/ | | | (_| | | |_| |___) | |_) | (_) | |_
|
||||||
|
|___/\___|_| |_|\__,_| \__,_|____/| .__/ \___/ \__|
|
||||||
|
|_|
|
||||||
'''
|
'''
|
||||||
|
|
||||||
if send_uSpot:
|
if send_uSpot:
|
||||||
@@ -1202,6 +1213,7 @@ try:
|
|||||||
print('<p class="text-success">No error detected</p>')
|
print('<p class="text-success">No error detected</p>')
|
||||||
elif error_code == 4:
|
elif error_code == 4:
|
||||||
print('<p class="text-danger">Error 4: Invalid server Hostname</p>')
|
print('<p class="text-danger">Error 4: Invalid server Hostname</p>')
|
||||||
|
|
||||||
elif error_code == 11:
|
elif error_code == 11:
|
||||||
print('<p class="text-danger">Error 11: Server connection error</p>')
|
print('<p class="text-danger">Error 11: Server connection error</p>')
|
||||||
elif error_code == 22:
|
elif error_code == 22:
|
||||||
@@ -1215,13 +1227,14 @@ try:
|
|||||||
|
|
||||||
#Pas forcément un moyen de résoudre le soucis
|
#Pas forcément un moyen de résoudre le soucis
|
||||||
|
|
||||||
# 2.2 code 1 (HHTP succeded)
|
# 2.2 code 1 (✅✅HHTP / UUHTTPCR succeded✅✅)
|
||||||
else:
|
else:
|
||||||
# Si la commande HTTP a réussi
|
# Si la commande HTTP a réussi
|
||||||
print('<span style="font-weight: bold;">✅✅HTTP operation successful.</span>')
|
print('<span style="font-weight: bold;">✅✅HTTP operation successful.</span>')
|
||||||
print("Blink blue LED")
|
print("Blink blue LED")
|
||||||
led_thread = Thread(target=blink_led, args=(23, 5, 0.5))
|
led_thread = Thread(target=blink_led, args=(23, 5, 0.5))
|
||||||
led_thread.start()
|
led_thread.start()
|
||||||
|
|
||||||
#4. Read reply from server
|
#4. Read reply from server
|
||||||
print("Reply from server:")
|
print("Reply from server:")
|
||||||
ser_sara.write(b'AT+URDFILE="uSpot_server_response.txt"\r')
|
ser_sara.write(b'AT+URDFILE="uSpot_server_response.txt"\r')
|
||||||
@@ -1230,6 +1243,32 @@ try:
|
|||||||
print(response_SARA_4b)
|
print(response_SARA_4b)
|
||||||
print("</p>", end="")
|
print("</p>", end="")
|
||||||
|
|
||||||
|
# Initialize http_response_code to 0 as a default value
|
||||||
|
http_response_code = 0
|
||||||
|
|
||||||
|
# Safely extract HTTP code
|
||||||
|
try:
|
||||||
|
http_prefix = "HTTP/"
|
||||||
|
# response_SARA_4b is a string, not a function - use .find() method
|
||||||
|
http_pos = response_SARA_4b.find(http_prefix)
|
||||||
|
|
||||||
|
if http_pos != -1:
|
||||||
|
# Find the space after the HTTP version
|
||||||
|
space_pos = response_SARA_4b.find(" ", http_pos)
|
||||||
|
if space_pos != -1:
|
||||||
|
# Extract the code after the space
|
||||||
|
code_start = space_pos + 1
|
||||||
|
code_end = response_SARA_4b.find(" ", code_start)
|
||||||
|
if code_end != -1:
|
||||||
|
# Extract and convert to integer
|
||||||
|
http_code_str = response_SARA_4b[code_start:code_end]
|
||||||
|
http_response_code = int(http_code_str)
|
||||||
|
print(f"HTTP response code: {http_response_code}")
|
||||||
|
except Exception as e:
|
||||||
|
# If any error occurs during parsing, keep the default value
|
||||||
|
print(f"Error parsing HTTP code: {e}")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#5. empty json
|
#5. empty json
|
||||||
|
|||||||
Reference in New Issue
Block a user