Browse Source

update

hand_acid_mainboard
zhaohe 11 months ago
parent
commit
3c9d276aab
  1. 4
      modbus/modbus_block_host.hpp
  2. 8
      tmcdriver/tmc51x0/tmc51x0.hpp
  3. 2
      zcanreceiver/zcanreceiver.cpp

4
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();

8
tmcdriver/tmc51x0/tmc51x0.hpp

@ -14,7 +14,7 @@ namespace iflytop {
* @brief
*
*
* 1. 6𧢲
* 1. 6?𧢲𧢲?
* 2. 𡅅MAX
*
*/
@ -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();
/***********************************************************************************************************************

2
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);

Loading…
Cancel
Save