[mercedesme] Update proto files for upcoming features (openhab#18205)

* update proto files

Signed-off-by: Bernd Weymann <bernd.weymann@gmail.com>

Author: weymann

bundles/org.openhab.binding.mercedesme/proto/acp.proto

@@ -1,10 +1,8 @@
 syntax = "proto3";
 package proto;
 
-//import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 import "gogo.proto";
 
-
 option (gogoproto.goproto_enum_prefix_all) = true;
 option java_package = "com.daimler.mbcarkit.proto";
 
@@ -48,6 +46,9 @@ message VehicleAPI {
         FINISHED = 5;
         // There was an error while executing the command process.
         FAILED = 6;
+        // added 20241105
+        ACKED_BY_APPTWIN = 7;
+        PIN_VALID = 8;
     }
 
     enum AttributeStatus {
@@ -284,6 +285,8 @@ message ACP {
         RTMREADCONFIG = 2410;
         AVPACTIVATE = 2700;
         CHARGECONTROLCONFIGURE = 2800;
+        CHARGINGBREAKCLOCKTIMERCONFIGURE = 3000;
+        WIPERRESET = 3110;
 
         unknownCommandType = 0;
         doorsLock = 100;
@@ -416,5 +419,7 @@ message ACP {
         rtmReadConfig = 2410;
         avpActivate = 2700;
         chargecontrolconfigure = 2800;
+        chargingbreakclocktimerconfigure = 3000;
+        wiperreset = 3110;
     }
 }

bundles/org.openhab.binding.mercedesme/proto/client.proto

@@ -36,6 +36,7 @@ message ClientMessage {
     AppTwinPendingCommandsResponse apptwin_pending_commands_response = 21;
     AcknowledgeVEPUpdatesByVIN acknowledge_vep_updates_by_vin = 22;
     AcknowledgeAssignedVehicles acknowledge_assigned_vehicles = 23;
+    AcknowledgeDataChangeEvent acknowledge_data_change_event = 26;
   }
 }
 

bundles/org.openhab.binding.mercedesme/proto/eventpush.proto

@@ -2,7 +2,6 @@ syntax = "proto3";
 package proto;
 import "acp.proto";
 
-//import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 import "gogo.proto";
 
 option (gogoproto.goproto_enum_prefix_all) = true;

bundles/org.openhab.binding.mercedesme/proto/gogo.proto

@@ -141,4 +141,4 @@ extend google.protobuf.FieldOptions {
 	optional bool stdduration = 65011;
 	optional bool wktpointer = 65012;
 
-}
+}

bundles/org.openhab.binding.mercedesme/proto/google/protobuf/timestamp.proto

