deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
11969 commits 6 branches 13 tags 80 MiB
Commit graph

2727 commits

Author SHA1 Message Date
Harald Pichler cf40f59843 add pin status 2016-08-15 20:22:49 +02:00
Harald Pichler 349f6bf429 Merge branch 'contiki' into osd 2016-06-29 09:04:54 +02:00
George Oikonomou 91255f5a81 Merge pull request #1711 from xukai871105/master 
One fix to sensorTag board_i2c.c
 2016-06-28 23:55:02 +01:00
Harald Pichler 3c8e91d74e cleanup confilicrts 2016-06-28 16:37:16 +02:00
George Oikonomou 3a105f2141 Disable CC2650_FAST_RADIO_STARTUP by default 
`CC2650_FAST_RADIO_STARTUP` is required for TSCH, but it currently breaks ContikiMAC. We set the default value to the one that will work with the default choice of RDC.

Fixes #1744
 2016-06-27 17:20:26 +01:00
Nicolas Tsiftes a8989f9f1c Merge pull request #1724 from nvt/coffee-simplify 
Coffee: minor enhancements
 2016-06-15 18:56:10 +02:00
Nicolas Tsiftes 5010309005 Make the I/O semantics functionality in Coffee unconditional so that the API becomes consistent across platforms. 
Change certain CPP conditionals into C conditionals, which should be possible for the compiler to optimize at runtime. This makes the source code easier to read.
 2016-06-14 21:08:00 +02:00
Atis Elsts 3a99639294 cc26xx: implement CC2650_FAST_RADIO_STARTUP option, required for TSCH 2016-06-14 00:54:33 +03:00
Atis Elsts 3ff8aa8ad8 srf06-cc26xx: add node_id variable 2016-06-14 00:54:32 +03:00
Atis Elsts f99511f494 srf06-cc26xx: add default TSCH configuration for the platform 2016-06-14 00:54:32 +03:00
George Oikonomou 4b67e21d2e Merge pull request #1714 from alignan/pull/add-relay 
Added generic relay driver for the zoul-based platforms
 2016-06-13 19:45:46 +01:00
Simon Duquennoy 4fd8f67053 Merge pull request #1715 from sumanpanchal/zoul-tsch 
TSCH port for Zolertia ReMote/Zoul.
 2016-06-13 09:03:16 +02:00
Sumankumar Panchal 373fda46f7 TSCH port for Zolertia ReMote/Zoul. 2016-06-12 16:37:01 +05:30
Benoît Thébaudeau 9845973971 cc2538: Print SoC information upon startup 
If STARTUP_CONF_VERBOSE is enabled, print SoC information upon startup.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-06-11 23:23:38 +02:00
xukai bd0716b044 Merge remote-tracking branch 'contiki-os/master' 2016-06-10 12:54:59 +08:00
Antonio Lignan 092f0e62fe Added generic relay driver for the zoul-based platforms 2016-06-09 15:53:25 +02:00
Simon Duquennoy ed11320dc3 Platform cooja: provision 300 links for RPL non-storing mode 2016-06-08 14:02:46 +02:00
xukai a1ea6d311f Fix i2c bug in sensortag flatform. 2016-06-08 15:09:00 +08:00
Antonio Lignan ee0b02c819 Merge pull request #1684 from g-oikonomou/contrib/cc26xx/aux-ctrl-and-adc 
Add CC13xx/CC26xx AUX controller module, ADC support, ALS driver and example
 2016-06-07 14:36:28 +02:00
Antonio Lignan b3faefe602 Merge pull request #1433 from mdlemay/x86-mm 
X86 memory management
 2016-06-05 13:49:49 +02:00
Antonio Lignan c746ca105a Merge pull request #1705 from simonduq/pr/nrf52dk-rtimer-diff 
Platform nrf52dk: use RTIMER_CLOCK_DIFF instead of RTIMER_CLOCK_LT
 2016-06-03 21:59:25 +02:00
Simon Duquennoy 64679642f2 Saving ROM and RAM 2016-06-03 16:44:06 +02:00
Simon Duquennoy 752fef9e42 Added link-stats and nbr-table to avr-ravenusb makefile 2016-06-03 15:46:05 +02:00
Oliver Schmidt 0151a7c27e Merge pull request #1706 from oliverschmidt/master 
Make use of new cl65 option --print-target-path.
 2016-06-03 15:13:08 +02:00
Simon Duquennoy 1afaae3fd7 nrf52dk: enable 32bit rtimer 2016-06-03 14:14:28 +02:00
Oliver Schmidt ae0c5f0dd0 Make use of new cl65 option --print-target-path. 
The new cl65 option --print-target-path allows to get rid of CC65_HOME altogether.
 2016-06-03 13:30:25 +02:00
Simon Duquennoy dca929cd07 Platform nrf52dk: use RTIMER_CLOCK_DIFF instead of RTIMER_CLOCK_LT 2016-06-03 13:26:08 +02:00
Simon Duquennoy 26bf33c762 Merge pull request #1550 from thomas-ha/tsch-cc2538-port 
Port of TSCH for CC2538
 2016-06-02 21:33:55 +02:00
