mirrors/micropython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stmhal/can: Fix a bug in filter handling.

Browse Source 
Reported here: http://forum.micropython.org/viewtopic.php?f=2&t=845
This commit is contained in:
Henrik Sölver 2015-11-01 23:30:46 +01:00 committed by Damien George
parent 06f70973f7
commit 35e7d9c0f1
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stmhal/can.c
View File

@ -688,10 +688,10 @@ STATIC mp_obj_t pyb_can_setfilter(mp_uint_t n_args, const mp_obj_t *pos_args, mp
rtr_masks[1] = mp_obj_get_int(rtr_flags[1]) ? 0x02 : 0; rtr_masks[1] = mp_obj_get_int(rtr_flags[1]) ? 0x02 : 0;
} }
} }
filter.FilterIdHigh = (mp_obj_get_int(params[0]) & 0xFF00) >> 13; filter.FilterIdHigh = (mp_obj_get_int(params[0]) & 0x1FFFE000) >> 13;
filter.FilterIdLow = (((mp_obj_get_int(params[0]) & 0x00FF) << 3) | 4) | rtr_masks[0]; filter.FilterIdLow = (((mp_obj_get_int(params[0]) & 0x00001FFF) << 3) | 4) | rtr_masks[0];
filter.FilterMaskIdHigh = (mp_obj_get_int(params[1]) & 0xFF00 ) >> 13; filter.FilterMaskIdHigh = (mp_obj_get_int(params[1]) & 0x1FFFE000 ) >> 13;
filter.FilterMaskIdLow = (((mp_obj_get_int(params[1]) & 0x00FF) << 3) | 4) | rtr_masks[1]; filter.FilterMaskIdLow = (((mp_obj_get_int(params[1]) & 0x00001FFF) << 3) | 4) | rtr_masks[1];
if (args[1].u_int == MASK32) { if (args[1].u_int == MASK32) {
filter.FilterMode = CAN_FILTERMODE_IDMASK; filter.FilterMode = CAN_FILTERMODE_IDMASK;
} }

20
tests/pyb/can.py
View File

@ -58,6 +58,26 @@ else:
else: else:
print('failed, wrong data received') print('failed, wrong data received')
# Test filters
for n in [0, 8, 16, 24]:
filter_id = 0b00001000 << n
filter_mask = 0b00011100 << n
id_ok = 0b00001010 << n
id_fail = 0b00011010 << n
can.clearfilter(0)
can.setfilter(0, pyb.CAN.MASK32, 0, (filter_id, filter_mask))
can.send('ok', id_ok, timeout=3)
if can.any(0):
msg = can.recv(0)
print((hex(filter_id), hex(filter_mask), hex(msg[0]), msg[3]))
can.send("fail", id_fail, timeout=3)
if can.any(0):
msg = can.recv(0)
print((hex(filter_id), hex(filter_mask), hex(msg[0]), msg[3]))
del can del can
# Test RxCallbacks # Test RxCallbacks

4
tests/pyb/can.py.exp
View File

@ -16,6 +16,10 @@ True
passed passed
CAN(1, CAN.LOOPBACK, extframe=True) CAN(1, CAN.LOOPBACK, extframe=True)
passed passed
('0x8', '0x1c', '0xa', b'ok')
('0x800', '0x1c00', '0xa00', b'ok')
('0x80000', '0x1c0000', '0xa0000', b'ok')
('0x8000000', '0x1c000000', '0xa000000', b'ok')
cb0 cb0
pending pending
cb0 cb0