@@ -0,0 +1,144 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+
+package google.protobuf;
+
+option cc_enable_arenas = true;
+option go_package = "google.golang.org/protobuf/types/known/timestamppb";
+option java_package = "com.google.protobuf";
+option java_outer_classname = "TimestampProto";
+option java_multiple_files = true;
+option objc_class_prefix = "GPB";
+option csharp_namespace = "Google.Protobuf.WellKnownTypes";
+
+// A Timestamp represents a point in time independent of any time zone or local
+// calendar, encoded as a count of seconds and fractions of seconds at
+// nanosecond resolution. The count is relative to an epoch at UTC midnight on
+// January 1, 1970, in the proleptic Gregorian calendar which extends the
+// Gregorian calendar backwards to year one.
+//
+// All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap
+// second table is needed for interpretation, using a [24-hour linear
+// smear](https://developers.google.com/time/smear).
+//
+// The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By
+// restricting to that range, we ensure that we can convert to and from [RFC
+// 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings.
+//
+// # Examples
+//
+// Example 1: Compute Timestamp from POSIX `time()`.
+//
+//     Timestamp timestamp;
+//     timestamp.set_seconds(time(NULL));
+//     timestamp.set_nanos(0);
+//
+// Example 2: Compute Timestamp from POSIX `gettimeofday()`.
+//
+//     struct timeval tv;
+//     gettimeofday(&tv, NULL);
+//
+//     Timestamp timestamp;
+//     timestamp.set_seconds(tv.tv_sec);
+//     timestamp.set_nanos(tv.tv_usec * 1000);
+//
+// Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`.
+//
+//     FILETIME ft;
+//     GetSystemTimeAsFileTime(&ft);
+//     UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime;
+//
+//     // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z
+//     // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z.
+//     Timestamp timestamp;
+//     timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL));
+//     timestamp.set_nanos((INT32) ((ticks % 10000000) * 100));
+//
+// Example 4: Compute Timestamp from Java `System.currentTimeMillis()`.
+//
+//     long millis = System.currentTimeMillis();
+//
+//     Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000)
+//         .setNanos((int) ((millis % 1000) * 1000000)).build();
+//
+// Example 5: Compute Timestamp from Java `Instant.now()`.
+//
+//     Instant now = Instant.now();
+//
+//     Timestamp timestamp =
+//         Timestamp.newBuilder().setSeconds(now.getEpochSecond())
+//             .setNanos(now.getNano()).build();
+//
+// Example 6: Compute Timestamp from current time in Python.
+//
+//     timestamp = Timestamp()
+//     timestamp.GetCurrentTime()
+//
+// # JSON Mapping
+//
+// In JSON format, the Timestamp type is encoded as a string in the
+// [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format. That is, the
+// format is "{year}-{month}-{day}T{hour}:{min}:{sec}[.{frac_sec}]Z"
+// where {year} is always expressed using four digits while {month}, {day},
+// {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional
+// seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution),
+// are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone
+// is required. A proto3 JSON serializer should always use UTC (as indicated by
+// "Z") when printing the Timestamp type and a proto3 JSON parser should be
+// able to accept both UTC and other timezones (as indicated by an offset).
+//
+// For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past
+// 01:30 UTC on January 15, 2017.
+//
+// In JavaScript, one can convert a Date object to this format using the
+// standard
+// [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString)
+// method. In Python, a standard `datetime.datetime` object can be converted
+// to this format using
+// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with
+// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use
+// the Joda Time's [`ISODateTimeFormat.dateTime()`](
+// http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime()
+// ) to obtain a formatter capable of generating timestamps in this format.
+//
+message Timestamp {
+  // Represents seconds of UTC time since Unix epoch
+  // 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
+  // 9999-12-31T23:59:59Z inclusive.
+  int64 seconds = 1;
+
+  // Non-negative fractions of a second at nanosecond resolution. Negative
+  // second values with fractions must still have non-negative nanos values
+  // that count forward in time. Must be from 0 to 999,999,999
+  // inclusive.
+  int32 nanos = 2;
+}

bundles/org.openhab.binding.mercedesme/proto/vehicle-commands.proto

@@ -1,6 +1,5 @@
 syntax = "proto3";
 package proto;
-//import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 import "gogo.proto";
 import "google/protobuf/wrappers.proto";
 
@@ -97,6 +96,9 @@ message CommandRequest {
 
     DeactivateVehicleKeys deactivate_vehicle_keys = 48;
     ActivateVehicleKeys activate_vehicle_keys = 49;
+
+    ChargingBreakClocktimerConfigure chargingbreak_clocktimer_configure = 50;
+    WiperHealthReset wiper_health_reset = 64;
   }
 }
 
