profile proto++

This commit is contained in:
Юрий Першин
2022-01-20 02:28:08 +05:00
parent 8f271f6094
commit 8d01d88e60
2 changed files with 167 additions and 75 deletions
+3 -3
View File
@@ -29,8 +29,8 @@ message Profile {
optional uint32 ride_gloves = 19;
optional fixed32 ride_jersey = 20;
optional fixed32 f21 = 21; //??? empty
optional fixed32 bike_wheel1 = 22;
optional fixed32 bike_wheel2 = 23;
optional fixed32 bike_wheel_front = 22;
optional fixed32 bike_wheel_rear = 23;
optional fixed32 bike_frame = 24;
optional fixed32 f25 = 25; //??? empty
optional fixed32 f26 = 26; //??? empty
@@ -170,7 +170,7 @@ message Profile {
}
repeated ReminderProperty f4 = 4;
}
repeated Reminder remainders = 111;
repeated Reminder reminders = 111;
optional bool f112 = 112; //??? empty
repeated Attribute private_attributes = 113;
repeated Attribute public_attributes = 114;
+164 -72
View File
@@ -18,10 +18,10 @@ types:
type:
switch-on: wire_type
cases:
'wire_types::varint': vlq_base128_le
'wire_types::varint': vlq_base128_le_with_crc32
'wire_types::len_delimited': delimited_bytes
'wire_types::bit_64': u8le
'wire_types::bit_32': u4le
'wire_types::bit_32': may_be_crc32
instances:
wire_type:
value: 'key.value & 0b111'
@@ -36,6 +36,46 @@ types:
3: group_start
4: group_end
5: bit_32
may_be_crc32:
seq:
- id: val
type: u4
enum: e_str_crc32
vlq_base128_le_with_crc32:
seq:
- id: groups
type: group
repeat: until
repeat-until: not _.has_next
types:
group:
doc: |
One byte group, clearly divided into 7-bit "value" chunk and 1-bit "continuation" flag.
seq:
- id: b
type: u1
instances:
has_next:
value: (b & 0b1000_0000) != 0
doc: If true, then we have more bytes to read
value:
value: b & 0b0111_1111
doc: The 7-bit (base128) numeric value chunk of this group
instances:
len:
value: groups.size
value:
value: >-
groups[0].value
+ (len >= 2 ? (groups[1].value << 7) : 0)
+ (len >= 3 ? (groups[2].value << 14) : 0)
+ (len >= 4 ? (groups[3].value << 21) : 0)
+ (len >= 5 ? (groups[4].value << 28) : 0)
+ (len >= 6 ? (groups[5].value << 35) : 0)
+ (len >= 7 ? (groups[6].value << 42) : 0)
+ (len >= 8 ? (groups[7].value << 49) : 0)
doc: Resulting value as normal integer
enum: e_str_crc32
delimited_bytes:
seq:
- id: len
@@ -50,8 +90,8 @@ types:
seq:
- id: game_saves
type: game_save
repeat: until
repeat-until: _.id == game_save::id::end_mark5
repeat: eos #until
#repeat-until: _.id == game_save::id::end_mark5
game_save:
seq:
- id: id
@@ -60,11 +100,13 @@ types:
- id: length
type: u4
- id: data
size: length - 8
type:
switch-on: id
cases:
'id::tracking16_var': t_tracking
_: t_simple
'id::my_garage9_50': t_garage
'id::achiev15_var': t_achiev
enums:
id:
0x10000001: accessories1_100 #2048bit=0x100 bytes, for example "Humans/Accessories/Gloves/ZwiftKOMGloves01.xml" maps to bit 318
@@ -75,7 +117,7 @@ types:
0x10000006: save_type6_var #current challenge
0x10000009: save_type9_50 #garage?
0x10000009: my_garage9_50 #garage items
0x10000007: save_type7_40 #512bit = 0x40 (all 0)
0x1000000D: save_type7r_40 #=save_type7_040on read, not saved
@@ -87,15 +129,57 @@ types:
0x10000011: old_goals17r_var #old goals data format
0x10000005: end_mark5 #mark end of all savings, no data
t_simple:
t_achiev:
seq:
- id: data
size: _parent.length - 8
- id: items
type: t_achiev_item
repeat: eos
types:
t_achiev_item:
seq:
- id: id
type: u4
enum: id
- id: data
type:
switch-on: id
cases:
'id::fanview': t_fanview
_: t_rideon
types:
t_fanview:
seq:
- id: length
type: u4
- id: data
size: length - 8 #time?
t_rideon:
seq:
- id: length
type: u4
- id: unknown
type: u4
- id: given
type: u4
- id: ext_data
size: length - 16
enums:
id:
0x1e: give_ride_on1
0x1f: give_ride_on2
0x20: give_ride_on3
0x1c: fanview
t_garage:
seq:
- id: items
type: u4
enum: e_str_crc32
repeat: eos
t_tracking:
seq:
- id: count
type: u4
- id: data
- id: items
type: t_track_item
repeat: expr
repeat-expr: count
@@ -103,70 +187,78 @@ types:
seq:
- id: id
type: u4
enum: id
- id: t_id
enum: e_str_crc32
- id: vt
type: u4
enum: t_id
enum: e_vt_id
- id: u4_val
type: u4
- id: f4_val
type: f4
enums:
t_id:
1: float
2: int
3: byte
id:
0x9e2c6328: pool_size # "PoolSize"
0xe8ed6e3d: swimming_pace_0 # "SwimmingPace_0"
0x9fea5eab: swimming_pace_1 # "SwimmingPace_1"
0x06e30f11: swimming_pace_2 # "SwimmingPace_2"
0x71e43f87: swimming_pace_3 # "SwimmingPace_3"
0xef80aa24: swimming_pace_4 # "SwimmingPace_4"
0x836cff9c: running_pace_1mi # "RunningPace_1mi"
0xd55234df: running_pace_5km # "RunningPace_5km"
0x4e699e99: running_pace_10km # "RunningPace_10km"
0xdb69cd45: running_pace_hm # "RunningPace_hm"
0x45eae0cb: running_pace_fm # "RunningPace_fm"
0xe795b583: running_pace_1mi_estimated # "RunningPace_1mi_estimated"
0x78c80977: running_pace_5km_estimated # "RunningPace_5km_estimated"
0xaf8e1b0f: running_pace_10km_estimated # "RunningPace_10km_estimated"
0x1c8c50e0: running_pace_hm_estimated # "RunningPace_hm_estimated"
0xf5bd83fe: running_pace_fm_estimated # "RunningPace_fm_estimated"
0x560fcbd5: use_skill_levelrunning # "UseSkillLevelRunning"
0xb2fd90ee: use_skill_levelcycling # "UseSkillLevelCycling"
0xec37cb97: cycling_skill_level # "CyclingSkillLevel"
0xc682fcc0: running_skill_level # "RunningSkillLevel"
0x598443fb: completed_any_workout # "COMPLETEDANYWORKOUT"
0x5b66cc9c: scotty_watching_tutorial_1 # "SCOTTY_WATCHING_TUTORIAL_1"
0x424ea4d3: scotty_leaderboard_tutorial # "SCOTTY_LEADERBOARD_TUTORIAL"
0xe6bb413b: scotty_ridersnearby_tutorial # "SCOTTY_RIDERSNEARBY_TUTORIAL"
0xbf79811f: mixtape_2019_1 # "MIXTAPE_2019_1"
0x2670d0a5: mixtape_2019_2 # "MIXTAPE_2019_2"
0x5177e033: mixtape_2019_3 # "MIXTAPE_2019_3"
0xcf137590: mixtape_2019_4 # "MIXTAPE_2019_4"
0xb8144506: mixtape_2019_5 # "MIXTAPE_2019_5"
0x211d14bc: mixtape_2019_6 # "MIXTAPE_2019_6"
0x561a242a: mixtape_2019_7 # "MIXTAPE_2019_7"
0xc6a539bb: mixtape_2019_8 # "MIXTAPE_2019_8"
0x34f647b2: spinwheel_spincount # "SPINWHEEL_SPINCOUNT"
0xe412bb7b: current_eula_version # "CURRENT_EULA_VERSION"
0x2ea8df6a: rode_with_zml # "RODE_WITH_ZML"
0x5ef9ad14: zar2021 # "ZAR2021"
0xdaa16f19: rfto2021 # "RFTO2021"
0xc72b3ccd: pacerbot_dropin_clicked # "PACERBOTDROPINCLICKED"
0xfea634fb: scotty_dropin_tutorial_01 # "SCOTTY_DROPIN_TUTORIAL_01"
0x67af6541: scotty_dropin_tutorial_02 # "SCOTTY_DROPIN_TUTORIAL_02"
0x10a855d7: scotty_dropin_tutorial_03 # "SCOTTY_DROPIN_TUTORIAL_03"
0x8eccc074: scotty_dropin_tutorial_04 # "SCOTTY_DROPIN_TUTORIAL_04"
0xf9cbf0e2: scotty_dropin_tutorial_05 # "SCOTTY_DROPIN_TUTORIAL_05"
0x60c2a158: scotty_dropin_tutorial_06 # "SCOTTY_DROPIN_TUTORIAL_06"
0x17c591ce: scotty_dropin_tutorial_07 # "SCOTTY_DROPIN_TUTORIAL_07"
0xd83c4c7a: scotty_pairing_outro # "SCOTTY_PAIRING_OUTRO"
0xd0646944: scotty_pairing_intro # "SCOTTY_PAIRING_INTRO"
0x2cebca4b: setup_profile_info # "SETUPPROFILEINFO"
0xb6061fba: current_route_version # "CURRENTROUTEVERSION"
0x06880226: android_setup_region # "ANDROID_SETUPREGION"
0x0509c9a9: last_zml_advert_time # "LAST_ZML_ADVERT_TIME"
0xd21df098: completed_orientation_ride # "COMPLETEDORIENTATIONRIDE"
0xeebaf1fd: completed_welcome_ride # "COMPLETEDWELCOMERIDE"
enums:
e_vt_id:
1: float
2: int
3: byte
e_str_crc32:
0xe1bb3ffa: wh_front_mnt # "...\\ZWIFTMOUNTAIN\\FRONT.XML" = -507822086
0x6b1396db: wh_rear_mnt # "...\\ZWIFTMOUNTAIN\\REAR.XML" = 1796445915
0x7d8c357d: fr_carbon # "...\\ZWIFT_CARBON\\CONFIG.XML" = 2106340733
0x0563E97A: jers_orange # "...\\ORIGINALS_ZWIFTSTANDARDORANGE.XML" = 90433914
0x37bbc526: helm01_zwift # "...\\ZWIFTHELMET01.XML" = 935052582
0x4dd46f4d: hair01_male # "...\\MALEHAIR01" = 1305767757
0x6E292D88: wh_camp_buhr # "BIKES\\WHEELS\\CAMPAGNOLO_BORA_ULTRA\\CAMPAGNOLO_BORA_ULTRA_HIGH_REAR.GDE" = 1848192392
0xDD4C7F63: acc_cj_op4 # "HUMANS\\ACCESSORIES\\CYCLINGJERSEYS\\ORIGINALS_PLAIN_04.XML" = -582189213
0x9e2c6328: pool_size # "PoolSize"
0xe8ed6e3d: swimming_pace_0 # "SwimmingPace_0"
0x9fea5eab: swimming_pace_1 # "SwimmingPace_1"
0x06e30f11: swimming_pace_2 # "SwimmingPace_2"
0x71e43f87: swimming_pace_3 # "SwimmingPace_3"
0xef80aa24: swimming_pace_4 # "SwimmingPace_4"
0x836cff9c: running_pace_1mi # "RunningPace_1mi"
0xd55234df: running_pace_5km # "RunningPace_5km"
0x4e699e99: running_pace_10km # "RunningPace_10km"
0xdb69cd45: running_pace_hm # "RunningPace_hm"
0x45eae0cb: running_pace_fm # "RunningPace_fm"
0xe795b583: running_pace_1mi_estimated # "RunningPace_1mi_estimated"
0x78c80977: running_pace_5km_estimated # "RunningPace_5km_estimated"
0xaf8e1b0f: running_pace_10km_estimated # "RunningPace_10km_estimated"
0x1c8c50e0: running_pace_hm_estimated # "RunningPace_hm_estimated"
0xf5bd83fe: running_pace_fm_estimated # "RunningPace_fm_estimated"
0x560fcbd5: use_skill_levelrunning # "UseSkillLevelRunning"
0xb2fd90ee: use_skill_levelcycling # "UseSkillLevelCycling"
0xec37cb97: cycling_skill_level # "CyclingSkillLevel"
0xc682fcc0: running_skill_level # "RunningSkillLevel"
0x598443fb: completed_any_workout # "COMPLETEDANYWORKOUT"
0x5b66cc9c: scotty_watching_tutorial_1 # "SCOTTY_WATCHING_TUTORIAL_1"
0x424ea4d3: scotty_leaderboard_tutorial # "SCOTTY_LEADERBOARD_TUTORIAL"
0xe6bb413b: scotty_ridersnearby_tutorial # "SCOTTY_RIDERSNEARBY_TUTORIAL"
0xbf79811f: mixtape_2019_1 # "MIXTAPE_2019_1"
0x2670d0a5: mixtape_2019_2 # "MIXTAPE_2019_2"
0x5177e033: mixtape_2019_3 # "MIXTAPE_2019_3"
0xcf137590: mixtape_2019_4 # "MIXTAPE_2019_4"
0xb8144506: mixtape_2019_5 # "MIXTAPE_2019_5"
0x211d14bc: mixtape_2019_6 # "MIXTAPE_2019_6"
0x561a242a: mixtape_2019_7 # "MIXTAPE_2019_7"
0xc6a539bb: mixtape_2019_8 # "MIXTAPE_2019_8"
0x34f647b2: spinwheel_spincount # "SPINWHEEL_SPINCOUNT"
0xe412bb7b: current_eula_version # "CURRENT_EULA_VERSION"
0x2ea8df6a: rode_with_zml # "RODE_WITH_ZML"
0x5ef9ad14: zar2021 # "ZAR2021"
0xdaa16f19: rfto2021 # "RFTO2021"
0xc72b3ccd: pacerbot_dropin_clicked # "PACERBOTDROPINCLICKED"
0xfea634fb: scotty_dropin_tutorial_01 # "SCOTTY_DROPIN_TUTORIAL_01"
0x67af6541: scotty_dropin_tutorial_02 # "SCOTTY_DROPIN_TUTORIAL_02"
0x10a855d7: scotty_dropin_tutorial_03 # "SCOTTY_DROPIN_TUTORIAL_03"
0x8eccc074: scotty_dropin_tutorial_04 # "SCOTTY_DROPIN_TUTORIAL_04"
0xf9cbf0e2: scotty_dropin_tutorial_05 # "SCOTTY_DROPIN_TUTORIAL_05"
0x60c2a158: scotty_dropin_tutorial_06 # "SCOTTY_DROPIN_TUTORIAL_06"
0x17c591ce: scotty_dropin_tutorial_07 # "SCOTTY_DROPIN_TUTORIAL_07"
0xd83c4c7a: scotty_pairing_outro # "SCOTTY_PAIRING_OUTRO"
0xd0646944: scotty_pairing_intro # "SCOTTY_PAIRING_INTRO"
0x2cebca4b: setup_profile_info # "SETUPPROFILEINFO"
0xb6061fba: current_route_version # "CURRENTROUTEVERSION"
0x06880226: android_setup_region # "ANDROID_SETUPREGION"
0x0509c9a9: last_zml_advert_time # "LAST_ZML_ADVERT_TIME"
0xd21df098: completed_orientation_ride # "COMPLETEDORIENTATIONRIDE"
0xeebaf1fd: completed_welcome_ride # "COMPLETEDWELCOMERIDE"