Corrigindo pequenos erros e realizando testes

lesunb · Dec 15, 2023 · d6575ce · d6575ce
1 parent b375b71
commit d6575ce
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 12 deletions.
diff --git a/data_to_read/bpm.csv b/data_to_read/bpm.csv
@@ -0,0 +1 @@
+106
diff --git a/data_to_read/spo2.csv b/data_to_read/spo2.csv
@@ -0,0 +1 @@
+98
diff --git a/data_to_read/temp.csv b/data_to_read/temp.csv
@@ -0,0 +1 @@
+38.33
diff --git a/src/sa-bsn/configurations/target_system/g3t1_1.launch b/src/sa-bsn/configurations/target_system/g3t1_1.launch
@@ -28,6 +28,6 @@
             0 -> Simulation (default)
             1 -> Real sensors with Arduino
             2 -> Table data (Turn on this feature to auto generate the file at data_to_read/*sensor_name*.csv)-->
-    <param name="connect_sensor_/g3t1_1" value="0" type="int" />
+    <param name="connect_sensor_/g3t1_1" value="2" type="int" />
 
 </launch>
diff --git a/src/sa-bsn/configurations/target_system/g3t1_2.launch b/src/sa-bsn/configurations/target_system/g3t1_2.launch
@@ -28,6 +28,6 @@
             0 -> Simulation (default)
             1 -> Real sensors with Arduino
             2 -> Table data (Turn on this feature to auto generate the file at data_to_read/*sensor_name*.csv)-->
-    <param name="connect_sensor_/g3t1_2" value="0" type="int" />
+    <param name="connect_sensor_/g3t1_2" value="2" type="int" />
 
 </launch>
diff --git a/src/sa-bsn/configurations/target_system/g3t1_3.launch b/src/sa-bsn/configurations/target_system/g3t1_3.launch
@@ -22,6 +22,6 @@
             0 -> Simulation (default)
             1 -> Real sensors with Arduino
             2 -> Table data (Turn on this feature to auto generate the file at data_to_read/*sensor_name*.csv)-->
-    <param name="connect_sensor_/g3t1_3" value="0" type="int" />
+    <param name="connect_sensor_/g3t1_3" value="2" type="int" />
 
 </launch>
diff --git a/src/sa-bsn/target_system/components/component/src/Sensor.cpp b/src/sa-bsn/target_system/components/component/src/Sensor.cpp
@@ -183,7 +183,6 @@ double Sensor::collect_table(){
             }
             if(line_number_counter == line_marker) {
                 m_data = std::stof(line);
-                std::cout << m_data << std::endl;
                 last_line = 0;
                 return m_data;
             }

diff --git a/src/sa-bsn/target_system/components/component/src/covid_detection/covid_detection.py b/src/sa-bsn/target_system/components/component/src/covid_detection/covid_detection.py
@@ -11,15 +11,16 @@ def callback(data):
     with open(caminho, 'rb') as file:
         model = pickle.load(file)
 
-    debug = 0
-    if(debug==1):
-        # Realiza a previsao de um unico caso de teste
-        rospy.loginfo("oxi_data %f" % (data.oxi_data))
-        rospy.loginfo("ecg_data %f" % (data.ecg_data))
-        rospy.loginfo("trm_data C %f" % (data.trm_data))
-        rospy.loginfo("trm_data F %f" % ((data.trm_data * 1.8) + 32))
     data_to_test = pd.DataFrame({'Oxygen': data.oxi_data, 'PulseRate': data.ecg_data, 'Temperature': ((data.trm_data * 1.8) + 32)}, index=[0])
     resultado = model.predict(data_to_test)
+    debug = 1
+    if(debug==1):
+        # Realiza a previsao de um unico caso de teste
+        rospy.loginfo("Debug: oxi_data %f" % (data.oxi_data))
+        rospy.loginfo("Debug: ecg_data %f" % (data.ecg_data))
+        rospy.loginfo("Debug: trm_data C %f" % (data.trm_data))
+        rospy.loginfo("Debug: trm_data F %f" % ((data.trm_data * 1.8) + 32))
+        rospy.loginfo("Debug: Covid suspect %i" % (resultado))
     if(resultado[0]==1):
         rospy.loginfo("The patient's condition was compatible with a suspected case of Covid-19. Please see a doctor.")
     else:

diff --git a/src/sa-bsn/target_system/components/component/src/g3t1_3/G3T1_3.cpp b/src/sa-bsn/target_system/components/component/src/g3t1_3/G3T1_3.cpp
@@ -20,7 +20,7 @@ G3T1_3::~G3T1_3() {}
 
 void G3T1_3::setUp() {
     Component::setUp();
-
+    convert_name();
     std::array<bsn::range::Range,5> ranges;
     std::string s;