fix TF runner to actually work with new model

remove additional model
rafcabezas · Apr 20, 2020 · a8f0313 · a8f0313
1 parent 83edaae
commit a8f0313
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/models/dmonitoring_model.current b/models/dmonitoring_model.current
diff --git a/models/supercombo.keras.new b/models/supercombo.keras.new
diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py
@@ -470,6 +470,10 @@ def controlsd_thread(sm=None, pm=None, can_sock=None):
 
   passive = passive or not openpilot_enabled_toggle
 
+  # Passive if internet needed
+  internet_needed = params.get("Offroad_ConnectivityNeeded", encoding='utf8') is not None
+  passive = passive or internet_needed
+
   # Pub/Sub Sockets
   if pm is None:
     pm = messaging.PubMaster(['sendcan', 'controlsState', 'carState', 'carControl', 'carEvents', 'carParams'])

diff --git a/selfdrive/modeld/models/driving.h b/selfdrive/modeld/models/driving.h
@@ -4,7 +4,7 @@
 // gate this here
 #define TEMPORAL
 #define DESIRE
-//#define TRAFFIC_CONVENTION
+#define TRAFFIC_CONVENTION
 
 #ifdef QCOM
 #include <eigen3/Eigen/Dense>

diff --git a/selfdrive/modeld/runners/tfmodel.cc b/selfdrive/modeld/runners/tfmodel.cc
@@ -102,6 +102,9 @@ void TFModel::execute(float *net_input_buf, int buf_size) {
   if (rnn_input_buf != NULL) {
     pwrite(rnn_input_buf, rnn_state_size);
   }
+  if (traffic_convention_input_buf != NULL) {
+    pwrite(traffic_convention_input_buf, traffic_convention_size);
+  }
   pread(output, output_size);
 }