feat: DragRacing screen enhancements

tzebrowski · Nov 6, 2024 · 7baf4ad · 7baf4ad
1 parent 24cfb18
commit 7baf4ad
Show file tree

Hide file tree

Showing 38 changed files with 181 additions and 98 deletions.
diff --git a/app/src/main/assets/alfa_2_0_gme.properties b/app/src/main/assets/alfa_2_0_gme.properties
@@ -120,4 +120,5 @@ profile_3.pref.adapter.batch.size="3"
 profile_3.pref.adapter.batch_01.size="3"
 
 profile_3.pref.profile.2_0_GME_extension.enabled=true
-profile_3.pref.aa.trip_info.pids.selected=[7021, 7076, 7035, 7002, 7037, 7014, 7047, 7025, 7003, 7036, 7028, 7016, 17078, 7005, 7020, 7019, 7018, 7009]
+profile_3.pref.aa.trip_info.pids.selected=[7021, 7076, 7035, 7002, 7037, 7014, 7047, 7025, 7003, 7036, 7028, 7016, 17078, 7005, 7020, 7019, 7018, 7009]
+profile_3.pref.aa.drag_race.debug.vehicle_speed_measurement=false
diff --git a/app/src/main/assets/alfa_2_0_gme_stn_usb.properties b/app/src/main/assets/alfa_2_0_gme_stn_usb.properties
@@ -114,4 +114,5 @@ profile_6.pref.adapter.batch.size="10"
 profile_6.pref.adapter.batch_01.size="3"
 
 profile_6.pref.profile.2_0_GME_extension.enabled=true
-profile_6.pref.aa.trip_info.pids.selected=[7021, 7076, 7035, 7002, 7037, 7014, 7047, 7025, 7003, 7036, 7028, 7016, 17078, 7005, 7020, 7019, 7018, 7009]
+profile_6.pref.aa.trip_info.pids.selected=[7021, 7076, 7035, 7002, 7037, 7014, 7047, 7025, 7003, 7036, 7028, 7016, 17078, 7005, 7020, 7019, 7018, 7009]
+profile_6.pref.aa.drag_race.debug.vehicle_speed_measurement=false
diff --git a/app/src/main/assets/alfa_2_0_gme_stn_wifi.properties b/app/src/main/assets/alfa_2_0_gme_stn_wifi.properties
@@ -125,4 +125,5 @@ profile_4.pref.adapter.batch_01.size="3"
 
 
 profile_4.pref.profile.2_0_GME_extension.enabled=true
-profile_4.pref.aa.trip_info.pids.selected=[7021, 7076, 7035, 7002, 7037, 7014, 7047, 7025, 7003, 7036, 7028, 7016, 17078, 7005, 7020, 7019, 7018, 7009]
+profile_4.pref.aa.trip_info.pids.selected=[7021, 7076, 7035, 7002, 7037, 7014, 7047, 7025, 7003, 7036, 7028, 7016, 17078, 7005, 7020, 7019, 7018, 7009]
+profile_4.pref.aa.drag_race.debug.vehicle_speed_measurement=false
diff --git a/app/src/main/assets/default.properties b/app/src/main/assets/default.properties
@@ -70,4 +70,5 @@ profile_1.pref.giulia.pids.selected=[22, 12, 16, 5, 6, 18]
 profile_1.pref.giulia.pids.selected.1=[22, 12, 16, 5, 6, 18]
 profile_1.pref.giulia.pids.selected.2=[16, 5, 6, 18]
 
-profile_1.pref.pids.registry.filter_pids_ecu_supported=true
+profile_1.pref.pids.registry.filter_pids_ecu_supported=true
+profile_1.pref.aa.drag_race.debug.vehicle_speed_measurement=false
diff --git a/app/src/main/assets/default_usb.properties b/app/src/main/assets/default_usb.properties
@@ -62,4 +62,5 @@ profile_7.pref.profile.about=This is default profile. It USB connection and CAN
 profile_7.pref.giulia.pids.selected=[22, 12, 16, 5, 6, 18]
 profile_7.pref.giulia.pids.selected.1=[22, 12, 16, 5, 6, 18]
 
