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

12987 commits

This branch
This branch
All branches
Author SHA1 Message Date
Harald Pichler 91fcc28b12 Merge branch 'osd' of https://github.com/osdomotics/osd-contiki into osd 
Conflicts:
	cpu/avr/dev/button-sensor.c
 2016-08-16 10:38:46 +02:00
George Oikonomou acbc482e55 Merge pull request #1824 from bthebaudeau/cc2538-fix-garbled-uart 
cc2538: uart: Fix garbled output occurring upon lpm_enter()
 2016-08-16 08:47:09 +01:00
Harald Pichler cf40f59843 add pin status 2016-08-15 20:22:49 +02:00
Harald Pichler 265d4e8723 shorter button deflipping time 2016-08-15 18:34:37 +02:00
Benoît Thébaudeau a52a3d94d3 cc2538: uart: Fix garbled output occurring upon lpm_enter() 
lpm_enter() must not enter PM1+ if the UART is transmitting. Otherwise,
the UART clock gets disabled, and its TX is broken.

The commit b8b54a033c had already
partially fixed this issue, but it could still occur while transmitting
stop bits because, contrary to UART_FR.BUSY, UART_FR.TXFE takes only the
data bits into account, not the stop bits.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-08-15 03:07:52 +02:00
Ralf Schlatterbeck 28cb276c70 Merge branch 'osd' 
Conflicts:
	apps/arduino/arduino-process.c
	apps/arduino/arduino-process.h
	apps/json-resource/generic_resource.c
	apps/json-resource/generic_resource.h
	apps/time/Makefile.time
	apps/time/resource_gmtime.c
	apps/time/resource_timestamp.c
	apps/time/time.c
	apps/time/time_resource.h
	core/dev/leds.c
	core/lib/petsciiconv.c
	core/net/ip/resolv.c
	core/net/ip/slipdev.c
	core/net/ip/tcpip.c
	core/net/ipv4/uip.c
	core/net/ipv6/uip-ds6.c
	core/net/mac/contikimac/contikimac.c
	core/net/mac/frame802154.h
	core/net/mac/framer-802154.c
	core/net/mac/nullrdc.c
	core/net/rpl/rpl-dag.c
	core/net/rpl/rpl-ext-header.c
	core/net/rpl/rpl-icmp6.c
	core/net/rpl/rpl-mrhof.c
	core/net/rpl/rpl-of0.c
	core/net/rpl/rpl-timers.c
	core/net/rpl/rpl.c
	cpu/avr/Makefile.avr
	cpu/avr/dev/lanc111.c
	cpu/avr/radio/rf230bb/halbb.c
	dev/arduino/arduino-compat.h
	examples/osd/.gitignore
	examples/osd/arduino-dooralert/Makefile
	examples/osd/arduino-dooralert/flash.sh
	examples/osd/arduino-dooralert/run.sh
	examples/osd/arduino-dooralert/sketch.pde
	examples/osd/arduino-merkurboard/Makefile
	examples/osd/arduino-merkurboard/README.md
	examples/osd/arduino-merkurboard/flash.sh
	examples/osd/arduino-merkurboard/project-conf.h
	examples/osd/arduino-merkurboard/run.sh
	examples/osd/arduino-plantobserving/Makefile
	examples/osd/arduino-plantobserving/flash.sh
	examples/osd/arduino-plantobserving/project-conf.h
	examples/osd/arduino-plantobserving/run.sh
	examples/osd/arduino-plantobserving/sketch.pde
	examples/osd/arduino-roomalert/Makefile
	examples/osd/arduino-roomalert/flash.sh
	examples/osd/arduino-roomalert/run.sh
	examples/osd/arduino-roomalert/sketch.pde
	examples/osd/arduino-sketch/Makefile
	examples/osd/arduino-sketch/flash.sh
	examples/osd/arduino-sketch/led_pwm.h
	examples/osd/arduino-sketch/resource_led_pwm.c
	examples/osd/arduino-sketch/run.sh
	examples/osd/arduino-sketch/sketch.pde
	examples/osd/arduino-wateralert/Makefile
	examples/osd/arduino-wateralert/flash.sh
	examples/osd/arduino-wateralert/run.sh
	examples/osd/arduino-wateralert/sketch.pde
	examples/osd/climate/Makefile
	examples/osd/climate/er-example-server.c
	examples/osd/climate/flash.sh
	examples/osd/climate/project-conf.h
	examples/osd/climate/run.sh
	examples/osd/climate/server-only.csc
	examples/osd/climate2/Makefile
	examples/osd/climate2/er-example-server.c
	examples/osd/climate2/flash.sh
	examples/osd/climate2/project-conf.h
	examples/osd/climate2/run.sh
	examples/osd/climate2/server-only.csc
	examples/osd/dual-rgbw-actor/Makefile
	examples/osd/dual-rgbw-actor/flash.sh
	examples/osd/dual-rgbw-actor/run.sh
	examples/osd/dual-rgbw-actor/server-client.csc
	examples/osd/dual-rgbw-actor/server-only.csc
	examples/osd/embedd-vm-merkurboard/Makefile
	examples/osd/embedd-vm-merkurboard/embedd-vm-server.c
	examples/osd/embedd-vm-merkurboard/flash.sh
	examples/osd/embedd-vm-merkurboard/run.sh
	examples/osd/embedd-vm-merkurboard/server-only.csc
	examples/osd/er-rest-example-merkurboard/Makefile
	examples/osd/er-rest-example-merkurboard/README.md
	examples/osd/er-rest-example-merkurboard/er-example-client.c
	examples/osd/er-rest-example-merkurboard/er-example-server.c
	examples/osd/er-rest-example-merkurboard/er-plugtest-server.c
	examples/osd/er-rest-example-merkurboard/flash.sh
	examples/osd/er-rest-example-merkurboard/flashclient.sh
	examples/osd/er-rest-example-merkurboard/project-conf.h
	examples/osd/er-rest-example-merkurboard/run.sh
	examples/osd/er-rest-example-merkurboard/runclient.sh
	examples/osd/er-rest-example-merkurboard/server-client.csc
	examples/osd/light-actor/Makefile
	examples/osd/light-actor/er-example-server.c
	examples/osd/light-actor/flash.sh
	examples/osd/light-actor/pcintkey.c
	examples/osd/light-actor/project-conf.h
	examples/osd/light-actor/run.sh
	examples/osd/light-actor/server-only.csc
	examples/osd/light-shutter-control/Makefile
	examples/osd/light-shutter-control/flash.sh
	examples/osd/light-shutter-control/pcintkey.c
	examples/osd/light-shutter-control/run.sh
	examples/osd/light-shutter-control/server-only.csc
	examples/osd/merkurboard/Makefile
	examples/osd/merkurboard/README.md
	examples/osd/merkurboard/er-example-client.c
	examples/osd/merkurboard/er-example-server.c
	examples/osd/merkurboard/er-plugtest-server.c
	examples/osd/merkurboard/flash.sh
	examples/osd/merkurboard/flashclient.sh
	examples/osd/merkurboard/project-conf.h
	examples/osd/merkurboard/run.sh
	examples/osd/merkurboard/runclient.sh
	examples/osd/native-border-router/Makefile
	examples/osd/native-border-router/border-router-cmds.c
	examples/osd/native-border-router/border-router-cmds.h
	examples/osd/native-border-router/border-router-rdc.c
	examples/osd/native-border-router/border-router.c
	examples/osd/native-border-router/border-router.h
	examples/osd/native-border-router/project-conf.h
	examples/osd/native-border-router/slip-config.c
	examples/osd/native-border-router/slip-dev.c
	examples/osd/native-border-router/tun-bridge.c
	examples/osd/pingtheplug/Makefile
	examples/osd/pingtheplug/er-example-server.c
	examples/osd/pingtheplug/flash.sh
	examples/osd/pingtheplug/pcintkey.c
	examples/osd/pingtheplug/run.sh
	examples/osd/pingtheplug/server-only.csc
	examples/osd/pir-sensor/Makefile
	examples/osd/pir-sensor/flash.sh
	examples/osd/pir-sensor/run.sh
	examples/osd/pir-sensor/server-client.csc
	examples/osd/pir-sensor/server-only.csc
	examples/osd/powerbox/Makefile
	examples/osd/powerbox/er-example-server.c
	examples/osd/powerbox/flash.sh
	examples/osd/powerbox/run.sh
	examples/osd/powerbox/server-only.csc
	examples/osd/pwm-example/Makefile
	examples/osd/pwm-example/er-example-server.c
	examples/osd/pwm-example/flash.sh
	examples/osd/pwm-example/led_pwm.h
	examples/osd/pwm-example/resource_led_pwm.c
	examples/osd/pwm-example/run.sh
	examples/osd/rpl-border-router/Makefile
	examples/osd/rpl-border-router/border-router.c
	examples/osd/rpl-border-router/flash.sh
	examples/osd/rpl-border-router/project-conf.h
	examples/osd/rpl-border-router/run.sh
	examples/osd/rpl-border-router/slip-bridge.c
	examples/osd/runall.sh
	examples/osd/servo-sensor/Makefile
	examples/osd/servo-sensor/er-example-server.c
	examples/osd/servo-sensor/flash.sh
	examples/osd/servo-sensor/project-conf.h
	examples/osd/servo-sensor/run.sh
	examples/osd/servo-sensor/server-client.csc
	examples/osd/servo-sensor/server-only.csc
	examples/osd/slip-radio/Makefile
	examples/osd/slip-radio/flash.sh
	examples/osd/slip-radio/no-framer.c
	examples/osd/slip-radio/project-conf.h
	examples/osd/slip-radio/run.sh
	examples/osd/slip-radio/slip-net.c
	examples/osd/slip-radio/slip-radio-cc2420.c
	examples/osd/slip-radio/slip-radio-sky-sensors.c
	examples/osd/slip-radio/slip-radio.c
	examples/osd/slip-radio/slip-radio.h
	examples/osd/wallclock-time/Makefile
	examples/osd/wallclock-time/flash.sh
	examples/osd/wallclock-time/run.sh
	examples/osd/wirelessplug/Makefile
	examples/osd/wirelessplug/flash.sh
	examples/osd/wirelessplug/run.sh
	examples/osd/wirelessplug/server-client.csc
	examples/osd/wirelessplug/server-only.csc
	platform/avr-atmega128rfa1/apps/raven-lcd-interface/raven-lcd.c
	platform/avr-raven/apps/raven-lcd-interface/raven-lcd.c
	tools/tunslip6.c
 2016-08-12 22:04:56 +02:00
