Commit graph

8762 commits

Author SHA1 Message Date
Adam Dunkels 71eea754d6 Added mspsim as a submodule instead of as a binary mspsim.jar file 2013-11-07 17:28:50 +01:00
Moritz 'Morty' Strübe c67c048cac Clean up setting channel and CCA-threshold for CC2420 based motes.
The CCA-threshold now defaults to -46 which give better simulation
results and typically also better experimental results.
This adjustment is also needed due to commit 0a13f99 in mspsim. As
promised in https://github.com/mspsim/mspsim/pull/18 it broke the
regression tests.
2013-11-07 17:28:33 +01:00
Moritz 'Morty' Strübe c89e827d6c Make regressiontest reproducable 2013-11-06 17:41:59 +01:00
Moritz 'Morty' Strübe 56afc6d437 Allow setting random seed as parameter 2013-11-06 17:41:53 +01:00
George Oikonomou ce0b2cacac Merge pull request #365 from g-oikonomou/cc2538-uart-init-fix
Set peripheral mode for the correct CC2538 UART TX/RX pins
2013-10-23 07:10:41 -07:00
Nicolas Tsiftes 4fd529eed8 Merge pull request #382 from ejoerns/pull-req/core/net
core/net/mac: Invalid struct member u8 in PRINTADDR
2013-10-22 08:03:11 -07:00
Enrico Joerns 4ba22102fd [core/net/mac] Removed invalid struct member u8 in PRINTADDR 2013-10-15 01:43:26 +02:00
Nicolas Tsiftes 6dd9f2c37a Merge pull request #380 from simonduq/fix-rpl-of0
Fixed printout that used deprectated rpl_parent_t structure
2013-10-10 08:48:29 -07:00
Oliver Schmidt 35e93f3bae Merge pull request #381 from oliverschmidt/master
Reverted commit below as the cc65 bug in question is fixed.
2013-10-08 13:44:23 -07:00
Oliver Schmidt 2316c6b461 Reverted commit below as the cc65 bug in question is fixed.
Rearranged some expressions to avoid triggering a cc65 bug. (reverse-merged from commit 7134da0915)
2013-10-08 22:42:41 +02:00
Simon Duquennoy 677b5ede16 Fixed printout that used deprectated rpl_parent_t structure 2013-10-08 14:46:55 +02:00
Adam Dunkels 4e1beb3ed3 Merge pull request #361 from nvt/rpl-mrhof-fix
MRHOF fixes
2013-10-07 11:45:31 -07:00
Oliver Schmidt e263bac1fc Merge pull request #378 from oliverschmidt/master
Final adjustments for the switch from 'atari' to 'atarixl'.
2013-10-06 08:24:30 -07:00
Oliver Schmidt c6474cc8bc Final adjustments for the switch from 'atari' to 'atarixl'. 2013-10-06 17:23:39 +02:00
Oliver Schmidt b0ecd68957 Merge pull request #377 from oliverschmidt/master
Finetuned Atari XL memory layout.
2013-10-05 14:53:38 -07:00
Oliver Schmidt 37b66bac5a Finetuned Atari XL memory layout.
The Telent server includes both uIP logging and uIP client functionality. Therefore uip.o is somewhat larger.
2013-10-05 23:51:49 +02:00
Oliver Schmidt d5ef2a0158 Merge pull request #376 from oliverschmidt/master
Rearranged some expressions to avoid triggering a cc65 bug.
2013-10-05 12:29:25 -07:00
Oliver Schmidt 7134da0915 Rearranged some expressions to avoid triggering a cc65 bug. 2013-10-05 21:26:28 +02:00
Nicolas Tsiftes 583a1fe9db Merge pull request #374 from g-oikonomou/code-style-tools
Code Style: Add uncrustify config and helper scripts
2013-10-04 08:25:01 -07:00
George Oikonomou 250de6201b Add uncrustify helper scripts 2013-10-04 15:27:46 +01:00
George Oikonomou a3e63d05d2 Add a config for the Uncrustify code beautifier 2013-10-04 15:27:45 +01:00
George Oikonomou 94a05f2f55 Move code style-related tools to their own dir 2013-10-04 14:34:57 +01:00
Oliver Schmidt 86e0c8209d Merge pull request #373 from oliverschmidt/master
Added missing 'atarixl' Makefile defines.
2013-10-03 15:04:49 -07:00
Oliver Schmidt d79ac1558a Added missing 'atarixl' Makefile defines. 2013-10-04 00:03:40 +02:00
Oliver Schmidt 0aa5965088 Merge pull request #372 from oliverschmidt/master
Adjustments for the switch from 'atari' to 'atarixl'.
2013-10-03 14:56:25 -07:00
Oliver Schmidt 70d7953ce7 Adjustments for the switch from 'atari' to 'atarixl'. 2013-10-03 23:54:33 +02:00
Oliver Schmidt 7150fc8280 Merge pull request #371 from oliverschmidt/master
Some beautification for the Contiki online configurator.
2013-10-03 14:52:04 -07:00
Oliver Schmidt 73684b32c7 Some beautification for the Contiki online configurator. 2013-10-03 23:51:01 +02:00
Oliver Schmidt 954b0e8d40 Merge pull request #370 from oliverschmidt/master
Removed support for 'atari' now that 'atarixl' is part of the cc65 master.
2013-10-03 13:59:16 -07:00
Oliver Schmidt 57d9c43a33 Removed support for 'atari' now that 'atarixl' is part of the cc65 master. 2013-10-03 22:55:32 +02:00
Oliver Schmidt 6869dd235a Merge pull request #369 from oliverschmidt/master
Adjusted Makefile to the final 'atarixl' cc65 target.
2013-10-03 13:42:11 -07:00
Oliver Schmidt 149f3834e6 Adjusted Makefile to the final 'atarixl' cc65 target.
- Assign source files to the splitted shadow RAM areas.
- Switched to dynamic Ethernet driver loading.
2013-10-03 22:40:25 +02:00
Oliver Schmidt a642a26e4a Merge pull request #368 from oliverschmidt/master
Saved another byte ;-)
2013-10-03 13:35:27 -07:00
Oliver Schmidt 7c2f3b3911 Saved another byte ;-) 2013-10-03 22:32:12 +02:00
George Oikonomou e4a454b284 Set peripheral mode for the correct UART TX/RX pins 2013-09-30 14:50:39 +01:00
Nicolas Tsiftes 1698c439c5 Merge pull request #359 from g-oikonomou/trickle-timer-stop
Add a method to stop running trickle timers
2013-09-30 05:47:23 -07:00
George Oikonomou 060b00c4b5 Use TRICKLE_TIMER_IS_STOPPED in trickle_timer_stop() 2013-09-30 12:37:03 +01:00
George Oikonomou 2957d44ff8 Merge pull request #352 from lab11/cc2538-spi-driver
Added SPI driver for CC2538
2013-09-28 13:25:17 -07:00
Brad Campbell e2af903d05 Added SPI driver for CC2538
This uses the core/dev/spi.h header and implements the spi_init()
function and the various macros for SPI operation. ssi.h contains all of
the register locations and information.

