Skip to content

Commit 9397032

Browse files
author
David Cooper
committed
Fixed bad ordering of scale and units in DynamicField in generate_profile.py.
1 parent 888670c commit 9397032

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎fitparse/profile.def‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
##############################################################################
2626
#
2727
# profile.def -- Exported FIT SDK Profile Data
28-
# Created on 2011-08-09 15:41:13 by generate_profile.py from Profile.xls
28+
# Created on 2011-08-11 10:52:29 by generate_profile.py from Profile.xls
2929
#
3030
##############################################################################
3131
#
@@ -743,7 +743,7 @@ MessageType(18, 'session', {
743743
7: Field('total_elapsed_time', FieldTypeBase(6), 's', 1000, None), # base type: uint32
744744
8: Field('total_timer_time', FieldTypeBase(6), 's', 1000, None), # base type: uint32
745745
9: Field('total_distance', FieldTypeBase(6), 'm', 100, None), # base type: uint32
746-
10: DynamicField('total_cycles', FieldTypeBase(6), 1, 'cycles', None, { # base type: uint32
746+
10: DynamicField('total_cycles', FieldTypeBase(6), 'cycles', 1, None, { # base type: uint32
747747
'sport': {
748748
'running': Field('total_strides', FieldTypeBase(6), 'strides', 1, None), # base type: uint32
749749
},
@@ -754,12 +754,12 @@ MessageType(18, 'session', {
754754
15: Field('max_speed', FieldTypeBase(4), 'm/s', 1000, None), # base type: uint16
755755
16: Field('avg_heart_rate', FieldTypeBase(2), 'bpm', 1, None), # base type: uint8
756756
17: Field('max_heart_rate', FieldTypeBase(2), 'bpm', 1, None), # base type: uint8
757-
18: DynamicField('avg_cadence', FieldTypeBase(2), 1, 'rpm', None, { # base type: uint8
757+
18: DynamicField('avg_cadence', FieldTypeBase(2), 'rpm', 1, None, { # base type: uint8
758758
'sport': {
759759
'running': Field('avg_running_cadence', FieldTypeBase(2), 'strides/min', 1, None), # base type: uint8
760760
},
761761
}),
762-
19: DynamicField('max_cadence', FieldTypeBase(2), 1, 'rpm', None, { # base type: uint8
762+
19: DynamicField('max_cadence', FieldTypeBase(2), 'rpm', 1, None, { # base type: uint8
763763
'sport': {
764764
'running': Field('max_running_cadence', FieldTypeBase(2), 'strides/min', 1, None), # base type: uint8
765765
},
@@ -792,7 +792,7 @@ MessageType(19, 'lap', {
792792
7: Field('total_elapsed_time', FieldTypeBase(6), 's', 1000, None), # base type: uint32
793793
8: Field('total_timer_time', FieldTypeBase(6), 's', 1000, None), # base type: uint32
794794
9: Field('total_distance', FieldTypeBase(6), 'm', 100, None), # base type: uint32
795-
10: DynamicField('total_cycles', FieldTypeBase(6), None, 'cycles', None, { # base type: uint32
795+
10: DynamicField('total_cycles', FieldTypeBase(6), 'cycles', None, None, { # base type: uint32
796796
'sport': {
797797
'running': Field('total_strides', FieldTypeBase(6), 'strides', None, None), # base type: uint32
798798
},
@@ -803,12 +803,12 @@ MessageType(19, 'lap', {
803803
14: Field('max_speed', FieldTypeBase(4), 'm/s', 1000, None), # base type: uint16
804804
15: Field('avg_heart_rate', FieldTypeBase(2), 'bpm', None, None), # base type: uint8
805805
16: Field('max_heart_rate', FieldTypeBase(2), 'bpm', None, None), # base type: uint8
806-
17: DynamicField('avg_cadence', FieldTypeBase(2), None, 'rpm', None, { # base type: uint8
806+
17: DynamicField('avg_cadence', FieldTypeBase(2), 'rpm', None, None, { # base type: uint8
807807
'sport': {
808808
'running': Field('avg_running_cadence', FieldTypeBase(2), 'strides/min', None, None), # base type: uint8
809809
},
810810
}),
811-
18: DynamicField('max_cadence', FieldTypeBase(2), None, 'rpm', None, { # base type: uint8
811+
18: DynamicField('max_cadence', FieldTypeBase(2), 'rpm', None, None, { # base type: uint8
812812
'sport': {
813813
'running': Field('max_running_cadence', FieldTypeBase(2), 'strides/min', None, None), # base type: uint8
814814
},
@@ -846,7 +846,7 @@ MessageType(20, 'record', {
846846
MessageType(21, 'event', {
847847
0: Field('event', FieldType('event'), None, None, None), # base type: enum
848848
1: Field('event_type', FieldType('event_type'), None, None, None), # base type: enum
849-
2: DynamicField('data16', FieldTypeBase(4), 1, None, None, { # base type: uint16
849+
2: DynamicField('data16', FieldTypeBase(4), None, 1, None, { # base type: uint16
850850
'event': {
851851
'cad_low_alert': Field('cad_low_alert', FieldTypeBase(4), 'rpm', 1, None), # base type: uint16
852852
'fitness_equipment': Field('fitness_equipment_state', FieldType('fitness_equipment_state'), None, 1, None), # base type: enum
@@ -866,7 +866,7 @@ MessageType(21, 'event', {
866866
'course_point': Field('course_point_index', FieldType('message_index'), None, 1, None), # base type: uint16
867867
},
868868
}),
869-
3: DynamicField('data', FieldTypeBase(6), 1, None, None, { # base type: uint32
869+
3: DynamicField('data', FieldTypeBase(6), None, 1, None, { # base type: uint32
870870
'event': {
871871
'cad_low_alert': Field('cad_low_alert', FieldTypeBase(4), 'rpm', 1, None), # base type: uint16
872872
'fitness_equipment': Field('fitness_equipment_state', FieldType('fitness_equipment_state'), None, 1, None), # base type: enum
@@ -914,7 +914,7 @@ MessageType(26, 'workout', {
914914
MessageType(27, 'workout_step', {
915915
0: Field('wkt_step_name', FieldTypeBase(7), None, 1, None), # base type: string
916916
1: Field('duration_type', FieldType('wkt_step_duration'), None, 1, None), # base type: enum
917-
2: DynamicField('duration_value', FieldTypeBase(6), 1, None, None, { # base type: uint32
917+
2: DynamicField('duration_value', FieldTypeBase(6), None, 1, None, { # base type: uint32
918918
'duration_type': {
919919
'repeat_until_power_less_than': Field('duration_step', FieldTypeBase(6), None, None, None), # base type: uint32
920920
'distance': Field('duration_distance', FieldTypeBase(6), 'm', 100, None), # base type: uint32
@@ -934,7 +934,7 @@ MessageType(27, 'workout_step', {
934934
},
935935
}),
936936
3: Field('target_type', FieldType('wkt_step_target'), None, 1, None), # base type: enum
937-
4: DynamicField('target_value', FieldTypeBase(6), 1, None, None, { # base type: uint32
937+
4: DynamicField('target_value', FieldTypeBase(6), None, 1, None, { # base type: uint32
938938
'duration_type': {
939939
'repeat_until_power_less_than': Field('repeat_power', FieldType('workout_power'), '% or watts', 1, None), # base type: uint32
940940
'repeat_until_steps_cmplt': Field('repeat_steps', FieldTypeBase(6), None, None, None), # base type: uint32
@@ -950,15 +950,15 @@ MessageType(27, 'workout_step', {
950950
'power': Field('target_power_zone', FieldTypeBase(6), None, None, None), # base type: uint32
951951
},
952952
}),
953-
5: DynamicField('custom_target_value_low', FieldTypeBase(6), 1, None, None, { # base type: uint32
953+
5: DynamicField('custom_target_value_low', FieldTypeBase(6), None, 1, None, { # base type: uint32
954954
'target_type': {
955955
'heart_rate': Field('custom_target_heart_rate_low', FieldType('workout_hr'), '% or bpm', 1, None), # base type: uint32
956956
'speed': Field('custom_target_speed_low', FieldTypeBase(6), 'm/s', 1000, None), # base type: uint32
957957
'power': Field('custom_target_power_low', FieldType('workout_power'), '% or watts', 1, None), # base type: uint32
958958
'cadence': Field('custom_target_cadence_low', FieldTypeBase(6), 'rpm', 1, None), # base type: uint32
959959
},
960960
}),
961-
6: DynamicField('custom_target_value_high', FieldTypeBase(6), 1, None, None, { # base type: uint32
961+
6: DynamicField('custom_target_value_high', FieldTypeBase(6), None, 1, None, { # base type: uint32
962962
'target_type': {
963963
'heart_rate': Field('custom_target_heart_rate_high', FieldType('workout_hr'), '% or bpm', 1, None), # base type: uint32
964964
'speed': Field('custom_target_speed_high', FieldTypeBase(6), 'm/s', 1000, None), # base type: uint32

‎scripts/generate_profile.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def banner_str(s):
6363
# are the similar to their counterparts in records.py by coincidence
6464

6565
Field = namedtuple('Field', ('name', 'type', 'scale', 'units', 'offset'))
66-
DynamicField = namedtuple('DynamicField', ('name', 'type', 'units', 'scale', 'offset', 'possibilities'))
66+
DynamicField = namedtuple('DynamicField', ('name', 'type', 'scale', 'units', 'offset', 'possibilities'))
6767
# Type.values can be a str, (ie, a lambda or the name of a function defined in records.py)
6868
Type = namedtuple('Type', ('name', 'base_type', 'values'))
6969
TypeValue = namedtuple('TypeValue', ('name', 'value'))

0 commit comments

Comments
 (0)