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

9364 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oliver Schmidt f9c2b77cb7 Merge pull request #577 from oliverschmidt/master 
Adjusted base address to final product.
 2014-02-26 22:17:32 +01:00
Oliver Schmidt 3e5e054f2a Adjusted base address to final product. 2014-02-26 20:23:09 +01:00
Nelson Kigen 5edd6bc75b New MACRO for creating jsontree_array 
This proposed MACRO simplifies jsontree_array declarations. It takes as arguments the name of the array and its size. ( I've modified the indention as requested )
 2014-02-26 19:38:10 +01:00
Luiz Eduardo 3062e9175f typo in event resource handler comment 
at line 531 says PERIODIC_RESOURCE, shouldn't it be EVENT_RESOURCE, since it's a EVENT_RESOURCE demo?
 2014-02-24 23:34:16 -02:00
Fredrik Österlind 602928d948 Merge pull request #533 from g-oikonomou/cooja-pcap-timestamp-fix 
Fix Cooja PCAP packet header timestamps
 2014-02-21 13:41:15 +01:00
Fredrik Österlind 3fe2890ddf Merge pull request #565 from cmorty/pull/backwards 
Fix backwards compatibility (and docs)
 2014-02-21 13:35:09 +01:00
Fredrik Österlind 4fe17ef17f Merge pull request #568 from ejoerns/pull-req/cooja-udgmvis 
[Cooja] Made UDGMVisualizerSkin closable
 2014-02-21 13:01:23 +01:00
Fredrik Österlind 140b55d8f7 Merge pull request #567 from ejoerns/pull-req/vis-scroll 
[Cooja] Mouse wheel zooming for Visualizer
 2014-02-21 12:55:13 +01:00
Fredrik Österlind e1e1f1c326 Merge pull request #566 from ejoerns/pull-req/addr-fix 
[Cooja] rename rimeaddr_node_addr to linkaddr_node_addr in RimeAddress interface
 2014-02-21 12:09:21 +01:00
Enrico Joerns 465b0ddfbe [cooja] pluings/skings/UDGMVisualizerSkin: Replaced unclosable Box implementation of JSpinner menus by JInternalFrame based variant. 2014-02-20 22:55:36 +01:00
Enrico Joerns 80b78ae6dd cooja: plugins/Visualizer: Implemented mouse wheel zooming with mouse coordinates as center 2014-02-20 16:56:49 +01:00
Enrico Joerns 90ab2e7051 cooja: interfaces/RimeAddress: renamed rimeaddr_node_addr to linkaddr_node_addr 2014-02-20 16:45:40 +01:00
Moritz 'Morty' Strübe 19e7611061 Fix backwards compatibility 2014-02-20 13:57:32 +01:00
Moritz 'Morty' Strübe 8dd4025248 Fix documentation 2014-02-20 13:57:22 +01:00
LudovicW d979e5b096 CC2538: add support for UART baudrate 9600, 38400 and 57600 2014-02-11 16:01:36 +01:00
Oliver Schmidt a1cd642e6e Merge pull request #554 from oliverschmidt/master 
Fixed win32 broken by recent changes.
 2014-02-02 12:10:57 -08:00
Oliver Schmidt 71c671b6cf Fixed win32 broken by recent changes. 2014-02-02 20:19:47 +01:00
Oliver Schmidt 9a44bafb16 Merge pull request #553 from oliverschmidt/master 
Some fine tuning after the recent general modularization.
 2014-02-02 11:14:17 -08:00
Oliver Schmidt ee3050897a Some fine tuning after the recent general modularization. 2014-02-02 17:59:06 +01:00
Oliver Schmidt 4db675e259 Some fine tuning after the recent general modularization. 2014-02-02 17:47:17 +01:00
George Oikonomou 7fb242f883 Merge pull request #493 from g-oikonomou/cc2538-demo-example-counter 
Don't increment the counter when a button is pressed
 2014-02-02 05:41:33 -08:00
Oliver Schmidt e16521e5c1 Merge pull request #550 from oliverschmidt/master 
Avoid compiler warnings.
 2014-01-31 16:22:53 -08:00
Oliver Schmidt a94e7e63e2 Avoid compiler warnings. 2014-02-01 00:46:57 +01:00
George Oikonomou c0ef70f88a Merge pull request #549 from g-oikonomou/cc2538-code-size-opt 
Improve optimisation settings for CC2538 builds
 2014-01-31 13:27:11 -08:00
George Oikonomou 332d56ac11 Make some CC2538 CFLAGS and LDFLAGS common 
Some CFLAGS and LDFLAGS previously only enabled with SMALL=1 have
now been enabled for all builds, regardless of the value of SMALL.

Therefore, from now on, SMALL only chooses between -Os and -O2
 2014-01-31 20:02:43 +00:00
George Oikonomou a63376f8be Use -Os for CC2538 builds 
As discussed in #503, -Os was broken with one of the toolchains
recommended in the platform's README and for that reason we were
using -O2 by default.

This commit sets the default to -Os and updates the README to no
longer recommend the toolchain in question
 2014-01-31 20:02:43 +00:00
George Oikonomou c8fbf8ca6e Merge pull request #503 from ADVANSEE/cc2538-nrdata-noload 
cc2538: Clean up link stage
 2014-01-30 07:58:55 -08:00
Nicolas Tsiftes 815287042b Merge pull request #548 from adamdunkels/push/sicslowpan-rime-cleanup 
Rename sicslowpan rime variable names
 2014-01-29 15:12:50 -08:00
Adam Dunkels 47e4113845 Changed the variable names that access the packetbuf code so that they are called packetbuf_* instead of rime_* 2014-01-29 23:02:00 +01:00
Nicolas Tsiftes 4e6bed24f9 Merge pull request #547 from adamdunkels/push/rimeaddr-linkaddr 
Rename the rimeaddr module to linkaddr
 2014-01-29 12:57:44 -08:00
Adam Dunkels 45265249fc Changed the name of the rimeaddr module to linkaddr 2014-01-29 20:12:24 +01:00
George Oikonomou 345532c559 Merge pull request #546 from ADVANSEE/cc2538-fix-disabled-lpm 
cc2538: lpm: Fix build for LPM_CONF_ENABLE == 0
 2014-01-29 08:40:56 -08:00
Adam Dunkels 765e9acded Merge pull request #499 from adamdunkels/bold/modularize-everything 
A bold move: modularize everything
 2014-01-29 08:17:10 -08:00
Benoît Thébaudeau 42c287f363 cc2538: lpm: Fix build for LPM_CONF_ENABLE == 0 
lpm.c needs to #include lpm.h in order to get the definition of
lpm_periph_permit_pm1_func_t, which made the replacement macros conflict with
the function definitions for the LPM_CONF_ENABLE == 0 case. This change fixes
this issue by #if-ing out the code in lpm.c in that case. Also, the replacement
macro for lpm_register_peripheral() was missing in that case, which is fixed
here.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
 2014-01-28 20:21:06 +01:00
Oliver Schmidt e10d462931 Merge pull request #545 from ADVANSEE/cc2538-lib-link 
cc2538: Fix library linkage
 2014-01-28 06:37:49 -08:00
Benoît Thébaudeau a562acb160 cc2538: Fix library linkage 
If a project needs to use some libraries at link stage, then the corresponding
linker options (e.g. '-lm') have to be passed after any .o file depending on
these libraries. Hence, LDFLAGS cannot be used to add such options when invoking
$(LD) in Makefile.cc2538, or it should be moved to the correct location.
Instead, this change adds TARGET_LIBFILES to the correct location, like most
other Contiki targets.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
 2014-01-28 14:32:30 +01:00
Mariano Alvira 4738a4b340 Merge pull request #540 from hexluthor/rl78-fixes2 
More fixes for the RL78 / EVAL-ADF7xxxMB4Z platform
 2014-01-27 08:06:46 -08:00
Fredrik Österlind f6c6ef9b54 Merge pull request #532 from darki2002/Plugin_sim 
Stopped to load plugins depending on simulations if there is no simulation
 2014-01-27 07:31:19 -08:00
Fredrik Österlind a369611fe7 Merge pull request #544 from drakkar-lig/cooja-compile-error 
Cooja compile error
 2014-01-27 07:14:14 -08:00
Martin Heusse 9eabbe02ad Adds encoding attribute utf-8 arg to cooja compile command 2014-01-27 15:14:34 +01:00
Ian Martin f3cc607101 eval-adf7xxxmb4z: Use the nullrdc driver instead of sicslowmac. 2014-01-26 17:40:31 -05:00
Adam Dunkels b6c4f50bea Merge pull request #538 from cskiraly/collect-fixes 
collect: making some protocol parameters configurable by COLLECT_CONF_
 2014-01-26 14:23:08 -08:00
Adam Dunkels 4f498e2eac Updated the include paths to point to the new places 2014-01-26 23:20:47 +01:00
Adam Dunkels 2ec176891f Added the necessary modules to make the eval-adf7xxxmb4z port compile 2014-01-26 23:20:47 +01:00
Adam Dunkels 824d2047da Add the explicit list of modules, since we cannot do auto-dependency management of them 2014-01-26 23:20:47 +01:00
Adam Dunkels 24155ee0ae Moved the custom strncasecmp code into a separate module, since it cannot be compiled on all platforms 2014-01-26 23:20:46 +01:00
Adam Dunkels b244f30480 Moved the ctk files from core/lib into core/lib/ and core/lib/libconio 2014-01-26 23:20:46 +01:00
Adam Dunkels bddd96d5c8 Removed all module makefiles. Instead, all .c files in a module directory are compiled. 2014-01-26 23:20:46 +01:00
Adam Dunkels fce84c178c Removed unused rime-udp code 2014-01-26 23:20:45 +01:00
Adam Dunkels 8eace27f9b Moved net/rime.h to net/rime/rime.h 2014-01-26 23:20:45 +01:00