-profile_7.pref.pids.registry.filter_pids_ecu_supported=true
+profile_7.pref.pids.registry.filter_pids_ecu_supported=true
+profile_7.pref.aa.drag_race.debug.vehicle_speed_measurement=false
diff --git a/app/src/main/res/drawable/action_drag_race_screen.png b/app/src/main/res/drawable/action_drag_race_screen.png
diff --git a/app/src/main/res/menu/left_nav_menu.xml b/app/src/main/res/menu/left_nav_menu.xml
@@ -82,7 +82,7 @@
         <menu>
             <item
                android:id="@+id/navigation_drag_racing"
-               android:icon="@drawable/action_drag_race_screen"
+               android:icon="@drawable/action_drag_race"
                android:checkable="true"
                android:title="@string/navigation.title_drag_racing">
             </item>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -193,13 +193,15 @@
     <string name="pref.aa.performance_meter.category">Drag Racing</string>
     <string name="pref.aa.performance_meter.metrics_read_freq">OBD2 Data reading frequency</string>
     <string name="pref.aa.performance_meter.display_frequency">Display OBD2 Data read frequency</string>
-    <string name="pref.aa.performance_meter.display_vehicle_speed_measurement">Display vehicle speed at which measurement was done</string>
+    <string name="pref.aa.performance_meter.display_vehicle_speed_measurement">Display the speed at which the measurement was taken</string>
     <string name="pref.aa.performance_meter.shift_lights_enabled">Enable gear shift lights</string>
-    <string name="pref.profile.2_0_GME_extension.enabled">Get additional context information </string>
+    <string name="pref.profile.2_0_GME_extension.enabled">Get additional context information.\nIts valid just for 2.0GME engine.</string>
     <string name="pref.profile.2_0_GME_extension.enabled_summary">It pulls additional metrics during performance meter.</string>
 
     <string name="pref.aa.performance_meter.shift_lights_enabled_summary">This is an EXPERIMENTAL feature.\nEnable gear shift lights</string>
     <string name="pref.aa.performance_meter.display_context_metrics">Display context metrics</string>
+    <string name="pref.aa.performance_meter.display_context_metrics_summary">Display additional context information like vehicle speed</string>
+
 
     <string name="ref.aa.performance_meter.shift_lights.rev">Shift lights revs threshold</string>
 

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -640,7 +640,7 @@
                     android:key="pref.profile.2_0_GME_extension.enabled"
                     android:summary="@string/pref.profile.2_0_GME_extension.enabled_summary"
                     android:title="@string/pref.profile.2_0_GME_extension.enabled"
-                    app:experimental="true"
+                    app:experimental="false"
                     app:singleLineTitle="false" />
 
                 <org.obd.graphs.preferences.aa.AASeekBar
@@ -1358,6 +1358,7 @@
                     <org.obd.graphs.preferences.aa.AACheckBoxPreference
                         android:defaultValue="true"
                         android:key="pref.aa.drag_race.vehicle_speed.enabled"
+                        android:summary="@string/pref.aa.performance_meter.display_context_metrics_summary"
                         android:title="@string/pref.aa.performance_meter.display_context_metrics"
                         app:singleLineTitle="false" />
 
@@ -1368,7 +1369,7 @@
                         app:singleLineTitle="false" />
 
                     <org.obd.graphs.preferences.aa.AACheckBoxPreference
-                        android:defaultValue="true"
+                        android:defaultValue="false"
                         android:key="pref.aa.drag_race.debug.vehicle_speed_measurement"
                         android:title="@string/pref.aa.performance_meter.display_vehicle_speed_measurement"
                         app:singleLineTitle="false" />

diff --git a/automotive/src/main/assets/alfa_2_0_gme_aa.properties b/automotive/src/main/assets/alfa_2_0_gme_aa.properties
@@ -147,4 +147,5 @@ profile_8.pref.aa.break_label.3=true
 profile_8.pref.aa.break_label.4=true
 
 profile_8.pref.graph.filter.source="AA"
-profile_8.pref.aa.trip_info.pids.selected=[7021, 7076, 7035, 7002, 7037, 7014, 7047, 7025, 7003, 7036, 7028, 7016, 17078, 7005, 7020, 7019, 7018, 7009]
+profile_8.pref.aa.trip_info.pids.selected=[7021, 7076, 7035, 7002, 7037, 7014, 7047, 7025, 7003, 7036, 7028, 7016, 17078, 7005, 7020, 7019, 7018, 7009]
+profile_8.pref.aa.drag_race.debug.vehicle_speed_measurement=false
diff --git a/automotive/src/main/assets/alfa_2_0_gme_aa_gg_stn.properties b/automotive/src/main/assets/alfa_2_0_gme_aa_gg_stn.properties
@@ -158,4 +158,5 @@ profile_10.pref.aa.break_label.3=true
 profile_10.pref.aa.break_label.4=true
 
 profile_10.pref.graph.filter.source="AA"
