Commit graph

2012 commits

Author SHA1 Message Date
Benoît Thébaudeau d2f3795a30 cc2538: Clean up port and pin definitions
Homogenize port and pin definitions naming:
 - PERIPHERAL_FUNCTION_PORT for the port ID,
 - PERIPHERAL_FUNCTION_PIN for the pin ID,
 - PERIPHERAL_FUNCTION_PORT_BASE for the port base,
 - PERIPHERAL_FUNCTION_PIN_MASK for the pin mask.

Define only PERIPHERAL_FUNCTION_PORT and PERIPHERAL_FUNCTION_PIN in board.h, and
deduce PERIPHERAL_FUNCTION_PORT_BASE and PERIPHERAL_FUNCTION_PIN_MASK in the
driver from the former definitions.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
2013-11-25 15:00:41 +01:00
Adam Dunkels bb2dcaa057 A massive all-tree automated update of all double inclusion guard #defines that changes from using two underscores as a prefix, which are reserved, to not using two underscores as a prefix 2013-11-24 20:20:11 +01:00
Adam Dunkels 19b32c54c0 Removed the old unused hc.[ch] code 2013-11-24 11:02:35 +01:00
Adam Dunkels cb8fc35e25 Removed the redbee platforms 2013-11-22 16:33:06 +01:00
Adam Dunkels eb99534c43 Removed the stk500/stk501 platforms 2013-11-22 16:33:06 +01:00
Adam Dunkels d68ce09fd5 Removed the stepper-robot platform 2013-11-22 16:33:06 +01:00
Adam Dunkels 13117203e0 Removed pc-6001 platform 2013-11-22 16:33:05 +01:00
Adam Dunkels 44370be06f Removed old, unused msp430-based platforms 2013-11-22 16:33:05 +01:00
Fredrik Osterlind b5c94910ac Renamed Java packages to match our contiki-os.org domain. Note that this commit does not affect external dependencies
like /tools/mspsim.

This is a very simple modification that affects a very large number of files in Contiki: Cooja,
/platform/cooja, Collect-view, Coffe-manager, and Cooja simulation files (.csc).

I've gone through Contiki to update all references I could find. Nevertheless, this commit will likely
break external dependencies, like saved Cooja simulation files.
2013-11-20 16:43:27 +01:00
George Oikonomou 4eeb527cb8 Don't specify -DUIP_CONF_IPV6 in platform makefiles
Makefile.include has done it for us already, we no longer need to do so ourselves
2013-11-20 14:52:33 +00:00
Nicolas Tsiftes d183b87f4b Merge pull request #434 from adamdunkels/push/cleanup-sys
Remove old unused code from the core/sys/ directory
2013-11-19 09:53:57 -08:00
Adam Dunkels 523c03e4b8 Removed old unused profile.h code 2013-11-19 08:31:52 +01:00
Yvonne-Anne Pignolet 83ae37b48e Add access to LQI and RSSI to Contiki motes 2013-11-18 15:05:23 +01:00
George Oikonomou b10c78f854 Merge pull request #425 from ADVANSEE/cc2538-gpio
cc2538: gpio: Bug fix and various improvements
2013-11-15 13:04:09 -08:00
George Oikonomou 98a1f2dfa9 Merge pull request #408 from ADVANSEE/cc2538-uart
cc2538: lpm: Add registration mechanism for peripherals and use it
2013-11-15 12:57:03 -08:00
Benoît Thébaudeau 680050861c cc2538: gpio: Use accessor macros
Use the GPIO accessor macros instead of copying raw register access code all
over the place. This is cleaner and less error prone.

This fixes the setting of the USB pull-up resistor that worked only by chance on
the CC2538DK because it is controlled by the pin 0 of the used GPIO port.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
2013-11-15 19:57:44 +01:00
Benoît Thébaudeau 0692ee251d cc2538: usb: Use the new LPM peripheral registration
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
2013-11-15 17:14:45 +01:00
Benoît Thébaudeau d35732505b cc2538: lpm: Add registration mechanism for peripherals
Some peripherals have their clocks automatically gated in PM1+ modes, so they
cannot operate. This new mechanism gives peripherals a way to prohibit PM1+
modes so that they can properly complete their current operations before
entering PM1+.

