Use constants instead of repeating the strings. (#242)

Fixes #65.

Author: ensonic

ev3dev/core.py

@@ -750,15 +750,15 @@ def run_forever(self, **kwargs):
         """
         for key in kwargs:
             setattr(self, key, kwargs[key])
-        self.command = 'run-forever'
+        self.command = self.COMMAND_RUN_FOREVER
 
     def run_to_abs_pos(self, **kwargs):
         """Run to an absolute position specified by `position_sp` and then
         stop using the action specified in `stop_action`.
         """
         for key in kwargs:
             setattr(self, key, kwargs[key])
-        self.command = 'run-to-abs-pos'
+        self.command = self.COMMAND_RUN_TO_ABS_POS
 
     def run_to_rel_pos(self, **kwargs):
         """Run to a position relative to the current `position` value.
@@ -768,15 +768,15 @@ def run_to_rel_pos(self, **kwargs):
         """
         for key in kwargs:
             setattr(self, key, kwargs[key])
-        self.command = 'run-to-rel-pos'
+        self.command = self.COMMAND_RUN_TO_REL_POS
 
     def run_timed(self, **kwargs):
         """Run the motor for the amount of time specified in `time_sp`
         and then stop the motor using the action specified by `stop_action`.
         """
         for key in kwargs:
             setattr(self, key, kwargs[key])
-        self.command = 'run-timed'
+        self.command = self.COMMAND_RUN_TIMED
 
     def run_direct(self, **kwargs):
         """Run the motor at the duty cycle specified by `duty_cycle_sp`.
@@ -785,23 +785,23 @@ def run_direct(self, **kwargs):
         """
         for key in kwargs:
             setattr(self, key, kwargs[key])
-        self.command = 'run-direct'
+        self.command = self.COMMAND_RUN_DIRECT
 
     def stop(self, **kwargs):
         """Stop any of the run commands before they are complete using the
         action specified by `stop_action`.
         """
         for key in kwargs:
             setattr(self, key, kwargs[key])
-        self.command = 'stop'
+        self.command = self.COMMAND_STOP
 
     def reset(self, **kwargs):
         """Reset all of the motor parameter attributes to their default value.
         This will also have the effect of stopping the motor.
         """
         for key in kwargs:
             setattr(self, key, kwargs[key])
-        self.command = 'reset'
+        self.command = self.COMMAND_RESET
 
 
 # ~autogen
@@ -1123,15 +1123,15 @@ def run_forever(self, **kwargs):
         """
         for key in kwargs:
             setattr(self, key, kwargs[key])
-        self.command = 'run-forever'
+        self.command = self.COMMAND_RUN_FOREVER
 
     def run_timed(self, **kwargs):
         """Run the motor for the amount of time specified in `time_sp`
         and then stop the motor using the action specified by `stop_action`.
         """
         for key in kwargs:
             setattr(self, key, kwargs[key])
-        self.command = 'run-timed'
+        self.command = self.COMMAND_RUN_TIMED
 
     def run_direct(self, **kwargs):
         """Run the motor at the duty cycle specified by `duty_cycle_sp`.
@@ -1140,15 +1140,15 @@ def run_direct(self, **kwargs):
         """
         for key in kwargs:
             setattr(self, key, kwargs[key])
-        self.command = 'run-direct'
+        self.command = self.COMMAND_RUN_DIRECT
 
     def stop(self, **kwargs):
         """Stop any of the run commands before they are complete using the
         action specified by `stop_action`.
         """
         for key in kwargs:
             setattr(self, key, kwargs[key])
-        self.command = 'stop'
+        self.command = self.COMMAND_STOP
 
 
 # ~autogen
@@ -1346,14 +1346,14 @@ def run(self, **kwargs):
         """
         for key in kwargs:
             setattr(self, key, kwargs[key])
-        self.command = 'run'
+        self.command = self.COMMAND_RUN
 
     def float(self, **kwargs):
         """Remove power from the motor.
         """
         for key in kwargs:
             setattr(self, key, kwargs[key])
-        self.command = 'float'
+        self.command = self.COMMAND_FLOAT
 
 
 # ~autogen

templates/motor_commands.liquid

@@ -1,15 +1,16 @@
 {% assign class_name = currentClass.friendlyName | camel_case | capitalize %}{%
-for propval in currentClass.propertyValues %}{%
-    if propval.propertyName == "Command" %}{%
-        for value in propval.values %}{%
+for prop in currentClass.propertyValues %}{%
+    assign propName = prop.propertyName | upcase | underscore_spaces %}{%
+    if prop.propertyName == "Command" %}{%
+        for value in prop.values %}{%
             assign cmd = value.name | replace:'-','_' %}
     def {{ cmd }}(self, **kwargs):
         """{%
         for line in value.description %}{{line}}
         {% endfor %}"""
         for key in kwargs:
             setattr(self, key, kwargs[key])
-        self.command = '{{value.name}}'
+        self.command = self.{{ propName }}_{{ value.name | upcase | underscore_non_wc }}
 {%
         endfor %}{%
     endif %}{%