正常的英雄

MDK-ARM/DevC.uvoptx

@@ -407,6 +407,11 @@
           <WinNumber>1</WinNumber>
           <ItemText>rc</ItemText>
         </Ww>
+        <Ww>
+          <count>10</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>cmd_host</ItemText>
+        </Ww>
       </WatchWindow1>
       <Tracepoint>
         <THDelay>0</THDelay>
@@ -658,7 +663,7 @@
 
   <Group>
     <GroupName>Application/User/USB_DEVICE/App</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -1214,7 +1219,7 @@
 
   <Group>
     <GroupName>Middlewares/USB_Device_Library</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -1494,7 +1499,7 @@
 
   <Group>
     <GroupName>User/component</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -1670,7 +1675,7 @@
 
   <Group>
     <GroupName>User/device</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -1750,7 +1755,7 @@
 
   <Group>
     <GroupName>User/module</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>

User/component/cmd.c

@@ -190,27 +190,27 @@ static void CMD_RcLogic(const CMD_RC_t *rc, CMD_t *cmd, float dt_sec) {
       /* 左拨杆相应行为选择和解析 */
     case CMD_SW_UP:
       cmd->chassis.mode = CHASSIS_MODE_BREAK;
-      cmd->host_overwrite = false;
+      // cmd->host_overwrite = false;
-      cmd->shoot.ai_fire = false;
+      // cmd->shoot.ai_fire = false;
       break;
 
     case CMD_SW_MID:
       cmd->chassis.mode = CHASSIS_MODE_FOLLOW_GIMBAL;
-      cmd->host_overwrite = true;
+      // cmd->host_overwrite = true;
-      cmd->shoot.ai_fire = false;
+      // cmd->shoot.ai_fire = false;
       break;
 
     case CMD_SW_DOWN:
       cmd->chassis.mode = CHASSIS_MODE_ROTOR;
       cmd->chassis.mode_rotor = ROTOR_MODE_CW;
-      cmd->host_overwrite = true;
+      // cmd->host_overwrite = true;
-      cmd->shoot.ai_fire = true;
+      // cmd->shoot.ai_fire = true;
       break;
 
     case CMD_SW_ERR:
       cmd->chassis.mode = CHASSIS_MODE_RELAX;
-      cmd->host_overwrite = false;
+      // cmd->host_overwrite = false;
-      cmd->shoot.ai_fire = false;
+      // cmd->shoot.ai_fire = false;
       break;
   }
   switch (rc->sw_r) {
@@ -254,7 +254,7 @@ static void CMD_RcLogic(const CMD_RC_t *rc, CMD_t *cmd, float dt_sec) {
     case CMD_SW_ERR:
       cmd->gimbal.mode = GIMBAL_MODE_RELAX;
       cmd->shoot.mode = SHOOT_MODE_RELAX;
-      cmd->host_overwrite = false;
+      // cmd->host_overwrite = false;
   }
   /* 将操纵杆的对应值转换为底盘的控制向量和云台变化的欧拉角 */
   cmd->chassis.ctrl_vec.vx = rc->ch_l_x;
@@ -355,12 +355,12 @@ int8_t CMD_ParseHost(const CMD_Host_t *host, CMD_t *cmd, float dt_sec) {
   cmd->gimbal.delta_eulr.yaw = host->gimbal_delta.yaw;
   cmd->gimbal.delta_eulr.pit = host->gimbal_delta.pit;
 
-  cmd->shoot.mode = SHOOT_MODE_LOADED;
   /* host射击命令，设置不同的射击频率和弹丸初速度 */
-  if (host->fire && cmd->shoot.ai_fire) {
+  if (host->fire) {
+    cmd->shoot.mode = SHOOT_MODE_LOADED;
     cmd->shoot.fire = true;
   } else {
-    cmd->shoot.fire = false;
+    cmd->shoot.mode = SHOOT_MODE_SAFE;
   }
   return 0;
 }

User/module/config.c

@@ -202,7 +202,11 @@ static const Config_RobotParam_t param_default = {
     }, /* can */
 }; /* param_default */
 
+#ifdef DEBUG
+Config_RobotParam_t param_hero = {
+#else
 static const Config_RobotParam_t param_hero = {
+#endif
   .model = ROBOT_MODEL_HERO,
 
   .chassis = { /* 底盘模块参数 */
@@ -236,7 +240,7 @@ static const Config_RobotParam_t param_hero = {
     },
 		
 		.reverse = {
-			.yaw = true,
+			.yaw = false,
 		},
   }, /* chassis */
 
@@ -285,7 +289,7 @@ static const Config_RobotParam_t param_hero = {
       },
     }, /* pid */
 
-		.pitch_travel_rad = 1.07685447f,
+		.pitch_travel_rad = 0.9685447f,
     
     .low_pass_cutoff_freq = {
       .out = -1.0f,
@@ -293,8 +297,8 @@ static const Config_RobotParam_t param_hero = {
     },
 
     .reverse = {
-      .yaw = true,
+      .yaw = false,
-      .pit = true,
+      .pit = false,
     },
 
     .pit_ctrl_reverse = false,
@@ -331,8 +335,8 @@ static const Config_RobotParam_t param_hero = {
         .trig = -1.0f,
       },
     },
-    .num_trig_tooth = 6.0f,
+    .num_trig_tooth = 5.0f,
-    .trig_gear_ratio = 3591.0f / 187.0f,
+    .trig_gear_ratio = 19.0f,
     .fric_radius = 0.03f,
     .cover_open_duty = 0.125f,
     .cover_close_duty = 0.075f,

User/module/gimbal.c

@@ -134,33 +134,33 @@ int8_t Gimbal_Control(Gimbal_t *g, CMD_GimbalCmd_t *g_cmd, uint32_t now) {
   if (g->param->pit_ctrl_reverse){
     g_cmd->delta_eulr.yaw = -g_cmd->delta_eulr.yaw;
   }else{
-    g_cmd->delta_eulr.yaw = g_cmd->delta_eulr.yaw;
+    g_cmd->delta_eulr.yaw = -g_cmd->delta_eulr.yaw;
   }
 
   /* 处理yaw控制命令 */
   CircleAdd(&(g->setpoint.eulr.yaw), g_cmd->delta_eulr.yaw, M_2PI);
 
   /* 处理pitch控制命令，软件限位 */
-  // const float delta_max =
-  //     CircleError(g->limit.max,
-  //                 (g->feedback.eulr.encoder.pit + g->setpoint.eulr.pit -
-  //                  g->feedback.eulr.imu.pit),
-  //                 M_2PI);
-  // const float delta_min =
-  //     CircleError(g->limit.min,
-  //                 (g->feedback.eulr.encoder.pit + g->setpoint.eulr.pit -
-  //                  g->feedback.eulr.imu.pit),
-  //                 M_2PI);
   const float delta_max =
       CircleError(g->limit.max,
                   (g->feedback.eulr.encoder.pit + g->setpoint.eulr.pit -
-                   g->feedback.eulr.encoder.pit),
+                   g->feedback.eulr.imu.pit),
                   M_2PI);
   const float delta_min =
       CircleError(g->limit.min,
                   (g->feedback.eulr.encoder.pit + g->setpoint.eulr.pit -
-                   g->feedback.eulr.encoder.pit),
+                   g->feedback.eulr.imu.pit),
                   M_2PI);
+  // const float delta_max =
+  //     CircleError(g->limit.max,
+  //                 (g->feedback.eulr.encoder.pit + g->setpoint.eulr.pit -
+  //                  g->feedback.eulr.encoder.pit),
+  //                 M_2PI);
+  // const float delta_min =
+  //     CircleError(g->limit.min,
+  //                 (g->feedback.eulr.encoder.pit + g->setpoint.eulr.pit -
+  //                  g->feedback.eulr.encoder.pit),
+  //                 M_2PI);
   Clip(&(g_cmd->delta_eulr.pit), delta_min, delta_max);
   g->setpoint.eulr.pit += g_cmd->delta_eulr.pit;
 
@@ -182,16 +182,20 @@ int8_t Gimbal_Control(Gimbal_t *g, CMD_GimbalCmd_t *g_cmd, uint32_t now) {
           PID_Calc(&(g->pid[GIMBAL_PID_YAW_OMEGA_IDX]), yaw_omega_set_point,
                    g->feedback.gyro.z, 0.f, g->dt);
 
-      // pit_omega_set_point =
-      //     PID_Calc(&(g->pid[GIMBAL_PID_PIT_ANGLE_IDX]), g->setpoint.eulr.pit,
-      //              g->feedback.eulr.imu.pit, 0.0f, g->dt);
       pit_omega_set_point =
           PID_Calc(&(g->pid[GIMBAL_PID_PIT_ANGLE_IDX]), g->setpoint.eulr.pit,
-                   g->feedback.eulr.encoder.pit, 0.0f, g->dt);
+                   g->feedback.eulr.imu.pit, 0.0f, g->dt);
+      // pit_omega_set_point =
+      //     PID_Calc(&(g->pid[GIMBAL_PID_PIT_ANGLE_IDX]), g->setpoint.eulr.pit,
+      //              g->feedback.eulr.encoder.pit, 0.0f, g->dt);
            
       g->out[GIMBAL_ACTR_PIT_IDX] =
           PID_Calc(&(g->pid[GIMBAL_PID_PIT_OMEGA_IDX]), pit_omega_set_point,
-                   0.0, 0.f, g->dt);
+                   g->feedback.gyro.x, 0.f, g->dt);
+      
+      // g->out[GIMBAL_ACTR_PIT_IDX] =
+      //     PID_Calc(&(g->pid[GIMBAL_PID_PIT_OMEGA_IDX]), pit_omega_set_point,
+      //              0.0, 0.f, g->dt);
       break;
 
     case GIMBAL_MODE_RELATIVE:

