examples: Update examples j1939

Change-Id: I060994c4b553c6ae52becd52f8b0bfa795230743
Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh>
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

3 files changed, 238 insertions, 465 deletions

diff --git a/examples/basic/signals.json b/examples/basic/signals.json
index c41cdf38..bc6f6a9f 100644
--- a/examples/basic/signals.json
+++ b/examples/basic/signals.json
@@ -1,5 +1,5 @@
 {   "name": "example",
-    "version": "1.0",
+    "version": "2.0",
     "extra_sources": [
         "handlers.cpp"
     ],
diff --git a/examples/j1939/j1939_parse.json b/examples/j1939/j1939_parse.json
index 41b3da20..a569cfd5 100644
--- a/examples/j1939/j1939_parse.json
+++ b/examples/j1939/j1939_parse.json
@@ -23,7 +23,7 @@
 					"offset": 0,
 					"comment": "State signal which indicates whether the torque converter lockup is engaged.",
 					"is_big_endian": false,
-					"is_signed": false,
+					"sign": 0,
 					"writable" : true,
 					"states": {
 						"TorqueConverterLockupDisengaged": [0],
@@ -40,7 +40,7 @@
 					"offset": 0,
 					"comment": "State signal indicating whether or not the transmission torque converter lock up clutch is transitioning between being",
 					"is_big_endian": false,
-					"is_signed": false,
+					"sign": 0,
 					"writable" : true,
 					"states": {
 						"TransitionIsNotInProcess": [0],
@@ -57,7 +57,7 @@
 					"offset": 0,
 					"comment": "The source address of the SAE J1939 device currently controlling the transmission.",
 					"is_big_endian": false,
-					"is_signed": false,
+					"sign": 0,
 					"writable" : true
 				},
 				"Momentary.Eng.Max.Power.Enable" : {
@@ -68,7 +68,7 @@
 					"offset": 0,
 					"comment": "Momentarily Requesting highest torque map from the engine control",
 					"is_big_endian": false,
-					"is_signed": false,
+					"sign": 0,
 					"writable" : true,
 					"states": {
 						"notRqingMaxPowerAvailable": [0],
@@ -86,7 +86,7 @@
 					"comment": "Rotational velocity of the primary shaft transferring power into the transmission.",
 					"unit": "rpm",
 					"is_big_endian": false,
-					"is_signed": false,
+					"sign": 0,
 					"writable" : true
 				},
 				"Progressive.Shift.Disable" : {
@@ -97,7 +97,7 @@
 					"offset": 0,
 					"comment": "Command signal used to indicate that progressive shifting by the engine should be disallowed.",
 					"is_big_endian": false,
-					"is_signed": false,
+					"sign": 0,
 					"writable" : true,
 					"states": {
 						"ProgressiveShiftIsNotDisabled": [0],
@@ -114,7 +114,7 @@
 					"offset": 0,
 					"comment": "Command signal used to indicate that the engine speed may be boosted up to the maximum engine overspeed value to",
 					"is_big_endian": false,
-					"is_signed": false,
+					"sign": 0,
 					"writable" : true,
 					"states": {
 						"MomentaryEngOverspeedIsDisabled": [0],
@@ -132,7 +132,7 @@
 					"comment": "Parameter which represents the ratio of input shaft speed to current engine speed (in percent).",
 					"unit": "%",
 					"is_big_endian": false,
-					"is_signed": false,
+					"sign": 0,
 					"writable" : true
 				},
 				"Trans.Output.Shaft.Speed" : {
@@ -144,7 +144,7 @@
 					"comment": "Calculated speed of the transmission output shaft.",
 					"unit": "rpm",
 					"is_big_endian": false,
-					"is_signed": false,
+					"sign": 0,
 					"writable" : true
 				},
 				"Trans.Shift.In.Process" : {
@@ -155,7 +155,7 @@
 					"offset": 0,
 					"comment": "Indicates that the transmission is in process of shifting from the current gear to the selected gear.",
 					"is_big_endian": false,
-					"is_signed": false,
+					"sign": 0,
 					"writable" : true,
 					"states": {
 						"ShiftIsNotInProcess": [0],
@@ -172,7 +172,7 @@
 					"offset": 0,
 					"comment": "Driveline engaged indicates the transmission controlled portion of the driveline is engaged sufficiently to allow a transfer",
 					"is_big_endian": false,
-					"is_signed": false,
+					"sign": 0,
 					"writable" : true,
 					"states": {
 						"DrivelineDisengaged": [0],
@@ -199,7 +199,7 @@
 					"offset": 0,
 					"comment": "The source address of the SAE J1939 device currently controlling the engine.",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				},
 				"Actl.Eng.Prcnt.Trque.High.Resolution" : {
 					"generic_name": "Actl.Eng.Prcnt.Trque.High.Resolution",
@@ -210,7 +210,7 @@
 					"comment": "This parameter displays an additional torque in percent of the reference engine torque.",
 					"unit": "%",
 					"is_big_endian": false,
-					"is_signed": false,
+					"sign": 0,
 					"states": {
 						"0000": [0],
 						"0125": [1],
@@ -227,7 +227,7 @@
 					"comment": "The requested torque output of the engine by all dynamic internal inputs, including smoke control, noise control and low",
 					"unit": "%",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				},
 				"Eng.Starter.Mode" : {
 					"generic_name": "Eng.Starter.Mode",
@@ -237,7 +237,7 @@
 					"offset": 0,
 					"comment": "There are several phases in a starting action and different reasons why a start cannot take place.",
 					"is_big_endian": false,
-					"is_signed": false,
+					"sign": 0,
 					"states": {
 						"startNotRqed": [0],
 						"starterActiveGearNotEngaged": [1],
@@ -263,7 +263,7 @@
 					"comment": "Actual engine speed which is calculated over a minimum crankshaft angle of 720 degrees divided by the number of cylinders.",
 					"unit": "rpm",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				},
 				"Actual.Eng.Percent.Torque" : {
 					"generic_name": "Actual.Eng.Percent.Torque",
@@ -274,7 +274,7 @@
 					"comment": "The calculated output torque of the engine.",
 					"unit": "%",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				},
 				"Drivers.Demand.Eng.Percent.Torque" : {
 					"generic_name": "Drivers.Demand.Eng.Percent.Torque",
@@ -285,7 +285,7 @@
 					"comment": "The requested torque output of the engine by the driver.",
 					"unit": "%",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				},
 				"Eng.Torque.Mode" : {
 					"generic_name": "Eng.Torque.Mode",
@@ -295,7 +295,7 @@
 					"offset": 0,
 					"comment": "State signal which indicates which engine torque mode is currently generating, limiting, or controlling the torque.",
 					"is_big_endian": false,
-					"is_signed": false,
+					"sign": 0,
 					"states": {
 						"Low idle governor/no request (de": [0],
 						"Accelerator pedal/operator selec": [1],
@@ -331,7 +331,7 @@
 					"comment": "Accumulated number of revolutions of engine crankshaft during its operation.",
 					"unit": "r",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				},
 				"Eng.Total.Hours.Of.Operation" : {
 					"generic_name": "Eng.Total.Hours.Of.Operation",
@@ -342,7 +342,7 @@
 					"comment": "Accumulated time of operation of engine.",
 					"unit": "hr",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				}
 			}
 		},
@@ -363,7 +363,7 @@
 					"comment": "The main operator`s steering wheel angle (on the steering column, not the actual wheel angle).",
 					"unit": "rad",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				},
 				"Longitudinal.Acceleration" : {
 					"generic_name": "Longitudinal.Acceleration",
@@ -374,7 +374,7 @@
 					"comment": "Indicates the longitudinal acceleration of the vehicle.",
 					"unit": "m/s/s",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				},
 				"Lateral.Acceleration" : {
 					"generic_name": "Lateral.Acceleration",
@@ -385,7 +385,7 @@
 					"comment": "Indicates a lateral acceleration of the vehicle.",
 					"unit": "m/s/s",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				},
 				"Yaw.Rate" : {
 					"generic_name": "Yaw.Rate",
@@ -396,7 +396,7 @@
 					"comment": "Indicates the rotation about the vertical axis.",
 					"unit": "rad/s",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				},
 				"Steer.Wheel.Angle.Sensor.Type" : {
 					"generic_name": "Steer.Wheel.Angle.Sensor.Type",
@@ -406,7 +406,7 @@
 					"offset": 0,
 					"comment": "Indicates whether the steering wheel angle sensor is capable of absolute measuring of the number of steering wheel",
 					"is_big_endian": false,
-					"is_signed": false,
+					"sign": 0,
 					"states": {
 						"RelativeMeasuringPrinciple": [0],
 						"AbsMeasuringPrinciple": [1],
@@ -423,7 +423,7 @@
 					"comment": "Indicates number of steering wheel turns, absolute position or relative position at ignition on.",
 					"unit": "turns",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				}
 			}
 		},
@@ -444,7 +444,7 @@
 					"comment": "The speed of the rear axle #2, right wheel relative to the front axle speed, SPN 904.",
 					"unit": "km/h",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				},
 				"Relative.Speed.Rear.Axle2.Left.Wheel" : {
 					"generic_name": "Relative.Speed.Rear.Axle2.Left.Wheel",
@@ -455,7 +455,7 @@
 					"comment": "The speed of the rear axle #2, left wheel relative to the front axle speed, SPN 904.",
 					"unit": "km/h",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				},
 				"Rlative.Speed.Rear.Axle1.Right.Wheel" : {
 					"generic_name": "Rlative.Speed.Rear.Axle1.Right.Wheel",
@@ -466,7 +466,7 @@
 					"comment": "The speed of the rear axle #1, right wheel relative to the front axle speed, SPN 904.",
 					"unit": "km/h",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				},
 				"Relative.Speed.Rear.Axle1.Left.Wheel" : {
 					"generic_name": "Relative.Speed.Rear.Axle1.Left.Wheel",
@@ -477,7 +477,7 @@
 					"comment": "The speed of the rear axle #1, left wheel relative to the front axle speed, SPN 904.",
 					"unit": "km/h",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				},
 				"Rlative.Speed.Front.Axle.Right.Wheel" : {
 					"generic_name": "Rlative.Speed.Front.Axle.Right.Wheel",
@@ -488,7 +488,7 @@
 					"comment": "The speed of the front axle, right wheel relative to the front axle speed, SPN 904.",
 					"unit": "km/h",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				},
 				"Relative.Speed.Front.Axle.Left.Wheel" : {
 					"generic_name": "Relative.Speed.Front.Axle.Left.Wheel",
@@ -499,7 +499,7 @@
 					"comment": "The speed of the front axle, left wheel relative to the front axle speed, SPN 904.",
 					"unit": "km/h",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				},
 				"Front.Axle.Speed" : {
 					"generic_name": "Front.Axle.Speed",
@@ -510,7 +510,7 @@
 					"comment": "The average speed of the two front wheels.",
 					"unit": "km/h",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				}
 			}
 		},
@@ -531,7 +531,7 @@
 					"comment": "Temperature of fuel (or gas) passing through the first fuel control system.",
 					"unit": "deg C",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				},
 				"Eng.Intercooler.Thermostat.Opening" : {
 					"generic_name": "Eng.Intercooler.Thermostat.Opening",
@@ -542,7 +542,7 @@
 					"comment": "The current position of the thermostat used to regulate the temperature of the engine intercooler.",
 					"unit": "%",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				},
 				"Eng.Intercooler.Temp" : {
 					"generic_name": "Eng.Intercooler.Temp",
@@ -553,7 +553,7 @@
 					"comment": "Temperature of liquid found in the intercooler located after the turbocharger.",
 					"unit": "deg C",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				},
 				"Eng.Turbo.Oil.Temp" : {
 					"generic_name": "Eng.Turbo.Oil.Temp",
@@ -564,7 +564,7 @@
 					"comment": "Temperature of the turbocharger lubricant.",
 					"unit": "deg C",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				},
 				"Eng.Oil.Temp1" : {
 					"generic_name": "Eng.Oil.Temp1",
@@ -575,7 +575,7 @@
 					"comment": "Temperature of the engine lubricant.",
 					"unit": "deg C",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				},
 				"Eng.Coolant.Temp" : {
 					"generic_name": "Eng.Coolant.Temp",
@@ -586,7 +586,7 @@
 					"comment": "Temperature of liquid found in engine cooling system.",
 					"unit": "deg C",
 					"is_big_endian": false,
-					"is_signed": false
+					"sign": 0
 				}
 			}
 		}
