Commit 314f509d authored by Wenxi Xu's avatar Wenxi Xu
Browse files

修复了莫名其妙的dji电机四倍角的问题,修复sbus的一个小warning

parent 8dfc78d2
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@
 */
#define M3508_CURRENT2TORQUE 0.00002200f
#define M3508_TORQUE2CURRENT 45000.0422411f
#define M3508_SPEED2RPM      1.0f
#define M3508_RPM2SPEED      1.0f
#define M3508_ANGLE2DEGREE   0.043945312f
#define M3508_DEGREE2ANGLE   22.75277778f
#define M3508_SPEED2RPM      1.0f / 4.0f
#define M3508_RPM2SPEED      4.0f
#define M3508_ANGLE2DEGREE   0.043945312f / 4.0f
#define M3508_DEGREE2ANGLE   22.75277778f / 4.0f

#define GM6020_CURRENT2TORQUE 0.00010986f
#define GM6020_TORQUE2CURRENT 9102.22222f
@@ -19,10 +19,10 @@

#define M2006_CURRENT2TORQUE 0.0000089606f
#define M2006_TORQUE2CURRENT 111600.0f
#define M2006_SPEED2RPM      1.0f
#define M2006_RPM2SPEED      1.0f
#define M2006_ANGLE2DEGREE   0.043950678f
#define M2006_DEGREE2ANGLE   22.75277778f
#define M2006_SPEED2RPM      1.0f / 4.0f
#define M2006_RPM2SPEED      4.0f
#define M2006_ANGLE2DEGREE   0.043950678f / 4.0f
#define M2006_DEGREE2ANGLE   22.75277778f / 4.0f

#define M3508_CONVERT_NUM  0
#define GM6020_CONVERT_NUM 1
+0 −1
Original line number Diff line number Diff line
@@ -227,7 +227,6 @@ static int sbus_init(const struct device *dev)
// 获取通道百分比
float sbus_getchannel_percentage(const struct device *dev, uint8_t channelid)
{
	struct sbus_driver_data *data = dev->data;
	int chan = sbus_parseframe_chan(dev, channelid);
	float scale = 2.0f / (SBUS_MAX - SBUS_MIN);
	float out = (int16_t)(chan - 1024) * scale;