Ralf Schlatterbeck 50a34d1235 Fix whitespace 2016-08-12 22:03:44 +02:00
George Oikonomou 3e7177dcc8 Add sensniff example README 2016-08-12 15:58:02 +01:00
George Oikonomou 20dc86c039 Add sensniff travis tests 2016-08-12 15:58:02 +01:00
George Oikonomou ac2dcb8b03 Add sensniff example Makefile 2016-08-12 15:58:02 +01:00
George Oikonomou 4922925c07 Add sensniff support: ev-aducrf101mkxz 2016-08-12 15:58:02 +01:00
George Oikonomou 166f90e4df Add sensniff support: zoul 2016-08-12 15:58:02 +01:00
George Oikonomou 9e91a3832d Merge pull request #1820 from alignan/pull/motelist-firefly 
Zoul: added firefly to motelist targets
 2016-08-12 13:38:12 +01:00
Yasuyuki Tanaka 8bca703282 Remove RPL_CONF_WITH_NON_STORING definition 2016-08-12 14:05:14 +02:00
Antonio Lignan 23eb3756c0 Zoul: added firefly to motelist targets 2016-08-12 13:21:09 +02:00
Antonio Lignan 1cd39a2621 Merge pull request #1780 from g-oikonomou/bugfix/cc2538/sniffer 
Don't flush the CC2538 RF RX FIFO unconditionally
 2016-08-12 12:09:12 +02:00
