Diff: TVDCTRL.h

Revision:

7:ad013d88a539

Parent:

6:26fa8c78500e

Child:

8:a22aec357a64

--- a/TVDCTRL.h	Tue Jul 26 05:12:15 2016 +0000
+++ b/TVDCTRL.h	Wed Jul 27 03:30:35 2016 +0000
@@ -49,7 +49,7 @@
 };
 
 const int MAX_MOTOR_TORQUE          = 0xFFFF;   //LSB : 45/65535 = 0.686655[mNm]
-const int MAX_OUTPUT_TORQUE         = (int)(MAX_MOTOR_TORQUE * 0.7);  //出力最大値
+const int MAX_OUTPUT_TORQUE         = (int)(MAX_MOTOR_TORQUE * 1.0);  //出力最大値
 const float MAX_DISTRIBUTION_TORQUE = (MAX_OUTPUT_TORQUE*0.8);
 const float MAX_STEER_ANGLE         = (float)(M_PI/180.0 * 25.0); //[-]
 
@@ -71,25 +71,21 @@
 const int DACOUTPUT_VALID_RANGE     =DACOUTPUT_MAX - DACOUTPUT_MIN; //実質有効電圧範囲
 
 const int LINEAR_REGION_TORQUE      =(int)(MAX_MOTOR_TORQUE/45.0 * 2.5);      //トルクに回転数が影響しない領域の境界値(トルク値)
-const int LINEAR_REGION_VOLTAGE     =(int)(0xFFFF/3.3 * 1.0) - DACOUTPUT_MIN; //トルクに回転数が影響しない領域の境界値(出力電圧値)
+const int LINEAR_REGION_VOLTAGE     =(int)(0xFFFF/3.3 * 1.0); //トルクに回転数が影響しない領域の境界値(出力電圧値)
 const int MAX_REVOLUTION_TORQUE     =(int)(MAX_MOTOR_TORQUE/45.0 * 13.5);     //最高回転数における最大出力トルク
 
-const float FIX_DACOUTFORM          =(float)((0xFFF/3.3 * 2.5)/0xFFFF);
+const double FIX_DACOUTFORM         =(double)((0xFFF/3.3 * 2.5)/0xFFFF);
 
 const int MAX_PULSE_TIME            =5000;  //12000rpmが最高回転数
 
-void loadSensorsLPF(void);
-int checkSensorPlausibility(void);
-
 void initTVD(void);
 void driveTVD(void);
 
 int getPulseTime(SelectMotor rl);
 float getVelocity(void);
-int loadCurrentSensor(int sensor);
-int loadRawSensor(int sensor);
+int getCurrentSensor(int sensor);
+int getRawSensor(int sensor);
 void getCurrentErrCount(struct errCounter_t *ptr);
 int calcRequestTorque(void);
 
-
 #endif
\ No newline at end of file