Antonio Lignan
26c4a81331
Z1: cleaned up non-required libraries from builds and moved SENSORS declaration to its own file
2016-08-24 16:05:38 +02:00
Antonio Lignan
8cc1870663
Zoul: generic servo driver
2016-08-24 14:27:41 +02:00
Harald Pichler
37ea128d65
Merge branch 'osd'
...
Conflicts:
cpu/avr/dev/button-sensor.c
2016-08-24 08:07:33 +02:00
Harald
c7de6343d9
Merge pull request #5 from piccaso/max-age
...
Triggerboard: set max-age header
2016-08-24 07:54:13 +02:00
Sumankumar Panchal
25dea7264a
CC2520: Added offset to calculate correct RSSI value
2016-08-24 10:21:14 +05:30
Flo
eeb90bab77
gets rid of 'deprecated conversion from string constant to char*'
2016-08-24 00:59:47 +02:00
Michael LeMay
c276081150
galileo: Add process to perform DHCP configuration
...
This patch adds a process that is started automatically to request DHCP
configuration. It also moves the IP configuration ahead of autostart processes
in case some autostart process depends on the IP configuration.
2016-08-23 13:16:39 -07:00
Michael LeMay
4181179985
galileo: Add support for Gen. 1 pinmux and GPIO
...
This patch adds support for IO pinmuxing and GPIO on first generation
Intel Galileo boards.
2016-08-23 13:02:39 -07:00
Michael LeMay
b17a936bf7
galileo: Add board-level abstraction layer for GPIO
...
This patch adds a HAL for GPIOs so that users of the API can specify
board-level IO pin numbers rather than CPU-level pin numbers.
2016-08-23 13:02:36 -07:00
Michael LeMay
2912559061
galileo: Revise pinmux API to be more intuitive
...
This patch replaces the pinmux APIs that require users to look up an arbitrary
function number for the desired function of each pin. The replacement API
functions have intuitive names and permit users to pass board-level IO port
numbers. The API functions internally convert those to CPU-level port numbers
when necessary. Furthermore, when configuring a pin to be a digital input or
output, those API functions also perform the corresponding configuration
operation on the CPU-level GPIO port. The revised APIs halt when users attempt
to configure a currently-unsupported GPIO, specifically those in the GPIO_SUS
port range and those implemented on the expander chip EXP2. This also means
that such ports are left unconfigured during initialization, whereas the
pinmuxing for them was setup by the old implementation.
2016-08-23 13:02:32 -07:00
Michael LeMay
3043f3956c
galileo: Simplify pinmux configuration
...
This patch refactors the pinmux configuration code for Intel Galileo to simplify
it. This patch also corrects an off-by-one error in how the pin number is
checked in galileo_pinmux_set_pin.
2016-08-23 12:39:21 -07:00
Harald Pichler
ec34b8640c
bugfix dallas remove first space
2016-08-23 20:51:21 +02:00
Michael LeMay
6a3ce86e10
galileo: Add general protection exception handler
...
This patch adds a general protection exception handler that prints a
message indicating the faulting instruction and the error code. This is
useful when debugging general protection exceptions.
2016-08-23 11:34:32 -07:00
Flo
3af0cc460c
set max-age header
2016-08-22 22:53:01 +02:00
Harald Pichler
0190c261e2
use led1_on
2016-08-22 22:15:41 +02:00
Harald Pichler
6cf4e147ed
add noncoresec
2016-08-20 14:32:26 +02:00
Harald Pichler
8b887ca429
add button led bled to project
2016-08-20 14:09:44 +02:00
Harald Pichler
a70a51acc2
fake return value to 0 for better range, function rf230_cca have a bug
2016-08-19 18:18:09 +02:00
Harald Pichler
1d2447d69d
add noncorsec section
2016-08-18 17:30:39 +02:00
Harald Pichler
12e77a1e58
bugfix cca threshold
2016-08-18 17:26:37 +02:00
Antonio Lignan
6947fc7381
Merge pull request #1826 from alignan/pull/crossval-fix
...
Zoul: fixed voltage divider relationship
2016-08-17 17:33:07 +02:00
George Oikonomou
6f44fb8c44
Merge pull request #1783 from g-oikonomou/bugfix/cc13xx/contikimac-timings
...
Adjust ContikiMAC timings for CC13xx PROP mode
2016-08-17 14:06:07 +01:00
Antonio Lignan
cb42bafbfb
Merge pull request #1756 from g-oikonomou/contrib/cc26xx/new-ccxxwares
...
Update to latest TI CC13xxware/CC26xxware
2016-08-16 15:44:41 +02:00
Nicolas Tsiftes
4c7d8d0214
Merge pull request #1739 from simonduq/pr/tsch-seqno
...
Improved TSCH sequence number handling
2016-08-16 14:49:21 +02:00
Nicolas Tsiftes
9fa777d4f4
Merge pull request #1738 from simonduq/pr/mac-seqno-timeout
...
mac-seqno: add a lifetime to sequence numbers in history
2016-08-16 14:48:21 +02:00
Antonio Lignan
7ddbe640be
Merge pull request #1795 from g-oikonomou/contrib/sensniff
...
Add generic sensniff example and remove legacy sniffers
2016-08-16 14:47:17 +02:00
Antonio Lignan
0a02f0ac7c
Zoul: fixed voltage divider relationship
2016-08-16 14:24:13 +02:00
Antonio Lignan
3550d43b47
Merge pull request #1794 from g-oikonomou/bugfix/cc13xx/prop-set-channel
...
Fix PROP mode channel switching
2016-08-16 12:57:43 +02:00
Harald Pichler
6c7dc58574
make it more flexible to user in other projects
2016-08-16 11:13:57 +02:00
Harald Pichler
d3431a0b54
bugfix contiki mac layer droped packets
2016-08-16 11:11:32 +02:00
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