giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
14,836 Commits 1 Branch 0 Tags 92 MiB
f04a290aae
Commit Graph

14836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jeppenodgaard
e1bf32181f
Merge branch 'develop' into fix/global/ip-addr/removed 2018-11-15 16:06:11 +01:00
George Oikonomou
f5657ec9e2
Merge pull request #763 from lafka/lafka-ldscript-override 
Allow configurable linker script
 2018-11-14 17:59:21 +00:00
Olav Frengstad
5e57f7de83 Allow configurable linker script 
Make it possible to overwrite `LDSCRIPT` from other Makefiles
 2018-11-14 22:35:27 +05:30
George Oikonomou
c9c3befb50
Merge pull request #754 from g-oikonomou/bugfix/macos-getopt 
Change help messages to specify the -v argument as non-optional
 2018-11-13 22:34:49 +00:00
Simon Duquennoy
aecde05134
Merge pull request #760 from contiki-ng/master 
Merge back 'master', release 4.2, into 'develop'
 2018-11-13 13:33:15 +01:00
Simon Duquennoy
d917b4f160
Merge branch 'develop' into bugfix/macos-getopt 2018-11-12 17:56:44 +01:00
Simon Duquennoy
7b076e4af1
Merge pull request #749 from contiki-ng/release-4.2 
Release v4.2
 2018-11-12 17:31:48 +01:00
Simon Duquennoy
9f935f9565
Merge pull request #758 from simonduq/contrib/nightly-plot-DAG-join 
Nightly runs: keep track of DAG joining events
 2018-11-12 17:05:11 +01:00
George Oikonomou
e706c3ee72
Merge branch 'develop' into contrib/nightly-plot-DAG-join 2018-11-12 15:34:43 +00:00
Simon Duquennoy
5a01bb05eb
Merge pull request #759 from g-oikonomou/bugfix/remove-obsolete 
Remove obsolete header
 2018-11-12 14:42:33 +01:00
George Oikonomou
0b9e3c3561 Remove obsolete header 2018-11-12 12:35:53 +00:00
Simon Duquennoy
67ed46944f Nightly runs: keep track of DAG joining events 2018-11-12 11:38:17 +01:00
George Oikonomou
6bc598d169
Merge pull request #757 from ThisIsIoT/bug/simplelink-linker 
fixes contiki-ng/contiki-ng#756 simplelink target .bin files too big.
 2018-11-12 09:29:40 +00:00
George Oikonomou
d937570e1f
Merge branch 'develop' into bug/simplelink-linker 2018-11-12 09:29:14 +00:00
firmwareguru
504be07f4f fixes contiki-ng/contiki-ng#756 simplelink target .bin files too big. 2018-11-11 20:58:12 -07:00
George Oikonomou
15f6e1d7a3 Change the way of accessing the default v6 prefix 
This commit changes the method of accessing the default v6 prefix. Instead of always using `UIP_DS6_DEFAULT_PREFIX`, we store the default prefix in a variable. We subsequently retrieve the prefix by calling `uip_ds6_default_prefix()`.

`uip_ds6_init()` will set this variable to the value of `UIP_DS6_DEFAULT_PREFIX`, but only if the startup code has not set a different default prefix before `uip_ds6_init()` gets called.

This approach has the following benefits:

* It allows us to change the default prefix at run time.
* It allows the startup code to set a prefix different than the one specified by `UIP_DS6_DEFAULT_PREFIX`, which can be useful if the default prefix comes from a different source (e.g. the command line for native, or a configuration stored on a node's flash)
* In many places the current code assumes that the prefix contains 6 bytes of zeros (e.g. `FDxx::/64`). Changing to a different prefix (e.g. `FD00:ABCD::`) would need extensive code changes. This change here makes it easy to use a prefix of any length.
 2018-11-11 18:30:54 +00:00
George Oikonomou
057dbebb24 Remove redundant code: prefix is always NULL 2018-11-11 18:24:33 +00:00
George Oikonomou
2e4984f671 Change help messages to specify the -v argument as non-optional 
This commit changes the help messages of `tunslip6` and native border router such thaty they stop specifying the `level` argument of `-v` as optional.
 2018-11-11 16:51:18 +00:00
Simon Duquennoy
d4022a5628
Merge pull request #743 from kkrentz/csma-improvements-pr 
General improvements to CSMA
 2018-11-11 14:43:10 +01:00
Simon Duquennoy
d286854bb4
Merge branch 'develop' into csma-improvements-pr 2018-11-10 15:20:35 +01:00
George Oikonomou
0e7f39c330
Merge pull request #750 from simonduq/merge/4.2-back-to-develop 
Merge release 4.2 back to develop
 2018-11-09 20:27:06 +00:00
Simon Duquennoy
4ea5d41d52 Merge branch release-4.2 back into develop 2018-11-09 17:04:31 +01:00
kkrentz
0c0d7b3e46 CSMA: Assert that n and q are non-NULL in csma-output.c#packet_sent 2018-11-07 03:06:50 -08:00
George Oikonomou
f42618ce94
Merge pull request #745 from simonduq/contrib/shell-empty-cmd 
Shell: skip empty lines
 2018-11-06 00:57:50 +00:00
George Oikonomou
0c7ada4535
Merge branch 'develop' into contrib/shell-empty-cmd 2018-11-05 23:01:04 +00:00
George Oikonomou
1a43e255f8
Merge pull request #730 from cperezpenichet/cc2420_carrier 
Unmodulated carrier transmission for cc2538 & cc2420
 2018-11-05 23:00:09 +00:00
George Oikonomou
cf9be4e7f8
Merge branch 'develop' into cc2420_carrier 2018-11-05 21:45:27 +00:00
George Oikonomou
98f35fe091
Merge pull request #746 from simonduq/contrib/nbr-error-msg 
Native border router: clearer error messages
 2018-11-05 16:14:25 +00:00
Simon Duquennoy
5d8fda2af4 Native border router: clearer error messages 2018-11-05 16:04:02 +01:00
Simon Duquennoy
07915ac580 Shell: skip empty lines 2018-11-05 16:03:21 +01:00
Niclas Finne
f24be610f5
Merge pull request #558 from joakimeriksson/contrib/csma-llsec 
Add back link layer security for CSMA
 2018-11-02 18:21:18 +01:00
Joakim Eriksson
ecb214bb2d clear uipbuf including its attributes before creating a packet 2018-11-02 15:44:45 +01:00
Niclas Finne
93c7aae49e
Update os/services/shell/shell-commands.c 
Co-Authored-By: joakimeriksson <joakime@sics.se>
 2018-11-02 15:20:07 +01:00
Niclas Finne
ef9b1f32ba
Update os/services/shell/shell-commands.c 
Co-Authored-By: joakimeriksson <joakime@sics.se>
 2018-11-02 15:19:27 +01:00
kkrentz
f71db7cc90 CSMA: Discard frames that come from ourselves 2018-11-02 07:14:25 -07:00
kkrentz
74780d5962 CSMA: Do not parse twice/Acknowledge MAC command frames, too 2018-11-02 07:13:23 -07:00
kkrentz
e4dcba32c9 CSMA: Do not depend depend on sequence numbers to identify packets 2018-11-02 07:13:23 -07:00
Simon Duquennoy
bda7c329ba
Merge branch 'develop' into contrib/csma-llsec 2018-11-02 01:13:14 +01:00
Joakim Eriksson
16ac869645 removed some no longer needed hard-coded calculations in the sicslowpan code 2018-10-31 23:02:14 +01:00
jeppenodgaard
00018d4c1b
Merge branch 'develop' into fix/global/ip-addr/removed 2018-10-30 17:18:35 +01:00
Jeppe Odgaard
5f441a509f Merge branch 'fix/global/ip-addr/removed' of https://github.com/jeppenodgaard/contiki-ng into fix/global/ip-addr/removed 2018-10-30 17:06:56 +01:00
Jeppe Odgaard
693e6fdb30 Increased rpl_done, because time to build rpl seems to be faster in Cooja with graphical interface. 2018-10-30 17:05:49 +01:00
Joakim Eriksson
35123e9dd8 fixed better packet size assumptions 2018-10-30 16:36:55 +01:00
Joakim Eriksson
42dfc81af2 added LLSEC attributes form packetbuf to uipbuf when receiving IP packet, and a few other minor fixes 2018-10-30 16:06:11 +01:00
Carlos Pérez Penichet
2d2d6b3ad6 Fixed code style issues 2018-10-29 11:15:40 +01:00
Simon Duquennoy
2b0c2d5e4a
Merge pull request #714 from simonduq/contrib/uip-cleanup 
Safer uIP6 buffer handling
 2018-10-29 11:09:54 +01:00
Simon Duquennoy
a2b7b996e4
Merge branch 'develop' into contrib/uip-cleanup 2018-10-29 10:18:10 +01:00
George Oikonomou
c174d7ddcc
Merge pull request #733 from kkrentz/init-pr 
Fix to queuebuf initialization
 2018-10-27 15:49:49 +01:00
kkrentz
468a14b528 moved initialization of queuebuf to contikimac-main.c 2018-10-27 07:13:36 -07:00
Carlos Pérez Penichet
a906f03a25 cc2420 return to last state when disabling carrier 
Made cc2420 follow the same logic as cc2538 when
disabling the unmodulated carrier. Now they both
return to the state they were in before the carrier
was enabled.
 2018-10-26 16:28:20 +02:00