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

2960 commits

Author SHA1 Message Date
Oliver Schmidt a26ee64dc0 Merge pull request #2097 from oliverschmidt/master 
Removed artifacts of former uip_appdata handling.
 2017-02-13 20:05:57 +01:00
Oliver Schmidt 6463c91a4f Removed artifacts of former uip_appdata handling. 
Adam Dunkels writes on 2/5/2017 on the Contiki mailing list:
[...] the original idea was that the application could just point the uip_appdata pointer to wherever the data was, but we then changed it so that the data actually had to be copied into the uip_aligned_buf buffer. So, yes, the network device driver should only need to read from this buffer. [...]

This change removes comments on the possibility of uip_appdata pointing somewhere outside the uip_aligned_buf. And it removes code in the SLIP drivers not necessary anymore.

Additionally it makes code in a SLIP driver optional that takes care of the Microsoft-specific CLIENT / SERVER / CLIENTSERVER chat.
 2017-02-05 23:20:39 +01:00
Simon Duquennoy 263af6f642 Merge pull request #2023 from OpenMote/master 
Adding support for OpenMote-CC2538 Rev.A1 and OpenUSB
 2017-02-02 08:47:07 +01:00
Harald Pichler 2f8549aaae Merge branch 'contiki' 
Conflicts:
	cpu/cc26xx-cc13xx/lib/cc13xxware
	cpu/cc26xx-cc13xx/lib/cc26xxware
 2017-01-31 15:00:59 +01:00
Oliver Schmidt a6472c8dd9 Revert to static Ethernet driver for the ATARI. 
After all there's no momentum for a W5100-based Ethernet solution on the ATARI. So I revert to static linkage of the CS8900A driver as this improves program load times.
 2017-01-27 00:18:25 +01:00
George Oikonomou 7b7781360f Merge pull request #2071 from g-oikonomou/bugfix/cc13xx/no-acks 
Make the number of Prop Mode RX Buffers easy to configure
 2017-01-21 00:17:49 +00:00
Laurent Deru 12c930893c Fix semantic of UIP_ND6_SEND_NA and add UIP_ND6_SEND_NS 2017-01-16 15:48:14 +01:00
George Oikonomou 5fb226f4c9 Make the count of prop mode RX buffers configurable 2017-01-15 12:31:09 +00:00
Nicolas Tsiftes c1f11cfaa9 Merge pull request #2034 from Vinggui/patch-1 
Fixing Avr-Zigbit Makefile not compiling.
 2017-01-12 07:49:30 +01:00
Pere Tuset 361cb612a7 Reduce bootloader baudrate to be on the safe side. 2017-01-10 10:59:06 +01:00
Antonio Lignan 82f3ce392e Merge pull request #2028 from joakimeriksson/minimal-net-ND-fix 
added support for 6-bytes link-layer address
 2017-01-10 09:07:50 +01:00
Antonio Lignan 247d79ea7c Merge pull request #2011 from jdede/z1-llsec 
Enable llsec on Z1 nodes
 2017-01-10 09:07:27 +01:00
George Oikonomou 960b81d484 Merge pull request #2024 from alignan/pull/eth-gw 
Zolertia Orion ethernet router with active POE support
 2017-01-09 21:03:45 +00:00
George Oikonomou 14757201a5 Merge pull request #2027 from alignan/pull/fix-adc-channels 
zoul: fix a bitmask bug in channels used
 2017-01-09 21:02:20 +00:00
Vinicius Guimaraes 42557bf484 Fixing Avr-Zigbit Makefile not compiling. 
I just tried to compile this platform for my Zigbit mote (AT86RF230) here in a hello-world example, but it didn't work.
I reviewed this makefile and found that the request to compile "frame.c" was not necessary and bring up a missing error:
"make: *** No rule to make target `obj_avr-zigbit/frame.o', needed by `contiki-avr-zigbit.a'.  Stop."
Frame.c is already inserted in radio's makefile.

Another problem was the undefined reference created by the missing module "core/net":
"contiki-avr-zigbit.a(sicslowpan.o): In function `input':"
"contiki/examples/hello-world/../../core/net/ipv6/sicslowpan.c:1521: undefined reference to `link_stats_input_callback'"

Both solved now. Hope it helps anyone else.
 2017-01-04 16:58:53 -02:00
