diff --git a/Core/Src/requester.c b/Core/Src/requester.c index 29719d0..56e245a 100644 --- a/Core/Src/requester.c +++ b/Core/Src/requester.c @@ -811,15 +811,15 @@ void CONFIG_CAN_FILTER(uint8_t filterBank, uint32_t idFilter, uint32_t idMask) #define BITS_20_23_MASK (0xFUL << 20) // 4 бита (20..23) #define BITS_24_26_MASK (0x7UL << 24) // 3 бита (24..26) -uint32_t filter1_id = BIT27 | CURRENT_TYPE_DEVICE | CURRENT_ID_DEVICE; +uint32_t filter1_id = BIT27 | (CURRENT_TYPE_DEVICE << 24) | (CURRENT_ID_DEVICE << 20); uint32_t filter1_mask = BIT27 | BITS_24_26_MASK | BITS_20_23_MASK; // все проверяемые биты #define BITS_16_19_MASK (0xFUL << 16) -uint32_t filter2_id = DATA_TYPE_BROADCAST; +uint32_t filter2_id = DATA_TYPE_BROADCAST << 16; uint32_t filter2_mask = BITS_16_19_MASK; -uint32_t filter3_id = DATA_TYPE_PULSE; +uint32_t filter3_id = DATA_TYPE_PULSE << 16; uint32_t filter3_mask = BITS_16_19_MASK; void REQUESTER_CAN_FILTERS()