-profile_10.pref.aa.trip_info.pids.selected=[7021, 7076, 7035, 7002, 7037, 7014, 7047, 7025, 7003, 7036, 7028, 7016, 17078, 7005, 7020, 7019, 7018, 7009]
+profile_10.pref.aa.trip_info.pids.selected=[7021, 7076, 7035, 7002, 7037, 7014, 7047, 7025, 7003, 7036, 7028, 7016, 17078, 7005, 7020, 7019, 7018, 7009]
+profile_10.pref.aa.drag_race.debug.vehicle_speed_measurement=false
diff --git a/automotive/src/main/assets/alfa_2_0_gme_aa_stn.properties b/automotive/src/main/assets/alfa_2_0_gme_aa_stn.properties
@@ -155,4 +155,5 @@ profile_9.pref.aa.break_label.3=true
 profile_9.pref.aa.break_label.4=true
 
 profile_9.pref.graph.filter.source="AA"
-profile_9.pref.aa.trip_info.pids.selected=[7021, 7076, 7035, 7002, 7037, 7014, 7047, 7025, 7003, 7036, 7028, 7016, 17078, 7005, 7020, 7019, 7018, 7009]
+profile_9.pref.aa.trip_info.pids.selected=[7021, 7076, 7035, 7002, 7037, 7014, 7047, 7025, 7003, 7036, 7028, 7016, 17078, 7005, 7020, 7019, 7018, 7009]
+profile_9.pref.aa.drag_race.debug.vehicle_speed_measurement=false
diff --git a/automotive/src/main/assets/alfa_2_0_gme_aa_stn_gpf.properties b/automotive/src/main/assets/alfa_2_0_gme_aa_stn_gpf.properties
@@ -156,4 +156,5 @@ profile_13.pref.adapter.stn.enabled=true
 profile_13.pref.profile.2_0_GME_extension.enabled=true
 
 profile_13.pref.graph.filter.source="AA"