Harald Pichler 70172a9eb8 Merge branch 'osd' of https://github.com/osdomotics/osd-contiki into osd 2016-08-12 07:50:23 +02:00
Harald Pichler 9408743938 move to arduino app 2016-08-12 07:50:17 +02:00
Harald Pichler 6e67d1415c shorter button flipping test 2016-08-12 07:46:30 +02:00
George Oikonomou d8fcaf9dec Add sensniff support: z1 2016-08-12 01:23:51 +01:00
George Oikonomou 3cebc42a2a Add sensniff support: cc13xx/cc26xx 2016-08-12 01:23:51 +01:00
George Oikonomou 525bafcc3c Add sensniff support: openmote-cc2538 2016-08-12 01:23:51 +01:00
George Oikonomou 63941d849a Add sensniff support: jn516x 2016-08-12 01:23:51 +01:00
George Oikonomou 690c299bb0 Add sensniff support: cc2538dk 2016-08-12 01:23:51 +01:00
George Oikonomou 1e6730758d Add sensniff support: cc2530dk 2016-08-12 01:23:51 +01:00
George Oikonomou c5a3a4e05e Add off-the-shelf sensniff drivers 
Can be re-used by any platform that uses any of those CPUs
 2016-08-12 01:23:51 +01:00
George Oikonomou a8dcb6566e Add sensniff example core files 2016-08-12 01:23:51 +01:00
George Oikonomou 39e8435141 Add 460800 baud rate support to Z1 2016-08-12 01:23:50 +01:00
George Oikonomou 983a618a36 Extend CC13xx PROP mode driver 
We now write a dummy LQI in read() and we also add support for `RADIO_PARAM_RX_MODE` in `set_value()`
 2016-08-12 01:23:50 +01:00
