6FPS/car-os
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change how different sensor types ar handled

Browse Source
This commit is contained in:
smithserver_admin
2026-07-06 13:57:09 -06:00
parent 6eb2993391
commit 8fc5088c01
21 changed files with 320 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sensor_approval/SensorApprovalController.gd
+2 -2
View File
@@ -32,9 +32,9 @@ func _on_settings_closed():
add_child(sensor_approval_nodes[val])
_update_container_position()
func _on_sensor_request_received(sensor_ip: String, data_provided: Array):
func _on_sensor_request_received(sensor_ip: String, sensor_class: String):
sensor_approval_nodes[sensor_ip] = sensor_approval_scene.instantiate()
sensor_approval_nodes[sensor_ip].set_provided_data(sensor_ip, data_provided)
sensor_approval_nodes[sensor_ip].set_provided_data(sensor_ip, sensor_class)
if not settings_open:
add_child(sensor_approval_nodes[sensor_ip])
_update_container_position()
sensor_approval/provided_data.gd
+9 -4
View File
@@ -11,9 +11,10 @@ offset | size | type | description
9 | 1 byte | bool | peer provides euler orientation
10 | 1 byte | bool | peer provides quaternion orientation
"""
var data_labels = ["Date Time", "PNT", "Accel", "Gyro", "Magnet", "Euler", "Quat"]
var data_labels = ["Date Time", "PNT", "Accel", "Gyro", "Magnet", "Euler", "Quat", "2D Lidar"]
var provided_data: Array = [0, 0, 0, 0, 0, 0, 0]
var sensor_class: String = ''
var provided_data: Array = [0, 0, 0, 0, 0, 0, 0, 0]
var data_columns: Array
@export var data_column_scene: PackedScene
@@ -35,5 +36,9 @@ func _setup_data_columns():
func _process(delta: float) -> void:
pass
func set_provided_data(incoming_provided_data):
provided_data = incoming_provided_data
func set_provided_data(incoming_sensor_class: String):
sensor_class = incoming_sensor_class.capitalize()
if incoming_sensor_class == "VEHICLE":
provided_data = [0, 1, 1, 1, 1, 0, 0, 0]
elif incoming_sensor_class == "LIDAR_2D":
provided_data = [0, 1, 1, 1, 0, 0, 0, 1]
sensor_approval/sensor_approval.gd
+6 -3
View File
@@ -5,7 +5,7 @@ var ip_label: Label
var data_instance: Node
var sensor_ip: String = "127.0.0.1"
var data_labels = ["PNT", "Accel", "Gyro", "Magnet"]
var data_labels = ["PNT", "Accel", "Gyro", "Magnet", "2D Lidar"]
var provided_data: Array = [0, 0, 0, 0]
var data_columns: Array
@@ -27,11 +27,14 @@ func _setup_data_columns():
column_instance.get_node('DataValue').text = "True"
container.add_child(column_instance)
func set_provided_data(incoming_sensor_ip: String, incoming_provided_data: Array):
func set_provided_data(incoming_sensor_ip: String, sensor_class: String):
sensor_ip = incoming_sensor_ip
ip_label = get_node('HBoxContainer/Label')
ip_label.text = sensor_ip
provided_data = incoming_provided_data
if sensor_class == "VEHICLE":
provided_data = [1, 1, 1, 1, 0]
elif sensor_class == "LIDAR_2D":
provided_data = [1, 1, 1, 0, 1]
if data_columns.size() == 0:
_setup_data_columns()
else: