Browse Source

update

master
zhaohe 2 years ago
parent
commit
d09520f2a4
  1. 2
      sdk
  2. 10
      usrc/main.cpp

2
sdk

@ -1 +1 @@
Subproject commit 6fca64edea002a9ce94890cc6bd5adf940c62e52
Subproject commit 1a999a25f569cc1b6a52203f6114fa0c34f2ac9c

10
usrc/main.cpp

@ -16,9 +16,9 @@
#include "sdk\components\zcancmder\zcanreceiver_master.hpp"
//
#include "sdk\components/step_motor_ctrl_module/step_motor_ctrl_script_cmder_module.hpp"
#include "sdk\components/step_motor_ctrl_module/zcan_master_step_motor_ctrl_module.hpp"
#include "sdk\components/xy_robot_ctrl_module/xy_robot_script_cmder_module.hpp"
#include "sdk\components/xy_robot_ctrl_module/zcan_xy_robot_master_module.hpp"
#include "sdk\components\eq_20_asb_motor\script_cmder_eq20_servomotor.hpp"
#include "sdk\components\mini_servo_motor\mini_servo_motor_ctrl_module.hpp"
#include "sdk\components\mini_servo_motor\scirpt_cmder_mini_servo_motor_ctrl_module.hpp"
@ -201,10 +201,10 @@ void Main::run() {
/*******************************************************************************
* É豸¹¹ÔìºÍ³õʼ»¯ *
*******************************************************************************/
g_z_step_motor = zcancmder_master::create_zcan_master_step_motor_ctrl_module(&m_zcanCommnaderMaster, 1);
ZASSERT(g_z_step_motor != nullptr);
// g_z_step_motor = zcancmder_master::create_zcan_master_step_motor_ctrl_module(&m_zcanCommnaderMaster, 1);
// ZASSERT(g_z_step_motor != nullptr);
g_xyrobotctrlmodule = zcancmder_master::create_xyrobot_ctrl_module(&m_zcanCommnaderMaster, 1);
// g_xyrobotctrlmodule = zcancmder_master::create_xyrobot_ctrl_module(&m_zcanCommnaderMaster, 1);
g_mini_servo[0].initialize(1, &g_feiteservomotor_bus, 1);
g_mini_servo[1].initialize(2, &g_feiteservomotor_bus, 2);
g_mini_servo[2].initialize(3, &g_feiteservomotor_bus, 3);

Loading…
Cancel
Save