User/module/shoot.c

@@ -252,9 +252,9 @@ int8_t Shoot_Control(Shoot_t *s, CMD_ShootCmd_t *s_cmd,
 
   float fric_rpm = CalculateRpm(s->fire_ctrl.bullet_speed, s->param->fric_radius,
                                 (s->param->model == SHOOT_MODEL_17MM));
-  s->setpoint.fric_rpm[0] = fric_rpm;
+  s->setpoint.fric_rpm[0] = -fric_rpm;
-  s->setpoint.fric_rpm[1] = -fric_rpm;
+  s->setpoint.fric_rpm[1] = fric_rpm;
-  s->setpoint.fric_rpm[2] = fric_rpm;
+  s->setpoint.fric_rpm[2] = -fric_rpm;
 
   /* 计算拨弹电机位置的目标值 */
   if (((now - s->fire_ctrl.last_shoot) >= s->fire_ctrl.period_ms) &&

User/task/cli.c

@@ -32,10 +32,10 @@ typedef struct {
 
 static const char *const CLI_WELCOME_MESSAGE =
     "\r\n"
-//    "  ______         __           _______               __              \r\n"
+   "  ______         __           _______               __              \r\n"
-//    " |   __ \\.-----.|  |--.-----.|   |   |.---.-.-----.|  |_.-----.----.\r\n"
+   " |   __ \\.-----.|  |--.-----.|   |   |.---.-.-----.|  |_.-----.----.\r\n"
-//    " |      <|  _  ||  _  |  _  ||       ||  _  |__ --||   _|  -__|   _|\r\n"
+   " |      <|  _  ||  _  |  _  ||       ||  _  |__ --||   _|  -__|   _|\r\n"
-//    " |___|__||_____||_____|_____||__|_|__||___._|_____||____|_____|__|  \r\n"
+   " |___|__||_____||_____|_____||__|_|__||___._|_____||____|_____|__|  \r\n"
     " -------------------------------------------------------------------\r\n"
     " FreeRTOS CLI. Type 'help' to view a list of registered commands.   \r\n"
     "\r\n";