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

2322 commits

Author SHA1 Message Date
George Oikonomou
fb22e15844 Fix warnings caused by incorrect param names / undocumented params 2015-02-15 20:11:08 +01:00
Nicolas Tsiftes
277dc8e174 Merge pull request #826 from alignan/fix_octal 
Remove leading zeros from node id
 2015-02-11 22:35:02 +01:00
Harald Pichler
6730ec16c8 Merge branch 'contiki' into osd 2015-02-10 15:13:21 +01:00
Thomas Weber
f06bd06b79 corrected line - #if UIP_CONF_IPV6 - in contiki-rcb-main.c to - #if NETSTACK_CONF_WITH_IPV6 - 2015-02-02 22:08:35 +01:00
PAtO!
2c2b930648 Fix: Misconfigurations to compile for avr-zigbit platform 2015-01-29 14:31:47 -03:00
Ralf Schlatterbeck
c8be130f2e Finally fix LED-Strip driver 
.. and adapt led-strip.c to changed polarity (again).
 2015-01-26 20:44:30 +01:00
Ralf Schlatterbeck
a2357e648e Invert LED count, use fixed led driver 2015-01-25 19:04:04 +01:00
Ralf Schlatterbeck
e946cd4c13 Add LED strip example 
.. not yet working
 2015-01-25 18:31:17 +01:00
Thomas Weber
d575f1a6ce added missing modules in Makefile.avr-rcb, added netstack init functions (to start the at86rf230, modified macros to increase the buffersize) 2015-01-17 19:19:16 +01:00
Harald Pichler
ff29ab2c94 bugfix define framer and llsec 2015-01-16 22:22:16 +01:00
Harald Pichler
000d37a7fc update modules remove llsec 2015-01-16 15:03:37 +01:00
Víctor Ariño
ccc0d27da0 Integrates uip-nameserver API 
On the same commit the src have been uncrustified and some typo
fixes as well as includes missing.
 2015-01-09 09:44:06 +01:00
Harald Pichler
fb473237ce bugfix modules 2014-12-29 11:02:51 +01:00
Harald Pichler
9efc5d41c1 Merge branch 'contiki' into osd 2014-12-29 08:20:00 +01:00
George Oikonomou
8fe5456588 Change default PAN ID for the CC2538DK platform to 0xABCD 2014-12-08 22:33:33 +00:00
George Oikonomou
73a133373a Change CC2530DK default PAN ID to 0xABCD and make it configurable by project-conf.h 2014-12-08 22:33:11 +00:00
Harald Pichler
ed161d1905 NETSTACK_CONF_WITH_IPV6 2014-12-07 17:36:53 +01:00
Harald Pichler
a02be51f08 Merge branch 'contiki' into osd 2014-12-07 15:24:00 +01:00
Simon Duquennoy
c2ca3e9fdb Cleanup UIP_CONF_IPV6_RPL configuration 2014-12-02 12:38:55 +01:00
Simon Duquennoy
6891bcdd20 Remove unneeded module inclusion from avr and seedeye platforms 2014-12-01 21:06:01 +01:00
Simon Duquennoy
0d9815e08b WITH_UIP6 -> NETSTACK_CONF_WITH_IPV6 2014-12-01 21:04:54 +01:00
Simon Duquennoy
a9cc909794 Network layer configuration: replace UIP_CONF_* with NETSTACK_CONF_WITH_* 2014-12-01 21:02:57 +01:00
Simon Duquennoy
229c53a2e6 Cooja platform: do not include the rime module by default 2014-12-01 20:13:10 +01:00
Simon Duquennoy
e85f41ffa0 Get IPv6 to fit in micaz platform again 2014-12-01 20:13:09 +01:00
Simon Duquennoy
722b3258d1 Cleanup of the Contiki network layer configuration. Now using CONTIKI_WITH_IPV6, CONTIKI_WITH_IPV4, and CONTIKI_WITH_RIME in makefiles, and UIP_CONF_IPV6, UIP_CONF_IPV4, UIP_CONF_RIME in c code. Now only the stacks that are used are compiled (via makefile MODULES). Make IPv6 the default network stack. 2014-12-01 20:13:09 +01:00
Nicolas Tsiftes
d820feadd6 Merge pull request #792 from wchyan/master 
atmega128rfa1: Fix the default build error
 2014-11-28 19:23:26 +01:00
