Commit graph

10373 commits

Author SHA1 Message Date
Adam Dunkels 060bc8f8d7 Merge pull request #1011 from g-oikonomou/contrib/rf230bb-guard
Update #if guard to match header filename
2015-03-30 08:05:34 +02:00
George Oikonomou aedffb6c87 Merge pull request #767 from ejoerns/pull-req/timer-note
Note that timer_reset() must not be executed before timer expired
2015-03-29 00:46:30 +00:00
George Oikonomou 489f9618e8 Update #if guard to match header filename
Closes #952
2015-03-28 23:53:05 +00:00
George Oikonomou ff118be070 Remove unnecessary #if guards
ipv4/uip.c will not even be include in the list of sources in the first place if we are building with NETSTACK_CONF_WITH_IPV6 (CONTIKI_WITH_IPV6). Thus, there is no longer a need to wrap the entire source code in an #if guard.

Closes #935
2015-03-28 23:50:19 +00:00
George Oikonomou 48e987baac Merge pull request #1005 from alignan/i2c_cc2538
CC2538 I2C driver
2015-03-28 23:23:06 +00:00
George Oikonomou 36a80089e7 Merge pull request #1000 from cladmi/master
Cleanup old platforms configuration
2015-03-28 22:17:55 +00:00
George Oikonomou a9f499e528 Merge pull request #1009 from bthebaudeau/use-additive-offsets
Use additive offsets
2015-03-28 19:55:45 +00:00
Benoît Thébaudeau 19fd7a3551 Use additive offsets
OR-ing an offset to a base address instead of adding it is dangerous
because it can only work if the base address is aligned enough for the
offset.

Moreover, if the base address or the offset has a value unknown at
compile time, then the assembly instructions dedicated to 'base +
offset' addressing on most CPUs can't be emitted by the compiler because
this would require the alignment of the base address against the offset
to be known in order to optimize 'base | offset' into 'base + offset'.
In that case, the compiler has to emit more instructions in order to
compute 'base | offset' on most CPUs, e.g. on ARM, which means larger
binary size and slower execution.

Hence, replace all occurrences of 'base | offset' with 'base + offset'.
This must become a coding rule.

Here are the results for the cc2538-demo example:
 - Compilation of uart_init():
    * before:
        REG(regs->base | UART_CC) = 0;
        200b78:	f446 637c 	orr.w	r3, r6, #4032	; 0xfc0
        200b7c:	f043 0308 	orr.w	r3, r3, #8
        200b80:	2200      	movs	r2, #0
        200b82:	601a      	str	r2, [r3, #0]

    * now:
        REG(regs->base + UART_CC) = 0;
        200b7a:	2300      	movs	r3, #0
        200b7c:	f8c4 3fc8 	str.w	r3, [r4, #4040]	; 0xfc8

 - Size of the .text section:
    * before:	0x4c7c
    * now:	0x4c28
    * saved:	84 bytes

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-03-28 17:28:15 +01: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 22be9fd8b7 I2C driver taken from PR #677, uncrustified, made functions static and added burst modes 2015-03-25 16:44:12 +01: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
Nicolas Tsiftes c76316adf2 Merge pull request #990 from alignan/sht25
Removed duplicated condition in sht25 configuration
2015-03-12 16:00:53 +01:00
Antonio Lignan 64fd000e5d Removed duplicated condition in sht25 configuration 2015-03-11 14:25:23 +01:00
George Oikonomou c169b3e3bb Merge pull request #845 from alignan/fix_region
Changed code region to any
2015-03-10 22:04:38 +00:00
George Oikonomou 15fe97ebc9 Merge pull request #989 from alignan/sht25
Added Z1 SHT25 sensor
2015-03-10 22:04:07 +00:00
Antonio Lignan 1af29a5beb Added SHT25 sensor 2015-03-10 15:33:58 +01:00
Nicolas Tsiftes 2734c97234 Merge pull request #914 from cetic/pr-always-send-no-path-dao
Send no-path DAO only when the dag has a preferred parent
2015-03-06 14:33:07 +01:00
Laurent Deru 9d94c4efae Remove all the DODAG from the instance when the node is set as Root 2015-03-04 09:55:11 +01:00
Laurent Deru 49bfb1308d Do not delete instance when a new DODAG can not be created 2015-03-04 09:43:28 +01:00
George Oikonomou cd219e206c Adjust the cc2538dk readme to reflect travis test changes 2015-03-02 08:41:53 +00:00
George Oikonomou 452d917e89 Rename travis arm tests to arm-aapcs 2015-03-02 08:41:53 +00:00
George Oikonomou 52eb7a3b57 Move cc2538dk travis tests to the arm-aapcs job
It makes sense to test cc2538dk with the toolchain recommended in the README (GNU Tools for ARM Embedded Processors) rather than the one which was being used two years ago (Sourcery G++ Lite)
2015-02-28 15:20:47 +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
George Oikonomou 1fc06b6581 Turn on the CC2538 RF explicitly 2015-02-28 15:01:32 +00:00
George Oikonomou 9fcb7f721f Merge pull request #978 from nvt/cc2420-rf-api
Implement set/get of the CCA threshold for CC2420
2015-02-26 14:08:17 +00:00
Nicolas Tsiftes f9e5e24cf4 Merge pull request #895 from simonduq/rpl-single-dag
Do not use rpl_add_dag when RPL is used with a single dag per instance
2015-02-26 11:41:24 +01: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
George Oikonomou a3b664d574 Merge pull request #974 from jonnteolsson/cc26xx-contrib
New platform: Texas Instruments CC26xx
2015-02-25 23:39:40 +00:00
Jonas Olsson 8bf35f9e4a Add cc26xx travis tests 2015-02-25 13:16:27 +01:00
Jonas Olsson fe6bbef69d Add CC26xx build artifacts to .gitignore 2015-02-25 13:16:07 +01:00
Jonas Olsson 0f567e499f Add CC26xx examples 2015-02-25 13:15:35 +01: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
Jonas Olsson 5e5e9b92fd Add CC26xx CPU files 2015-02-25 13:09:56 +01:00
Daniele Alessandrelli b6e716233a er-coap-example: add example for client-side CoAP observe 2015-02-24 22:48:12 +01:00
Daniele Alessandrelli 799e9350a0 er-coap: add client-side support for CoAP Observe
Client-side support for CoAP observe is not compiled by default. To enable it, the COAP_OBSERVE_CLIENT macro must be defined equal to 1.
2015-02-24 22:46:48 +01:00
Nicolas Tsiftes 0c7d261465 Merge pull request #971 from g-oikonomou/doxygen-expand-macros
Expand Macros when Building Docs
2015-02-24 12:45:52 +01:00
George Oikonomou 76d8956a02 Adjust warning count in the doxygen travis job 2015-02-22 16:39:49 +00:00
George Oikonomou 938cd5c689 Expand macros when building docs 2015-02-22 16:39:49 +00: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