Antonio Lignan a7e617657a zoul: fix a bitmask bug in channels used 2016-12-29 14:19:32 +01:00
Antonio Lignan fb9c6009a2 Fixed Firefly revision A image links 2016-12-29 13:40:50 +01:00
Antonio Lignan a98792a79f Updated ARM toolchain information 2016-12-29 13:38:09 +01:00
Antonio Lignan 6bda852052 Updated maintainer info 2016-12-29 13:32:35 +01:00
Antonio Lignan 579620ce0e Added Zolertia Orion ethernet router with active POE support 2016-12-29 13:07:53 +01:00
Pere Tuset 93828d867e Updated OpenMote-CC2538 README.md file with new features. 2016-12-29 12:30:58 +01:00
Pere Tuset b72110fe8a Add support for the OpenMote-CC2538 Rev.A1 board that uses the CC2538SF23 (256 KB) chip instead of the CC2538SF53 (512 KB) chip. 2016-12-29 12:10:21 +01:00
Pere Tuset 1a993da8fc Add support for automatic bootloading with the cc2538-bsl.py script on the OpenUSB carrier board. 2016-12-29 12:09:07 +01:00
Antonio Lignan cf2b24971b Merge pull request #1978 from makrog/pr/cc1200-fixes 
Added NullRDC and ContikiMAC timings for Zolertia RE-Mote.
 2016-12-23 18:31:47 +01:00
Jens Dede 7b2c687789 Use hardware-AES on z1 as default 2016-12-22 20:08:19 +01:00
Jens Dede 0b68334e95 Enable llsec on Z1 nodes 2016-12-21 14:54:15 +01:00
Antonio Lignan 3594cf5167 zoul: default cc2538-bsl baudrate to 460800 2016-12-20 18:18:28 +01:00
Antonio Lignan 7927af021e Minor cosmetic change 2016-12-16 15:47:13 +01:00
George Oikonomou a6b14a0731 Add documentation for the new boards 2016-12-11 20:44:26 +00:00
George Oikonomou fd3d733e4b Add support for the CC1350 Launchpad 2016-12-11 20:44:25 +00:00
George Oikonomou a864ebbce4 Re-organise sensortag documentation modules 
Many of those doxygen blocks are now applicable to both sensortags, with only a couple of them being different between the CC1350 and CC2650 tags
 2016-12-11 20:44:25 +00:00
George Oikonomou d291ec53e6 Add support for the CC1350 sensortag 2016-12-11 20:44:25 +00:00
George Oikonomou 6694e69788 Make Launchpad unused pins configurable 2016-12-11 16:54:11 +00:00
George Oikonomou d6e8e7dab4 Adjust ContikiMAC timings to compensate for new patches/overrides 2016-12-11 16:51:48 +00:00
Antonio Lignan ac2a31455e Merge pull request #1957 from alignan/pull/bme280-sensor 
sensors: bme280 weather sensor
 2016-12-10 18:37:21 +01:00
Antonio Lignan bd3f8fa3c5 Merge pull request #1939 from bthebaudeau/re-mote-sd-fat 
Add global SD/MMC and FAT support, with RE-Mote as an example
 2016-12-10 18:32:39 +01:00
Nicolas Tsiftes ece7cfee38 Merge pull request #1835 from mdlemay/gp-exc-handler 
galileo: Add general protection exception handler
 2016-12-08 20:12:45 +01:00
Antonis Makrogiannakis ba241db968 Added NullRDC and ContikiMAC timings for Zolertia RE-Mote. 
CC1200 SubGHz 50 Kbps mode.
 2016-12-06 13:34:26 +02:00
Nicolas Tsiftes f09e84976a Merge pull request #1950 from yatch/pr/update-for-tsch-cooja-mote 
Miscellaneous updates for tsch-cooja-mote
 2016-12-05 18:40:28 +01:00
Harald Pichler 938aa0db71 bugfix type 2016-12-04 16:09:55 +01:00
Harald Pichler aa1670e5d4 add used serial lines 2016-12-04 15:45:09 +01:00
Antonio Lignan 2be999c707 Merge pull request #1967 from MohamedSeliem/patch-9 
Fix the leftover mentions of aaaa as a prefix to be UIP_DS6_DEFAULT_PREFIX (now fd00)
 2016-12-04 12:46:07 +01:00
Mohamed Seliem 82b5fb5073 Fix the leftover mentions of aaaa as a prefix to be UIP_DS6_DEFAULT_PREFIX (now fd00) 2016-12-04 03:29:49 +02:00
George Oikonomou d6656ccde1 Fix minor typo 2016-12-03 23:26:25 +00:00
Mohamed seliem 0ef0a21d9e update for all platforms 2016-12-01 21:26:32 +02:00
Mohamed Seliem 0c65a4db9c update contiki-conf to avoid redfintion of UIP_CONF_RECEIVE_WINDOW 
in case of compiling any example that contains the definition of UIP_CONF_RECEIVE_WINDOW over Z1 mote.
i receive this warning: 
 In file included from ../../../core/./contiki.h:38:0,
                   from ../../../core/./contiki-net.h:37,
                   from httpd-simple.c:43:
  ../../../platform/z1/./contiki-conf.h:225:0: warning: "UIP_CONF_RECEIVE_WINDOW" redefined
 ./project-conf.h:60:0: note: this is the location of the previous definition
 2016-12-01 20:35:29 +02:00