diff --git a/examples/tests/signal.json b/examples/tests/signal.json
index 1e706461..ee7e467f 100644
--- a/examples/tests/signal.json
+++ b/examples/tests/signal.json
@@ -305,7 +305,7 @@
                 "offset": 0,
                 "comment": "State signal which indicates whether the torque converter lockup is engaged.",
                 "is_big_endian": false,
-                "is_signed": false,
+                "sign": 0,
                 "writable" : true,
                 "states": {
                     "TorqueConverterLockupDisengaged": [0],
@@ -322,7 +322,7 @@
                 "offset": 0,
                 "comment": "State signal indicating whether or not the transmission torque converter lock up clutch is transitioning between being",
                 "is_big_endian": false,
-                "is_signed": false,
+                "sign": 0,
                 "writable" : true,
                 "states": {
                     "TransitionIsNotInProcess": [0],
@@ -339,7 +339,7 @@
                 "offset": 0,
                 "comment": "The source address of the SAE J1939 device currently controlling the transmission.",
                 "is_big_endian": false,
-                "is_signed": false,
+                "sign": 0,
                 "writable" : true
             },
             "Momentary.Eng.Max.Power.Enable" : {
@@ -350,7 +350,7 @@
                 "offset": 0,
                 "comment": "Momentarily Requesting highest torque map from the engine control",
                 "is_big_endian": false,
-                "is_signed": false,
+                "sign": 0,
                 "writable" : true,
                 "states": {
                     "notRqingMaxPowerAvailable": [0],
@@ -368,7 +368,7 @@
                 "comment": "Rotational velocity of the primary shaft transferring power into the transmission.",
                 "unit": "rpm",
                 "is_big_endian": false,
-                "is_signed": false,
+                "sign": 0,
                 "writable" : true
             },
             "Progressive.Shift.Disable" : {
@@ -379,7 +379,7 @@
                 "offset": 0,
                 "comment": "Command signal used to indicate that progressive shifting by the engine should be disallowed.",
                 "is_big_endian": false,
-                "is_signed": false,
+                "sign": 0,
                 "writable" : true,
                 "states": {
                     "ProgressiveShiftIsNotDisabled": [0],
@@ -396,7 +396,7 @@
                 "offset": 0,
                 "comment": "Command signal used to indicate that the engine speed may be boosted up to the maximum engine overspeed value to",
                 "is_big_endian": false,
-                "is_signed": false,
+                "sign": 0,
                 "writable" : true,
                 "states": {
                     "MomentaryEngOverspeedIsDisabled": [0],
@@ -414,7 +414,7 @@
                 "comment": "Parameter which represents the ratio of input shaft speed to current engine speed (in percent).",
                 "unit": "%",
                 "is_big_endian": false,
-                "is_signed": false,
+                "sign": 0,
                 "writable" : true
             },
             "Trans.Output.Shaft.Speed" : {
@@ -426,7 +426,7 @@
                 "comment": "Calculated speed of the transmission output shaft.",
                 "unit": "rpm",
                 "is_big_endian": false,
-                "is_signed": false,
+                "sign": 0,
                 "writable" : true
             },
             "Trans.Shift.In.Process" : {
@@ -437,7 +437,7 @@
                 "offset": 0,
                 "comment": "Indicates that the transmission is in process of shifting from the current gear to the selected gear.",
                 "is_big_endian": false,
-                "is_signed": false,
+                "sign": 0,
                 "writable" : true,
                 "states": {
                     "ShiftIsNotInProcess": [0],
@@ -454,7 +454,7 @@
                 "offset": 0,
                 "comment": "Driveline engaged indicates the transmission controlled portion of the driveline is engaged sufficiently to allow a transfer",
                 "is_big_endian": false,
-                "is_signed": false,
+                "sign": 0,
                 "writable" : true,
                 "states": {
                     "DrivelineDisengaged": [0],
@@ -464,419 +464,192 @@
                 }
             }
         }
-    },
-    "61444": {
-        "comment": "Electronic Engine Controller 1",
-        "length": 8,
-        "name": "EEC1",
-        "bus" : "j1939",
-        "is_fd" : false,
-        "is_extended": false,
-        "is_j1939" : true,
-        "signals" : {
-            "Src.AddrssOf.Ctrllng.Dvc.Fr.Eng.Cntrl" : {
-                "generic_name": "Src.AddrssOf.Ctrllng.Dvc.Fr.Eng.Cntrl",
-                "bit_position": 40,
-                "bit_size": 8,
-                "factor": 1,
-                "offset": 0,
-                "comment": "The source address of the SAE J1939 device currently controlling the engine.",
-                "is_big_endian": false,
-                "is_signed": false
-            },
-            "Actl.Eng.Prcnt.Trque.High.Resolution" : {
-                "generic_name": "Actl.Eng.Prcnt.Trque.High.Resolution",
-                "bit_position": 4,
-                "bit_size": 4,
-                "factor": 0.125,
-                "offset": 0,
-                "comment": "This parameter displays an additional torque in percent of the reference engine torque.",
-                "unit": "%",
-                "is_big_endian": false,
-                "is_signed": false,
-                "states": {
-                    "0000": [0],
-                    "0125": [1],
-                    "0875": [7],
-                    "1111NotAvailable": [8]
-                }
-            },
-            "Eng.Demand.Percent.Torque" : {
-                "generic_name": "Eng.Demand.Percent.Torque",
-                "bit_position": 56,
-                "bit_size": 8,
-                "factor": 1,
-                "offset": -125,
-                "comment": "The requested torque output of the engine by all dynamic internal inputs, including smoke control, noise control and low",
-                "unit": "%",
-                "is_big_endian": false,
-                "is_signed": false
-            },
-            "Eng.Starter.Mode" : {
-                "generic_name": "Eng.Starter.Mode",
-                "bit_position": 48,
-                "bit_size": 4,
-                "factor": 1,
-                "offset": 0,
-                "comment": "There are several phases in a starting action and different reasons why a start cannot take place.",
-                "is_big_endian": false,
-                "is_signed": false,
-                "states": {
-                    "startNotRqed": [0],
-                    "starterActiveGearNotEngaged": [1],
-                    "starterActiveGearEngaged": [2],
-                    "strtFnshdStrtrNtActvAftrHvngBnA": [3],
-                    "strtrInhbtdDToEngAlreadyRunning": [4],
-                    "strtrInhbtdDTEngNtReadyForStart": [5],
-                    "strtrInhbtdDTDrvlnEnggdOthrTrns": [6],
-                    "strtrInhbtdDToActiveImmobilizer": [7],
-                    "strtrInhbtdDueToStarterOvertemp": [8],
-                    "1011Reserved": [9],
-                    "starterInhibitedReasonUnknown": [12],
-                    "error": [14],
-                    "notAvailable": [15]
-                }
-            },
-            "Eng.Speed" : {
-                "generic_name": "Eng.Speed",
-                "bit_position": 24,
-                "bit_size": 16,
-                "factor": 0.125,
-                "offset": 0,
-                "comment": "Actual engine speed which is calculated over a minimum crankshaft angle of 720 degrees divided by the number of cylinders.",
-                "unit": "rpm",
-                "is_big_endian": false,
-                "is_signed": false
-            },
-            "Actual.Eng.Percent.Torque" : {
-                "generic_name": "Actual.Eng.Percent.Torque",
-                "bit_position": 16,
-                "bit_size": 8,
-                "factor": 1,
-                "offset": -125,
-                "comment": "The calculated output torque of the engine.",
-                "unit": "%",
-                "is_big_endian": false,
-                "is_signed": false
-            },
-            "Drivers.Demand.Eng.Percent.Torque" : {
-                "generic_name": "Drivers.Demand.Eng.Percent.Torque",
-                "bit_position": 8,
-                "bit_size": 8,
-                "factor": 1,
-                "offset": -125,
-                "comment": "The requested torque output of the engine by the driver.",
-                "unit": "%",
-                "is_big_endian": false,
-                "is_signed": false
-            },
-            "Eng.Torque.Mode" : {
-                "generic_name": "Eng.Torque.Mode",
-                "bit_position": 0,
-                "bit_size": 4,
-                "factor": 1,
-                "offset": 0,
-                "comment": "State signal which indicates which engine torque mode is currently generating, limiting, or controlling the torque.",
-                "is_big_endian": false,
-                "is_signed": false,
-                "states": {
-                    "Low idle governor/no request (de": [0],
-                    "Accelerator pedal/operator selec": [1],
-                    "Cruise control": [2],
-                    "PTO governor": [3],
-                    "Road speed governor": [4],
-                    "ASR control": [5],
-                    "Transmission control": [6],
-                    "ABS control": [7],
-                    "Torque limiting": [8],
-                    "High speed governor": [9],
-                    "Braking system": [10],
-                    "Remote accelerator": [11],
-                    "Not available": [15]
-                }
-            }
-        }
-    },
-    "65253": {
-        "comment": "Engine Hours, Revolutions",
-        "length": 8,
-        "name": "HOURS",
-        "bus" : "j1939",
-        "is_fd" : false,
-        "is_extended": false,
-        "is_j1939" : true,
-        "signals" : {
-            "Eng.Total.Revolutions" : {
-                "generic_name": "Eng.Total.Revolutions",
-                "bit_position": 32,
-                "bit_size": 32,
-                "factor": 1000,
-                "offset": 0,
-                "comment": "Accumulated number of revolutions of engine crankshaft during its operation.",
-                "unit": "r",
-                "is_big_endian": false,
-                "is_signed": false
-            },
-            "Eng.Total.Hours.Of.Operation" : {
-                "generic_name": "Eng.Total.Hours.Of.Operation",
-                "bit_position": 0,
-                "bit_size": 32,
-                "factor": 0.05,
-                "offset": 0,
-                "comment": "Accumulated time of operation of engine.",
-                "unit": "hr",
-                "is_big_endian": false,
-                "is_signed": false
-            }
-        }
-    },
-    "61449": {
-        "comment": "Vehicle Dynamic Stability Control 2",
-        "length": 8,
-        "name": "VDC2",
-        "bus" : "j1939",
-        "is_fd" : false,
-        "is_extended": false,
-        "is_j1939" : true,
-        "signals" : {
-            "Steer.Wheel.Angle" : {
-                "generic_name": "Steer.Wheel.Angle",
-                "bit_position": 0,
-                "bit_size": 16,
-                "factor": 0.0009765625,
-                "offset": -31.374,
-                "comment": "The main operator`s steering wheel angle (on the steering column, not the actual wheel angle).",
-                "unit": "rad",
-                "is_big_endian": false,
-                "is_signed": false
-            },
-            "Longitudinal.Acceleration" : {
-                "generic_name": "Longitudinal.Acceleration",
-                "bit_position": 56,
-                "bit_size": 8,
-                "factor": 0.1,
-                "offset": -12.5,
-                "comment": "Indicates the longitudinal acceleration of the vehicle.",
-                "unit": "m/s/s",
-                "is_big_endian": false,
-                "is_signed": false
-            },
-            "Lateral.Acceleration" : {
-                "generic_name": "Lateral.Acceleration",
-                "bit_position": 40,
-                "bit_size": 16,
-                "factor": 0.00048828125,
-                "offset": -15.687,
-                "comment": "Indicates a lateral acceleration of the vehicle.",
-                "unit": "m/s/s",
-                "is_big_endian": false,
-                "is_signed": false
-            },
-            "Yaw.Rate" : {
-                "generic_name": "Yaw.Rate",
-                "bit_position": 24,
-                "bit_size": 16,
-                "factor": 0.0001220703125,
-                "offset": -3.92,
-                "comment": "Indicates the rotation about the vertical axis.",
-                "unit": "rad/s",
-                "is_big_endian": false,
-                "is_signed": false
-            },
-            "Steer.Wheel.Angle.Sensor.Type" : {
-                "generic_name": "Steer.Wheel.Angle.Sensor.Type",
-                "bit_position": 22,
-                "bit_size": 2,
-                "factor": 1,
-                "offset": 0,
-                "comment": "Indicates whether the steering wheel angle sensor is capable of absolute measuring of the number of steering wheel",
-                "is_big_endian": false,
-                "is_signed": false,
-                "states": {
-                    "RelativeMeasuringPrinciple": [0],
-                    "AbsMeasuringPrinciple": [1],
-                    "Reserved": [2],
-                    "NotAvailable": [3]
-                }
-            },
-            "Steer.Wheel.Turn.Counter" : {
-                "generic_name": "Steer.Wheel.Turn.Counter",
-                "bit_position": 16,
-                "bit_size": 6,
-                "factor": 1,
-                "offset": -32,
-                "comment": "Indicates number of steering wheel turns, absolute position or relative position at ignition on.",
-                "unit": "turns",
-                "is_big_endian": false,
-                "is_signed": false
-            }
-        }
-    },
-    "65215": {
-        "comment": "Wheel Speed Information",
-        "length": 8,
-        "name": "EBC2",
-        "bus" : "j1939",
-        "is_fd" : false,
-        "is_extended": false,
-        "is_j1939" : true,
-        "signals" : {
-            "Rlative.Speed.Rear.Axle2.Right.Wheel" : {
-                "generic_name": "Rlative.Speed.Rear.Axle2.Right.Wheel",
-                "bit_position": 56,
-                "bit_size": 8,
-                "factor": 0.0625,
-                "offset": -7.8125,
-                "comment": "The speed of the rear axle #2, right wheel relative to the front axle speed, SPN 904.",
-                "unit": "km/h",
-                "is_big_endian": false,
-                "is_signed": false
-            },
-            "Relative.Speed.Rear.Axle2.Left.Wheel" : {
-                "generic_name": "Relative.Speed.Rear.Axle2.Left.Wheel",
-                "bit_position": 48,
-                "bit_size": 8,
-                "factor": 0.0625,
-                "offset": -7.8125,
-                "comment": "The speed of the rear axle #2, left wheel relative to the front axle speed, SPN 904.",
-                "unit": "km/h",
-                "is_big_endian": false,
-                "is_signed": false
-            },
-            "Rlative.Speed.Rear.Axle1.Right.Wheel" : {
-                "generic_name": "Rlative.Speed.Rear.Axle1.Right.Wheel",
-                "bit_position": 40,
-                "bit_size": 8,
-                "factor": 0.0625,
-                "offset": -7.8125,
-                "comment": "The speed of the rear axle #1, right wheel relative to the front axle speed, SPN 904.",
-                "unit": "km/h",
-                "is_big_endian": false,
-                "is_signed": false
-            },
-            "Relative.Speed.Rear.Axle1.Left.Wheel" : {
-                "generic_name": "Relative.Speed.Rear.Axle1.Left.Wheel",
-                "bit_position": 32,
-                "bit_size": 8,
-                "factor": 0.0625,
-                "offset": -7.8125,
-                "comment": "The speed of the rear axle #1, left wheel relative to the front axle speed, SPN 904.",
-                "unit": "km/h",
-                "is_big_endian": false,
-                "is_signed": false
-            },
-            "Rlative.Speed.Front.Axle.Right.Wheel" : {
-                "generic_name": "Rlative.Speed.Front.Axle.Right.Wheel",
-                "bit_position": 24,
-                "bit_size": 8,
-                "factor": 0.0625,
-                "offset": -7.8125,
-                "comment": "The speed of the front axle, right wheel relative to the front axle speed, SPN 904.",
-                "unit": "km/h",
-                "is_big_endian": false,
-                "is_signed": false
-            },
-            "Relative.Speed.Front.Axle.Left.Wheel" : {
-                "generic_name": "Relative.Speed.Front.Axle.Left.Wheel",
-                "bit_position": 16,
-                "bit_size": 8,
-                "factor": 0.0625,
-                "offset": -7.8125,
-                "comment": "The speed of the front axle, left wheel relative to the front axle speed, SPN 904.",
-                "unit": "km/h",
-                "is_big_endian": false,
-                "is_signed": false
-            },
-            "Front.Axle.Speed" : {
-                "generic_name": "Front.Axle.Speed",
-                "bit_position": 0,
-                "bit_size": 16,
-                "factor": 0.00390625,
-                "offset": 0,
-                "comment": "The average speed of the two front wheels.",
-                "unit": "km/h",
-                "is_big_endian": false,
-                "is_signed": false
-            }
-        }
-    },
-    "65262": {
-        "comment": "Engine Temperature 1",
-        "length": 8,
-        "name": "ET1",
-        "bus" : "j1939",
-        "is_fd" : false,
-        "is_extended": false,
-        "is_j1939" : true,
-        "signals" : {
-            "Eng.Fuel.Temp1" : {
-                "generic_name": "Eng.Fuel.Temp1",
-                "bit_position": 8,
-                "bit_size": 8,
-                "factor": 1,
-                "offset": -40,
-                "comment": "Temperature of fuel (or gas) passing through the first fuel control system.",
-                "unit": "deg C",
-                "is_big_endian": false,
-                "is_signed": false
-            },
-            "Eng.Intercooler.Thermostat.Opening" : {
-                "generic_name": "Eng.Intercooler.Thermostat.Opening",
-                "bit_position": 56,
-                "bit_size": 8,
-                "factor": 0.4,
-                "offset": 0,
-                "comment": "The current position of the thermostat used to regulate the temperature of the engine intercooler.",
-                "unit": "%",
-                "is_big_endian": false,
-                "is_signed": false
-            },
-            "Eng.Intercooler.Temp" : {
-                "generic_name": "Eng.Intercooler.Temp",
-                "bit_position": 48,
-                "bit_size": 8,
-                "factor": 1,
-                "offset": -40,
-                "comment": "Temperature of liquid found in the intercooler located after the turbocharger.",
-                "unit": "deg C",
-                "is_big_endian": false,
-                "is_signed": false
-            },
-            "Eng.Turbo.Oil.Temp" : {
-                "generic_name": "Eng.Turbo.Oil.Temp",
-                "bit_position": 32,
-                "bit_size": 16,
-                "factor": 0.03125,
-                "offset": -273,
-                "comment": "Temperature of the turbocharger lubricant.",
-                "unit": "deg C",
-                "is_big_endian": false,
-                "is_signed": false
-            },
-            "Eng.Oil.Temp1" : {
-                "generic_name": "Eng.Oil.Temp1",
-                "bit_position": 16,
-                "bit_size": 16,
-                "factor": 0.03125,
-                "offset": -273,
-                "comment": "Temperature of the engine lubricant.",
-                "unit": "deg C",
-                "is_big_endian": false,
-                "is_signed": false
-            },
-            "Eng.Coolant.Temp" : {
-                "generic_name": "Eng.Coolant.Temp",
-                "bit_position": 0,
-                "bit_size": 8,
-                "factor": 0.03125,
-                "offset": -273,
-                "comment": "Temperature of liquid found in engine cooling system.",
-                "unit": "deg C",
-                "is_big_endian": false,
-                "is_signed": false
-            }
-        }
-    }
+	},
+	"61444": {
+		"comment": "Electronic Engine Controller 1",
+		"length": 8,
+		"name": "EEC1",
+		"bus" : "j1939",
+		"is_fd" : false,
+		"is_j1939" : true,
+		"signals" : {
+			"Src.AddrssOf.Ctrllng.Dvc.Fr.Eng.Cntrl" : {
+				"generic_name": "Src.AddrssOf.Ctrllng.Dvc.Fr.Eng.Cntrl",
+				"bit_position": 40,
+				"bit_size": 8,
+				"factor": 1,
+				"offset": 0,
+				"comment": "The source address of the SAE J1939 device currently controlling the engine.",
+				"is_big_endian": false,
+				"sign": 0
+			},
+			"Actl.Eng.Prcnt.Trque.High.Resolution" : {
+				"generic_name": "Actl.Eng.Prcnt.Trque.High.Resolution",
+				"bit_position": 4,
+				"bit_size": 4,
+				"factor": 0.125,
+				"offset": 0,
+				"comment": "This parameter displays an additional torque in percent of the reference engine torque.",
+				"unit": "%",
+				"is_big_endian": false,
+				"sign": 0,
+				"states": {
+					"0000": [0],
+					"0125": [1],
+					"0875": [7],
+					"1111NotAvailable": [8]
+				}
+			},
+			"Eng.Demand.Percent.Torque" : {
+				"generic_name": "Eng.Demand.Percent.Torque",
+				"bit_position": 56,
+				"bit_size": 8,
+				"factor": 1,
+				"offset": -125,
+				"comment": "The requested torque output of the engine by all dynamic internal inputs, including smoke control, noise control and low",
+				"unit": "%",
+				"is_big_endian": false,
+				"sign": 0
+			},
+			"Eng.Starter.Mode" : {
+				"generic_name": "Eng.Starter.Mode",
+				"bit_position": 48,
+				"bit_size": 4,
+				"factor": 1,
+				"offset": 0,
+				"comment": "There are several phases in a starting action and different reasons why a start cannot take place.",
+				"is_big_endian": false,
+				"sign": 0,
+				"states": {
+					"startNotRqed": [0],
+					"starterActiveGearNotEngaged": [1],
+					"starterActiveGearEngaged": [2],
+					"strtFnshdStrtrNtActvAftrHvngBnA": [3],
+					"strtrInhbtdDToEngAlreadyRunning": [4],
+					"strtrInhbtdDTEngNtReadyForStart": [5],
+					"strtrInhbtdDTDrvlnEnggdOthrTrns": [6],
+					"strtrInhbtdDToActiveImmobilizer": [7],
+					"strtrInhbtdDueToStarterOvertemp": [8],
+					"1011Reserved": [9],
+					"starterInhibitedReasonUnknown": [12],
+					"error": [14],
+					"notAvailable": [15]
+				}
+			},
+			"Eng.Speed" : {
+				"generic_name": "Eng.Speed",
+				"bit_position": 24,
+				"bit_size": 16,
+				"factor": 0.125,
+				"offset": 0,
+				"comment": "Actual engine speed which is calculated over a minimum crankshaft angle of 720 degrees divided by the number of cylinders.",
+				"unit": "rpm",
+				"is_big_endian": false,
+				"sign": 0
+			},
+			"Actual.Eng.Percent.Torque" : {
+				"generic_name": "Actual.Eng.Percent.Torque",
+				"bit_position": 16,
+				"bit_size": 8,
+				"factor": 1,
+				"offset": -125,
+				"comment": "The calculated output torque of the engine.",
+				"unit": "%",
+				"is_big_endian": false,
+				"sign": 0
+			},
+			"Drivers.Demand.Eng.Percent.Torque" : {
+				"generic_name": "Drivers.Demand.Eng.Percent.Torque",
+				"bit_position": 8,
+				"bit_size": 8,
+				"factor": 1,
+				"offset": -125,
+				"comment": "The requested torque output of the engine by the driver.",
+				"unit": "%",
+				"is_big_endian": false,
+				"sign": 0
+			},
+			"Eng.Torque.Mode" : {
+				"generic_name": "Eng.Torque.Mode",
+				"bit_position": 0,
+				"bit_size": 4,
+				"factor": 1,
+				"offset": 0,
+				"comment": "State signal which indicates which engine torque mode is currently generating, limiting, or controlling the torque.",
+				"is_big_endian": false,
+				"sign": 0,
+				"states": {
+					"Low idle governor/no request (de": [0],
+					"Accelerator pedal/operator selec": [1],
+					"Cruise control": [2],
+					"PTO governor": [3],
+					"Road speed governor": [4],
+					"ASR control": [5],
+					"Transmission control": [6],
+					"ABS control": [7],
+					"Torque limiting": [8],
+					"High speed governor": [9],
+					"Braking system": [10],
+					"Remote accelerator": [11],
+					"Not available": [15]
+				}
+			}
+		}
+	},
+	"130306": {
+		"name": "Wind.Data",
+		"bus":"j1939",
+		"comment":"Wind Data",
+		"length": 8,
+		"is_fd": false,
+		"is_extended": false,
+		"is_j1939": true,
+		"signals": {
+			"Sid": {
+				"bit_position": 0,
+				"bit_size": 8,
+				"sign": 0,
+				"generic_name": "Wind.Data.Sid"
+			},
+			"Wind.Speed": {
+				"bit_position": 8,
+				"bit_size": 16,
+				"factor": 0.01,
+				"sign": 0,
+				"unit":"m/s",
+				"generic_name": "Wind.Data.Wind.Speed"
+			},
+			"Wind.Angle": {
+				"bit_position": 24,
+				"bit_size": 16,
+				"factor": 0.0001,
+				"sign": 0,
+				"unit":"rad",
+				"generic_name": "Wind.Data.Wind.Angle"
+			},
+			"Reference": {
+				"bit_position": 40,
+				"bit_size": 3,
+				"decoder": "decoder_t::decode_state",
+				"sign": 0,
+				"states": {
+					"True (ground referenced to North)": [0],
+					"Magnetic (ground referenced to Magnetic North)": [1],
+					"Apparent": [2],
+					"True (boat referenced)": [3],
+					"True (water referenced)": [4]
+				},
+				"generic_name": "Wind.Data.Reference"
+			},
+			"Reserved": {
+				"bit_position": 43,
+				"bit_size": 21,
+				"decoder": "decoder_t::decode_bytes",
+				"sign": 0,
+				"generic_name": "Wind.Data.Reserved"
+			}
+		}
+	}
 },
 "diagnostic_messages": [
 		{