Diff: core/core.h

Revision:

33:e7b132029bae

Parent:

30:2b6d426f3bfc

diff -r 4e1a223fad52 -r e7b132029bae core/core.h
--- a/core/core.h	Mon Mar 16 02:43:19 2015 +0000
+++ b/core/core.h	Mon Mar 16 03:09:48 2015 +0000
@@ -13,21 +13,18 @@
 
 class Motor {
 public:
-    Motor(PositionSensor *sense_p, TempSensor *sense_t);
-    void InitSensors(float ib_zero, float ic_zero, float scale);
+    Motor(CurrentSensor *sense_c, CurrentSensor *sense_b, PositionSensor *sense_p, TempSensor *sense_t);
     void Config(int num_poles, float kv);
     float GetCurrentC();
     float GetCurrentB();
     float GetPosition();
     float GetTemp();
 private:
+    CurrentSensor *_sense_c,*_sense_b;
     PositionSensor *_sense_p;
     TempSensor *_sense_t;
     int _num_poles;
     float _kv;
-    float _ib, _ic;
-    float _ib_zero, _ic_zero;
-    float _scale;
 };
 
 class Inverter {