fix migration issue

selfdrive/ui/paint.cc

@@ -1068,12 +1068,12 @@ static void bb_ui_draw_measures_right(UIState *s, int bb_x, int bb_y, int bb_w )
 static void ui_draw_bbui(UIState *s) {
     const UIScene *scene = &s->scene;
     const int bb_dml_w = 180;
-    const int bb_dml_x = (scene->ui_viz_rx + (bdr_is * 2));
-    const int bb_dml_y = (box_y + (bdr_is * 1.5)) + 220;
+    const int bb_dml_x = (scene->ui_viz_rx + (bdr_s * 2));
+    const int bb_dml_y = (box_y + (bdr_s * 1.5)) + 220;
 
     const int bb_dmr_w = 180;
-    const int bb_dmr_x = scene->ui_viz_rx + scene->ui_viz_rw - bb_dmr_w - (bdr_is * 2);
-    const int bb_dmr_y = (box_y + (bdr_is * 1.5)) + 220;
+    const int bb_dmr_x = scene->ui_viz_rx + scene->ui_viz_rw - bb_dmr_w - (bdr_s * 2);
+    const int bb_dmr_y = (box_y + (bdr_s * 1.5)) + 220;
 
     bb_ui_draw_measures_right(s, bb_dml_x, bb_dml_y, bb_dml_w);
     bb_ui_draw_measures_left(s, bb_dmr_x, bb_dmr_y, bb_dmr_w);

selfdrive/ui/ui.cc

@@ -963,7 +963,7 @@ int main(int argc, char* argv[]) {
         volume = volume * (1 + s->dragon_ui_volume_boost /100);
         volume = volume > MAX_VOLUME? MAX_VOLUME : volume;
       }
-      set_volume(s, volume);
+      set_volume(volume);
       s->volume_timeout = 5 * UI_FREQ;
     }
 

selfdrive/ui/ui.hpp

@@ -117,6 +117,16 @@ typedef struct UIScene {
 
   // Used to show gps planner status
   bool gps_planner_active;
+
+  // dragonpilot
+  // for minimal UI
+  float angleSteersDes;
+  float angleSteers;
+
+  // for blinker, from kegman
+  bool leftBlinker;
+  bool rightBlinker;
+  int blinker_blinkingrate;
 } UIScene;
 
 typedef struct {
@@ -244,6 +254,7 @@ typedef struct UIState {
   track_vertices_data track_vertices[2];
   
   // dragonpilot
+  SubSocket *carstate_sock;
   int dragon_ui_speed_timeout;
   int dragon_ui_event_timeout;
   int dragon_ui_maxspeed_timeout;