Antonio Lignan 7dd2f1144b Disabled rtimer redefinition, removed outdated address print and timer-test from regression tests 2016-06-02 10:50:22 +02:00
Antonio Lignan 34af72c047 Merge pull request #1609 from simonduq/pr/net-debug 
Added net-debug.[ch] to provide debug functions even in the non-IP case
 2016-06-01 23:52:34 +02:00
Antonio Lignan 6fc4e2535c Merge pull request #1665 from g-oikonomou/contrib/cc26xx-bsl 
Consolidate .upload for all CC26xx/CC13xx boards and add login make target
 2016-06-01 23:37:29 +02:00
Antonio Lignan c742d07803 Merge pull request #1695 from alignan/pull/fix-remote-pinout 
Fixed CC2538/PIC labels being swapped
 2016-06-01 23:34:42 +02:00
Antonio Lignan acf13a4e0d Merge pull request #1606 from OpenMote/master 
Adapted OpenMote-CC2538 sensor drivers to Contiki sensor API.
 2016-06-01 23:15:27 +02:00
Antonio Lignan 9e1c378919 Merge pull request #1469 from wbober/nrf52dk-pr 
Add support for nRF52 DK platform
 2016-06-01 23:11:39 +02:00
Antonio Lignan f065971efc Merge pull request #1619 from simonduq/pr/tsch-rtimer16-fix 
Fix bug in TSCH for platforms with 16-bit rtimer
 2016-06-01 23:03:50 +02:00
Antonio Lignan 4334990e16 Merge pull request #1686 from bthebaudeau/unified-cfs-coffee-examples 
Unified CFS/Coffee examples
 2016-06-01 22:00:13 +02:00
Antonio Lignan 429699d421 Merge pull request #1666 from g-oikonomou/contrib/cc1310-lp 
Add support for the CC1310 LaunchPad (LAUNCHXL-CC1310)
 2016-06-01 15:41:44 +02:00
Antonio Lignan 10601b2e5c Fixed CC2538/PIC labels being swapped 2016-06-01 14:28:53 +02:00
Pere Tuset 2b3cab18f4 Run uncrustify through ADXL346 driver. 2016-06-01 11:11:21 +02:00
Benoît Thébaudeau 0079b78966 zoul: Make it possible to override COFFEE_CONF_SIZE 
The projects need to be able to override it with project-conf.h.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-05-30 23:05:14 +02:00
George Oikonomou 2ec9c8ccf0 Add ALS support for Srf06 + CC13xx/CC26xxEM 
This provides an example on how to use the CC13xx / CC26xx ADC
 2016-05-29 15:05:13 +01:00
Antonio Lignan de64ed3975 Fixed typo 2016-05-24 10:50:20 +02:00
George Oikonomou c5bea81bb6 Merge pull request #1530 from herjulf/avr-rss2 
Adding AtMegaXXRFR2 support and avr-rss2 platform
 2016-05-15 20:38:50 +01:00
Robert Olsson 958dcf06f7 Remove wsnbridge. Let's focus sniffing efforts on sensniff. 2016-05-15 17:43:09 +02:00
Robert Olsson a11cfa10b4 Removed unneeded file for avr-rss2 sniffer 2016-05-15 16:36:19 +02:00
Robert Olsson 868f100366 Fix compilation warning in co2_sa_kxx-sensor.c 2016-05-15 16:23:29 +02:00
George Oikonomou 80efd730ae Extend the flash driver to support the MX25R1635F 
According to the CC1310LP design files, the flash on it is the same as the flash on the CC2650 LP (MX25R8035F 8Mbit). However, the flash on some CC1310 LPs reportedly identifies itself as the 16Mbit one (MX25R1635F). Instruction sets are identical, we simply need to tell the driver to recognise this part's Device ID.
 2016-05-14 20:34:08 +01:00
George Oikonomou 06f4463996 Extend documentation to include the CC1310 LaunchPad 2016-05-14 20:32:17 +01:00
George Oikonomou 099a933c90 Add support for the CC1310 LaunchPad 2016-05-14 20:32:17 +01:00
George Oikonomou cd5a0ef291 Consolidate .upload for all CC26xx/CC13xx boards 
The block that controls the `.upload` target is unnecessarily replicated in multiple sub-board Makefiles. This was originally done because the SmartRF and the Launchpad can be programmed with the c2538-bsl script, whereas the sensortag cannot.

This commit moves the `cc2538-bsl` / `.upload` target logic to the top level cpu Makefile (`cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx`). Board makefiles simply set the make variable `BOARD_SUPPORTS_BSL` to 1 to signal that they can be programmed by the BSL script. If `BOARD_SUPPORTS_BSL` is not equal to 1, trying to use the `.upload` target will return an error message.

For example:

```
$ make BOARD=sensortag/cc2650 cc26xx-demo.upload
using saved target 'srf06-cc26xx'
This board cannot be programmed with the ROM bootloader and therefore does not support the .upload target.
```
 2016-05-14 19:30:53 +01:00