This mechanism is implemented with peripheral functions registered to the LPM
module. These functions return whether the associated peripheral permits or not
PM1+ modes. They are called by the LPM module each time PM1+ might be possible.
If any of the peripherals wants to block PM1+, then the system is only dropped
to PM0.

Partly from: George Oikonomou
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
2013-11-15 17:09:22 +01:00
George Oikonomou d08a87880c Merge pull request #410 from ADVANSEE/cc2538-sys_ctrl
cc2538: sys_ctrl: Make it possible to use the 32-kHz crystal
2013-11-15 07:42:45 -08:00
Benoît Thébaudeau 47d570343e cc2538: sys_ctrl: Make it possible to use the 32-kHz crystal
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
2013-11-15 15:52:10 +01:00
Benoît Thébaudeau 6452624120 cc2538dk: Make it possible to override UIP_CONF_TCP_MSS
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
2013-11-15 15:41:58 +01:00
Adam Dunkels f2f0540051 Merge pull request #331 from alessandrelli/msp430-gcc-4.7-flags-wismote
Add mspgcc 4.7.x flags to the wismote makefile
2013-11-14 12:30:47 -08:00
George Oikonomou 2893af5e5d Document alternative toolchain for the CC2538DK 2013-11-14 12:22:21 +00:00
Adam Dunkels df2d2f53c2 Merge pull request #407 from cmorty/submodule
Add submodule support for MSPSim and get Travis green again.
2013-11-14 03:22:03 -08:00
Oliver Schmidt 2d7d1b123d Added 6502 driver for WIZnet W5100 in MACRAW mode. 2013-11-09 23:15:20 +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
Christian Taedcke ae6972426d Added support for STM32w boards MB950 and MB951 revision B. 2013-10-19 16:58:54 +02:00
Oliver Schmidt c6474cc8bc Final adjustments for the switch from 'atari' to 'atarixl'. 2013-10-06 17:23:39 +02: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 57d9c43a33 Removed support for 'atari' now that 'atarixl' is part of the cc65 master. 2013-10-03 22:55:32 +02: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
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
Brad Campbell 766fc5a174 Add conf checks to CC2538dk conf file
Allows for specific apps to control more settings of the platform.
2013-09-11 21:43:13 -04:00
Oliver Schmidt 17bbded894 Allow text screen memory to be aligned to 0x2000. 2013-09-10 20:59:19 +02:00
Oliver Schmidt 6fc83cf601 Initialize tcpip process before resolver process.
Since introduction of mDNS (f145c17039)
the resolver process initialization depends on the tcpip process
already being initialized (because of the call to udp_new()).
2013-09-01 20:53:51 +02:00
Simon Duquennoy 248301a041 Fix naming issues and includes in uip-ds6-nbr.h 2013-08-19 17:48:30 +02:00
Simon Duquennoy 5dc05e7913 Port apps, examples, platforms and tools so they use the new neighbor and route API. 2013-08-19 17:48:30 +02:00
Simon Duquennoy ff093a2b50 Removed now unused per-module neighbor table size configs. Use NEIGHBOR_CONF_MAX_NEIGHBORS instead. 2013-08-19 17:48:30 +02:00
Fredrik Osterlind 150807f2e6 removed rpl configuration, instead using contiki default values 2013-08-16 15:06:31 +02:00
Fredrik Osterlind 8041f66d8c link-layer acks support for cooja motes 2013-08-15 14:32:35 +02:00
Fredrik Osterlind 3caf1bfab4 cooja motes rimestats 2013-08-15 11:56:12 +02:00
Daniele Alessandrelli e82d201ca5 Added mspgcc 4.7.x flags to the Wismote makefile 2013-08-12 16:37:45 +02:00
Nicolas Tsiftes 7987a6dac7 Merge pull request #328 from g-oikonomou/cc2538-uart-config
Make the CC2538 UART driver more configurable
2013-08-09 10:20:36 -07:00
George Oikonomou 4f1485e238 Remove the second 6LoWPAN context from Sensinode
This context was once used in an in-house testbed
and is not required upstream
2013-08-09 16:38:12 +01:00
George Oikonomou f30d92b101 Change the way we switch between cc2530 models
The switch is now performed through a configuration define,
which has also been renamed to better match Contiki's naming
conventions
2013-08-09 15:53:23 +01:00
George Oikonomou 1b0470687b Change the cc2531 usb stick descriptor
The CC2531 USB stick now identifies itself as a
'Texas Instruments CC2531 USB Dongle' and uses a
TI-assigmed VID:PID. The VID:PID is now configurable
in contiki- or project-conf.h
2013-08-09 15:51:58 +01:00
George Oikonomou 0614c4e720 No longer build rpl-of0 for Sensinodes 2013-08-09 15:50:47 +01:00
George Oikonomou 6a79ac3b2d Increase 8051 plaform configurability 2013-08-09 15:50:47 +01:00
George Oikonomou 70d8bd71df Disable example-defined putchar for 8051 platforms 2013-08-09 15:50:47 +01:00
George Oikonomou ecf8ca55ef Move SLIP interface define to project-conf 2013-08-09 15:50:47 +01:00
George Oikonomou fa166116b7 Auto-enable SLIP for 8051-based platforms 2013-08-09 15:50:47 +01:00
George Oikonomou 0a7094bc39 Remove leftover make targets
The sensinode platform does not support .upload and .serialdump
Their presence in the makefile has confused in the past confused
some users. This commit removes them