-profile_13.pref.aa.trip_info.pids.selected=[7021, 7076,  7035, 7002, 7037, 7014, 7047, 7025, 7003, 7036, 7028, 7016, 17078, 7005, 7020, 7019, 7018, 7009]
+profile_13.pref.aa.trip_info.pids.selected=[7021, 7076,  7035, 7002, 7037, 7014, 7047, 7025, 7003, 7036, 7028, 7016, 17078, 7005, 7020, 7019, 7018, 7009]
+profile_13.pref.aa.drag_race.debug.vehicle_speed_measurement=false
diff --git a/automotive/src/main/java/org/obd/graphs/aa/CarSettings.kt b/automotive/src/main/java/org/obd/graphs/aa/CarSettings.kt
@@ -72,7 +72,7 @@ class CarSettings(private val carContext: CarContext) : ScreenSettings {
 
     override fun getDragRacingScreenSettings(): DragRacingScreenSettings = dragRacingScreenSettings.apply {
         metricsFrequencyReadEnabled = Prefs.getBoolean("pref.aa.drag_race.debug.display_frequency", true)
-        vehicleSpeedDisplayDebugEnabled = Prefs.getBoolean("pref.aa.drag_race.debug.vehicle_speed_measurement", true)
+        vehicleSpeedDisplayDebugEnabled = Prefs.getBoolean("pref.aa.drag_race.debug.vehicle_speed_measurement", false)
         displayMetricsEnabled = Prefs.getBoolean("pref.aa.drag_race.vehicle_speed.enabled", true)
         shiftLightsEnabled = Prefs.getBoolean("pref.aa.drag_race.shift_lights.enabled", false)
         shiftLightsRevThreshold = Prefs.getS("pref.aa.drag_race.shift_lights.rev_value", "5000").toInt()

diff --git a/automotive/src/main/java/org/obd/graphs/aa/screen/nav/SurfaceRendererScreen.kt b/automotive/src/main/java/org/obd/graphs/aa/screen/nav/SurfaceRendererScreen.kt
@@ -213,10 +213,10 @@ internal class SurfaceRendererScreen(
 
     fun isSurfaceRendererScreen(identity: Identity) = identity is SurfaceRendererType
     override fun getFeatureDescription(): List<FeatureDescription>  = mutableListOf(
-        FeatureDescription(SurfaceRendererType.DRAG_RACING, R.drawable.action_drag_race_screen, carContext.getString(R.string.available_features_drag_race_screen_title)),
+        FeatureDescription(SurfaceRendererType.DRAG_RACING, R.drawable.action_drag_race, carContext.getString(R.string.available_features_drag_race_screen_title)),
 
-        FeatureDescription(SurfaceRendererType.GAUGE, R.drawable.action_giulia, carContext.getString(R.string.available_features_gauge_screen_title)),
-        FeatureDescription(SurfaceRendererType.GIULIA, R.drawable.action_giulia, carContext.getString(R.string.available_features_giulia_screen_title))).apply {
+        FeatureDescription(SurfaceRendererType.GAUGE, R.drawable.action_gauge, carContext.getString(R.string.available_features_gauge_screen_title)),
+        FeatureDescription(SurfaceRendererType.GIULIA, R.drawable.action_giulia_metics, carContext.getString(R.string.available_features_giulia_screen_title))).apply {
             if (settings.getTripInfoScreenSettings().viewEnabled) {
                 add(FeatureDescription(SurfaceRendererType.TRIP_INFO, R.drawable.action_giulia,  carContext.getString(R.string.available_features_trip_info_screen_title)))
             }

diff --git a/automotive/src/main/res/drawable/action_disconnect.png b/automotive/src/main/res/drawable/action_disconnect.png
diff --git a/automotive/src/main/res/drawable/action_drag_race_screen.png b/automotive/src/main/res/drawable/action_drag_race_screen.png
diff --git a/automotive/src/main/res/drawable/action_exit.png b/automotive/src/main/res/drawable/action_exit.png
diff --git a/automotive/src/main/res/drawable/action_features.png b/automotive/src/main/res/drawable/action_features.png
diff --git a/automotive/src/main/res/drawable/action_gauge.png b/automotive/src/main/res/drawable/action_gauge.png
diff --git a/automotive/src/main/res/drawable/action_giulia.png b/automotive/src/main/res/drawable/action_giulia.png
diff --git a/automotive/src/main/res/drawable/action_giulia_metics.png b/automotive/src/main/res/drawable/action_giulia_metics.png
diff --git a/automotive/src/main/res/drawable/action_virtual_screen_1.png b/automotive/src/main/res/drawable/action_virtual_screen_1.png
diff --git a/automotive/src/main/res/drawable/action_virtual_screen_2.png b/automotive/src/main/res/drawable/action_virtual_screen_2.png
diff --git a/automotive/src/main/res/drawable/action_virtual_screen_3.png b/automotive/src/main/res/drawable/action_virtual_screen_3.png
diff --git a/automotive/src/main/res/drawable/action_virtual_screen_4.png b/automotive/src/main/res/drawable/action_virtual_screen_4.png
diff --git a/automotive/src/main/res/drawable/actions_connect.png b/automotive/src/main/res/drawable/actions_connect.png
diff --git a/automotive/src/main/res/drawable/config.png b/automotive/src/main/res/drawable/config.png
diff --git a/automotive/src/main/res/values/strings.xml b/automotive/src/main/res/values/strings.xml
@@ -16,8 +16,8 @@
     <string name="available_features.page_title">Available screens</string>
     <string name="available_features.routine_screen.title">Routines</string>
     <string name="available_features.drag_race_screen.title">Drag Racing</string>
-    <string name="available_features.giulia_screen.title">Metrics - Giulia</string>
-    <string name="available_features.gauge_screen.title">Metrics - Gauge </string>
+    <string name="available_features.giulia_screen.title">Giulia - Metrics</string>
+    <string name="available_features.gauge_screen.title">Gauge - Metrics</string>
     <string name="available_features.trip_info_screen.title">Trip Info</string>
 
 </resources>
diff --git a/common/src/main/res/drawable/action_drag_race.png b/common/src/main/res/drawable/action_drag_race.png