Pablo Corbalán 983d858570 Remove definitions of outdated RPL_CONF_OF 2016-12-01 13:13:41 +01:00
Antonio Lignan a8acaf08d5 Merge pull request #1938 from makrog/pr/cc1200-fixes 
Fixed checking of the cc1200 GPIO0 pin status.
 2016-11-30 14:24:48 +01:00
Robert Olsson 4ef4bdd0a5 bme280 delay fixes plus Makefile for avr-rss2 2016-11-30 12:04:57 +01:00
Antonio Lignan f9b32f8139 bme280: reworked to allow platform-specific I2C implementations 2016-11-30 12:04:57 +01:00
Robert Olsson dcbb5f6271 BME280 I2C integration fixes 2016-11-30 12:04:57 +01:00
Robert Olsson 5c25ec4d11 Example modified to use BME280 2016-11-30 12:04:57 +01:00
MakA 91a6ce6576 Fixed checking of the cc1200 GPIO0 pin status. 2016-11-29 12:16:03 +02:00
Benoît Thébaudeau 3cd7b7efd1 zoul: remote: Add support for FAT 
Signed-off-by: Benoît Thébaudeau <benoit@wsystem.com>
 2016-11-27 22:50:45 +01:00
Benoît Thébaudeau 12ea1bd492 zoul: remote: Factor out duplicate RTC init 
Signed-off-by: Benoît Thébaudeau <benoit@wsystem.com>
 2016-11-27 22:50:44 +01:00
Benoît Thébaudeau 062a8535ec zoul: remote: Add support for SD/MMC 
This change adds SD/MMC support at block level, by porting the SD/MMC
driver.

Signed-off-by: Benoît Thébaudeau <benoit@wsystem.com>
 2016-11-27 22:50:43 +01:00
Andreas Urke 835a6aa6e6 Move RF_CHANNEL such that it is applied for prop mode as well 2016-11-27 16:13:58 +01:00
Yasuyuki Tanaka a4adc257e8 Add RTIMERTICKS_TO_US_64() macro (platform/cooja) 2016-11-26 11:47:59 +01:00
Antonio Lignan fc582606f2 Harmonize RF_CHANNEL definition 2016-11-25 10:37:14 +01:00
Benoît Thébaudeau ab1491be69 CC2538: Use CMSIS-CORE 
Switch to CMSIS-CORE and remove the duplicate code.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-11-24 22:30:26 +01:00
Simon Duquennoy ecd1d57eec Merge pull request #1661 from yatch/pr-tsch-cooja-mote 
TSCH on Cooja mote
 2016-11-23 11:59:29 +01:00
Harald Pichler f9f923d29c bugfix SPI 2016-11-15 09:36:30 +01:00
Harald Pichler b708fac68d Merge branch 'contiki' 2016-11-15 08:29:23 +01:00
Harald Pichler c666b18a12 add hardware serial1 to use with arduino api 2016-11-09 15:14:45 +01:00
Antonio Lignan 1ebceb8f23 Merge pull request #1897 from mdlemay/shrink-pinmux-array 
galileo: Shrink pinmux array
 2016-11-02 21:40:42 +01:00
Antonio Lignan 0bb9052840 Merge pull request #1896 from alignan/pull/tsl-256x-rework 
Renamed driver and reworked to support both TSL2561/TSL2563
 2016-10-27 09:29:49 +02:00
Harald Pichler e6dbb8c3f2 Merge branch 'master' into osd 
Conflicts:
	examples/osd/triggerbaord/sketch.pde
 2016-10-26 17:03:37 +02:00
Nicolas Tsiftes d690dcae31 Merge pull request #1864 from sumanpanchal/wismote-battery-voltage 
Wismote: Added support for Battery voltage measurement
 2016-10-24 14:41:23 +02:00
Harald Pichler 54e676343f set reciever amplifier to -90dB if use nullmac 2016-10-20 15:41:26 +02:00
Antonio Lignan 94174be708 Renamed driver and reworked to support both TSL2561/TSL2563 2016-10-19 23:13:25 +02:00
Michael LeMay 5c4cc2722e galileo: Shrink pinmux array 
The pins array in galileo-gen2-pinmux.c:galileo_brd_to_cpu_gpio_pin is
unnecessarily large.  This patch reduces its size.
 2016-10-19 09:31:50 -07:00
Antonio Lignan 2f76fc1f77 Merge pull request #1784 from g-oikonomou/contrib/cc1350 
Add CC1350 support
 2016-10-18 12:04:48 +02:00
