Commit graph

1030 commits

Author SHA1 Message Date
Benoît Thébaudeau e8a268cd15 cc2538: aes: Add support for 192- and 256-bit keys
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-06-02 21:41:56 +02:00
Benoît Thébaudeau 801315e819 cc2538: aes: Make it possible to have several keys stored at once
Several keys can be kept at the same time in the key store, and several
keys can be loaded at once. Give access to these features.

The ccm-test example is also improved to better demonstrate the use of
the key store.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-06-02 21:41:07 +02:00
Benoît Thébaudeau b92a5afcc4 cc2538: ccm: Make it possible to use the interrupt
Using the AES interrupt allows the user process not to waste time
polling for the completion of the operation. This time can be used by
the user process to do something else, or to let the system enter PM0.

Since the system is now free to perform various operations during a
crypto operation, a protection of the crypto resource is added, and PM1+
is prohibited in order not to stall crypto operations.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-06-02 21:41:07 +02:00
Benoît Thébaudeau 117dc4e5e3 cc2538: Add crypto drivers and examples for AES-CCM and SHA-256
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-06-02 21:41:06 +02:00
Antonio Lignan 330e450ba4 Zolertia Re-Mote platform ported to Contiki, developed whitin RERUM FP7 European project (grant #609094).
The port was done jointly by Zolertia and George Oikonomou (University of Bristol).
2015-05-29 22:04:43 +02:00
Antonio Lignan 2cee62eb33 Merge pull request #1074 from g-oikonomou/cc26xx/contrib/new-cc26xxware
Update to latest CC26xxware and add it as a submodule
2015-05-21 10:01:00 +02:00
Adam Dunkels 730bda2001 Merge pull request #883 from cmorty/pull/global-macros
Move MAX, MIN and ABS to contiki-macros
2015-05-18 21:33:00 +02:00
Moritz 'Morty' Strübe 0dab6926b3 Move MAX, MIN and ABS to sys/cc.h 2015-05-18 08:53:17 +02:00
George Oikonomou 5f4154a0e3 Adjust AON BatMon usage 2015-05-17 14:09:51 +01:00
Antonio Lignan 32afadea77 Merge pull request #1047 from g-oikonomou/cc26xx/contrib/lpm
CC26xx Ultra Low Power Operation
2015-05-16 10:27:22 +02:00
Antonio Lignan 402eabecca Merge pull request #929 from lab11/delete-old-coap
Delete old CoAP implementation
2015-05-15 15:49:04 +02:00
George Oikonomou 7e00eeb76a Achieve lowest consumption with the CC26xx demo:
This changes the CC26xx simple demo so that a devices running this firmware will achieve the lowest possible energy consumption without requiring any changes to the example
2015-05-15 09:21:05 +01:00
George Oikonomou 421fbfae25 Change the LPM locks API:
Instead of using a separate data structure to request that a PD remain powered during deep sleep,
we do the same within the main LPM data structure through an additional field.

This allows us to maintain only one linked list of LPM modules and overall improves code clarity
2015-05-15 09:21:02 +01:00
George Oikonomou 00a6c31158 Improve OPT sensor driver and usage
* Query the sensor about its state, rather than using variables in the driver
* Correctly put the sensor to deep sleep
* Fix doxygen comments
* Don't turn off the sensor in examples since it is no longer needed
2015-05-15 09:20:59 +01:00
Antonio Lignan b50ae639b3 Merge pull request #986 from g-oikonomou/cc26xx-hdc-sensor
Replace STH21 with HDC1000 for the CC2650 SensorTag
2015-05-15 10:12:08 +02:00
Brad Campbell 869768902b seedeye powerswitch: update coap
The powerswitch app was using old an older implementation of er-coap.
This updates it.
2015-05-14 17:20:46 -04:00
Brad Campbell 6eaada0c3f Delete old CoAP implementation
It seems that this implementation of CoAP in Contiki is no longer
maintained in favor of the `er-coap` implementation. This commit
removes the code to prevent confusion and further bit-rot.
2015-05-14 17:20:46 -04:00
Benoît Thébaudeau d64927397f Merge pull request #968 from g-oikonomou/cc2538-contrib-on-chip-sensors
Move CC2538 VDD/3 and On-Chip Temp sensors to the CPU dir
2015-05-14 19:21:56 +02:00
George Oikonomou e4722bb0ea Replace SHT21 with HDC1000 in the web demo 2015-05-14 13:20:39 +01:00
George Oikonomou 62f978b993 Replace SHT21 with HDC1000 in the simple demo 2015-05-14 13:20:39 +01:00
George Oikonomou 11a5e0a49a Merge pull request #1051 from simonduq/fix-warning
Fixed a number of compiler warnings
2015-05-13 00:52:40 +01:00
George Oikonomou 49d1782a06 Adjust the MQTT demo to use re-engineered sensors 2015-05-12 23:42:20 +01:00
George Oikonomou ac459df128 Re-work the CC2538 demo to use the 3 separate ADC sensors 2015-05-12 23:42:20 +01:00
Simon Duquennoy 1ac5d85042 Enable NA in examples that need it 2015-05-10 19:56:38 +02: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
Adam Dunkels bc222ed85c Code for building an IP64 router 2015-05-10 10:51:11 +02:00
Adam Dunkels 33372945a3 HTTP socket code with support for GET and POST 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 6e3197b0bf Merge pull request #1008 from g-oikonomou/cc26xx/contrib/web-demo-httpd
Improve HTTPD in the CC26xx web demo
2015-05-09 22:46:26 +01:00
George Oikonomou bd5e35c968 Merge pull request #1052 from simonduq/packetbuf-cleanup
Packetbuf cleanup
2015-05-09 22:30:21 +01:00
George Oikonomou 33526be5ab Merge pull request #985 from g-oikonomou/cc26xx-minor-updates
Minor Updates to the CC26xx Port
2015-05-09 22:29:30 +01:00
George Oikonomou 38b3b8b74a Merge pull request #981 from g-oikonomou/cc2538-sniffer-fix
Turn on the CC2538 RF explicitly in the sniffer example
2015-05-09 21:56:23 +01:00
Simon Duquennoy 4a93f5148d Fixed a number of compiler warnings 2015-05-08 09:07:20 +02:00
Simon Duquennoy 290fc829ea Consistently use PACKETBUF_ATTR_MAC_SEQNO for MAC sequence number, both input and output. Disable PACKETBUF_ATTR_PACKET_ID in the non-Rime case. 2015-05-06 16:34:44 +02: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 f83c4e7286 Improve code style 2015-05-03 22:36:03 +01:00
Nicolas Tsiftes f7ca4b41a9 Merge pull request #1001 from adamdunkels/pr/queuebuf-no-ref
Cleanup: remove the obsolete reference packetbuf
2015-05-03 16:35:17 +02:00
George Oikonomou a72d90e283 Control TCP MSS in the project's conf 2015-05-03 13:31:03 +01:00
Adam Dunkels 7acf747c1a Removed packetbuf references. This was a feature that is not used anymore and only made the code more complex. 2015-04-01 21:33:02 +02:00
Antonio Lignan b9334a3b0e Added Reed Sensor driver and example 2015-03-30 10:30:09 +02:00
George Oikonomou 7730215f99 Point all form action attributes to the current html page 2015-03-27 20:18:58 +00:00
George Oikonomou 7637164ae7 Parse filename for POST requests
so we can return it in the "Location:" header subsequently
2015-03-27 20:18:58 +00:00
George Oikonomou 54c1cd05e8 Simplify the page name to script mapping 2015-03-27 20:18:58 +00:00
George Oikonomou 90a3cd8e14 Change the way we handle HTTP response headers 2015-03-27 20:18:58 +00:00
George Oikonomou 733378679f Prettify httpd top matter in the web demo 2015-03-27 20:11:44 +00:00
Antonio Lignan 1af29a5beb Added SHT25 sensor 2015-03-10 15:33:58 +01:00
George Oikonomou 1fc06b6581 Turn on the CC2538 RF explicitly 2015-02-28 15:01:32 +00:00
Nicolas Tsiftes bfd2a90e08 Merge pull request #933 from alessandrelli/coap-observe-client
Erbium: client-side support for CoAP Observe
2015-02-26 10:06:58 +01:00
Jonas Olsson 0f567e499f Add CC26xx examples 2015-02-25 13:15:35 +01:00
Daniele Alessandrelli b6e716233a er-coap-example: add example for client-side CoAP observe 2015-02-24 22:48:12 +01:00
Jonas Olsson 2bb7fcc0cb Fixed doxygen formatting 2015-02-17 16:11:45 +01:00
Jonas Olsson 4fb2bd410f Add title to doxygen group 2015-02-17 16:07:37 +01:00
Jonas Olsson 6112ec54d3 Add MQTT demo for the cc2538dk platform 2015-02-17 15:58:50 +01:00
George Oikonomou 72914369e8 Re-structure CC2538 doxygen module hierarchy 2015-02-16 10:17:58 +01:00
Michael Richardson 5699127c9a additional edits to further clarify interface between native-border-router and slip-radio 2015-02-07 10:51:41 -05:00
Michael Richardson a0ac6bceb6 added some documentation of native-border-router and slip-radio relationship 2015-02-03 11:05:13 -05:00
Simon Duquennoy c2ca3e9fdb Cleanup UIP_CONF_IPV6_RPL configuration 2014-12-02 12:38:55 +01:00
Simon Duquennoy 74f6ae3751 slip-radio: remove unneeded definition of NETSTACK_CONF_WITH_RPL (now set from makefile with CONTIKI_WITH_RPL) 2014-12-01 21:04:25 +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 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 bb645b6287 Merge pull request #877 from gebart/for-upstream/rpl-border-router-webserver-tcp
examples/ipv6/rpl-border-router: Add -DUIP_CONF_TCP=1 to CFLAGS
2014-11-28 19:00:46 +01:00
Nicolas Tsiftes 4a41f147d3 Merge pull request #879 from alignan/fix_rssi_app
Fixed rssi scanner application and moved into single example
2014-11-28 19:00:23 +01:00
Antonio Lignan 4f744d858a Fixed rssi scanner application and moved into single example 2014-11-28 13:07:26 +01:00
Joakim Gebart 1e03cdd553 examples/ipv6/rpl-border-router: Add -DUIP_CONF_TCP=1 to CFLAGS
The example used to rely on the default value being set to 1 which
caused build failures on platforms which have a default UIP_CONF_TCP=0

Signed-off-by: Joakim Gebart <joakim.gebart@eistec.se>
2014-11-26 19:05:32 +01:00
Joakim Gebart 64a4755354 examples/webserver-ipv6: Add UIP_CONF_TCP=1 to DEFINES.
TCP is mandatory for this HTTP server.

Fixes builds for platforms which have TCP turned off by default (mulle)

Signed-off-by: Joakim Gebart <joakim.gebart@eistec.se>
2014-11-26 19:03:51 +01:00
Nicolas Tsiftes 6ca95ebc0c Merge pull request #811 from kkrentz/llsec-renaming
llsec renaming
2014-11-07 22:20:15 +01:00
Antonio Lignan ef6c351d0c Add function to change I2C baudrate and push relevant configuration values to platform config 2014-10-20 14:23:36 +02:00
Nicolas Tsiftes 27cde1ff81 Merge pull request #824 from alignan/fix_warnings
Warning fixes
2014-10-20 11:16:36 +02:00
Antonio Lignan c836fbfbd9 Fixes warnings, bad code and code style 2014-10-20 10:28:00 +02:00
kkrentz 0579e304e4 llsec: Renamed ccm to ccm_star & Renamed llsec regression test 2014-10-16 09:21:56 -07:00
Adam Dunkels d891d11324 Merge pull request #557 from kkrentz/llsec-integration
Integration of Link Layer Security
2014-10-08 15:45:46 +02:00
Joakim Gebart d4179a0a0c examples/rpl-border-router: Fix two minor warnings.
- Remove unused variable i in generate_routes.
 - Add cast to unsigned long for printf(..%lu..) in generate_routes.

Signed-off-by: Joakim Gebart <joakim.gebart@eistec.se>
2014-10-04 18:05:38 +02:00
Nicolas Tsiftes 7738cdd15e Avoid compilation warnings in Antelope. 2014-09-05 18:21:47 +02:00
Pablo Corbalan fab4f4144f Add SHT11 CoAP Resource and Activate Sensors for several CoAP Resources. 2014-08-25 11:36:31 +01:00
kkrentz 2cf7d98cad ContikiMAC: Create and parse ContikiMAC header in special framer; Expanded framer interface
to allow for creating and securing frames in advance; Create and secure frames in advance when sending bursts; Do neither recreate nor resecure frames that come from phase
2014-08-05 05:07:06 -07:00
kkrentz 2687c345cf llsec: CCM* encryption tests 2014-08-05 05:07:05 -07:00
kkrentz 5e6cf8da36 llsec: CCM* verification tests 2014-08-05 05:07:05 -07:00
kkrentz c396a85364 llsec: Added a layer in between NETSTACK_MAC and NETSTACK_NETWORK for implementing link layer security 2014-08-04 01:09:57 -07:00
Fredrik Österlind ed7e09ed5b Merge pull request #755 from sieben/SkyByteRadio
SkyByteRadio was replaced by Msp802154Radio
2014-07-24 09:15:45 +02:00
Rémy Léone 911f3aa07c SkyByteRadio was replaced by Msp802154Radio 2014-07-23 15:42:59 +02:00
Benjamin Cabé afcd5e5387 Add missing semi-colon 2014-07-16 21:37:47 +02:00
Antonio Lignan 5467674fcc Merges Z1SP into Z1 platform 2014-07-04 10:41:05 +02:00
Nicolas Tsiftes 24e260910c Merge pull request #718 from g-oikonomou/rpl-dodagid-compliance
Make DODAG ID selection RFC 6550-compliant
2014-06-13 15:33:56 +02:00
Adam Dunkels 14aedabffd Updated to match the new leds_toggle() API 2014-06-12 20:02:33 +02:00
George Oikonomou a9e7bea675 Make DODAG ID selection RFC 6550-compliant
Some calls to `rpl_set_root` select a hardcoded DODAG ID
(0x1111, 0x1100, 0, 0, 0, 0, 0, 0x0011)

This is against what RFC 6550 says. We change these calls
to select a DODAG ID corresponding to a routable v6 address
corresponding to the root
2014-06-12 00:09:53 +01:00
Adam Dunkels eceaf0c59b Merge pull request #631 from nfi/framer-len
Added function to framer that returns the estimated header length
2014-06-11 23:17:47 +02:00
Adam Dunkels 64f65b4e45 Merge pull request #617 from nfi/extended-radio-api
Extended radio API with support for setting channel, pan id, addressing modes, etc
2014-06-03 21:32:53 +02:00
Matthias Kovatsch 2683e13da5 Updated README and Makefile. 2014-05-15 20:29:05 +02:00
Matthias Kovatsch a26533f501 Updated Cooja simulations. 2014-05-15 20:29:05 +02:00
Lars Schmertmann 386d708b56 Added function for easy block1 usage.
Fixed blocksize calculation when REST_MAX_CHUNK_SIZE != 2^x.
Added example for block1 + separate + block2.
2014-05-15 20:29:04 +02:00
Lars Schmertmann bb737f85ae Used Uncrustify and fixed Travis build errors. 2014-05-15 20:29:04 +02:00
Matthias Kovatsch 3dd5bd7a37 Renamed erbium to er-coap to avoid confusion and have a meaningful directory name. 2014-05-15 20:29:03 +02:00
Matthias Kovatsch 7d79b69ada Updated to CoAP Proposed Standard and removed draft versions. 2014-05-15 20:29:03 +02:00
George Oikonomou 49b6ad2af5 Use the extended RF API for the cc2530 border router example 2014-04-23 12:16:50 +01:00
George Oikonomou df81cbaed9 Simplify the extended RF API example 2014-04-22 19:42:47 +01:00
Benoît Thébaudeau d93d129da6 cc2538: uart: Make it possible to use several UARTs simultaneously
This avoids the limitation of having a single UART available at runtime, without
duplicating code.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
2014-04-17 18:53:44 +02:00
Niclas Finne ceb868d934 Modified project setup for er-rest-example and rest-example to use
nullrdc and nullmac to reduce the code size. This allows the examples
to compile on Tmote Sky again.
2014-04-15 22:59:20 +02:00
Niclas Finne 0327623ae1 Minor update to improve output in extended RF API example. On 16 bit
platforms, PAN id and short address might be negative when used as
16 bit signed integers.
2014-04-15 22:50:11 +02:00
George Oikonomou 22800de94e Add extended RF API example 2014-04-14 15:25:32 +02:00
George Oikonomou 33abe26ec8 Merge pull request #411 from ADVANSEE/cc2538-adc
cc2538: Add adc driver and example
2014-04-13 03:05:12 +01:00