mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-08-29 13:29:09 +00:00
Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x
This commit is contained in:
commit
1f99a4cdd6
@ -618,7 +618,7 @@ void maca_isr(void) {
|
||||
dma_rx->rx_time = *MACA_TIMESTAMP;
|
||||
|
||||
/* check if received packet needs an ack */
|
||||
if(dma_rx->data[1] & 0x20) {
|
||||
if(prm_mode == AUTOACK && (dma_rx->data[1] & 0x20)) {
|
||||
/* this wait is necessary to auto-ack */
|
||||
volatile uint32_t wait_clk;
|
||||
wait_clk = *MACA_CLK + 200;
|
||||
@ -1037,14 +1037,14 @@ const uint8_t VCODivI[16] = {
|
||||
0x2f,
|
||||
0x2f,
|
||||
0x2f,
|
||||
0x30,
|
||||
0x30,
|
||||
0x30,
|
||||
0x2f,
|
||||
0x30,
|
||||
0x30,
|
||||
0x30,
|
||||
0x30,
|
||||
0x30,
|
||||
0x30,
|
||||
0x30,
|
||||
};
|
||||
|
||||
const uint32_t VCODivF[16] = {
|
||||
|
Loading…
Reference in New Issue
Block a user