Nicolas Tsiftes
69c76c9f2f Merge pull request #872 from Bocci83/master 
Seedeye platform: add the explicit list of modules
 2014-11-28 19:21:52 +01:00
Nicolas Tsiftes
9b90c378e8 Merge pull request #812 from kkrentz/packetbuf-holds-broadcast 
packetbuf_holds_broadcast()
 2014-11-28 19:15:19 +01:00
kkrentz
7b63217a32 ContikiMAC: Default to contikimac_framer when using Rime over ContikiMAC 2014-11-25 04:56:09 -08:00
Stefano
a5550fa083 Seedeye platform: add the explicit list of modules 2014-11-21 14:36:23 +01:00
Antonio Lignan
e8c49dd29e Remove leading zeros from node id 2014-11-20 14:48:28 +01:00
Harald Pichler
a86f137cf5 add module llsec 2014-11-19 15:10:10 +01:00
Harald Pichler
5f18fc6955 set all colors to the same pin PE5 2014-11-19 13:54:35 +01:00
Harald Pichler
42d3b38c9c optriac sensors use Arduino API 2014-11-19 13:54:28 +01:00
Harald Pichler
f7e987cbeb change port manipulation to ardino commands and lets change the pin at runtime possible 2014-11-19 13:54:22 +01:00
Ralf Schlatterbeck
1a1aaa883e Turn off JTAG in adc_init 2014-11-19 13:54:13 +01:00
Ralf Schlatterbeck
53cf5ab6cf Fix A0-A5 ADC constants, use in example sketch 2014-11-19 13:53:59 +01:00
Ralf Schlatterbeck
fbe6ae6a60 Fix off-by-one error in digitalPinToTimer 2014-11-19 13:53:53 +01:00
Ralf Schlatterbeck
abdf6f8c6b Refactor A/D conversion in adc.c 
Now the necessary settings are in adc.h. Refactored to allow repeated
ADC reads without reinitialization. Arduino allows setting
analogReference, this is now also implemented.
ADC is now initialized to sane values in apps/arduino/arduino-process.c
dev/arduino/arduino-compat.h now has all hardware independent settings
for arduino (some moved from platform/osd-merkur/dev/hw-arduino.h).
turnOffPWM re-implemented with hw_timer, removed from wiring_digital.c
ADC-specific arduino stuff moved to arduino-compat.h
Arduinos wiring_analog no longer necessary.
arduino-sketch example now reads analog inputs 1 and 5 using analogRead.
 2014-11-19 13:53:32 +01:00
Ralf Schlatterbeck
c46d6afa39 Make Arduino timer stuff work on Contiki 
New discovery: Contiki also uses timer 0. With almost the same interface
as Arduino. So we now completely get rid of wiring.c (only the main
file, the other wiring_xxx stay) and implement Arduino timer, delay, etc
in terms of the corresponding Contiki routines. Verified that now delay
works as expected. The LED in examples/osd/arduino-sketch blinks!

Before this, the arduino_init routine in wiring.c destroyed the timer-0
initialization of contiki, making both, contiki timer implementation
*and* contiki timer implementation fail if the arduino_init routine was
called. Now both work.

Squashed with following bug-fix commit.
 2014-11-19 13:50:58 +01:00
Ralf Schlatterbeck
b6be226e69 Add Arduino compatibility layer 
We can now directly compile arduino sketches (.pde) files.
Arduino compatible analogWrite works now.
But there is still a long way to go, serial I/O and timer stuff (delay,
millis etc) currently don't work (not tested but I don't expect this to
work).
It can be used in an arduino sketch or in a normal contiki program.
We get a PWM frequency of 490.2 Hz (a period of 2.040 ms), that's
Arduino compatible. If you need different frequencies see native timer
usage in examples/osd/pwm-example
In a contiki program you have to call arduino_pwm_timer_init to
initialize the timer before pwm works. The arduino sketch wrapper
already does this.
For running a sketch, see examples/osd/arduino-sketch
 2014-11-19 13:48:05 +01:00
