Harald Pichler
5b288a5777
Merge branch 'osd'
2016-09-08 10:33:24 +02:00
Harald Pichler
34a9135f83
activate reciver on
2016-09-01 09:34:57 +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
Flo
eeb90bab77
gets rid of 'deprecated conversion from string constant to char*'
2016-08-24 00:59:47 +02:00
Harald Pichler
ec34b8640c
bugfix dallas remove first space
2016-08-23 20:51:21 +02: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
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
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
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
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
Harald Pichler
c42a75d9d6
optimize power consumtion
2016-08-11 23:49:45 +02:00
Harald Pichler
6a2d13216a
add mcu_sleep_off and on
2016-08-11 19:46:33 +02:00
Harald Pichler
542a921e3f
initial uplaod
2016-08-11 14:04:29 +02:00
Harald Pichler
8402b1c151
initial upload, add button
2016-08-03 21:58:02 +02:00
Harald Pichler
e534bcaa25
bugfix dht11 config
2016-07-04 20:26:06 +02:00
Harald Pichler
349f6bf429
Merge branch 'contiki' into osd
2016-06-29 09:04:54 +02:00
Harald Pichler
d408da5be5
bugfix merge
2016-06-29 07:50:41 +02:00
George Oikonomou
91255f5a81
Merge pull request #1711 from xukai871105/master
...
One fix to sensorTag board_i2c.c
2016-06-28 23:55:02 +01:00
George Oikonomou
a509aa7136
Merge pull request #1689 from kqorany/kqorany-esmrf
...
A new multicast engine called ESMRF for RPL
2016-06-28 23:23:30 +01:00
George Oikonomou
5e66770aaf
Merge pull request #1734 from yatch/pr/pr-fix-mcast6-macro
...
Fix the source address selection for multicast packets
2016-06-28 23:22:08 +01:00
George Oikonomou
ef8c97f46d
Merge pull request #1746 from g-oikonomou/bugfix/cc26xx/fast-startup-off
...
Disable CC2650_FAST_RADIO_STARTUP by default
2016-06-28 16:15:45 +01:00
Harald Pichler
3c8e91d74e
cleanup confilicrts
2016-06-28 16:37:16 +02:00
Harald Pichler
978ef63002
cleanup debugpronts
2016-06-28 14:08:38 +02:00
George Oikonomou
3a105f2141
Disable CC2650_FAST_RADIO_STARTUP by default
...
`CC2650_FAST_RADIO_STARTUP` is required for TSCH, but it currently breaks ContikiMAC. We set the default value to the one that will work with the default choice of RDC.
Fixes #1744
2016-06-27 17:20:26 +01:00
Benoît Thébaudeau
01a533fb75
Merge pull request #1704 from kkrentz/cc2538-aes-fixes
...
One fix to CC2538 hardware security
2016-06-25 01:30:16 +02:00
Antonio Lignan
6a2d802b9a
Merge pull request #1737 from bthebaudeau/cc2538-fix-missing-result-av
...
cc2538: aes: Fix possibly missing result available status
2016-06-25 00:14:29 +02:00
George Oikonomou
5a9b493d2b
Merge pull request #1743 from alignan/pull/update-cc2538-bsl
...
Updated cc2538-bsl to version 2.1 (c6100a7)
2016-06-24 23:12:18 +01:00
Antonio Lignan
bc8b6cd8ed
Updated cc2538-bsl to version 2.1 (c6100a7)
2016-06-24 22:10:39 +02:00
Antonio Lignan
f0b19a18a9
Merge pull request #1732 from bthebaudeau/cc2538-flash-conf-fw-coffee
...
cc2538: Add configuration for firmware location
2016-06-24 18:44:16 +02:00
kkrentz
c28b6fb7ba
CC2538: Reboot if the crypto engine fails (error handling is too hard)
2016-06-24 01:50:27 -07:00
Benoît Thébaudeau
1da00a482f
cc2538: aes: Fix possibly missing result available status
...
Depending on the use case and on the timings,
aes_auth_crypt_check_status() sometimes never reported an available
result, leading to a deadlock of any protothread waiting for this event,
and to a WDT reset if a protothread was polling it.
This was caused by aes_auth_crypt_start() clearing the result available
interrupt after operations that may rightfully trigger it, leading to a
missed interrupt.
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2016-06-23 22:25:27 +02:00
Benoît Thébaudeau
8fd7719c07
noncoresec: Fix build errors with DEBUG set to 1
...
Fix these build errors, which are generated if DEBUG is set to 1:
../../core/net/llsec/noncoresec/noncoresec.c: In function 'parse':
../../core/net/llsec/noncoresec/noncoresec.c:198:54: error: expected ')' before 'PRIu32'
PRINTF("noncoresec: received unauthentic frame %"PRIu32"\n",
^
../../core/net/llsec/noncoresec/noncoresec.c:88:28: note: in definition of macro 'PRINTF'
#define PRINTF(...) printf(__VA_ARGS__)
^
../../core/net/llsec/noncoresec/noncoresec.c:198:12: warning: spurious trailing '%' in format [-Wformat=]
PRINTF("noncoresec: received unauthentic frame %"PRIu32"\n",
^
../../core/net/llsec/noncoresec/noncoresec.c:88:28: note: in definition of macro 'PRINTF'
#define PRINTF(...) printf(__VA_ARGS__)
^
../../core/net/llsec/noncoresec/noncoresec.c:198:12: warning: spurious trailing '%' in format [-Wformat=]
PRINTF("noncoresec: received unauthentic frame %"PRIu32"\n",
^
../../core/net/llsec/noncoresec/noncoresec.c:88:28: note: in definition of macro 'PRINTF'
#define PRINTF(...) printf(__VA_ARGS__)
^
../../core/net/llsec/noncoresec/noncoresec.c:231:54: error: expected ')' before 'PRIu32'
PRINTF("noncoresec: received replayed frame %"PRIu32"\n",
^
../../core/net/llsec/noncoresec/noncoresec.c:88:28: note: in definition of macro 'PRINTF'
#define PRINTF(...) printf(__VA_ARGS__)
^
../../core/net/llsec/noncoresec/noncoresec.c:231:15: warning: spurious trailing '%' in format [-Wformat=]
PRINTF("noncoresec: received replayed frame %"PRIu32"\n",
^
../../core/net/llsec/noncoresec/noncoresec.c:88:28: note: in definition of macro 'PRINTF'
#define PRINTF(...) printf(__VA_ARGS__)
^
../../core/net/llsec/noncoresec/noncoresec.c:231:15: warning: spurious trailing '%' in format [-Wformat=]
PRINTF("noncoresec: received replayed frame %"PRIu32"\n",
^
../../core/net/llsec/noncoresec/noncoresec.c:88:28: note: in definition of macro 'PRINTF'
#define PRINTF(...) printf(__VA_ARGS__)
^
PRIu32 is not defined, so replace it with a standard format directive.
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2016-06-23 22:10:43 +02:00
Yasuyuki Tanaka
e5ac3df7e1
Include uip-mcast6.h to refer to UIP_IPV6_MULTICAST
2016-06-20 16:35:09 +02:00
Yasuyuki Tanaka
ca3a4726d1
Rename two macros related to multicast, which are not user configuration
...
- UIP_CONF_IPV6_MULTICAST -> UIP_IPV6_MULTICAST
- RPL_CONF_MULTICAST -> RPL_WITH_MULTICAST
2016-06-20 16:35:09 +02:00
Yasuyuki Tanaka
704847db04
Fix a typo, UIP_IPV6_CONF_MULTICAST, in a comment with UIP_CONF_IPV6_MULTICAST
2016-06-20 16:35:09 +02:00
Yasuyuki Tanaka
b074e5c3e0
Replece UIP_IPV6_MULTICAST_RPL in a comment with RPL_CONF_MULTICAST
2016-06-20 16:35:09 +02:00
Benoît Thébaudeau
8a273a248e
cc2538: Add configuration for firmware location
...
Introduce FLASH_CONF_FW_ADDR and FLASH_CONF_FW_SIZE in order to make it
possible to place the firmware anywhere, regardless of Coffee, and
without having to write a custom linker script. Also, handle the default
values properly in order to fix the link breakage reported by
Arthur Fabre <arthur@arthurfabre.com> with COFFEE_CONF_CUSTOM_PORT.
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2016-06-19 23:12:02 +02:00
