Commit graph

82 commits

Author SHA1 Message Date
Harald Pichler b708fac68d Merge branch 'contiki' 2016-11-15 08:29:23 +01:00
Simon Duquennoy ba739f679e cc1200: configurable tx-rx turaround time 2016-09-23 09:41:20 +02:00
Simon Duquennoy 5dd3d03699 cc1200: call watchdog_periodic while in busy-wait 2016-09-23 09:10:42 +02:00
Simon Duquennoy 086499a864 cc1200: added configuration for 868 MHz 2-FSK at 1.2 kbps 2016-09-23 09:06:14 +02:00
Simon Duquennoy 622d576439 cc1200: configure RSSI offset as part of cc1200_rf_cfg 2016-09-23 09:06:13 +02:00
Simon Duquennoy 97843ed322 cc1200: use Hz instead of kHz for channel spacing 2016-09-23 09:06:05 +02:00
Harald Pichler a5b59e8cbb Merge branch 'contiki'
Conflicts:
	.gitmodules
	core/net/mac/contikimac/contikimac.c
	cpu/cc26xx-cc13xx/lib/cc13xxware
2016-09-21 21:09:29 +02:00
Sumankumar Panchal 25dea7264a CC2520: Added offset to calculate correct RSSI value 2016-08-24 10:21:14 +05:30
George Oikonomou a52d50f332 Remove built-in sniffer support: CC1200 2016-08-12 01:23:49 +01:00
Harald Pichler 3c8e91d74e cleanup confilicrts 2016-06-28 16:37:16 +02:00
Antonio Lignan 7503628077 Merge pull request #1673 from njh/enc28j60_init_const
Changed read-only pointers to const in enc28j60
2016-06-03 19:46:31 +02:00
Nicholas Humfrey 65ff03537b Changed read-only pointers to const in enc28j60 2016-05-23 12:54:16 +01:00
Antonio Lignan a70b9bc277 Merge pull request #1447 from alignan/pull/cc1200-sensniff
Added sensniff support for the CC1200
2016-04-27 23:59:45 +02:00
harald42 98e4451518 Merge branch 'contiki' into osd 2016-02-25 08:18:55 +01:00
Antonio Lignan c924567d86 Fix ip64 warnings 2016-02-04 00:26:54 +01:00
Antonio Lignan 8456b8333f Added sensniff support for the CC1200 2016-01-08 14:45:50 +01:00
Harald Pichler 428131e8a8 use dynamic sleep for loop 2016-01-06 21:57:29 +01:00
Benoît Thébaudeau a2cae3359b Merge pull request #1168 from bthebaudeau/enc28j60-fixes-and-improvements
enc28j60: Fixes and improvements
2015-12-15 00:14:02 +01:00
Simon Duquennoy 1e0adbbf24 New radio interface parameters: Rx poll mode, last packet timestamp, last packet rssi, last packet lqi. Implementation of these parameters for cc2420, with, in addition, runtime configuration of CCA before Tx, auto-ack and frame filtering 2015-12-04 15:21:51 +01:00
Ulf Knoblich 5d1045d002 cc1200: Make it more suitable for contikimac + bugfix in rx_rx() 2015-11-26 09:42:19 +01:00
Simon Duquennoy fbd78a7e3b Merge pull request #1293 from simonduq/pr/fix-warnings
Fix a number of compiler warnings and enable -Werror in Travis
2015-11-10 08:49:11 +01:00
Antonio Lignan 50ee33630e Made CC1200 test mode and rx watchdog selectable 2015-10-20 11:20:19 +02:00
Simon Duquennoy ca8fe618e7 cc2420 and cc2430: add comment on why we discard tbiv 2015-10-20 10:11:49 +02:00
Simon Duquennoy b7fb06052f cc2530: do not declare sfd_timestamp if not used 2015-10-20 09:37:22 +02:00
Simon Duquennoy cf97cfaff8 cc2530: removed warning on unused variable 2015-10-20 09:37:21 +02:00
Simon Duquennoy e5d5cf7018 cc2420: do not declare sfd_timestamp if not used 2015-10-20 09:37:14 +02:00
Simon Duquennoy 6594cd1bba cc2420: fix function prototype of set_key 2015-10-20 09:37:13 +02:00
Simon Duquennoy cb4003eb52 Removed compiler warning from sht11.c 2015-10-20 09:37:12 +02:00
Nicolas Tsiftes 2ec3b1e973 Merge pull request #1185 from sumanpanchal/cc2520
Fixed the issue with CC2520_READ_REG macro to read correct value of register.
2015-09-10 14:37:00 +02:00
Sumankumar Panchal 27dd3f493b Solved issue with CC2520_READ_REG macro to read correct value of register. 2015-09-08 19:39:23 +05:30
Harald Pichler 500078ef9a update to contiki 3.0 2015-08-26 16:01:57 +02:00
Ulf Knoblich bfcea70831 Removed NULLRDC specific stuff from rf configuration as it is not the correct place to define it 2015-08-20 16:00:18 +02:00
Benoît Thébaudeau 6b76ead49c enc28j60: Prevent enc28j60_read() from running before init
This is a precaution in case enc28j60-ip64-driver.c is skipped.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-07-16 21:14:16 +02:00
Benoît Thébaudeau b4c32954a6 enc28j60: Fix workaround for erratum #14
Only odd addresses may be programmed to the ERXRDPT registers, so
initialize them to RX_BUF_END instead of RX_BUF_START.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-07-16 21:14:15 +02:00
Benoît Thébaudeau 8615b77da0 enc28j60: Print the status vector in case of transmit error
This makes debugging easier.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-07-16 21:14:15 +02:00
Benoît Thébaudeau 8c6e3e348a enc28j60: Program ETXND after the data packet
Just follow the steps from the data sheet to transmit a packet.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-07-16 21:14:15 +02:00
Benoît Thébaudeau 15d1b177d6 enc28j60: Use hardware padding for transmissions
There is no reason to use software when a feature is available in
hardware.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-07-16 21:14:15 +02:00
Benoît Thébaudeau 2cd3eaf310 enc28j60: Implement and use the BFS and BFC commands
The Bit Field Set and Bit Field Clear commands are more efficient than
the Read Control Register + Write Control Register combination, so use
them whenever possible, i.e. for the ETH registers.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-07-16 21:14:15 +02:00
Benoît Thébaudeau 356d17737c enc28j60: ERXFCON needs to be set only once
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-07-16 21:14:14 +02:00
Benoît Thébaudeau 8a20e7c05c enc28j60: Fix the MAC address configuration comment
The MAADRx register numbering was wrong.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-07-16 21:14:14 +02:00
Benoît Thébaudeau 31e0c87a6f enc28j60: Do not initialize MAIPGH for full duplex
MAIPGH should be programmed only if half duplex is used.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-07-16 21:14:14 +02:00
Benoît Thébaudeau 121b066f04 enc28j60: Update the MACON4 configuration comment
This only applies to half duplex, so the actual configuration of MACON4
does not need to be changed.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-07-16 21:14:14 +02:00
Benoît Thébaudeau 2b08c32528 enc28j60: The MACON2 register is reserved
The register 0x01 in bank 2, named MACON2 in the code, is actually
reserved, so its contents must not be changed.