Harald Pichler
5077010fc0 add i2c driver from Ingo 2014-11-19 13:46:58 +01:00
Harald Pichler
16fa63ebac bugfix read analog 2014-11-19 13:46:14 +01:00
Harald Pichler
4461dca8f2 set 0xABCD default panid 2014-11-19 13:46:07 +01:00
Ralf Schlatterbeck
4ceffb090d Make HW timer for contiki rtimer configurable 
... and configure osd platform to use timer 5. With the new
configuration we can use timer 3 for generating hardware PWM.
 2014-11-19 13:44:55 +01:00
Harald Pichler
38dbf611e6 add Arduino pin definition and commands 2014-11-19 13:42:57 +01:00
Harald Pichler
7c0cd36a77 bugfix define panid 2014-11-19 13:42:47 +01:00
Ralf Schlatterbeck
56f6f87c94 Allow changing bootloader_get_mac address 
Current default in the Makefile is the *new* bootloader address.
But for backward compatibility we've modified the run*.sh files
to use the old address. The run*.sh also now explain how to change
the default.
 2014-11-19 13:42:35 +01:00
Harald Pichler
1efbe0736a change resources to simple and make climate2 default 2014-11-19 13:42:13 +01:00
Harald Pichler
d90e0d622d get s/button ->show button status 0/1 2014-11-19 13:42:05 +01:00
Harald Pichler
affe81cc6d bugfix includes and names 2014-11-19 13:40:29 +01:00
Harald Pichler
a16849120f adapt new names and api 2014-11-19 13:40:09 +01:00
Harald Pichler
964164b157 remove t4 driver at the moment, config problem 2014-11-19 13:39:11 +01:00
Marcus Priesch
630bd8e9e4 Factored to support configurable amount of pwm's, fixes 2014-11-19 13:38:58 +01:00
Harald Pichler
11b13a7a7e remove link status and bugfix params.c 2014-11-19 13:37:41 +01:00
Harald Pichler
9906e9736c temp and hum sensors values xxxx -> xx.xx 2014-11-19 13:37:21 +01:00
Harald Pichler
1b04a24022 config panid over defines 2014-11-19 13:37:06 +01:00
Harald Pichler
8b323633cd define new tria pins, configurable type ligt or shutter or plug 2014-11-19 13:36:58 +01:00
Harald Pichler
2408af0b93 remove xmac config 2014-11-19 13:36:35 +01:00
Harald Pichler
ab16ebd4ea bugfix nbr name xmac 2014-11-19 13:35:04 +01:00
Harald Pichler
171c1290c3 update boarder router to new rpl tables 2014-11-19 13:34:47 +01:00
Harald Pichler
dd917c3260 bugfix server client demo 2014-11-19 13:34:37 +01:00
Harald Pichler
e2edd006d4 initial upload 2014-11-19 13:34:27 +01:00
Harald Pichler
837f70770a cleanup plattform defines, disable energest, radiostatistics 2014-11-19 13:34:20 +01:00
Harald Pichler
34d64b4eb0 bugfix blockmode, 8 Hz dutycyle as standard 2014-11-19 13:34:07 +01:00
Harald Pichler
1093989aef bugfix CS cast to uint8_t 2014-11-19 13:33:59 +01:00
Harald Pichler
29c7297591 bugfix RH03 sensor 2014-11-19 13:33:50 +01:00
Harald Pichler
45ede69308 add dht22 and RHT03 support 2014-11-19 13:33:40 +01:00
Harald Pichler
8f85f7fb0a bugfix new dresden module 32khz 2014-11-19 13:33:31 +01:00
Harald Pichler
cead1c7ce0 use batmon in battery_sensor 2014-11-19 13:32:41 +01:00
Harald Pichler
ae732f4636 initial upload 2014-11-19 13:32:31 +01:00
Harald Pichler
db823713eb bugfix packet loss 
Conflicts:
	platform/osd-merkur/contiki-main.c
 2014-11-19 13:31:33 +01:00
Harald Pichler
48fff35bd9 update for new contiki fetch 2014-11-19 13:22:20 +01:00
Harald Pichler
e9c033688b bugfix 2014-11-19 13:21:52 +01:00
Harald Pichler
1fc136d379 add BOOTLOADER_GET_MAC 
Conflicts:
	platform/osd-merkur/params.h
 2014-11-19 13:19:44 +01:00
