From f58d4d63fdfab5db1444f993a16e3b4aa3bb33d9 Mon Sep 17 00:00:00 2001 From: Edward Emelianov Date: Tue, 3 Jun 2025 17:34:14 +0300 Subject: [PATCH] fixed bug with CRC for SSII --- F1:F103/BISS_C_encoders/encoders.bin | Bin 13972 -> 13972 bytes F1:F103/BISS_C_encoders/usart.c | 8 ++++++-- F1:F103/BISS_C_encoders/version.inc | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/F1:F103/BISS_C_encoders/encoders.bin b/F1:F103/BISS_C_encoders/encoders.bin index ad542cee7060b305be888d43cfc9f6be6dfa03af..97dee9ee77992880486660b4d3fd94b842835f23 100755 GIT binary patch delta 120 zcmV-;0EhpSZIo@Wycc8WK#6_zN(N_zDn>_z575_zYl;_y7Q-Y5*(z(3O)5947+>uyC_A a91ji-I3PeEGB7eVEig7MFf+4KDnbm9?JOz) delta 120 zcmV-;0EhpSZIo@Wyc(02>OR8WT*-_yG`&_zN(N_zD1x_z575_zZB3_yAC&Y5*(z(3X=6947+=u<)}r a91ji-Hy}VDGB7eVEig7MFfy}JDnbkeh%NH~ diff --git a/F1:F103/BISS_C_encoders/usart.c b/F1:F103/BISS_C_encoders/usart.c index e4702e7..33abc9e 100644 --- a/F1:F103/BISS_C_encoders/usart.c +++ b/F1:F103/BISS_C_encoders/usart.c @@ -50,18 +50,22 @@ typedef struct __attribute__((packed)){ uint8_t crc[4]; } enc_t; +//#include "usb_dev.h" +//#include "strfunc.h" void usart_send_enc(uint32_t encX, uint32_t encY){ enc_t edata; uint8_t *databuf = (uint8_t*) &edata; + edata.encX = encX; + edata.encY = encY; uint32_t POS_SUM = 0; for(int i = 1; i < 9; ++i) POS_SUM += databuf[i]; +// DBG("POSSUM:"); DBGs(uhex2str(POS_SUM)); edata.crc[0] = POS_SUM >> 8; edata.crc[1] = ((0xFFFF - POS_SUM) & 0xFF) - edata.crc[0]; edata.crc[2] = (0xFFFF - POS_SUM) >> 8; edata.crc[3] = 0; edata.magick = ENC_MAGICK; - edata.encX = encX; - edata.encY = encY; +// DBG("CRC:"); DBGs(uhex2str(*(uint32_t*)edata.crc)); usart_send(databuf, sizeof(enc_t)); } diff --git a/F1:F103/BISS_C_encoders/version.inc b/F1:F103/BISS_C_encoders/version.inc index e4b7dcc..4e70e46 100644 --- a/F1:F103/BISS_C_encoders/version.inc +++ b/F1:F103/BISS_C_encoders/version.inc @@ -1,2 +1,2 @@ -#define BUILD_NUMBER "107" -#define BUILD_DATE "2025-06-02" +#define BUILD_NUMBER "108" +#define BUILD_DATE "2025-06-03"