The commit also removes the $(OBJECTDIR)/%.rel: %.cS recipe which
is not used by either 8051 platform and is probably broken anyway,
since it has been unmaintained for years
2013-08-09 15:48:05 +01:00
George Oikonomou 6c6013b898 Make the CC2538 UART driver more configurable
* We can now very easily switch between UART0 and UART1 through a define
* We can also configure the UART RX and TX port/pin through defines
2013-08-09 12:20:25 +01:00
Adam Dunkels 70eb439a88 Merge pull request #325 from g-oikonomou/cc2538-tools-release
CC2538 IEEE address and README updates
2013-08-07 08:25:30 -07:00
George Oikonomou 81318909e0 Read IEEE address from InfoPage by default 2013-08-07 15:28:33 +01:00
George Oikonomou 6b01b36cc9 Update readme references and tool download URLs 2013-08-07 15:28:04 +01:00
George Oikonomou 64c16d4be1 Adjust a config define to its new name 2013-08-07 15:27:19 +01:00
Adam Dunkels 99c331382b Turn off the LCD by default as it is somewhat flaky 2013-08-06 21:33:03 +02:00
Adam Dunkels e147c63044 Added mspgcc 4.7.x flags 2013-08-06 21:33:03 +02:00
Oliver Schmidt 6ab336f55f Several minor consistency improvements. 2013-07-31 00:55:31 +02:00
Oliver Schmidt 8d23d1b0bb Support the recently added verbosity control. 2013-07-31 00:15:38 +02:00
Oliver Schmidt 3cda787264 Be consistent with tab chars in Makefiles. 2013-07-30 23:39:02 +02:00
Adam Dunkels 54f2109134 Merge pull request #290 from simonduq/rpl-mrhof-etx-nomc
Update of RPL MRHOF (use no metric container with ETX [RFC6719])
2013-07-29 00:56:25 -07:00
Mariano Alvira 5d19de3dbf Merge pull request #266 from ismb-pert/fix-mbxxx
mb851 platform is now the more generic mbxxx. STM32W_CPUREV environment variable is used to select the variant of STM32W to use.
2013-07-26 07:38:11 -07:00
Nicolas Tsiftes 8f5941a4c9 Merge pull request #253 from JelmerT/feature-z1-tlc59116
TLC59116 I2C led driver for Zolertia Z1
2013-07-23 11:09:02 -07:00
Simon Duquennoy defcc639ce Use no metric container when having MRHOF with ETX, as specified in RFC6719. Renamed rpl-of-etx to rpl-mrhof. 2013-07-23 19:36:38 +02:00
stefano pascali 36e7db42de Some little refactor 2013-07-19 16:15:55 +02:00
stefano pascali b43ce0f677 Travis-ci tweaks, added CPUREV to 01 regression test, needed by mbxxx platform 2013-07-12 17:07:04 +02:00
stefano pascali fcb09d5d30 Fixed mbxxx platform 2013-07-11 17:56:17 +02:00
Robert Quattlebaum 0308d3fcf0 settings: Correct a problem where sometimes CC_INLINE is not defined properly. 2013-07-02 08:46:03 -07:00
Jelmer Tiete 4e0d5cf65e Corrected copyright holder. 2013-06-24 16:13:35 +02:00
Jelmer Tiete 9810bfbcfd contiki code style changes and copyright update + added source to ARCH instead of SOURCEFILES in platform Makefile 2013-06-24 15:17:52 +02:00
Jelmer Tiete 0a4a14aacb added tlc59116 datasheet url 2013-06-24 15:17:52 +02:00
Jelmer Tiete ed8be502db tlc59116 for zolertia, added 0 values at init and code clean-up 2013-06-24 15:17:52 +02:00
Jelmer Tiete cc2567b988 working tlc59116 implementation for z1 2013-06-24 15:17:52 +02:00
Jelmer Tiete 8b61492152 first implementation for tlc59116 on z1 2013-06-24 15:17:52 +02:00
Peter A. Bigot 5fc0575e99 Makefile.include: support make clean all
Historically $(OBJECTDIR) was created when Makefile.include is read.  A
consequence is that combining "clean" with "all" (or any other build
target) results in an error because the clean removes the object
directory that is required to exist when building dependencies.
Creating $(OBJECTDIR) on-demand ensures it is present when needed.