Harald Pichler
b1e1ef1ffd periodic prints configurable 2014-11-19 13:14:20 +01:00
Harald Pichler
88ae1828f9 remove debug code 2014-11-19 13:12:43 +01:00
Harald Pichler
245d801862 add merkurboard coap client demo 2014-11-19 12:14:24 +01:00
Marcus Priesch
42c28e0bf7 timer4 servo pwm 2014-11-19 12:11:19 +01:00
Marcus Priesch
277f63d76a timer4 servo pwm 2014-11-19 12:10:09 +01:00
Harald Pichler
54114b0943 many bugfixes, add cputemp 2014-11-19 12:07:31 +01:00
Harald Pichler
e645833a99 add light-actor 2014-11-19 12:06:54 +01:00
Harald Pichler
8c08364cad add servo example 2014-11-19 12:06:45 +01:00
Harald Pichler
81e6734626 add climate example 2014-11-19 12:04:53 +01:00
Harald Pichler
715cfa3a75 add platform osd-merkur 2014-11-19 12:04:38 +01:00
Nicolas Tsiftes
866bb99944 Merge pull request #860 from simonduq/frame802154-align 
frame802154_t: make sure dest_addr and src_addr are aligned
 2014-11-18 08:59:30 +01:00
kkrentz
fb00a217f5 packetbuf: Use packetbuf_holds_broadcast() all-over 2014-11-13 09:58:08 -08:00
Enrico Joerns
b0206e2f58 [doc] avr-raven: Fix placement of description for ravenserial group 
Note: The raven-lcd-interface and raven-ipso modules in atmega128rfa1
seem to be needles for this platform and might be there only because of
copy&paste from the raven platform. Should be removed in a later patch.
 2014-11-10 23:53:34 +01:00
Enrico Joerns
846fd567d4 [doc] avr-atmega128rfa1: add to parent platform group 2014-11-10 23:53:34 +01:00
Enrico Joerns
d4cf5ef5a1 [doc] Added minimal doxygen anchor for each platform currently available in Contiki 
Already existing label names and titles were retained
 2014-11-10 23:53:34 +01:00
Enrico Joerns
0288f867ce [platform/native] Add to doxygen tree 2014-11-10 23:53:32 +01:00
Enrico Joerns
9dd7f1d29a [doc] added faulty esb and msp430 references 2014-11-10 23:53:32 +01:00
Enrico Joerns
0b8769e576 [doc] Various fixes for doxygen grouping etc. 2014-11-10 23:53:32 +01:00
Simon Duquennoy
6b7017452b frame802154: move inclusion of linkaddr.h from .h to .c file 2014-11-10 15:43:32 +01:00
Fredrik Österlind
0a2804fd69 Merge pull request #846 from ejoerns/pull-req/cooja-platform 
Cooja platform fixes
 2014-11-05 15:21:18 +01:00
Enrico Joerns
0d12bcffcb [cooja-platform] Fixes for slip-bridge compatibility 
* Added dev/uart1.h header file to cooja platform
* Added slip arch stub
* Suppress examples putchar definition as cooja platform provides its own

Note that the uart1.h file should only be an intermediate solution.
A generic contiki-wide definition for uart handling is required as each
platform defines its own varying set of uart functions.
 2014-11-04 00:14:06 +01:00
Enrico Joerns
5a4c2e0d1f [cooja-platform] Add cast to linkaddr_t to avoid warning 2014-11-04 00:09:45 +01:00
Enrico Joerns
f8445ba1bd [cooja-platform] Remove unused variable 'shortaddr' 
This variable was set but never used in the code
 2014-11-04 00:09:45 +01:00
Enrico Joerns
2bc1e08f19 [cooja-platform] Include eeprom.h to avoid implicit declaration warning 2014-11-04 00:09:45 +01:00
Antonio Lignan
ef6c351d0c Add function to change I2C baudrate and push relevant configuration values to platform config 2014-10-20 14:23:36 +02:00
Nicolas Tsiftes
0d39ee96ad Merge pull request #820 from alignan/serialnum_as_nodeid 
Use the Z1 product ID as MAC/Node ID if no value is found in XMEM
 2014-10-20 11:38:11 +02:00
Nicolas Tsiftes
27cde1ff81 Merge pull request #824 from alignan/fix_warnings 
Warning fixes
 2014-10-20 11:16:36 +02:00
