Browse Source

Merge branch 'master' of 192.168.1.3:manufacturer_stm32/iflytop_stm32_os_sdk

master
zhaohe 2 years ago
parent
commit
f8c43b9647
  1. 7
      components/flash/zsimple_flash.cpp
  2. 4
      components/mini_servo_motor/scirpt_cmder_mini_servo_motor_ctrl_module.cpp
  3. 4
      components/step_motor_ctrl_module/step_motor_ctrl_module.cpp

7
components/flash/zsimple_flash.cpp

@ -66,14 +66,15 @@ void zsimple_flash_write(const uint8_t* data, size_t len) {
uint32_t* to = (uint32_t*)zsimple_flash_get_add(m_sector_num); uint32_t* to = (uint32_t*)zsimple_flash_get_add(m_sector_num);
uint32_t writesize = len / 4; uint32_t writesize = len / 4;
HAL_StatusTypeDef status;
//HAL_StatusTypeDef status;
HAL_FLASH_Unlock(); // ½âËø HAL_FLASH_Unlock(); // ½âËø
for (size_t i = 0; i < writesize; i++) { for (size_t i = 0; i < writesize; i++) {
status = HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD, (uint32_t)to, *from);
//status =
HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD, (uint32_t)to, *from);
from++; from++;
to++; to++;
} }
HAL_FLASH_Lock(); // ÉÏËø HAL_FLASH_Lock(); // ÉÏËø
} }
} // namespace iflytop
} // namespace iflytop

4
components/mini_servo_motor/scirpt_cmder_mini_servo_motor_ctrl_module.cpp

@ -49,7 +49,7 @@ int32_t ScirptCmderMiniServoMotorCtrlModule::findmodule(int id, I_MiniServoModul
return 0; return 0;
} }
static bool streq(const char* a, const char* b) { return strcmp(a, b) == 0; }
//static bool streq(const char* a, const char* b) { return strcmp(a, b) == 0; }
void ScirptCmderMiniServoMotorCtrlModule::regmodule(int id, I_MiniServoModule* robot) { void ScirptCmderMiniServoMotorCtrlModule::regmodule(int id, I_MiniServoModule* robot) {
ZASSERT(moduler.find(id) == moduler.end()); ZASSERT(moduler.find(id) == moduler.end());
@ -70,4 +70,4 @@ void ScirptCmderMiniServoMotorCtrlModule::regcmd() {
REG_CMD_WITH_ACK("mini_servo_", read_status, "(id)", 1, I_MiniServoModule::status_t, ack); REG_CMD_WITH_ACK("mini_servo_", read_status, "(id)", 1, I_MiniServoModule::status_t, ack);
REG_CMD_WITH_ACK("mini_servo_", read_detailed_status, "(id)", 1, I_MiniServoModule::detailed_status_t, ack); REG_CMD_WITH_ACK("mini_servo_", read_detailed_status, "(id)", 1, I_MiniServoModule::detailed_status_t, ack);
REG_CMD_WITH_ACK("mini_servo_", get_basic_param, "(id)", 1, I_MiniServoModule::basic_param_t, ack); REG_CMD_WITH_ACK("mini_servo_", get_basic_param, "(id)", 1, I_MiniServoModule::basic_param_t, ack);
}
}

4
components/step_motor_ctrl_module/step_motor_ctrl_module.cpp

@ -766,7 +766,9 @@ int32_t StepMotorCtrlModule::module_xxx_reg(int32_t param_id, bool read, int32_t
} }
return 0; return 0;
} }
int32_t StepMotorCtrlModule::do_action(int32_t actioncode) {}
int32_t StepMotorCtrlModule::do_action(int32_t actioncode) {
return 0;
}
int32_t StepMotorCtrlModule::module_clear_error() { return 0; } int32_t StepMotorCtrlModule::module_clear_error() { return 0; }

Loading…
Cancel
Save