diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index b52317d..93bee9f 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/sdk b/sdk index b3dbb15..c13f0f7 160000 --- a/sdk +++ b/sdk @@ -1 +1 @@ -Subproject commit b3dbb159e8a0f0593bfc9088c96ae7c24edb975a +Subproject commit c13f0f786605b749458956e3b77c66b065315c7a diff --git a/usrc/main.cpp b/usrc/main.cpp index 3dcdd4f..35f6880 100644 --- a/usrc/main.cpp +++ b/usrc/main.cpp @@ -61,7 +61,7 @@ void umain() { zos_init(&zoscfg); uint8_t deviceId = getId(); - ZLOGI(TAG, "deviceId:%d", deviceId); + ZLOGI(TAG, "motorId:%d boardId", deviceId, deviceId + ZCAN_CMD_PUBLIC_DEVICE_ID_STEP_MOTOR_BOARD_OFFEST); if (deviceId == 0) { chip_set_error(); while (true) { @@ -100,7 +100,6 @@ void umain() { g_motor.rotate(0); // g_motor.enable(false); - auto zcanCmder_cfg = g_zcanCmder.createCFG(deviceId + ZCAN_CMD_PUBLIC_DEVICE_ID_STEP_MOTOR_BOARD_OFFEST); g_zcanCmder.init(zcanCmder_cfg); @@ -137,6 +136,7 @@ void umain() { OSDefaultSchduler::getInstance()->regPeriodJob( [](OSDefaultSchduler::Context& context) { +#if 0 ZLOGI(TAG, "[0]:%d [1]:%d [2]:%d [3]:%d [4]:%d [5]:%d [6]:%d [7]:%d [8]:%d [9]:%d", // input[0].getState(), // input[1].getState(), // @@ -148,6 +148,7 @@ void umain() { input[7].getState(), // input[8].getState(), // input[9].getState()); +#endif }, 1000);