Oliver Schmidt fb4c42a357 Added custom log function for CBM machines. 
The log function writes directly to the screen. Combined with the usage of PFS this means that the POSIX layer of the C library isn't referenced anymore thus reducing the memory requirements.
 2016-10-15 23:36:53 +02:00
Oliver Schmidt d864e73579 Added directory functions to the Commodore Platform File System. 
They reduce the Telnet server's run size by 1231 bytes.
 2016-10-15 18:36:54 +02:00
Oliver Schmidt c25e965b0c Avoid unnecessary key presses. 
The recently added doesclrscrafterexit() allows cc65 programs to determine if the screen will be cleared after exit(). If that isn't the case then there's no need to ask the user to press a key in order to allow him to read the final program output.
 2016-10-15 15:27:42 +02:00
g.oikonomou@bristol.ac.uk ec4b403e77 Allow and document IEEE mode for CC13xx 2016-10-07 10:05:14 +01:00
Harald Pichler 34adab3210 remove redefine routing warning 2016-10-02 22:50:10 +02:00
Harald Pichler 9226facda8 remove warnings 2016-10-02 22:49:22 +02:00
Antonio Lignan 6157dce0b5 Merge pull request #1877 from alignan/pull/fix-zoul-doc 
Zoul: updated pin-out images
 2016-09-28 23:05:17 +02:00
Antonio Lignan fd881bec19 Merge pull request #1874 from alignan/pull/zolertia-firefly-reva1 
Zoul: added new Firefly revision A
 2016-09-28 17:01:19 +02:00
Antonio Lignan 1758eaa08c Zoul: updated pin-out images 2016-09-28 16:54:51 +02:00
Michael LeMay 04446e8da5 galileo: Omit DHCP code when IPv6 is enabled 2016-09-24 17:37:07 -07:00
Antonio Lignan 75e260b2fc Zoul: added new Firefly revision A 2016-09-23 11:44:33 +02:00
Antonio Lignan e206984d90 Merge pull request #1873 from MohamedSeliem/patch-7 
Doxygen Fix
 2016-09-23 08:31:41 +02:00
Antonio Lignan e658bdfcfe Merge pull request #1860 from alignan/pull/remote-power-mgmt 
Zoul: power management driver for the RE-Mote revision B
 2016-09-23 08:30:56 +02:00
Antonio Lignan 95ed9a9a91 Merge pull request #1859 from alignan/pull/remote-rtcc-update 
Zoul: RTCC with trigger selection and second-based time increase
 2016-09-23 08:30:20 +02:00
Mohamed Seliem 150b97879d Doxygen Fix 
this minor fixation to avoid Doxygen bug, which appears when doing this in the documented code:
/**
* \exception \c text
*/
void foo();
 2016-09-22 22:30:54 +02:00
Antonio Lignan 268330c7e5 Zoul: power management driver for the RE-Mote revision B 2016-09-22 21:45:54 +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
Harald Pichler 6f7e68c3d4 make it possible to config node as host in project.conf 2016-09-20 21:56:32 +02:00
Sumankumar Panchal 7803131ea8 Wismote: Added support for Battery voltage measurement 2016-09-17 11:41:30 +05:30
Harald Pichler c663bb527e add UIP_CONF_ROUTER to project.conf 2016-09-16 14:12:37 +02:00
George Oikonomou 94d900a76f Merge pull request #1857 from alignan/pull/remote-revb 
Zoul: RE-Mote revision B
 2016-09-14 06:52:02 +01:00
Antonio Lignan 072bf74aa2 Added RTCC function to increase current time in seconds 2016-09-13 15:16:54 +02:00
Antonio Lignan d1a7740a2c Updated RTCC driver with selectable INT1/INT2 trigger 2016-09-13 15:16:54 +02:00
Nicolas Tsiftes 2d49edfc57 Merge pull request #1849 from MohamedSeliem/patch3 
Make UIP_CONF_DS6_ROUTE_NBU and DS6_NBR_NBU, DS6_ROUTE_NBU obsolete
 2016-09-12 14:25:59 +02:00
Nicolas Tsiftes 8bf235ef86 Merge pull request #1836 from mdlemay/dhcp 
galileo: Add process to perform DHCP configuration
 2016-09-09 16:55:05 +02:00
Yasuyuki Tanaka 6d51c5f58e Reimplement Rtimer of Cooja mote as a microsecond resolution timer 2016-09-06 15:14:10 +02:00
Yasuyuki Tanaka 958ff6e4f6 Fix indentation in cooja-radio.c 2016-09-06 15:14:10 +02:00
Yasuyuki Tanaka 38c5382054 Add timing macros required for TSCH 2016-09-06 15:14:10 +02:00