Commit graph

2210 commits

Author SHA1 Message Date
Harald Pichler 000d37a7fc update modules remove llsec 2015-01-16 15:03:37 +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
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