@@ -609,3 +611,25 @@ message AutomaticValetParkingActivate {
 message ChargeFlapUnlock {}
 
 message ChargeCouplerUnlock {}
+
+message ChargingBreakClocktimerConfigure {
+  repeated ChargingBreakClockTimerConfigureEntry chargingbreak_clocktimer_configure_entry = 1;
+}
+
+
+enum ChargingBreakClockTimerEntryStatus {
+  DELETE = 0;
+  INACTIVE = 1;
+  ACTIVE = 2;
+}
+
+message ChargingBreakClockTimerConfigureEntry {
+  ChargingBreakClockTimerEntryStatus action = 1;
+  int32 endTimeHour = 2;
+  int32 endTimeMinute = 3;
+  int32 startTimeHour = 4;
+  int32 startTimeMinute = 5;
+  int32 timerId = 6;
+}
+
+message WiperHealthReset {}

bundles/org.openhab.binding.mercedesme/proto/vehicle-events.proto

@@ -5,6 +5,7 @@ import "user-events.proto";
 import "vehicle-commands.proto";
 import "protos.proto";
 import "vehicleapi.proto";
+import "google/protobuf/timestamp.proto";
 
 option java_package = "com.daimler.mbcarkit.proto";
 
@@ -129,6 +130,37 @@ message VehicleAttributeStatus {
     T24H = 2;
   }
 
+  enum TcuConnectionStateLowChannelStatus {
+    UNKNOWN_TCU_CONNECTION_STATE = 0;
+    INITIALLY_CONNECTED = 1;
+    RECONNECTED = 2;
+    DISCONNECTED = 3;
+    UNPLANNED_DISCONNECTED = 4;
+  }
+  
+  enum ChargingCouplerErrorDetails {
+    CHARING_COUPLER_ERROR_DETAILS_NO_INFO_OR_ERROR_MESSAGE = 0;
+    CHARING_COUPLER_ERROR_DETAILS_RELIEVE_CHARGE_COUPLER_AND_RETRY = 1;
+    CHARING_COUPLER_ERROR_DETAILS_CONTACT_SERVICE_HOTLINE_FOR_EMERGENCY_UNLOCK = 2;
+    CHARING_COUPLER_ERROR_DETAILS_UNPLUG_AND_REPLUG_CHARGE_COUPLER = 3;
+    CHARING_COUPLER_ERROR_DETAILS_CHARGE_COUPLER_LOCK_DEFECT = 4;
+  }
+
+  enum ChargingErrorImpossibleChangeTo400V {
+    CHARGING_ERROR_IMPOSSIBLE_CHANGE_TO_400V_NO_INFO = 0;
+    CHARGING_ERROR_IMPOSSIBLE_CHANGE_TO_400V_400V_IMPOSSIBLE_STUCK_TO_800V = 1;
+  }
+
+  enum ChargingErrorImpossibleChangeTo800V {
+    CHARGING_ERROR_IMPOSSIBLE_CHANGE_TO_800V_NO_INFO = 0;
+    CHARGING_ERROR_IMPOSSIBLE_CHANGE_TO_800V_800V_IMPOSSIBLE_STUCK_TO_400V = 1;
+  }
+
+  enum ChargingErrorVehicleNoSupport400V {
+    CHARGING_ERROR_VEHICLE_NO_SUPPORT_400V_NO_INFO = 0;
+    CHARGING_ERROR_VEHICLE_NO_SUPPORT_400V_400V_CHARGING_NOT_POSSIBLE = 1;
+  }
+
   // A list of service ids for which this attribute was sent
   // this field ist just used backend internally and will always
   // be empty when sent out to the client.
@@ -164,7 +196,136 @@ message VehicleAttributeStatus {
     EcoHistogramValue eco_histogram_value = 28;
     WeeklyProfileValue weekly_profile_value = 29;
     ChargeProgramsValue charge_programs_value = 31;
+    ChargingBreakClockTimerValue chargingbreak_clocktimer_value = 32;
+    ChargingPowerControl charging_power_control = 33;
+    TcuConnectionStateLowChannelStatus tcu_connection_state_low_channel = 38;
+    PrecondState precond_state = 44;
+    ChargingPowerRestrictions charging_power_restrictions = 55;
+    ChargingCouplerErrorDetails charging_coupler_error_details = 56;
+    ChargingErrorVehicleNoSupport400V charging_error_vehicle_no_support_400v = 58;
+    ChargingErrorImpossibleChangeTo400V charging_error_impossible_change_to_400v = 59;
+    ChargingErrorImpossibleChangeTo800V charging_error_impossible_change_to_800v = 60;
+    ChargingPredictionSoc charging_prediction_soc = 80;
+    ChargingPredictionDepartureTime charging_prediction_departure_time = 81;
+    // ChargingScheduleActive charging_schedule_active = 82;
+    ChargeFlaps charge_flaps = 84;
+    ChargeInlets charge_inlets = 85;
+    
+  }
+}
+
+message ChargingPredictionSoc {
+  google.protobuf.Timestamp predicted_end_time = 1;
+  int64 predicted_electrical_energy_range = 2;
+}
+
+message ChargingPredictionDepartureTime {
+  int32 predicted_soc = 1;
+  int64 predicted_electrical_energy_range = 2;
+}
+
+
+message ChargeInletsEntry {
+  enum ChargeInletsCouplerState {
+    CHARGE_INLETS_COUPLER_STATE_UNKNOWN = 0;
+    CHARGE_INLETS_COUPLER_STATE_PLUGGED = 1;
+    CHARGE_INLETS_COUPLER_STATE_VEHICLE_PLUGGED = 2;
+    CHARGE_INLETS_COUPLER_STATE_VEHICLE_NOT_PLUGGED = 3;
+    CHARGE_INLETS_COUPLER_STATE_DEFECT = 4;
+  }
+
+  enum ChargeInletsLockState {
+    CHARGE_INLETS_LOCK_STATE_UNKNOWN = 0;
+    CHARGE_INLETS_LOCK_STATE_UNLOCKED = 1;
+    CHARGE_INLETS_LOCK_STATE_LOCKED = 2;
+    CHARGE_INLETS_LOCK_STATE_LOCK_STATE_NOT_CLEAR = 3;
+    CHARGE_INLETS_LOCK_STATE_NOT_AVAILABLE = 4;
+  }
+
+  int64 id = 1;
+  ChargeInletsCouplerState coupler_state = 2;
+  ChargeInletsLockState lock_state = 3;
+}
+
+message ChargeInlets {
+  repeated ChargeInletsEntry entries = 1;
+}
+
+enum ChargeFlapsPositionState {
+  CHARGE_FLAPS_POSITION_STATE_DEFAULT = 0;
+  CHARGE_FLAPS_POSITION_STATE_OPEN = 1;
+  CHARGE_FLAPS_POSITION_STATE_CLOSED = 2;
+  CHARGE_FLAPS_POSITION_STATE_FLAP_PRESSED = 3;
+  CHARGE_FLAPS_POSITION_STATE_UNKNOWN = 4;
+}
+
+message ChargeFlapsEntry {
+  int64 id = 1;
+  ChargeFlapsPositionState position_state = 2;
+}
+
+message ChargeFlaps {
+  repeated ChargeFlapsEntry entries= 1;
+}
+
+enum ChargingPowerRestriction {
+  CHARGING_POWER_RESTRICTION_NO_RESTRICTION = 0;
+  CHARGING_POWER_RESTRICTION_ECO_CHARGING_ACTIVE = 1;
+  CHARGING_POWER_RESTRICTION_REDUCED_DUE_TO_CUSTOMER_SETTING = 2;
+  CHARGING_POWER_RESTRICTION_REDUCED_DUE_TO_VEHICLE_CHARGING_SYSTEM = 3;
+  CHARGING_POWER_RESTRICTION_REDUCED_DUE_TO_REMOTE_CONTROL = 4;
+  CHARGING_POWER_RESTRICTION_REDUCED_DUE_TO_CHARGING_INFRASTRUCTURE = 5;
+  CHARGING_POWER_RESTRICTION_REDUCED_DUE_TO_CHARGING_STRATEGY = 6;
+  CHARGING_POWER_RESTRICTION_STATE_OF_CHARGE_TOO_LOW = 7;
+  CHARGING_POWER_RESTRICTION_STATE_OF_CHARGE_TOO_HIGH = 8;
+  CHARGING_POWER_RESTRICTION_BATTERY_TEMPERATURE_TOO_LOW = 9;
+  CHARGING_POWER_RESTRICTION_BATTERY_TEMPERATURE_TOO_HIGH = 10;
+}
+
+message ChargingPowerRestrictions {
+  repeated ChargingPowerRestriction charging_power_restriction = 1;
+}
+
+message ChargingBreakClockTimerValue {
+  repeated ChargingBreakClockTimerEntry chargingbreak_clocktimer_entry = 1;
+}
+
+enum PrecondStateType {
+  PRECOND_STATE_TYPE_ON_UNLOCK = 0;
+  PRECOND_STATE_TYPE_AT_DEPARTURE_TIME = 1;
+  PRECOND_STATE_TYPE_IMMEDIATE = 2;
+  PRECOND_STATE_TYPE_CHILD_PRESENCE_DETECTION = 3;
+}
+
+message PrecondState {
+  bool activation_state = 1;
+  bool precond_immediate_support = 2;
+  repeated PrecondStateType precond_state_types = 3;
+}
+
+message ChargingPowerControl {
+  enum ChargingStatusForPowerControl {
+    NOT_DEFINED = 0;
+    DEACTIVATED = 1;
+    ACTIVATED = 2;
   }
+  
+  ChargingStatusForPowerControl charge_status = 1;
+  int32 ctrl_duration = 2;
+  int32 ctrl_info = 3;
+  int32 charge_power = 4;
+  int32 serv_stat = 5;
+  int32 serv_avail = 6;
+  int32 use_case = 7;
+}
+
+message ChargingBreakClockTimerEntry {
+  ChargingBreakClockTimerEntryStatus status = 1;
+  int32 endTimeHour = 2;
+  int32 endTimeMinute = 3;
+  int32 startTimeHour = 4;
+  int32 startTimeMinute = 5;
+  int32 timerId = 6;
 }
 
 message ChargeProgramsValue {
@@ -375,6 +536,7 @@ message PushMessage {
     AppTwinCommandStatusUpdatesByVIN apptwin_command_status_updates_by_vin = 17;
     AppTwinPendingCommandsRequest apptwin_pending_command_request = 18;
     AssignedVehicles assigned_vehicles = 19;
+    DataChangeEvent data_change_event = 21;
   }
 }
 
@@ -455,3 +617,30 @@ message PreferredDealerChange {
   // When was the event emitted (milliseconds in Unix time)
   int64 emit_timestamp_in_ms = 10;
 }
+
+message AcknowledgeDataChangeEvent {
+  int32 sequence_number = 1;
+}
+
+enum Scope {
+  USER = 0;
+  ONBOARD_FENCES = 1;
+  USER_PIN = 3;
+  SERVICE_PREREQUISITE = 4;
+  USER_PROFILE_PICTURE = 5;
+}
+
+message Scopes {
+  Scope scope = 1;
+  string ciamId = 2;
+  string vin = 3;
+  map<string, string> additional_resources = 4;
+  string resource_ciam_id = 5;
+  string resource_vin = 6;
+}
+
+message DataChangeEvent {
+  repeated Scopes scopes = 1;
+  string tracking_id = 2;  
+  int32 sequence_number = 3;
+}

bundles/org.openhab.binding.mercedesme/proto/vehicleapi.proto

@@ -3,7 +3,6 @@ package proto;
 
 import "acp.proto";
 import "google/protobuf/struct.proto";
-//import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 import "gogo.proto";
 
 option (gogoproto.goproto_enum_prefix_all) = true;