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
96e1647270 Move cc2538 startup-gcc.c to the CPU dir 2015-05-13 01:31:10 +01:00
George Oikonomou
4de471478a Link and build tmp, vdd and als sensors 2015-05-12 23:42:20 +01:00
George Oikonomou
12ac8e1fb5 Initialise ADC in main, not in sensor drivers 2015-05-12 23:42:20 +01:00
George Oikonomou
3717522680 Re-work the CC2538 driver to be a driver for the Srf06 ALS only 2015-05-12 23:42:19 +01:00
Nicolas Tsiftes
44af0fa66b Merge pull request #1003 from adamdunkels/pr/http-socket-dns64-tcp-socket 
New HTTP socket, DNS64, IP64 Cooja tests
 2015-05-10 17:14:31 +02:00
George Oikonomou
351b16c43c Update CC26xxware download instructions 2015-05-10 14:53:05 +01:00
Adam Dunkels
64bae5b38d Include the ip64-addr module, to make http-socket compile 2015-05-10 10:51:12 +02:00
Adam Dunkels
4a85d49a09 Include a subplatform-conf.h, which may override configuration parameters set by the cooja/contiki-conf.h 2015-05-10 10:51:12 +02:00
Adam Dunkels
81391c11a7 Need to specify the target name, which allows us to have platforms that inherit from the cooja platform, like the cooja-ip64 platform 2015-05-10 10:51:12 +02:00
Adam Dunkels
bab1c48912 New Cooja platform designed for runnig IP64 routers for automated testing 2015-05-10 10:51:11 +02:00
George Oikonomou
447be526ae Merge pull request #1046 from g-oikonomou/cc26xx/contrib/slip-and-br 
Enable slip-radio and rpl-border-router for CC26xx
 2015-05-09 22:51:06 +01:00
George Oikonomou
598fd770b8 Merge pull request #960 from g-oikonomou/travis-arm-aapcs-tests 
Test cc2538dk with the recommended toolchain
 2015-05-09 22:31:18 +01:00
George Oikonomou
bd5e35c968 Merge pull request #1052 from simonduq/packetbuf-cleanup 
Packetbuf cleanup
 2015-05-09 22:30:21 +01:00
