Move ENCODER_DATA instruction to Firmata.h

nicolaspanel · nicolaspanel · commit 47fc4e6d728a · 2014-02-17T00:15:42.000-08:00
diff --git a/Firmata.h b/Firmata.h
@@ -41,6 +41,7 @@
 
 // extended command set using sysex (0-127/0x00-0x7F)
 /* 0x00-0x0F reserved for user-defined commands */
+#define ENCODER_DATA            0x61 // reply with encoders current positions
 #define SERVO_CONFIG            0x70 // set max angle, minPulse, maxPulse, freq
 #define STRING_DATA             0x71 // a string message with 14-bits per char
 #define STEPPER_DATA            0x72 // control a stepper motor
@@ -61,6 +62,7 @@
 #define SCHEDULER_DATA          0x7B // send a createtask/deletetask/addtotask/schedule/querytasks/querytask request to the scheduler
 #define SYSEX_NON_REALTIME      0x7E // MIDI Reserved for non-realtime messages
 #define SYSEX_REALTIME          0x7F // MIDI Reserved for realtime messages
+
 // these are DEPRECATED to make the naming more consistent
 #define FIRMATA_STRING          0x71 // same as STRING_DATA
 #define SYSEX_I2C_REQUEST       0x76 // same as I2C_REQUEST
diff --git a/utility/EncoderFirmata.h b/utility/EncoderFirmata.h
@@ -40,7 +40,6 @@
 #define ENCODER_RESET_POSITION      (0x03)
 #define ENCODER_REPORT_AUTO         (0x04)
 #define ENCODER_DETACH              (0x05)
-#define ENCODER_DATA                (0x61) // TODO : Move to Firmata.h
 
 class EncoderFirmata:public FirmataFeature
 {

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@`
`40`	`40`	`#define ENCODER_RESET_POSITION (0x03)`
`41`	`41`	`#define ENCODER_REPORT_AUTO (0x04)`
`42`	`42`	`#define ENCODER_DETACH (0x05)`
`43`		`-#define ENCODER_DATA (0x61) // TODO : Move to Firmata.h`
`44`	`43`
`45`	`44`	`class EncoderFirmata:public FirmataFeature`
`46`	`45`	`{`