From 35827323a42c39eecf952ca3f4260cb473909945 Mon Sep 17 00:00:00 2001
From: Patrick McDonagh <patrickjmcd@gmail.com>
Date: Tue, 30 Jan 2018 22:32:59 -0600
Subject: [PATCH] Fixes for not splitting python list correctly.

---
 python-driver/config.txt        |    2 +-
 python-driver/driverConfig.json |    2 +-
 python-driver/modbusMap.p       | 2971 +++++++++++++++++++++----------
 python-driver/test_utilities.py |    2 +-
 python-driver/utilities.py      |    8 +-
 5 files changed, 2078 insertions(+), 907 deletions(-)

diff --git a/python-driver/config.txt b/python-driver/config.txt
index 0940714..e309a8d 100644
--- a/python-driver/config.txt
+++ b/python-driver/config.txt
@@ -7,6 +7,6 @@
     }, 
     "deviceName": "prostarsolar", 
     "driverId": "0170", 
-    "releaseVersion": "2", 
+    "releaseVersion": "3", 
     "driverFileName": "prostarsolar.py"
 }
\ No newline at end of file
diff --git a/python-driver/driverConfig.json b/python-driver/driverConfig.json
index cae7c7f..77260cc 100644
--- a/python-driver/driverConfig.json
+++ b/python-driver/driverConfig.json
@@ -7,6 +7,6 @@
         "persistence.py", 
         "modbusMap.p"
     ], 
-    "version": 2, 
+    "version": 3, 
     "s3BucketName": "prostarsolar"
 }
