Merge pull request #117 from openxc/Signalfrequency

Signalfrequency

Author: cwbaldwin

openxc/generator/structures.py

@@ -1,6 +1,7 @@
 import operator
 import math
 from collections import defaultdict
+from openxc.utils import fatal_error
 
 import logging
 
@@ -353,6 +354,14 @@ def merge_signal(self, data):
                     "%s is deprecated and has no effect " % self.generic_name +
                     " - see the replacement, max_frequency")
 
+        signal_attributes = dir(self)
+        data_attributes = list(data.keys())
+        extra_attributes = set(data_attributes) - set(signal_attributes)
+
+        if extra_attributes:
+           fatal_error('ERROR: Signal %s in %s has unrecognized attributes: %s' % (self.name, self.message.name, ', '.join(extra_attributes)))
+        
+
     @property
     def decoder(self):
         decoder = getattr(self, '_decoder', None)

tests/mapped_signals.json.example

@@ -2,24 +2,26 @@
     "messages": {
         "0x128": {
             "name": "ECM_z_5D2",
+            "handlers": ["handleInvertedSteeringWheel","ignoreHandler","handleSteeringWheelMessage"],
             "signals": {
                 "StrAnglAct": {
                     "generic_name": "SteeringWheelAngle",
                     "bit_position": 52,
                     "bit_size": 12,
                     "factor": 0.15392,
-                    "offset": 0,
-                    "handler": "handleInvertedSteeringWheel"},
+                    "offset": 0
+                },
                 "StrAnglSign": {
                     "generic_name": "steering_angle_sign",
-                    "handler": "ignoreHandler",
                     "bit_position": 52,
-                    "bit_size": 12},
+                    "bit_size": 12
+                },
                 "EngSpd": {
                     "generic_name": "engine_speed",
                     "max_frequency": 5,
                     "bit_position": 12,
-                    "bit_size": 8},
+                    "bit_size": 8
+                },
                 "GrshftPos": {
                     "generic_name": "GearshiftPosition",
                     "bit_position": 41,
@@ -31,23 +33,21 @@
                         "FOURTH": [4],
                         "REVERSE": [5],
                         "NEUTRAL": [6]}
-                    },
+                 },
                 "StrAnglErr": {
-                    "handler": "ignoreHandler",
                     "generic_name": "steering_wheel_angle_error",
                     "bit_position": 44,
                     "bit_size": 12
                 }
-            },
-            "handlers": ["handleSteeringWheelMessage"]
+            }
         },
         "0x49": {
             "name": "BrkSt",
+            "handlers": ["booleanHandler"],
             "signals": {
                 "BrakePedalPosition": {
                     "generic_name": "brake_pedal_status",
                     "send_same": false,
-                    "handler": "booleanHandler",
                     "bit_position": 0,
                     "bit_size": 0
                 }
@@ -58,19 +58,17 @@
             "signals": {
                 "TurnSignalLeft": {
                     "generic_name": "turn_signal_left",
-                    "handler": "booleanHandler",
                     "bit_position": 0,
                     "bit_size": 0,
                     "writable": true,
-                    "write_handler": "booleanWriter"
+                    "encoder": "booleanWriter"
                 },
                 "TurnSignalRight": {
                     "generic_name": "turn_signal_right",
-                    "handler": "booleanHandler",
                     "bit_position": 1,
                     "bit_size": 0,
                     "writable": true,
-                    "write_handler": "booleanWriter"
+                    "encoder": "booleanWriter"
                 }
             }
         }