iarv/Lora-Scanner
1
0
Fork 0
mirror of https://github.com/skinnyrad/Lora-Scanner.git synced 2026-03-28 17:43:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15 from skinnyrad/feat/disconnect

Browse Source 
Fix: Preventing simultaneous serial port connections
This commit is contained in:
Halcy0nic
2024-10-27 16:18:11 -06:00
committed by GitHub
parent 3bb975d54f f7b9582ff7
commit 00e2f670fe
4 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app.py
View File

@@ -40,6 +40,7 @@ gateway_ips = {
frequency = lambda port: {'port1': 433, 'port2': 868,'port3': 915}.get(port, None)
surveydata = {}
parsed_entries = set()
used_ports = set()
def read_serial_data(port, ser, buffer):
"""
@@ -303,6 +304,11 @@ def connect_serial(port, frequency):
global ser1
global ser2
global ser3
global used_ports
# Check if the port is already in use
if port in used_ports:
raise Exception(f"Port {port} is already in use for another frequency.")
if frequency == 433:
try:
@@ -311,6 +317,7 @@ def connect_serial(port, frequency):
serial_threads['port1'] = threading.Thread(target=read_serial_data, args=('port1', ser1, serial_buffers['port1']))
serial_threads['port1'].daemon = True
serial_threads['port1'].start()
used_ports.add(port) # Mark the port as used
except:
print("\n\nPort for 433 MHz not available\n\n")
if frequency == 868:
@@ -320,6 +327,7 @@ def connect_serial(port, frequency):
serial_threads['port2'] = threading.Thread(target=read_serial_data, args=('port2', ser2, serial_buffers['port2']))
serial_threads['port2'].daemon = True
serial_threads['port2'].start()
used_ports.add(port) # Mark the port as used
except:
print("\n\nPort for 868 MHz not available\n\n")
if frequency == 915:
@@ -329,7 +337,7 @@ def connect_serial(port, frequency):
serial_threads['port3'] = threading.Thread(target=read_serial_data, args=('port3', ser3, serial_buffers['port3']))
serial_threads['port3'].daemon = True
serial_threads['port3'].start()
used_ports.add(port) # Mark the port as used
except:
print('\n\nPort for 915 MHz not available\n\n')
@@ -347,6 +355,7 @@ def disconnect_serial(port):
global ser1
global ser2
global ser3
global used_ports
try:
serial_threads[port].stop()
del serial_threads[port]
@@ -355,12 +364,15 @@ def disconnect_serial(port):
pass
if port == "port1":
ser1.close()
used_ports.remove(ser1.port) # Remove the port from the used set
elif port == "port2":
ser2.close()
used_ports.remove(ser2.port) # Remove the port from the used set
elif port == "port3":
ser3.close()
used_ports.remove(ser3.port) # Remove the port from the used set
else:
print("Unkown port, something went wrong...")
print("Unknown port, something went wrong...")
@app.route('/')
@@ -432,8 +444,14 @@ def attach_serial_433():
Returns:
Response: A JSON response indicating the result of the operation.
"""
try:
# Disconnect any existing connection for 433 MHz
disconnect_serial("port1")
print("Current port for 433 MHz disconnected")
except:
pass
user_input = escape(request.args.get('user_input'))
port1_status = True
connect_serial(str(user_input), 433)
result = f'Serial Port Requested for 433 MHz'
return jsonify(result=result)
@@ -467,8 +485,14 @@ def attach_serial_868():
Returns:
Response: A JSON response indicating the result of the operation.
"""
try:
# Disconnect any existing connection for 868 MHz
disconnect_serial("port2")
print("Current port for 868 MHz disconnected")
except:
pass
user_input = escape(request.args.get('user_input'))
port2_status = True
connect_serial(str(user_input), 868)
result = f'Serial Port Requested for 868 MHz'
return jsonify(result=result)
@@ -502,6 +526,13 @@ def attach_serial_915():
Returns:
Response: A JSON response indicating the result of the operation.
"""
try:
# Disconnect any existing connection for 915 MHz
disconnect_serial("port3")
print("Current port for 915 MHz disconnected")
except:
pass
user_input = escape(request.args.get('user_input'))
connect_serial(str(user_input), 915)
result = f'Serial Port Requested for 915 MHz'

6
templates/analysis.html
View File

@@ -181,7 +181,7 @@
})
.catch(error => {
console.error('Error:', error);
Swal.fire('Oops!', 'Something went wrong.', 'error');
Swal.fire('Oops!', 'Something went wrong. The port might already be in use.', 'error');
});
}
});
@@ -377,7 +377,7 @@
})
.catch(error => {
console.error('Error:', error);
Swal.fire('Oops!', 'Something went wrong.', 'error');
Swal.fire('Oops!', 'Something went wrong. The port might already be in use.', 'error');
});
}
});
@@ -573,7 +573,7 @@
})
.catch(error => {
console.error('Error:', error);
Swal.fire('Oops!', 'Something went wrong.', 'error');
Swal.fire('Oops!', 'Something went wrong. The port might already be in use.', 'error');
});
}
});

6
templates/index.html
View File

@@ -202,7 +202,7 @@
})
.catch(error => {
console.error('Error:', error);
Swal.fire('Oops!', 'Something went wrong.', 'error');
Swal.fire('Oops!', 'Something went wrong. The port might already be in use.', 'error');
});
}
});
@@ -398,7 +398,7 @@
})
.catch(error => {
console.error('Error:', error);
Swal.fire('Oops!', 'Something went wrong.', 'error');
Swal.fire('Oops!', 'Something went wrong. The port might already be in use.', 'error');
});
}
});
@@ -594,7 +594,7 @@
})
.catch(error => {
console.error('Error:', error);
Swal.fire('Oops!', 'Something went wrong.', 'error');
Swal.fire('Oops!', 'Something went wrong. The port might already be in use.', 'error');
});
}
});

6
templates/tracking.html
View File

@@ -311,7 +311,7 @@
})
.catch(error => {
console.error('Error:', error);
Swal.fire('Oops!', 'Something went wrong.', 'error');
Swal.fire('Oops!', 'Something went wrong. The port might already be in use.', 'error');
});
}
});
@@ -565,7 +565,7 @@
})
.catch(error => {
console.error('Error:', error);
Swal.fire('Oops!', 'Something went wrong.', 'error');
Swal.fire('Oops!', 'Something went wrong. The port might already be in use.', 'error');
});
}
});
@@ -822,7 +822,7 @@
})
.catch(error => {
console.error('Error:', error);
Swal.fire('Oops!', 'Something went wrong.', 'error');
Swal.fire('Oops!', 'Something went wrong. The port might already be in use.', 'error');
});
}
});