This register has been marked as reserved from the revision B of the
data sheet in July 2006. The current revision of the data sheet is E,
and it is quite clear about this register.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-07-16 21:14:14 +02:00
Benoît Thébaudeau b21da96e67 enc28j60: Print revision during initialization
This is useful as debug information since the revisions of this device
have notable differences.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-07-16 21:14:14 +02:00
Benoît Thébaudeau ba6a0bc381 enc28j60: Add workaround for erratum #2 "CLKRDY set early"
A delay of 1 ms must be added after the System Reset Command. Still wait
for ESTAT.CLKRDY afterwards as a precaution.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-07-16 21:14:13 +02:00
Benoît Thébaudeau 48f269e4f5 enc28j60: Fix RCR command for MAC and MII registers
The Read Control Register command requires that a dummy byte be read
before the register value for the MAC and MII registers.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-07-16 21:14:13 +02:00
Benoît Thébaudeau 35544e81ee enc28j60: Reuse read/writedata() for read/writedatabyte()
The read/writedatabyte() functions are just a special case of
read/writedata() with a simpler API, so reuse these instead of
duplicating code.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-07-16 21:14:13 +02:00
Ulf Knoblich 557091b710 cc1200: added nullrdc timing parameters to rf configuration file 2015-06-22 14:59:14 +02:00
Ulf Knoblich 584b6ae4ca cc1200: removed the hardware dependent sniffer stuff from cc1200 2015-05-29 15:19:16 +02:00
Ulf Knoblich ed0460e369 cc1200: Initial commit (tested with 50kps nullrdc) + update rf configuration 2015-05-28 15:08:01 +02:00