\ No newline at end of file
diff --git a/python-driver/modbusMap.p b/python-driver/modbusMap.p
index a4b605a..4d3ac82 100644
--- a/python-driver/modbusMap.p
+++ b/python-driver/modbusMap.p
@@ -19,90 +19,90 @@ p9
 V2-2
 p11
 (dp12
-Vah
+Vr
 p13
-V
+V0-65535
 p14
-sVbytary
+sVah
 p15
-NsVal
+V
 p16
-g14
-sVvn
+sVbytary
 p17
-VRaw Battery Terminal Voltage
+NsVal
 p18
-sVct
+g16
+sVvn
 p19
-Vnumber
+VRaw Battery Terminal Voltage
 p20
-sVle
+sVct
 p21
-V16
+Vnumber
 p22
-sVgrp
+sVle
 p23
-V600
+V16
 p24
-sVla
+sVgrp
 p25
-I19225
-sVchn
+V600
 p26
-Vadc_vbterm_raw
+sVla
 p27
-sVun
+I20046
+sVchn
 p28
+Vadc_vbterm_raw
+p29
+sVun
+p30
 g9
 sVdn
-p29
-Vprostarsolar
-p30
-sVvm
 p31
-NsVlrt
+Vprostarsolar
 p32
-F1515515387.9155248
-sVda
+sVvm
 p33
+NsVlrt
+p34
+F1515775290.9225079
+sVda
+p35
 g9
 sVa
-p34
-V18
-p35
-sVc
 p36
-V0
+V18
 p37
-sVmisc_u
+sVc
 p38
-g14
-sVf
+V0
 p39
-V3
+sVmisc_u
 p40
-sVmrt
+g16
+sVf
 p41
-V60
+V3
 p42
-sVm
+sVmrt
 p43
-Vnone
+V60
 p44
-sVm1ch
+sVm
 p45
-g11
-sVmv
+Vnone
 p46
-g37
-sVs
+sVm1ch
 p47
-VOn
+g11
+sVs
 p48
-sVr
+VOn
 p49
-V0-65535
+sVmv
 p50
+g39
 sVt
 p51
 Vint
@@ -110,795 +110,795 @@ p52
 ssV2-3
 p53
 (dp54
-Val
+Vah
 p55
-g14
-sVah
-p56
-g14
+g16
 sVbytary
+p56
+NsVal
 p57
-NsVvm
+g16
+sVvn
 p58
-NsVvn
-p59
 VRaw Array Voltage
-p60
+p59
 sVct
-p61
+p60
 Vnumber
-p62
+p61
 sVle
-p63
+p62
 V16
-p64
+p63
 sVgrp
-p65
+p64
 V600
-p66
+p65
 sVla
-p67
-I19467
+p66
+I19750
 sVchn
-p68
+p67
 Vadc_va_raw
-p69
+p68
 sVun
-p70
+p69
 g9
 sVdn
-p71
+p70
 Vprostarsolar
+p71
+sVvm
 p72
-sVda
+NsVlrt
 p73
-g9
-sVlrt
+F1515775567.9501009
+sVda
 p74
-F1515515388.4029889
-sg49
-V0-65535
-p75
-sg34
-V19
-p76
+g9
 sg36
-g37
+V19
+p75
+sg38
+g39
 sVmisc_u
-p77
-g14
-sg39
-g40
+p76
+g16
+sg41
+g42
 sVmrt
-p78
+p77
 V60
-p79
-sg43
+p78
+sg45
 Vnone
-p80
+p79
 sS'm1ch'
-p81
+p80
 g53
-sg47
+sVmv
+p81
+g39
+sg48
 VOn
 p82
-sVmv
+sg13
+V0-65535
 p83
-g37
 sg51
 Vint
 p84
 ssV2-1
 p85
 (dp86
-Val
+Vah
 p87
-g14
-sVah
-p88
-g14
+g16
 sVbytary
+p88
+NsVal
 p89
-NsVvm
+g16
+sVvn
 p90
-NsVvn
-p91
 VRaw Array Current
-p92
+p91
 sVct
-p93
+p92
 Vnumber
-p94
+p93
 sVle
-p95
+p94
 V16
-p96
+p95
 sVgrp
-p97
+p96
 V600
-p98
+p97
 sVla
-p99
-I14789
+p98
+I35208
 sVchn
-p100
+p99
 Vadc_ia_raw
-p101
+p100
 sVun
-p102
+p101
 g9
 sVdn
-p103
+p102
 Vprostarsolar
+p103
+sVvm
 p104
-sVda
+NsVlrt
 p105
-g9
-sVlrt
+F1515775632.3861569
+sVda
 p106
-F1515515378.8921958
-sg49
-V0-65535
-p107
-sg34
-V17
-p108
+g9
 sg36
+V17
+p107
+sg38
 g9
 sVmisc_u
-p109
-g14
-sg39
-g40
+p108
+g16
+sg41
+g42
 sVmrt
-p110
+p109
 V60
-p111
-sg43
+p110
+sg45
 Vnone
-p112
-sg81
+p111
+sg80
 g85
-sg47
+sVmv
+p112
+g39
+sg48
 VOn
 p113
-sVmv
+sg13
+V0-65535
 p114
-g37
 sg51
 Vint
 p115
 ssV2-6
 p116
 (dp117
-Val
+Vah
 p118
-g14
-sVah
-p119
-g14
+g16
 sVbytary
+p119
+NsVal
 p120
-NsVvm
+g16
+sVvn
 p121
-NsVvn
-p122
 VRaw Ambient Temp
-p123
+p122
 sVct
-p124
+p123
 Vnumber
-p125
+p124
 sVle
-p126
+p125
 V16
-p127
+p126
 sVgrp
-p128
+p127
 V600
-p129
+p128
 sVla
-p130
-I19515
+p129
+I19672
 sVchn
-p131
+p130
 Vt_amb_raw
-p132
+p131
 sVun
-p133
+p132
 g9
 sVdn
-p134
+p133
 Vprostarsolar
+p134
+sVvm
 p135
-sVda
+NsVlrt
 p136
-g9
-sVlrt
+F1515775649.7532052
+sVda
 p137
-F1515515379.419792
-sg49
-V0-65535
-p138
-sg34
-V28
-p139
+g9
 sg36
-g37
+V28
+p138
+sg38
+g39
 sVmisc_u
-p140
-g14
-sg39
-g40
+p139
+g16
+sg41
+g42
 sVmrt
-p141
+p140
 V60
-p142
-sg43
+p141
+sg45
 Vnone
-p143
-sg81
+p142
+sg80
 g116
-sg47
+sVmv
+p143
+g39
+sg48
 VOn
 p144
-sVmv
+sg13
+V0-65535
 p145
-g37
 sg51
 Vint
 p146
 ssV2-7
 p147
 (dp148
-Val
+Vah
 p149
-g14
-sVah
-p150
-g14
+g16
 sVbytary
+p150
+NsVal
 p151
-NsVvm
+g16
+sVvn
 p152
-NsVvn
-p153
 VRaw Min Daily Battery Voltage
-p154
+p153
 sVct
-p155
+p154
 Vnumber
-p156
+p155
 sVle
-p157
+p156
 V16
-p158
+p157
 sVgrp
-p159
+p158
 V600
-p160
+p159
 sVla
-p161
-I19058
+p160
+I20045
 sVchn
-p162
+p161
 Vvb_min_daily_raw
-p163
+p162
 sVun
-p164
+p163
 g9
 sVdn
-p165
+p164
 Vprostarsolar
+p165
+sVvm
 p166
-sVda
+NsVlrt
 p167
-g9
-sVlrt
+F1515775097.6945859
+sVda
 p168
-F1515514883.7010118
-sg49
-V0-65535
-p169
-sg34
-V65
-p170
+g9
 sg36
-g37
+V65
+p169
+sg38
+g39
 sVmisc_u
-p171
-g14
-sg39
-g40
+p170
+g16
+sg41
+g42
 sVmrt
-p172
+p171
 V60
-p173
-sg43
+p172
+sg45
 Vnone
-p174
-sg81
+p173
+sg80
 g147
-sg47
+sVmv
+p174
+g39
+sg48
 VOn
 p175
-sVmv
+sg13
+V0-65535
 p176
-g37
 sg51
 Vint
 p177
 ssV2-4
 p178
 (dp179
-Val
+Vah
 p180
-g14
-sVah
-p181
-g14
+g16
 sVbytary
+p181
+NsVal
 p182
-NsVvm
+g16
+sVvn
 p183
-NsVvn
-p184
 VRaw Load Voltage
-p185
+p184
 sVct
-p186
+p185
 Vnumber
-p187
+p186
 sVle
-p188
+p187
 V16
-p189
+p188
 sVgrp
-p190
+p189
 V600
-p191
+p190
 sVla
-p192
-I19232
+p191
+I20047
 sVchn
-p193
+p192
 Vadc_vl_raw
-p194
+p193
 sVun
-p195
+p194
 g9
 sVdn
-p196
+p195
 Vprostarsolar
+p196
+sVvm
 p197
-sVda
+NsVlrt
 p198
-g9
-sVlrt
+F1515775666.2369889
+sVda
 p199
-F1515515370.4007909
-sg49
-V0-65535
-p200
-sg34
-V20
-p201
+g9
 sg36
-g37
+V20
+p200
+sg38
+g39
 sVmisc_u
-p202
-g14
-sg39
-g40
+p201
+g16
+sg41
+g42
 sVmrt
-p203
+p202
 V60
-p204
-sg43
+p203
+sg45
 Vnone
-p205
-sg81
+p204
+sg80
 g178
-sg47
+sVmv
+p205
+g39
+sg48
 VOn
 p206
-sVmv
+sg13
+V0-65535
 p207
-g37
 sg51
 Vint
 p208
 ssV2-5
 p209
 (dp210
-Val
+Vah
 p211
-g14
-sVah
-p212
-g14
+g16
 sVbytary
+p212
+NsVal
 p213
-NsVvm
+g16
+sVvn
 p214
-NsVvn
-p215
 VRaw Load Current
-p216
+p215
 sVct
-p217
+p216
 Vnumber
-p218
+p217
 sVle
-p219
+p218
 V16
-p220
+p219
 sVgrp
-p221
+p220
 V600
-p222
+p221
 sVla
-p223
-I12849
+p222
+I12292
 sVchn
-p224
+p223
 Vadc_il_raw
-p225
+p224
 sVun
-p226
+p225
 g9
 sVdn
-p227
+p226
 Vprostarsolar
+p227
+sVvm
 p228
-sVda
+NsVlrt
 p229
-g9
-sVlrt
+F1515775618.7710589
+sVda
 p230
-F1515515370.884296
-sg49
-V0-65535
-p231
-sg34
-V22
-p232
+g9
 sg36
-g37
+V22
+p231
+sg38
+g39
 sVmisc_u
-p233
-g14
-sg39
-g40
+p232
+g16
+sg41
+g42
 sVmrt
-p234
+p233
 V60
-p235
-sg43
+p234
+sg45
 Vnone
-p236
-sg81
+p235
+sg80
 g209
-sg47
+sVmv
+p236
+g39
+sg48
 VOn
 p237
-sVmv
+sg13
+V0-65535
 p238
-g37
 sg51
 Vint
 p239
 ssV2-8
 p240
 (dp241
-Val
+Vah
 p242
-g14
-sVah
-p243
-g14
+g16
 sVbytary
+p243
+NsVal
 p244
-NsVvm
+g16
+sVvn
 p245
-NsVvn
-p246
 VRaw Max Daily Battery Voltage
-p247
+p246
 sVct
-p248
+p247
 Vnumber
-p249
+p248
 sVle
-p250
+p249
 V16
-p251
+p250
 sVgrp
-p252
+p251
 V600
-p253
+p252
 sVla
-p254
-I19280
+p253
+I20058
 sVchn
-p255
+p254
 Vvb_max_daily_raw
-p256
+p255
 sVun
-p257
+p256
 g9
 sVdn
-p258
+p257
 Vprostarsolar
+p258
+sVvm
 p259
-sVda
+NsVlrt
 p260
-g9
-sVlrt
+F1515775181.078918
+sVda
 p261
-F1515514885.1708192
-sg49
-V0-65535
-p262
-sg34
-V66
-p263
+g9
 sg36
-g37
+V66
+p262
+sg38
+g39
 sVmisc_u
-p264
-g14
-sg39
-g40
+p263
+g16
+sg41
+g42
 sVmrt
-p265
+p264
 V60
-p266
-sg43
+p265
+sg45
 Vnone
-p267
-sg81
+p266
+sg80
 g240
-sg47
+sVmv
+p267
+g39
+sg48
 VOn
 p268
-sVmv
+sg13
+V0-65535
 p269
-g37
 sg51
 Vint
 p270
 ssV2-9
 p271
 (dp272
-Val
+Vah
 p273
-g14
-sVah
-p274
-g14
+g16
 sVbytary
+p274
+NsVal
 p275
-NsVvm
+g16
+sVvn
 p276
-(dp277
-g9
-VNight Check
-p278
-sg37
-VStart
-p279
-sg40
-VNight
-p280
-sV2
-p281
-VDisconnect
-p282
-sV5
-p283
-VBulk
-p284
-sV4
-p285
-VFault
-p286
-sV7
-p287
-VFloat
-p288
-sV6
-p289
-VAbsorption
-p290
-sV8
-p291
-VEqualize
-p292
-ssVvn
-p293
 VCharge State
-p294
+p277
 sVct
-p295
+p278
 Vnumber
-p296
+p279
 sVle
-p297
+p280
 V16
-p298
+p281
 sVgrp
-p299
+p282
 V600
-p300
+p283
 sVla
-p301
-I6
+p284
+I1
 sVchn
-p302
+p285
 Vcharge_state
-p303
+p286
 sVun
-p304
+p287
 g9
 sVdn
-p305
+p288
 Vprostarsolar
-p306
-sVda
-p307
+p289
+sVvm
+p290
+(dp291
 g9
-sVlrt
-p308
-F1515514905.7810062
-sg49
-V0-65535
-p309
-sg34
-V33
-p310
-sg36
-g37
-sVmisc_u
-p311
-g14
+VNight Check
+p292
 sg39
-g40
+VStart
+p293
+sg42
+VNight
+p294
+sV2
+p295
+VDisconnect
+p296
+sV5
+p297
+VBulk
+p298
+sV4
+p299
+VFault
+p300
+sV7
+p301
+VFloat
+p302
+sV6
+p303
+VAbsorption
+p304
+sV8
+p305
+VEqualize
+p306
+ssVlrt
+p307
+F1515775635.6964082
+sVda
+p308
+g9
+sg36
+V33
+p309
+sg38
+g39
+sVmisc_u
+p310
+g16
+sg41
+g42
 sVmrt
-p312
+p311
 V60
-p313
-sg43
+p312
+sg45
 Vnone
-p314
-sg81
+p313
+sg80
 g271
-sg47
+sVmv
+p314
+g39
+sg48
 VOn
 p315
-sVmv
+sg13
+V0-65535
 p316
-g37
 sg51
 Vint
 p317
 ssV2-10
 p318
 (dp319
-Val
+Vah
 p320
-g14
-sVah
-p321
-g14
+g16
 sVbytary
+p321
+NsVal
 p322
-NsVvm
+g16
+sVvn
 p323
-(dp324
-V11
-p325
-VProcessor Supply Fault
-p326
-sV10
-p327
-VDip Switch Changed (Excl. DIP 8)
-p328
-sg9
-VFETs Shorted
-p329
-sg37
-VOvercurrent Phase 1
-p330
-sg40
-VBattery HVD (High Voltage Disconnect)
-p331
-sg281
-VSoftware Bug
-p332
-sg283
-VEEPROM Setting Edit (Reset required)
-p333
-sg285
-VArray HVD (High Voltage Disconnect)
-p334
-sg287
-VRTS was valid now disconnected
-p335
-sg289
-VRTS Shorted
-p336
-sV9
-p337
-VBattery LVD (Low Voltage Disconnect)
-p338
-sg291
-VLocal temp. sensor failed
-p339
-ssVvn
-p340
 VArray Fault
-p341
+p324
 sVct
-p342
+p325
 Vnumber
-p343
+p326
 sVle
-p344
+p327
 V16
-p345
+p328
 sVgrp
-p346
+p329
 V600
-p347
+p330
 sVla
-p348
+p331
 I0
 sVchn
-p349
+p332
 Varray_fault
-p350
+p333
 sVun
-p351
+p334
 g9
 sVdn
-p352
+p335
 Vprostarsolar
-p353
-sVda
-p354
-g9
-sVlrt
-p355
-F1515514886.1563522
-sg49
-V0-65535
-p356
-sg34
-V34
-p357
-sg36
-g37
-sVmisc_u
-p358
-g14
+p336
+sVvm
+p337
+(dp338
+V11
+p339
+VProcessor Supply Fault
+p340
+sV10
+p341
+VDip Switch Changed (Excl. DIP 8)
+p342
+sg9
+VFETs Shorted
+p343
 sg39
-g40
+VOvercurrent Phase 1
+p344
+sg42
+VBattery HVD (High Voltage Disconnect)
+p345
+sg295
+VSoftware Bug
+p346
+sg297
+VEEPROM Setting Edit (Reset required)
+p347
+sg299
+VArray HVD (High Voltage Disconnect)
+p348
+sg301
+VRTS was valid now disconnected
+p349
+sg303
+VRTS Shorted
+p350
+sV9
+p351
+VBattery LVD (Low Voltage Disconnect)
+p352
+sg305
+VLocal temp. sensor failed
+p353
+ssVlrt
+p354
+F1515775246.5188161
+sVda
+p355
+g9
+sg36
+V34
+p356
+sg38
+g39
+sVmisc_u
+p357
+g16
+sg41
+g42
 sVmrt
-p359
+p358
 V60
-p360
-sg43
+p359
+sg45
 Vnone
-p361
-sg81
+p360
+sg80
 g318
-sg47
+sVmv
+p361
+g39
+sg48
 VOn
 p362
-sVmv
+sg13
+V0-65535
 p363
-g37
 sg51
 Vint
 p364
@@ -908,507 +908,1678 @@ VOff
 p366
 sS'p'
 p367
-g14
+g16
 sS's'
 p368
-g281
-ssS'2'
+V2
 p369
-(dp370
+ssS'2'
+p370
+(dp371
 g3
 VM1-485
-p371
+p372
 sg5
 V9600
-p372
+p373
 sg7
-(dp373
-g281
 (dp374
+g295
+(dp375
 V4-1
-p375
-(dp376
-Val
-p377
-g14
-sVah
+p376
+(dp377
+Vr
 p378
-g14
-sVbytary
+V0-100000
 p379
-NsVvm
+sVah
 p380
-NsVvn
+g16
+sVbytary
 p381
-VVolume Flow
+NsVal
 p382
-sVct
+V0
 p383
-Vnumber
+sVvn
 p384
-sVle
+VVolume Flow
 p385
-V32
+sVct
 p386
-sVgrp
+Vnumber
 p387
-V600
+sVle
 p388
-sVla
+V32
 p389
-NsVchn
+sVgrp
 p390
-Vvolume_flow
+V600
 p391
-sVun
+sVla
 p392
-g9
-sVdn
+F0.0
+sVchn
 p393
-Vpromagmbs
+Vvolume_flow
 p394
-sVda
+sVun
 p395
-g281
-sVlrt
+V1
 p396
-g37
-sg49
-V0-10000
+sVdn
 p397
-sg34
-V2008
+Vpromagmbs
 p398
-sg36
-g283
-sVmisc_u
+sVvm
 p399
-g14
-sg39
-g40
-sVmrt
+NsVlrt
 p400
-V60
+F1515775636.8625349
+sVda
 p401
-sg43
-Vnone
+g369
+sVa
 p402
-sg81
-g375
-sg47
-VOn
+V2008
 p403
-sVmv
+sVc
 p404
-g37
-sg51
-Vfloat
+V5
 p405
-ssV4-2
+sVmisc_u
 p406
-(dp407
-Val
+g16
+sVf
+p407
+V3
 p408
-g14
-sVah
+sVmrt
 p409
-g14
-sVbytary
+V60
 p410
-NsVvm
+sVm
 p411
-NsVvn
+Vnone
 p412
-VMass Flow
+sVm1ch
 p413
-sVct
+g376
+sVs
 p414
-Vnumber
+VOn
 p415
-sVle
+sVmv
 p416
-V32
+g383
+sVt
 p417
-sVgrp
+Vfloatbs
 p418
-V600
-p419
-sVla
-p420
-NsVchn
-p421
-Vmass_flow
-p422
-sVun
-p423
-g9
-sVdn
-p424
-Vpromagmbs
-p425
-sVda
-p426
-g281
-sVlrt
-p427
-g37
-sg49
-V0-10000
-p428
-sg34
-V2010
-p429
-sg36
-g283
-sVmisc_u
-p430
-g14
-sg39
-g40
-sVmrt
-p431
-V60
-p432
-sg43
-Vnone
-p433
-sg81
-g406
-sg47
-VOn
-p434
-sVmv
-p435
-g37
-sg51
-Vfloat
-p436
 ssV4-3
-p437
-(dp438
-Val
-p439
-g14
-sVah
-p440
-g14
-sVbytary
-p441
-NsVvm
-p442
-NsVvn
-p443
-VConductivity
-p444
-sVct
-p445
-Vnumber
-p446
-sVle
-p447
-V32
-p448
-sVgrp
-p449
-V600
-p450
-sVla
-p451
-NsVchn
-p452
-Vconductivity
-p453
-sVun
-p454
-g9
-sVdn
-p455
-Vpromagmbs
-p456
-sVda
-p457
-g281
-sVlrt
-p458
-g37
-sg49
+p419
+(dp420
+g378
 V0-10000
-p459
-sg34
-V2014
-p460
-sg36
+p421
+sVah
+p422
+g16
+sVbytary
+p423
+NsVal
+p424
+g383
+sVvn
+p425
+VConductivity
+p426
+sVct
+p427
+Vnumber
+p428
+sVle
+p429
+V32
+p430
+sVgrp
+p431
+V600
+p432
+sVla
+p433
+Fnan
+sVchn
+p434
+Vconductivity
+p435
+sVun
+p436
+g396
+sVdn
+p437
+Vpromagmbs
+p438
+sVvm
+p439
+NsVlrt
+p440
+F1515775621.2621409
+sVda
+p441
+g369
+sg402
+V2012
+p442
+sg404
 V0.5
-p461
+p443
 sVmisc_u
-p462
-g14
-sg39
-g40
+p444
+g16
+sg407
+g408
 sVmrt
-p463
+p445
 V60
-p464
-sg43
+p446
+sg411
 Vnone
-p465
-sg81
-g437
-sg47
+p447
+sVm1ch
+p448
+g419
+sg414
 VOn
-p466
+p449
 sVmv
-p467
-g37
-sg51
-Vfloat
-p468
+p450
+g383
+sg417
+Vfloatbs
+p451
 ssV4-4
-p469
-(dp470
-Val
-p471
-g14
+p452
+(dp453
+g378
+V0-10000000
+p454
 sVah
-p472
-g14
+p455
+g16
 sVbytary
-p473
-NsVvm
-p474
-NsVvn
-p475
+p456
+NsVal
+p457
+g383
+sVvn
+p458
 VTotalizer 1
-p476
+p459
 sVct
-p477
+p460
 Vnumber
-p478
+p461
 sVle
-p479
+p462
 V32
-p480
+p463
 sVgrp
-p481
+p464
 V600
-p482
+p465
 sVla
-p483
-NsVchn
-p484
+p466
+F245249.88
+sVchn
+p467
 Vtotalizer_1
-p485
+p468
 sVun
-p486
-g9
+p469
+g396
 sVdn
-p487
+p470
 Vpromagmbs
-p488
+p471
+sVvm
+p472
+NsVlrt
+p473
+F1515775638.257201
 sVda
-p489
-g281
-sVlrt
-p490
-g37
-sg49
-V0-10000000
-p491
-sg34
-V2611
-p492
-sg36
+p474
+g369
+sg402
+V2609
+p475
+sg404
 V50.0
-p493
+p476
 sVmisc_u
-p494
-g14
-sg39
-g40
+p477
+g16
+sg407
+g408
 sVmrt
-p495
+p478
 V60
-p496
-sg43
+p479
+sg411
 Vnone
-p497
-sg81
-g469
-sg47
+p480
+sVm1ch
+p481
+g452
+sg414
 VOn
-p498
+p482
 sVmv
-p499
-g37
-sg51
-Vfloat
-p500
+p483
+g383
+sg417
+Vfloatbs
+p484
 ssV4-5
-p501
-(dp502
-Val
-p503
-g14
+p485
+(dp486
+g378
+V0-10000000
+p487
 sVah
-p504
-g14
+p488
+g16
 sVbytary
-p505
-NsVvm
-p506
-NsVvn
-p507
+p489
+NsVal
+p490
+g383
+sVvn
+p491
 VTotalizer 2
-p508
+p492
 sVct
-p509
+p493
 Vnumber
-p510
+p494
 sVle
-p511
+p495
 V32
-p512
+p496
 sVgrp
-p513
+p497
 V600
-p514
+p498
 sVla
-p515
-NsVchn
-p516
+p499
+F265849.71999999997
+sVchn
+p500
 Vtotalizer_2
+p501
+sVun
+p502
+g396
+sVdn
+p503
+Vpromagmbs
+p504
+sVvm
+p505
+NsVlrt
+p506
+F1515775574.6507481
+sVda
+p507
+g369
+sg402
+V2809
+p508
+sg404
+V50
+p509
+sVmisc_u
+p510
+g16
+sg407
+g408
+sVmrt
+p511
+V60
+p512
+sg411
+Vnone
+p513
+sVm1ch
+p514
+g485
+sg414
+VOn
+p515
+sVmv
+p516
+g383
+sg417
+Vfloatbs
 p517
-sVun
-p518
-g9
-sVdn
-p519
-Vpromagmbs
-p520
-sVda
-p521
-g281
-sVlrt
-p522
-g37
-sg49
-V0-10000000
-p523
-sg34
-V2811
-p524
-sg36
-V50
-p525
-sVmisc_u
-p526
-g14
-sg39
-g40
-sVmrt
-p527
-V60
-p528
-sg43
-Vnone
-p529
-sg81
-g501
-sg47
-VOn
-p530
-sVmv
-p531
-g37
-sg51
-Vfloat
-p532
 ssV4-6
-p533
-(dp534
-Val
-p535
-g14
-sVah
-p536
-g14
+p518
+(dp519
+Vah
+p520
+g16
 sVbytary
-p537
-NsVvm
-p538
-NsVvn
-p539
+p521
+NsVal
+p522
+g383
+sVvn
+p523
 VTotalizer 3
-p540
+p524
 sVct
-p541
+p525
 Vnumber
-p542
+p526
 sVle
-p543
+p527
 V32
-p544
+p528
 sVgrp
-p545
+p529
 V600
-p546
+p530
 sVla
-p547
-NsVchn
-p548
+p531
+I0
+sVchn
+p532
 Vtotalizer_3
-p549
+p533
 sVun
-p550
-g9
+p534
+g396
 sVdn
-p551
+p535
 Vpromagmbs
-p552
+p536
 sVda
-p553
-g281
+p537
+g369
 sVlrt
-p554
-g37
-sg49
-V0-10000000
-p555
-sg34
-V3011
-p556
-sg36
+p538
+F1515624472.5080973
+sg402
+V3009
+p539
+sg404
 V50
-p557
+p540
 sVmisc_u
-p558
-g14
-sg39
-g40
+p541
+g16
+sg407
+g408
 sVmrt
-p559
+p542
 V60
-p560
-sg43
+p543
+sg411
 Vnone
-p561
-sg81
-g533
-sg47
-VOn
-p562
+p544
+sVm1ch
+p545
+g518
 sVmv
+p546
+g383
+sg414
+VOn
+p547
+sg378
+V-10000000-10000000
+p548
+sg417
+Vfloatbs
+p549
+sVvm
+p550
+NssV4-7
+p551
+(dp552
+g378
+V0-100
+p553
+sVah
+p554
+g16
+sVbytary
+p555
+NsVal
+p556
+g16
+sVvn
+p557
+VVolume Flow Units
+p558
+sVct
+p559
+Vnumber
+p560
+sVle
+p561
+V16
+p562
+sVgrp
 p563
-g37
-sg51
-Vfloat
+V86400
 p564
+sVla
+p565
+I45
+sVchn
+p566
+Vvolume_flow_units
+p567
+sVun
+p568
+g396
+sVdn
+p569
+Vpromagmbs
+p570
+sVvm
+p571
+(dp572
+V24
+p573
+VMl/s
+p574
+sV25
+p575
+VMl/min
+p576
+sV26
+p577
+VMl/h
+p578
+sV27
+p579
+VMl/d
+p580
+sV20
+p581
+Vhl/s
+p582
+sV21
+p583
+Vhl/min
+p584
+sV22
+p585
+Vhl/h
+p586
+sV23
+p587
+Vhl/d
+p588
+sg383
+Vcm3/s
+p589
+sV4
+p590
+Vdm3/s
+p591
+sV8
+p592
+Vm3/s
+p593
+sV59
+p594
+VBBL/d (US beer)
+p595
+sV58
+p596
+VBBL/h (US beer)
+p597
+sV55
+p598
+VBBL/d (US liq.)
+p599
+sV54
+p600
+VBBL/h (US liq.)
+p601
+sV57
+p602
+VBBL/min (US beer)
+p603
+sV56
+p604
+VBBL/s (US beer)
+p605
+sV51
+p606
+VMgal/d
+p607
+sV50
+p608
+VMgal/h
+p609
+sV53
+p610
+VBBL/min (US liq.)
+p611
+sV52
+p612
+VBBL/s (US liq.)
+p613
+sV88
+p614
+Vkgal/s (us)
+p615
+sV89
+p616
+Vkgal/min (us)
+p617
+sV82
+p618
+VBBL/h (imp oil)
+p619
+sV83
+p620
+VBBL/d (imp oil)
+p621
+sV80
+p622
+VBBL/s (imp oil)
+p623
+sV81
+p624
+VBBL/min (imp oil)
+p625
+sV86
+p626
+VUser vol / hour
+p627
+sV87
+p628
+VUser vol / day
+p629
+sV84
+p630
+VUser vol / s
+p631
+sV85
+p632
+VUser vol / min
+p633
+sg408
+Vcm3/d
+p634
+sV7
+p635
+Vdm3/d
+p636
+sV39
+p637
+Vft3/d
+p638
+sV38
+p639
+Vft3/h
+p640
+sV33
+p641
+Vaf/min
+p642
+sV32
+p643
+Vaf/s
+p644
+sV37
+p645
+Vft3/min
+p646
+sV36
+p647
+Vft3/s
+p648
+sV35
+p649
+Vaf/d
+p650
+sV34
+p651
+Vaf/h
+p652
+sV60
+p653
+VBBL/s (US oil)
+p654
+sV61
+p655
+VBBL/min (US oil)
+p656
+sV62
+p657
+VBBL/h (US oil)
+p658
+sV63
+p659
+VBBL/d (US oil)
+p660
+sV64
+p661
+VBBL/s (US tank)
+p662
+sV65
+p663
+VBBL/min (US tank)
+p664
+sV66
+p665
+VBBL/h (US tank)
+p666
+sV67
+p667
+VBBL/d (US tank)
+p668
+sV68
+p669
+Vgal/s (imp)
+p670
+sV69
+p671
+Vgal/min (imp)
+p672
+sg369
+Vcm3/h
+p673
+sV6
+p674
+Vdm3/h
+p675
+sV91
+p676
+Vkgal/d (us)
+p677
+sV90
+p678
+Vkgal/h (us)
+p679
+sV11
+p680
+Vm3/d
+p681
+sV10
+p682
+Vm3/h
+p683
+sV13
+p684
+VmL/min
+p685
+sV12
+p686
+VmL/s
+p687
+sV15
+p688
+VmL/d
+p689
+sV14
+p690
+VmL/h
+p691
+sV17
+p692
+Vl/min
+p693
+sV16
+p694
+Vl/s
+p695
+sV19
+p696
+Vl/d
+p697
+sV18
+p698
+Vl/h
+p699
+sV48
+p700
+VMgal/s
+p701
+sV49
+p702
+VMgal/min
+p703
+sV46
+p704
+Vgal/h
+p705
+sV47
+p706
+Vgal/d
+p707
+sV44
+p708
+Vgal/s
+p709
+sV45
+p710
+Vgal/min
+p711
+sV42
+p712
+Vfl oz/h
+p713
+sV43
+p714
+Vfl oz/d
+p715
+sV40
+p716
+Vfl oz/s
+p717
+sV41
+p718
+Vfl oz/min
+p719
+sg396
+Vcm3/min
+p720
+sg405
+Vdm3/min
+p721
+sV9
+p722
+Vm3/min
+p723
+sV77
+p724
+VBBL/min (imp beer)
+p725
+sV76
+p726
+VBBL/s (imp beer)
+p727
+sV75
+p728
+VMgal/d (imp)
+p729
+sV74
+p730
+VMgal/h (imp)
+p731
+sV73
+p732
+VMgal/min (imp)
+p733
+sV72
+p734
+VMgal/s (imp)
+p735
+sV71
+p736
+Vgal/d (imp)
+p737
+sV70
+p738
+Vgal/h (imp)
+p739
+sV79
+p740
+VBBL/d (imp beer)
+p741
+sV78
+p742
+VBBL/h (imp beer)
+p743
+ssVlrt
+p744
+F1515711271.343798
+sVda
+p745
+g369
+sg402
+V2102
+p746
+sg404
+g383
+sVmisc_u
+p747
+g16
+sg407
+g408
+sVmrt
+p748
+V60
+p749
+sg411
+Vnone
+p750
+sVm1ch
+p751
+g551
+sg414
+VOn
+p752
+sVmv
+p753
+g383
+sg417
+Vint
+p754
+ssV4-8
+p755
+(dp756
+Vah
+p757
+g16
+sVbytary
+p758
+NsVal
+p759
+g16
+sVvn
+p760
+VVolume Units
+p761
+sVct
+p762
+Vnumber
+p763
+sVle
+p764
+V16
+p765
+sVgrp
+p766
+V86400
+p767
+sVla
+p768
+I11
+sVchn
+p769
+g16
+sVun
+p770
+g16
+sVdn
+p771
+VM1
+p772
+sVvm
+p773
+(dp774
+V20
+p775
+VBBL (imp oil)
+p776
+sV21
+p777
+VUser vol.
+p778
+sV22
+p779
+Vkgal (us)
+p780
+sg396
+Vdm3
+p781
+sg383
+Vcm3
+p782
+sg408
+Vml
+p783
+sg369
+Vm3
+p784
+sg405
+Vhl
+p785
+sg590
+Vl
+p786
+sg674
+VMl Mega
+p787
+sg722
+Vft3
+p788
+sg592
+Vaf
+p789
+sV11
+p790
+Vgal (us)
+p791
+sV10
+p792
+Vfl oz (us)
+p793
+sV13
+p794
+VBBL (US liq)
+p795
+sV12
+p796
+VMgal (us)
+p797
+sV15
+p798
+VBBL (US oil)
+p799
+sV14
+p800
+VBBL (US beer)
+p801
+sV17
+p802
+Vgal (imp)
+p803
+sV16
+p804
+VBBL (US tank)
+p805
+sV19
+p806
+VBBL (imp beer)
+p807
+sV18
+p808
+VMgal (imp)
+p809
+ssVlrt
+p810
+F1515711271.8358022
+sVda
+p811
+g369
+sg402
+V2103
+p812
+sg404
+g383
+sVmisc_u
+p813
+g16
+sg407
+g408
+sVmrt
+p814
+V60
+p815
+sg411
+Vnone
+p816
+sVm1ch
+p817
+g755
+sVmv
+p818
+g383
+sg414
+VOn
+p819
+sg378
+V0-22
+p820
+sg417
+Vint
+p821
+ssV4-9
+p822
+(dp823
+Val
+p824
+g16
+sVah
+p825
+g16
+sVbytary
+p826
+NsVvm
+p827
+NsVvn
+p828
+VConductivity Unit
+p829
+sVct
+p830
+Vnumber
+p831
+sVle
+p832
+V16
+p833
+sVgrp
+p834
+V86400
+p835
+sVla
+p836
+I8
+sVchn
+p837
+g16
+sVun
+p838
+g16
+sVdn
+p839
+VM1
+p840
+sVda
+p841
+g369
+sVlrt
+p842
+F1515711272.3275089
+sg378
+V0-10
+p843
+sg402
+V2120
+p844
+sg404
+g383
+sVmisc_u
+p845
+g16
+sg407
+g408
+sVmrt
+p846
+V60
+p847
+sg411
+Vnone
+p848
+sS'm1ch'
+p849
+g822
+sg414
+VOn
+p850
+sVmv
+p851
+g383
+sg417
+Vint
+p852
+ssV4-12
+p853
+(dp854
+Vah
+p855
+g16
+sVbytary
+p856
+NsVal
+p857
+g16
+sVvn
+p858
+VTotalizer 1 Units
+p859
+sVct
+p860
+Vnumber
+p861
+sVle
+p862
+V16
+p863
+sVgrp
+p864
+V86400
+p865
+sVla
+p866
+I11
+sVchn
+p867
+Vtotalizer_1_units
+p868
+sVun
+p869
+g396
+sVdn
+p870
+Vpromagmbs
+p871
+sVvm
+p872
+(dp873
+V20
+p874
+VBBL (imp oil)
+p875
+sV21
+p876
+VUser vol.
+p877
+sV22
+p878
+VkGal (us)
+p879
+sg396
+Vdm3
+p880
+sg383
+Vcm3
+p881
+sg408
+Vml
+p882
+sg369
+Vm3
+p883
+sg405
+Vhl
+p884
+sg590
+g786
+sg674
+VMl Mega
+p885
+sg722
+Vft3
+p886
+sg592
+Vaf
+p887
+sV11
+p888
+Vgal (us)
+p889
+sV10
+p890
+Vfl oz (us)
+p891
+sV13
+p892
+VBBL (US liq)
+p893
+sV12
+p894
+VMgal (us)
+p895
+sV15
+p896
+VBBL (US oil)
+p897
+sV14
+p898
+VBBL (US beer)
+p899
+sV17
+p900
+Vgal (imp)
+p901
+sV16
+p902
+VBBL (US tank)
+p903
+sV19
+p904
+VBBL (imp beer)
+p905
+sV18
+p906
+VMgal (imp)
+p907
+sV56
+p908
+VUser mass
+p909
+sV51
+p910
+Vkg
+p911
+sV50
+p912
+Vg
+p913
+sV53
+p914
+Voz
+p915
+sV52
+p916
+g417
+sV55
+p917
+VSTon
+p918
+sV54
+p919
+Vlb
+p920
+ssVlrt
+p921
+F1515711272.82556
+sVda
+p922
+g369
+sg402
+V4603
+p923
+sg404
+g383
+sVmisc_u
+p924
+g16
+sg407
+g408
+sVmrt
+p925
+V60
+p926
+sg411
+Vnone
+p927
+sVm1ch
+p928
+g853
+sVmv
+p929
+g383
+sg414
+VOn
+p930
+sg378
+V0-56
+p931
+sg417
+Vint
+p932
+ssV4-13
+p933
+(dp934
+Val
+p935
+g16
+sVah
+p936
+g16
+sVbytary
+p937
+NsVvm
+p938
+(dp939
+V20
+p940
+VBBL (imp oil)
+p941
+sV21
+p942
+VUser vol.
+p943
+sV22
+p944
+VkGal (us)
+p945
+sg396
+Vdm3
+p946
+sg383
+Vcm3
+p947
+sg408
+Vml
+p948
+sg369
+Vm3
+p949
+sg405
+Vhl
+p950
+sg590
+g786
+sg674
+VMl Mega
+p951
+sg722
+Vft3
+p952
+sg592
+Vaf
+p953
+sV11
+p954
+Vgal (us)
+p955
+sV10
+p956
+Vfl oz (us)
+p957
+sV13
+p958
+VBBL (US liq)
+p959
+sV12
+p960
+VMgal (us)
+p961
+sV15
+p962
+VBBL (US oil)
+p963
+sV14
+p964
+VBBL (US beer)
+p965
+sV17
+p966
+Vgal (imp)
+p967
+sV16
+p968
+VBBL (US tank)
+p969
+sV19
+p970
+VBBL (imp beer)
+p971
+sV18
+p972
+VMgal (imp)
+p973
+sV56
+p974
+VUser mass
+p975
+sV51
+p976
+Vkg
+p977
+sV50
+p978
+g913
+sV53
+p979
+Voz
+p980
+sV52
+p981
+g417
+sV55
+p982
+VSTon
+p983
+sV54
+p984
+Vlb
+p985
+ssVvn
+p986
+VTotalizer 2 Units
+p987
+sVct
+p988
+Vnumber
+p989
+sVle
+p990
+V16
+p991
+sVgrp
+p992
+V86400
+p993
+sVla
+p994
+I11
+sVchn
+p995
+Vtotalizer_2_units
+p996
+sVun
+p997
+g396
+sVdn
+p998
+Vpromagmbs
+p999
+sVda
+p1000
+g369
+sVlrt
+p1001
+F1515711273.323234
+sg378
+V0-56
+p1002
+sg402
+V4604
+p1003
+sg404
+g383
+sVmisc_u
+p1004
+g16
+sg407
+g408
+sVmrt
+p1005
+V60
+p1006
+sg411
+Vnone
+p1007
+sVm1ch
+p1008
+g933
+sg414
+VOn
+p1009
+sVmv
+p1010
+g383
+sg417
+Vint
+p1011
+ssV4-14
+p1012
+(dp1013
+Val
+p1014
+g16
+sVah
+p1015
+g16
+sVbytary
+p1016
+NsVvm
+p1017
+(dp1018
+V20
+p1019
+VBBL (imp oil)
+p1020
+sV21
+p1021
+VUser vol.
+p1022
+sV22
+p1023
+VkGal (us)
+p1024
+sg396
+Vdm3
+p1025
+sg383
+Vcm3
+p1026
+sg408
+Vml
+p1027
+sg369
+Vm3
+p1028
+sg405
+Vhl
+p1029
+sg590
+g786
+sg674
+VMl Mega
+p1030
+sg722
+Vft3
+p1031
+sg592
+Vaf
+p1032
+sV11
+p1033
+Vgal (us)
+p1034
+sV10
+p1035
+Vfl oz (us)
+p1036
+sV13
+p1037
+VBBL (US liq)
+p1038
+sV12
+p1039
+VMgal (us)
+p1040
+sV15
+p1041
+VBBL (US oil)
+p1042
+sV14
+p1043
+VBBL (US beer)
+p1044
+sV17
+p1045
+Vgal (imp)
+p1046
+sV16
+p1047
+VBBL (US tank)
+p1048
+sV19
+p1049
+VBBL (imp beer)
+p1050
+sV18
+p1051
+VMgal (imp)
+p1052
+sV56
+p1053
+VUser mass
+p1054
+sV51
+p1055
+Vkg
+p1056
+sV50
+p1057
+g913
+sV53
+p1058
+Voz
+p1059
+sV52
+p1060
+g417
+sV55
+p1061
+VSTon
+p1062
+sV54
+p1063
+Vlb
+p1064
+ssVvn
+p1065
+VTotalizer 3 Units
+p1066
+sVct
+p1067
+Vnumber
+p1068
+sVle
+p1069
+V16
+p1070
+sVgrp
+p1071
+V86400
+p1072
+sVla
+p1073
+I11
+sVchn
+p1074
+Vtotalizer_3_units
+p1075
+sVun
+p1076
+g396
+sVdn
+p1077
+Vpromagmbs
+p1078
+sVda
+p1079
+g369
+sVlrt
+p1080
+F1515711273.829602
+sg378
+V0-56
+p1081
+sg402
+V4605
+p1082
+sg404
+g383
+sVmisc_u
+p1083
+g16
+sg407
+g408
+sVmrt
+p1084
+V60
+p1085
+sg411
+Vnone
+p1086
+sVm1ch
+p1087
+g1012
+sg414
+VOn
+p1088
+sVmv
+p1089
+g383
+sg417
+Vint
+p1090
 ssssg365
 VOff
-p565
+p1091
 sg367
 VNone
-p566
+p1092
 sg368
-g9
+g396
 ss.
\ No newline at end of file
diff --git a/python-driver/test_utilities.py b/python-driver/test_utilities.py
index 493d5da..1731446 100644
--- a/python-driver/test_utilities.py
+++ b/python-driver/test_utilities.py
@@ -36,7 +36,7 @@ def pad(string_to_pad, char_to_pad_with, num_chars):
 
 def split_into_parts(inp_str):
     """Split the binary string."""
-    return inp_str[0:1] + " " + inp_str[1:6] + " " + inp_str[7:15]
+    return inp_str[0:1] + " " + inp_str[1:6] + " " + inp_str[6:17]
 
 
 for t in test_values:
diff --git a/python-driver/utilities.py b/python-driver/utilities.py
index ddd98a5..d47533f 100644
--- a/python-driver/utilities.py
+++ b/python-driver/utilities.py
@@ -18,10 +18,10 @@ def int_to_float16(int_to_convert):
     if int(bin_rep[0]) == 1:
         sign = -1.0
     exponent = float(int(bin_rep[1:6], 2))
-    if exponent == 30:
-        fraction = float(int("1" + bin_rep[7:17], 2))
-    else:
-        fraction = float(int(bin_rep[7:17], 2))
+    # if exponent == 30:
+    #     fraction = float(int("1" + bin_rep[:17], 2))
+    # else:
+    fraction = float(int(bin_rep[6:17], 2))
 
     if exponent == float(0b00000):
         return sign * 2 ** -14 * fraction / (2.0 ** 10.0)