Simon Duquennoy
bb76bb8beb Remove unused flag SICSLOWPAN_CONF_ACK_ALL. Include packetbuf attribute PACKETBUF_ATTR_RELIABLE only when RIME is compiled. 2015-05-06 16:34:26 +02:00
George Oikonomou
d808978149 Improve platform README 2015-05-03 22:36:04 +01:00
George Oikonomou
0327eea109 Printf Driverlib version at startup 2015-05-03 22:36:04 +01:00
George Oikonomou
77874dc02b Remove unused configuration defines 2015-05-03 22:36:03 +01:00
George Oikonomou
f83c4e7286 Improve code style 2015-05-03 22:36:03 +01:00
George Oikonomou
1d97e7e11e Improve Reed Relay macro and comments for clarity 2015-05-03 22:36:03 +01:00
George Oikonomou
8c55bc3f3d Remove obsolete/unused make variables 2015-05-03 22:36:03 +01:00
George Oikonomou
a72d90e283 Control TCP MSS in the project's conf 2015-05-03 13:31:03 +01:00
George Oikonomou
364fc9cacf Define button_sensor in contiki-conf.h 2015-05-03 13:30:59 +01:00
Oliver Schmidt
9aee07c9ad Leverage the recently added exec() cmdline support in the cc65 C library for the Apple ][. 2015-04-26 21:45:33 +02:00
Oliver Schmidt
a824722862 Merge remote-tracking branch 'upstream/master' 2015-04-26 14:35:40 +02:00
David Rabel
29e62c4e20 SERVO_OFFSET deleted, SERVO_MIN added 2015-04-03 15:55:00 +02:00
David Rabel
41163406c2 Use OCR3 instead of OCR1 for servo 2015-04-03 15:49:17 +02:00
David Rabel
235f368340 Bugfix: missing braces added in serco_set() 2015-04-03 15:47:15 +02:00
Nicolas Tsiftes
8f50d9709d Merge pull request #999 from adamdunkels/lebrush-rdnss-support-rebased 
RDNSS support, again
 2015-03-30 17:21:23 +02:00
George Oikonomou
7238a1628f Merge pull request #1004 from alignan/z1-reed-sensor 
Added Reed Sensor driver, example, and minor fix to the SHT25 sensor driver
 2015-03-30 15:05:05 +01:00
Antonio Lignan
b9334a3b0e Added Reed Sensor driver and example 2015-03-30 10:30:09 +02:00
Gaëtan Harter
d0232bb20d Remove unused UIP_CONF_ND6_ defines in platforms 
UIP_CONF_ND6_MAX_PREFIXE
  UIP_CONF_ND6_MAX_DEFROUTERS
 2015-03-24 13:09:29 +01:00
Gaëtan Harter
697d8c0d23 Remove siclowpan compressions define in platforms 
Several platforms defined compressions modes values:

    SICSLOWPAN_CONF_COMPRESSION_IPV6
    SICSLOWPAN_CONF_COMPRESSION_HC1
    SICSLOWPAN_CONF_COMPRESSION_HC01

instead of using the global SICSLOWPAN_COMPRESSION_LEVEL definitions
 2015-03-24 11:40:32 +01:00
Gaëtan Harter
60719b8239 Remove unused SICSLOWPAN_CONF_CONVENTIONAL_MAC 2015-03-24 11:18:25 +01:00
Harald Pichler
560117e8f3 Merge branch 'contiki' into osd 2015-03-23 13:07:28 +01:00
Harald Pichler
0097d192be move dht11 define to project.conf 2015-03-23 13:03:32 +01:00
Antonio Lignan
64fd000e5d Removed duplicated condition in sht25 configuration 2015-03-11 14:25:23 +01:00
Antonio Lignan
1af29a5beb Added SHT25 sensor 2015-03-10 15:33:58 +01:00
George Oikonomou
cd219e206c Adjust the cc2538dk readme to reflect travis test changes 2015-03-02 08:41:53 +00:00
George Oikonomou
0ba7f8df52 Merge pull request #951 from hrzr/master 
Make the CC2538DK button sensor clearer to work with
 2015-02-28 15:14:53 +00:00
Jonas Olsson
c9071b6952 Add CC26xx common platform files 2015-02-25 13:12:20 +01:00
Jonas Olsson
b385933fa8 Add SensorTag CC2650 files 2015-02-25 13:11:09 +01:00
Jonas Olsson
c7d85c3ea5 Add Srf06EB + CC26xx EM files 2015-02-25 13:10:26 +01:00
Oliver Schmidt
da536cb07c Removed superfluous AppleCommander parameters. 2015-02-21 17:16:08 +01:00
Mikhail Gaivoronskii
3f2869824c Uncrustified platform/cc2538dk/dev/button-sensor.c 2015-02-20 21:53:33 +05:00
Harald Pichler
d31ecbf486 Merge branch 'contiki' into osd 2015-02-18 10:04:47 +01:00
Nicolas Tsiftes
e58aae1dcd Merge pull request #950 from patoman007/master 
Fix: Misconfigurations to compile for avr-zigbit platform
 2015-02-17 09:41:20 +01:00
George Oikonomou
6bd8bb05f6 Improve wording 2015-02-16 10:17:58 +01:00
George Oikonomou
72914369e8 Re-structure CC2538 doxygen module hierarchy 2015-02-16 10:17:58 +01:00
George Oikonomou
8751e55c94 Improve wording, fix warnigs in the SSI/SPI docs 2015-02-16 10:17:58 +01:00
George Oikonomou
b6bd556805 Fix clock.h warnings caused by multiple, conflicting documentation blocks of clock functions 2015-02-15 21:48:30 +01:00
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