diff --git a/modbus/modbus_block_host.hpp b/modbus/modbus_block_host.hpp index e5b6736..fbf3a0a 100644 --- a/modbus/modbus_block_host.hpp +++ b/modbus/modbus_block_host.hpp @@ -10,8 +10,8 @@ class ModbusBlockHost { uint8_t txbuff[100]; uint8_t rxbuff[100]; - zmutex m_modbus_lock; - bool m_dump= false; + zmutex m_modbus_lock = {"m_modbus_lock"}; + bool m_dump = false; public: ModbusBlockHost(); diff --git a/tmcdriver/tmc51x0/tmc51x0.hpp b/tmcdriver/tmc51x0/tmc51x0.hpp index 1ceabdd..bd92870 100644 --- a/tmcdriver/tmc51x0/tmc51x0.hpp +++ b/tmcdriver/tmc51x0/tmc51x0.hpp @@ -14,7 +14,7 @@ namespace iflytop { * @brief * 注意事项 * - * 1. 6点加速控制只在位置模式下有效,在速度模式下无效 + * 1. 6点加速控制只在位?模式下有效,在速度模式下无? * 2. 速度模式下只有AMAX有效 * */ @@ -42,7 +42,7 @@ class TMC51X0 { double m_onecirclepulse = 51200; int32_t m_enc_resolution = 0; // 编码器分辨率,默认只有在256细分的情况下有效 - zmutex m_mutex; + zmutex m_mutex={"TMC51X0"}; bool m_driErr = false; public: @@ -81,10 +81,10 @@ class TMC51X0 { int32_t getEncVal(); // ENCVAL TMC5130RampStat getRampStat(); TMC5130DevStatusReg_t getDevStatus(); // R 读后不清 - TMC5130GState_t getGState(); // R+C 读后自动清除 + TMC5130GState_t getGState(); // R+C 读后?动清? int32_t readICVersion(); - bool isReachTarget(TMC5130RampStat *state); // 是否到达目标位置 + bool isReachTarget(TMC5130RampStat *state); // ?否到达目标位? bool isTMC5130(); /*********************************************************************************************************************** diff --git a/zcanreceiver/zcanreceiver.cpp b/zcanreceiver/zcanreceiver.cpp index 1628d8a..115c6a0 100644 --- a/zcanreceiver/zcanreceiver.cpp +++ b/zcanreceiver/zcanreceiver.cpp @@ -29,7 +29,7 @@ static bool m_is_connected; static uint8_t m_priority; -zmutex m_lock; +zmutex m_lock = {"ZCANReceiver"}; static void _oncanpacket(CAN_HandleTypeDef *hcan); static void _processOneCanPacket(CAN_RxHeaderTypeDef *pHeader, uint8_t *aData);