Antonio Lignan
cceb97059c Use the Z1 product ID as MAC/Node ID if no value is found in the XMEM 2014-10-20 10:36:49 +02:00
Antonio Lignan
c836fbfbd9 Fixes warnings, bad code and code style 2014-10-20 10:28:00 +02:00
Moritz 'Morty' Strübe
c0783e2841 sky: Initialize energest as early as possible 
If energest is initialized too late, the radio is not accounted
until the first switch. This is a problem when the radio is always
listening.
 2014-10-09 09:42:56 +02:00
Mariano Alvira
e803a654b4 Merge pull request #684 from SmallLars/2nd-button 
Enabled 2nd button on platform econotag
 2014-10-08 14:05:24 -05:00
Adam Dunkels
d891d11324 Merge pull request #557 from kkrentz/llsec-integration 
Integration of Link Layer Security
 2014-10-08 15:45:46 +02:00
Antonio Lignan
5bbb0cabbc Added battery capability to Z1 platform 2014-10-08 11:53:09 +02:00
Antonio Lignan
343a3d3f7b Added missing radio capability define to Z1 platform config 2014-09-24 11:42:55 +02:00
Weichuan Yan
7b6439bd6f atmega128rfa1: Fix the default build error 
Fixing from http://sourceforge.net/p/contiki/mailman/message/32494852/

Signed-off-by: Weichuan Yan <yan.weichuan@gmail.com>
 2014-09-18 08:53:32 +08:00
Atis Elsts
0e9c051485 Fix time accounting on TI EXP5438 MSP430x5438a experimenters board 2014-08-21 18:10:53 +02:00
Nicolas Tsiftes
35b6032c64 Merge pull request #745 from PaulCorbalan/patch-1 
Add PLATFORM_HAS_RADIO in Sky Platform
 2014-08-18 15:08:37 +02:00
kkrentz
94d2b519e4 aducrf101mkxz: added llsec module 2014-08-05 09:15:40 -07:00
kkrentz
2cf7d98cad ContikiMAC: Create and parse ContikiMAC header in special framer; Expanded framer interface 
to allow for creating and securing frames in advance; Create and secure frames in advance when sending bursts; Do neither recreate nor resecure frames that come from phase
 2014-08-05 05:07:06 -07:00
kkrentz
c15a05aee1 Sky: Use the cc2420_aes_128_driver by default 2014-08-05 05:07:06 -07:00
kkrentz
c6a98f2968 CC2420: Turned SPI macros to functions and removed redundant AES API 2014-08-05 05:07:06 -07:00
kkrentz
c032b67969 llsec: Noncompromise-resilient 802.15.4 security 2014-08-05 05:07:05 -07:00
kkrentz
7943751b16 Sky: DEBUG on/off switch 2014-08-04 01:09:57 -07:00
kkrentz
c7b394c51b Sky: Calling NETSTACK_LLSEC.bootstrap from contiki-sky-main.c 2014-08-04 01:09:57 -07:00
kkrentz
c396a85364 llsec: Added a layer in between NETSTACK_MAC and NETSTACK_NETWORK for implementing link layer security 2014-08-04 01:09:57 -07:00
Jim Paris
9b76c2fb17 aducrf101: Adjust default buffer sizes to fit better in available RAM 2014-07-29 18:25:55 -04:00
Adam Dunkels
62b8aafb03 Merge pull request #722 from royscheefhals/contiki-fix 
char * data to void * data parameter in process_start
 2014-07-28 22:04:36 +02:00
Nicolas Tsiftes
582bfcb8c6 Merge pull request #696 from sieben/doc 
Correct several doxygen tags (\file,...)
 2014-07-28 11:42:41 +02:00
Rémy Léone
8c3fa17ec0 Correct several doxygen tags (\file) 2014-07-28 11:11:45 +02:00
George Oikonomou
95e2cd9021 Merge pull request #732 from camilorodegheri/patch-1 
Update README.md
 2014-07-27 22:55:00 +01:00
Jim Paris
6db05caed9 Fix radio hangups when trying to transmit with radio off. 
The border-router tries to transmit and do other stuff after turning
the radio off, and the radio driver didn't handle that very well.
With this fix, it's no longer necessary to reset the border router
after starting tunslip6.
 2014-07-23 16:21:53 -04:00