This implementation is not very versatile, mostly because I don't how to
make it flexible in the contiki system. It supports pin muxing for the
four spi pins, but other than that picks sensible defaults.

The SPI macros (like SPI_READ()) are defined in
cpu/cc2538/spi-arch.h. In order to use the SPI driver, add the following
includes to your project:

    #include "spi-arch.h
    #include "dev/spi.h"
2013-09-27 17:46:15 -04:00
Adam Dunkels bf7edf6c4c Merge pull request #354 from lab11/core-net-fixes
Small fixes to networking files
2013-09-26 23:43:07 -07:00
Nicolas Tsiftes 43b5425493 Cleaned up various fragments and fixed a compilation error that occured when switching metric container.
Fixed a wrapping problem in the ETX EWMA calculation.

Corrected the multiplier of the link metric, and simplified the configuration
so that the user does not need to specify the multiplier.
2013-09-23 15:58:42 +02:00
George Oikonomou 995a9c92d9 Only schedule a trickle interval doubling for running timers 2013-09-16 11:53:39 +01:00
George Oikonomou fa7219d0b8 Add a way to determine whether a trickle timer is running 2013-09-16 11:53:39 +01:00
Adam Dunkels 50395666fc Merge pull request #341 from ismb-pert/fix-lladdr
Fixed fail to build from source due to a bad &nbr->lladdr
2013-09-14 03:24:12 -07:00
George Oikonomou d646f3daf5 Merge pull request #342 from zwuh/patch-trickle-lib
Typo and file mode fix for Trickle library, typo fix in uipopt.h
2013-09-13 02:46:26 -07:00
Oliver Schmidt 4772455a9a Merge pull request #358 from oliverschmidt/master
Optimized 6502 Ethernet drivers.
2013-09-12 14:38:31 -07:00
Oliver Schmidt 2263c1aa55 - Optimized LAN91C96 driver for speed and size.
- Speed: The primary byte copy loops are reduzed to the bare minimum by adjusting the base pointer 'ptr' and loop register 'y' in such a way that the 'y' overflow matches the low byte of the loop size.

- Introduced a loop for setting the MAC address.

Additional minor fix:

- Properly start self modification with first location.
2013-09-12 23:32:26 +02:00
Oliver Schmidt ea08635ca4 Optimized CS8900A driver for speed and size.
- Speed: The primary byte copy loops are reduzed to the bare minimum by adjusting the base pointer 'ptr' and loop register 'y' in such a way that the 'y' overflow matches the low byte of the loop size.

- Size: Factored out all repeated code into subroutines. Introduced a loop for setting the MAC address.

Additional minor changes:

- Activate frame reception as last step of initialization after CS8900A configuration.

- Properly set internal address bits used by the CS8900A.
2013-09-12 23:32:25 +02:00
George Oikonomou eb33d5e4c5 Merge pull request #353 from lab11/cc2538-gpio
Updates to CC2538 GPIO
2013-09-12 00:59:39 -07:00
George Oikonomou f31aac7e1c Merge pull request #355 from lab11/cc2538dk-conf-defines
Add conf checks to CC2538dk conf file
2013-09-12 00:27:52 -07:00