config: add support for specifying ev_connector_types

Author: manio

contrib/config.toml

@@ -98,3 +98,12 @@
   # Path to script executed when Android Auto session starts/stops and EV battery data is needed
   # Argument "start" or "stop" is appended automatically when invoked
   ev_battery_logger = ""
+
+  # List of EV connector types supported by your car.
+  # Possible values (separate multiple with a comma ','):
+  # EV_CONNECTOR_TYPE_J1772, EV_CONNECTOR_TYPE_MENNEKES, EV_CONNECTOR_TYPE_CHADEMO,
+  # EV_CONNECTOR_TYPE_COMBO_1, EV_CONNECTOR_TYPE_COMBO_2, EV_CONNECTOR_TYPE_TESLA_SUPERCHARGER,
+  # EV_CONNECTOR_TYPE_GBT
+  #
+  # If left empty, the default is EV_CONNECTOR_TYPE_MENNEKES.
+  ev_connector_types = ""

src/config.rs

@@ -141,6 +141,8 @@ pub struct AppConfig {
     pub ev: bool,
     #[serde(default, deserialize_with = "empty_string_as_none")]
     pub ev_battery_logger: Option<PathBuf>,
+    #[serde(default, deserialize_with = "empty_string_as_none")]
+    pub ev_connector_types: Option<String>,
 
     #[serde(skip)]
     pub restart_requested: bool,
@@ -178,6 +180,7 @@ impl Default for AppConfig {
             ev: false,
             ev_battery_logger: None,
             restart_requested: false,
+            ev_connector_types: None,
         }
     }
 }
@@ -273,6 +276,9 @@ impl AppConfig {
         if let Some(path) = &self.ev_battery_logger {
             doc["ev_battery_logger"] = value(path.display().to_string());
         }
+        if let Some(ev_connector_types) = &self.ev_connector_types {
+            doc["ev_connector_types"] = value(ev_connector_types);
+        }
 
         let _ = remount_root(false);
         info!(

src/mitm.rs

@@ -24,7 +24,7 @@ use crate::mitm::AudioStreamType::*;
 use crate::mitm::SensorMessageId::*;
 use crate::mitm::SensorType::*;
 use protobuf::text_format::print_to_string_pretty;
-use protobuf::{Enum, Message, MessageDyn};
+use protobuf::{Enum, EnumOrUnknown, Message, MessageDyn};
 use protos::ControlMessageType::{self, *};
 
 use crate::config::AppConfig;
@@ -272,6 +272,7 @@ pub async fn pkt_modify_hook(
     ctx: &mut ModifyContext,
     sensor_channel: Arc<tokio::sync::Mutex<Option<u8>>>,
     ev_battery_logger: Option<PathBuf>,
+    connector_types: Option<String>,
 ) -> Result<bool> {
     // if for some reason we have too small packet, bail out
     if pkt.payload.len() < 2 {
@@ -466,12 +467,20 @@ pub async fn pkt_modify_hook(
                         .supported_fuel_types = vec![FuelType::FUEL_TYPE_ELECTRIC.into()];
 
                     // supported connector types
-                    // FIXME: make this connectors configurable via config
+                    let connectors: Vec<EnumOrUnknown<EvConnectorType>> = match connector_types {
+                        Some(types) => types
+                            .split(',')
+                            .filter_map(|s| EvConnectorType::from_str(s.trim()))
+                            .map(EnumOrUnknown::new)
+                            .collect(),
+                        None => {
+                            vec![EvConnectorType::EV_CONNECTOR_TYPE_MENNEKES.into()]
+                        }
+                    };
                     svc.sensor_source_service
                         .as_mut()
                         .unwrap()
-                        .supported_ev_connector_types =
-                        vec![EvConnectorType::EV_CONNECTOR_TYPE_MENNEKES.into()];
+                        .supported_ev_connector_types = connectors;
                 }
             }
 
@@ -797,6 +806,7 @@ pub async fn proxy<A: Endpoint<A> + 'static>(
                 &mut ctx,
                 sensor_channel.clone(),
                 config.ev_battery_logger.clone(),
+                config.ev_connector_types.clone(),
             )
             .await?;
             let _ = pkt_debug(
@@ -842,6 +852,7 @@ pub async fn proxy<A: Endpoint<A> + 'static>(
                         &mut ctx,
                         sensor_channel.clone(),
                         config.ev_battery_logger.clone(),
+                        config.ev_connector_types.clone(),
                     )
                     .await?;
                     let _ = pkt_debug(

static/index.html

@@ -42,8 +42,8 @@ <h3>🛸 aa-proxy-rs</h3>
             <small
               >Log file path, by default it is saved to <code>/var/log</code> in
               <code>tmpfs</code>/memory. If you want, you can change it e.g. to
-              <code>/data/aa-proxy-rs.log</code> and it will be saved to SD
-              card (appended, not replaced).</small
+              <code>/data/aa-proxy-rs.log</code> and it will be saved to SD card
+              (appended, not replaced).</small
             >
           </td>
         </tr>
@@ -294,6 +294,21 @@ <h3>🛸 aa-proxy-rs</h3>
             >
           </td>
         </tr>
+        <tr>
+          <td><label for="ev_connector_types">ev_connector_types</label></td>
+          <td>
+            <input type="text" id="ev_connector_types" /><br /><small>
+              List of EV connector types supported by your car. Possible values
+              (separate multiple with a comma ','):<br />
+              EV_CONNECTOR_TYPE_J1772, EV_CONNECTOR_TYPE_MENNEKES,
+              EV_CONNECTOR_TYPE_CHADEMO, EV_CONNECTOR_TYPE_COMBO_1,
+              EV_CONNECTOR_TYPE_COMBO_2, EV_CONNECTOR_TYPE_TESLA_SUPERCHARGER,
+              EV_CONNECTOR_TYPE_GBT<br />
+
+              If left empty, the default is EV_CONNECTOR_TYPE_MENNEKES.
+            </small>
+          </td>
+        </tr>
       </table>
     </form>
 
@@ -384,6 +399,7 @@ <h3>🛸 aa-proxy-rs</h3>
           "dhu",
           "ev",
           "ev_battery_logger",
+          "ev_connector_types",
         ];
         ids.forEach((id) => (config[id] = getValue(id)));
         await fetch("/config", {