Jim Paris
6937b29670 Add Windows build instructions for ev-aducrf101mkxz platform 2014-07-23 16:21:53 -04:00
Jim Paris
07201d13a3 Add IAR compiler support for ADuCRF101 2014-07-23 16:21:53 -04:00
Jim Paris
4f1fc3557c Add README.md for ev-aducrf101mkxz platform 2014-07-23 16:21:53 -04:00
Jim Paris
ad141b00fb Implement rtimers for ADuCRF101 2014-07-22 21:18:16 -04:00
Jim Paris
c8716f4d57 Add platform LED driver 2014-07-22 21:18:16 -04:00
Jim Paris
63692ba96d Add button sensor support (BOOT button) 2014-07-22 21:18:16 -04:00
Jim Paris
4cb97a3311 Move RF RX into its own process 2014-07-22 21:18:16 -04:00
Jim Paris
b7373edf8c Add ADuCRF101 radio driver 2014-07-22 21:18:16 -04:00
Jim Paris
5673b46e86 Add initial EV-ADuCRF101MKxZ platform support 2014-07-22 21:18:16 -04:00
Nicolas Tsiftes
784b20c04d Merge pull request #739 from alignan/merge_z1sp_with_z1 
Merges Z1SP into Z1 platform
 2014-07-04 22:03:27 +02:00
Oliver Schmidt
9ee1bae150 Only wait for a keypress if the user is told to press a key. 2014-07-04 19:33:35 +02:00
Antonio Lignan
5467674fcc Merges Z1SP into Z1 platform 2014-07-04 10:41:05 +02:00
Pablo Corbalán
a490986401 Add PLATFORM_HAS_RADIO in Sky Platform 
In order to use the er-server-example Radio resource it is required that the platform defines that it has a radio. This line might be required in other platforms.
 2014-07-03 14:59:13 +01:00
Rémy Léone
f111058472 Removing trailing whitespaces 2014-06-30 20:01:05 +02:00
Ian Martin
6ae6c4768e rl78: Change RIMEADDR_CONF_SIZE to LINKADDR_CONF_SIZE because the rimeaddr module has been renamed to linkaddr. 2014-06-28 22:07:57 -04:00
Camilo Rodegheri
a50e933f4b Update README.md 
Adding new command for ftdi_sio which applies to Kernel>3.12 used by Ubuntu 14.04 LTS
 2014-06-21 15:04:48 -03:00
Antonio Lignan
3d64b80e40 Added flags to enable 20-bit support from msp430-gcc 4.7.x 2014-06-17 12:55:08 +02:00
Nicolas Tsiftes
4c5fa6ff5d Merge pull request #713 from adamdunkels/pr/drop-iris 
Remove the unmaintained iris platform
 2014-06-13 12:57:52 +02:00
Roy Scheefhals
1058ea986a Changed the parameter 'char * data' of process_start to the 
type process_data_t. This was an artifact when the choice was
made to use the void * type for the data parameter in processes.

Changed parameter 'void * data' of process_post_synch to
process_data_t for consistency.

Checked all the uses of process_start() in contiki and fixed casts
of the data parameter.
 2014-06-12 13:40:28 +02:00
Adam Dunkels
9ceb059c21 Merge pull request #611 from nfi/cc2x20-sfd-config 
Corrected CC2x20 sfd config and startup message.
 2014-06-11 23:17:05 +02:00
Adam Dunkels
d7e4443ab2 Remove the unmaintained iris platform 2014-06-11 19:52:19 +02:00
Nicolas Tsiftes
da8e9a3e8d Merge pull request #655 from atiselsts/stm32_patches 
Fix inconsistent usage of short/long integer type in mbxxx platform's configuration file.
 2014-06-07 23:21:59 +02:00
Nicolas Tsiftes
350c83c947 Merge pull request #656 from atiselsts/native_platform_patches 
Minor improvements for the native platform
 2014-06-07 23:06:36 +02:00
George Oikonomou
ba9c2d40eb Merge pull request #682 from g-oikonomou/watchdog-cc2538 
Confine CC2538 WDT on/off conf inside the driver
 2014-06-03 22:05:08 +01:00