Diff: MDX20.h

Revision:

3:3bf2936b8d9b

Parent:

2:8446eb1774c4

Child:

4:b01a67ab40cf

--- a/MDX20.h	Sun Oct 16 12:42:34 2016 +0000
+++ b/MDX20.h	Sat Nov 19 11:10:48 2016 +0000
@@ -12,23 +12,34 @@
 
     void clearPositon(void);
     void answerPositon(int16_t *position);
-    void integralPosition(char *data);
-    
+    void answerPositonMillimeter(float *position);
+    void integralPosition(char *str);
+
+    uint8_t xyOrigin(void);
+    uint8_t zOrigin(void);
+
+
     uint8_t sendData(char* data);
+    uint8_t reciveData(void);
 
     int putc(int c);
     uint8_t initial(void);
+    uint8_t userOriginInitial(void);
+
     uint8_t final(void);
     uint8_t zeroSetting(void);
     uint8_t XYZMove(int16_t x, int16_t y, int16_t z);
 
 private:
+
     BufferedSerial _serial; // tx, rx(NC)
     DigitalIn _cts;
 
     char B_masterTx[0xff];
-    int16_t D_position[3]; //[0]:x, [1]:y, [2]:z
+    double D_position[3]; //[0]:x, [1]:y, [2]:z
+    double D_userOriginPosition[3]; //[0]:x, [1]:y, [2]:z
 
+#define countToMillimeter (0.025)
 #define Z_x (0)
 #define Z_y (1)
 #define Z_z (2)