Removed creation of $(OBJECTDIR) on initial read, and added an order-only
dependency forcing its creation all Makefile* rules where the target is
explicitly or implicitly in $(OBJECTDIR).
2013-06-20 17:45:41 -05:00
Oliver Schmidt af93e5fbd9 Merge pull request #274 from oliverschmidt/master
Made use of Atari XL shadow RAM.
2013-06-18 13:38:08 -07:00
Oliver Schmidt b90a1e2417 Made use of Atari XL shadow RAM.
The new Atari XL target allows cc65 programs to make use of
the shadow RAM. This allows to turn aon all features of the
web browser - and will allow for additional improvements to
come :-)
2013-06-18 22:36:58 +02:00
Oliver Schmidt 807293ab6d Merge pull request #267 from oliverschmidt/master
Removed some more old RCS tags from the Contiki source tree.
2013-06-13 06:55:47 -07:00
Oliver Schmidt 79bb5ea73f Removed some more old RCS tags from the Contiki source tree. 2013-06-13 15:54:26 +02:00
Matthias Kovatsch 58dd33b145 Fixing minimal-net for Cygwin. 2013-06-06 19:04:11 +02:00
Oliver Schmidt d636d7110f Added platform 'Atari XL'.
Don't be afraid, I'm not trying to have more retro platforms than "real" platforms ;-)
The platform 'atarixl' will replace the platform 'atari'. However I need both for some
transition period.
2013-06-01 22:49:00 +02:00
Oliver Schmidt c138dc758a Removed obsolete file.
I wrote:
> Moved from last cc65 release (2.13.3) to recent cc65 snapshot (2.13.9).
> [...]
> Atari:
> - The builtin linker config allows to override the start addr so there no more need for a custom linker config.
> [...]
However I didn't actually remove the custom linker config not needed anymore.
2013-06-01 22:38:45 +02:00
Robert Quattlebaum 36fbbe48aa Merge pull request #244 from darconeous/pull-requests/cpu-native-tapdev-ipv6-fix
native/net/tapdev: Fix for new `UIP_CONF_IPV6` handling.
2013-05-21 17:42:44 -07:00
Nicolas Tsiftes a445c4020d Merge pull request #153 from darconeous/pull-requests/cpu-avr-bootloader
avr/bootloader.c: Now compatible with bootloaders which always run first
2013-05-20 05:49:13 -07:00
Nicolas Tsiftes 4b80ad9c89 Merge pull request #239 from darconeous/pull-requests/avr-ravenusb-rpl
avr-ravenusb/cdc_task: Fix compile issues.
2013-05-20 04:42:03 -07:00
Robert Quattlebaum 09eec82d08 Merge pull request #134 from darconeous/pull-requests/cpu-avr-avrdude-mcu
cpu/avr: Added "AVRDUDE_MCU" configuration parameter.
2013-05-19 17:35:26 -07:00
Robert Quattlebaum 9c70e0e5cc native/net/tapdev: Fix for new UIP_CONF_IPV6 handling. 2013-05-19 17:27:30 -07:00
Robert Quattlebaum 674f70b6c3 cpu/avr: Added "AVRDUDE_MCU" configuration parameter. 2013-05-19 14:23:31 -07:00
Adam Dunkels aaac20a950 Merge pull request #225 from tecip-nes/pic32_minor_reorganization
Pic32 minor reorganization
2013-05-19 14:22:14 -07:00
Robert Quattlebaum 3e0666265d avr-ravenusb/cdc_task: Fix compile issues.
A lot more changes are in the pipeline, but compiling is a good start.
2013-05-19 11:31:01 -07:00
Robert Quattlebaum 92b4f5fe59 platform/econotag: Allow RPL and Router settings to be overridden. 2013-05-19 08:21:18 -07:00
Robert Quattlebaum 9c17a542a7 avr/bootloader.c: Now compatible with bootloaders which always run first.
The boot loader now knows when to go into bootstrap mode by
looking for a specific EEPROM value. Also updated code style
to match Contiki code style guidelines.
2013-05-19 08:21:16 -07:00
Mariano Alvira 5df586e09d Merge pull request #184 from g-oikonomou/bug-fixes/rimestats
Rimestats Fix (#183)
2013-05-19 07:45:22 -07:00
Mariano Alvira 26d81d85a1 Merge pull request #228 from g-oikonomou/bug-fixes/uip-conf-ipv6
Fix 8051 port builds to play nicely with #173
2013-05-18 15:36:59 -07:00
Robert Quattlebaum 535e90343c Merge pull request #144 from darconeous/pull-requests/settings-for-all-targets
core/lib/settings: Generalized settings manager to work on any platform
2013-05-18 12:03:09 -07:00
Robert Quattlebaum b8c0f2de6c cpu/native: Add file-backed simulated EEPROM to native cpu.
This patch removes a defunct EEPROM implementation from the native
platform and provides a new EEPROM implementation for the native cpu.
The previous implementation appears to be vestigal.

This is useful for testing code which uses the EEPROM without running
the code on the actual hardware.

By default the code will create a new temporary file as the EEPROM
backing, reinitializing each time. If you would like to preserve the
EEPROM contents or specify a specific EEPROM file to use, you can set the
`CONTIKI_EEPROM` environment variable to the name of the EEPROM file you
wish to use instead. If it already exists, its contents will be used.
If it does not already exist, it will be created and initialized by
filling it with `0xFF`---just like a real EEPROM.

A new example is also included, which was used to verify the correctness
of the implementation. It can easily be used to verify the EEPROM
implementations of other targets.
2013-05-18 10:29:41 -07:00
George Oikonomou 13e29c7975 Fix 8051 port builds to play nicely with #173 2013-05-17 23:41:36 +01:00