George Oikonomou d7028652fe Remove legacy sniffer configuration: zoul 2016-08-12 01:23:50 +01:00
George Oikonomou 35c37f356c Remove legacy sniffer configuration: openmote-cc2538 2016-08-12 01:23:50 +01:00
George Oikonomou 4a4b3a344d Remove legacy sniffer configuration: cc2538dk 2016-08-12 01:23:50 +01:00
George Oikonomou 07f984eec2 Remove legacy sniffer references: Docs 2016-08-12 01:23:50 +01:00
George Oikonomou 63417cba0e Remove legacy zoul/CC1200 sniffer example 2016-08-12 01:23:50 +01:00
George Oikonomou 32e4f0f432 Remove legacy CC2538 sniffer example 2016-08-12 01:23:50 +01:00
George Oikonomou fa769b98e9 Remove legacy CC2530 sniffer example 2016-08-12 01:23:49 +01:00
George Oikonomou b0672713bb Remove built-in sniffer support: aducrf101 2016-08-12 01:23:49 +01:00
George Oikonomou a932dfa6df Remove built-in sniffer support: CC2538 2016-08-12 01:23:49 +01:00
George Oikonomou a52d50f332 Remove built-in sniffer support: CC1200 2016-08-12 01:23:49 +01:00
George Oikonomou dbd4f630fd Remove built-in sniffer support: CC13xx PROP mode 2016-08-12 01:23:49 +01:00
George Oikonomou 0de1dc1025 Remove built-in sniffer support: CC2530 2016-08-12 01:23:49 +01:00
George Oikonomou 1a4947499c Merge pull request #1819 from bthebaudeau/cc2538-en-32k-xtal 
CC2538: Use the 32.768-kHz crystal if present
 2016-08-11 23:48:04 +01:00
George Oikonomou 47265c9305 Merge pull request #1813 from arurke/cc26xx_cc13xx_i2c_fixes 
CC26xx/CC13xx fix for burst TX followed by burst RX
 2016-08-11 23:47:42 +01:00
Harald Pichler c42a75d9d6 optimize power consumtion 2016-08-11 23:49:45 +02:00
Benoît Thébaudeau 9e03df6cb7 CC2538: Use the 32.768-kHz crystal if present 
Enable the 32.768-kHz crystal on all the CC2538 platforms where it is
present in order to get a better time accuracy.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-08-11 23:49:03 +02:00
Harald Pichler 6a2d13216a add mcu_sleep_off and on 2016-08-11 19:46:33 +02:00
Nicolas Tsiftes 209e16890b Merge pull request #1815 from bthebaudeau/fix-dox-orphan-mods 
doxygen: Fix orphan modules
 2016-08-11 15:14:35 +02:00
Harald Pichler 542a921e3f initial uplaod 2016-08-11 14:04:29 +02:00
Benoît Thébaudeau ae5205f9e2 doxygen: Fix orphan modules 
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-08-10 04:56:15 +02:00
Andreas Urke 8128986ccd Remove unecessary bool 2016-08-09 22:56:53 +02:00