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

2346 commits

Author SHA1 Message Date
Harald Pichler 88ae1828f9 remove debug code 2014-11-19 13:12:43 +01:00
Harald Pichler 245d801862 add merkurboard coap client demo 2014-11-19 12:14:24 +01:00
Marcus Priesch 42c28e0bf7 timer4 servo pwm 2014-11-19 12:11:19 +01:00
Marcus Priesch 277f63d76a timer4 servo pwm 2014-11-19 12:10:09 +01:00
Harald Pichler 54114b0943 many bugfixes, add cputemp 2014-11-19 12:07:31 +01:00
Harald Pichler e645833a99 add light-actor 2014-11-19 12:06:54 +01:00
Harald Pichler 8c08364cad add servo example 2014-11-19 12:06:45 +01:00
Harald Pichler 81e6734626 add climate example 2014-11-19 12:04:53 +01:00
Harald Pichler 715cfa3a75 add platform osd-merkur 2014-11-19 12:04:38 +01:00
Nicolas Tsiftes 866bb99944 Merge pull request #860 from simonduq/frame802154-align 
frame802154_t: make sure dest_addr and src_addr are aligned
 2014-11-18 08:59:30 +01:00
kkrentz fb00a217f5 packetbuf: Use packetbuf_holds_broadcast() all-over 2014-11-13 09:58:08 -08:00
Enrico Joerns b0206e2f58 [doc] avr-raven: Fix placement of description for ravenserial group 
Note: The raven-lcd-interface and raven-ipso modules in atmega128rfa1
seem to be needles for this platform and might be there only because of
copy&paste from the raven platform. Should be removed in a later patch.
 2014-11-10 23:53:34 +01:00
Enrico Joerns 846fd567d4 [doc] avr-atmega128rfa1: add to parent platform group 2014-11-10 23:53:34 +01:00
Enrico Joerns d4cf5ef5a1 [doc] Added minimal doxygen anchor for each platform currently available in Contiki 
Already existing label names and titles were retained
 2014-11-10 23:53:34 +01:00
Enrico Joerns 0288f867ce [platform/native] Add to doxygen tree 2014-11-10 23:53:32 +01:00
Enrico Joerns 9dd7f1d29a [doc] added faulty esb and msp430 references 2014-11-10 23:53:32 +01:00
Enrico Joerns 0b8769e576 [doc] Various fixes for doxygen grouping etc. 2014-11-10 23:53:32 +01:00
Simon Duquennoy 6b7017452b frame802154: move inclusion of linkaddr.h from .h to .c file 2014-11-10 15:43:32 +01:00
Fredrik Österlind 0a2804fd69 Merge pull request #846 from ejoerns/pull-req/cooja-platform 
Cooja platform fixes
 2014-11-05 15:21:18 +01:00
Enrico Joerns 0d12bcffcb [cooja-platform] Fixes for slip-bridge compatibility 
* Added dev/uart1.h header file to cooja platform
* Added slip arch stub
* Suppress examples putchar definition as cooja platform provides its own

Note that the uart1.h file should only be an intermediate solution.
A generic contiki-wide definition for uart handling is required as each
platform defines its own varying set of uart functions.
 2014-11-04 00:14:06 +01:00
Enrico Joerns 5a4c2e0d1f [cooja-platform] Add cast to linkaddr_t to avoid warning 2014-11-04 00:09:45 +01:00
Enrico Joerns f8445ba1bd [cooja-platform] Remove unused variable 'shortaddr' 
This variable was set but never used in the code
 2014-11-04 00:09:45 +01:00
Enrico Joerns 2bc1e08f19 [cooja-platform] Include eeprom.h to avoid implicit declaration warning 2014-11-04 00:09:45 +01:00
Antonio Lignan ef6c351d0c Add function to change I2C baudrate and push relevant configuration values to platform config 2014-10-20 14:23:36 +02:00
Nicolas Tsiftes 0d39ee96ad Merge pull request #820 from alignan/serialnum_as_nodeid 
Use the Z1 product ID as MAC/Node ID if no value is found in XMEM
 2014-10-20 11:38:11 +02:00
Nicolas Tsiftes 27cde1ff81 Merge pull request #824 from alignan/fix_warnings 
Warning fixes
 2014-10-20 11:16:36 +02:00
Antonio Lignan cceb97059c Use the Z1 product ID as MAC/Node ID if no value is found in the XMEM 2014-10-20 10:36:49 +02:00
Antonio Lignan c836fbfbd9 Fixes warnings, bad code and code style 2014-10-20 10:28:00 +02:00
Moritz 'Morty' Strübe c0783e2841 sky: Initialize energest as early as possible 
If energest is initialized too late, the radio is not accounted
until the first switch. This is a problem when the radio is always
listening.
 2014-10-09 09:42:56 +02:00
Mariano Alvira e803a654b4 Merge pull request #684 from SmallLars/2nd-button 
Enabled 2nd button on platform econotag
 2014-10-08 14:05:24 -05:00
Adam Dunkels d891d11324 Merge pull request #557 from kkrentz/llsec-integration 
Integration of Link Layer Security
 2014-10-08 15:45:46 +02:00
Antonio Lignan 5bbb0cabbc Added battery capability to Z1 platform 2014-10-08 11:53:09 +02:00
Antonio Lignan 343a3d3f7b Added missing radio capability define to Z1 platform config 2014-09-24 11:42:55 +02:00
Weichuan Yan 7b6439bd6f atmega128rfa1: Fix the default build error 
Fixing from http://sourceforge.net/p/contiki/mailman/message/32494852/

Signed-off-by: Weichuan Yan <yan.weichuan@gmail.com>
 2014-09-18 08:53:32 +08:00
Atis Elsts 0e9c051485 Fix time accounting on TI EXP5438 MSP430x5438a experimenters board 2014-08-21 18:10:53 +02:00
Nicolas Tsiftes 35b6032c64 Merge pull request #745 from PaulCorbalan/patch-1 
Add PLATFORM_HAS_RADIO in Sky Platform
 2014-08-18 15:08:37 +02:00
kkrentz 94d2b519e4 aducrf101mkxz: added llsec module 2014-08-05 09:15:40 -07:00
kkrentz 2cf7d98cad ContikiMAC: Create and parse ContikiMAC header in special framer; Expanded framer interface 
to allow for creating and securing frames in advance; Create and secure frames in advance when sending bursts; Do neither recreate nor resecure frames that come from phase
 2014-08-05 05:07:06 -07:00
kkrentz c15a05aee1 Sky: Use the cc2420_aes_128_driver by default 2014-08-05 05:07:06 -07:00
kkrentz c6a98f2968 CC2420: Turned SPI macros to functions and removed redundant AES API 2014-08-05 05:07:06 -07:00
kkrentz c032b67969 llsec: Noncompromise-resilient 802.15.4 security 2014-08-05 05:07:05 -07:00
kkrentz 7943751b16 Sky: DEBUG on/off switch 2014-08-04 01:09:57 -07:00
kkrentz c7b394c51b Sky: Calling NETSTACK_LLSEC.bootstrap from contiki-sky-main.c 2014-08-04 01:09:57 -07:00
kkrentz c396a85364 llsec: Added a layer in between NETSTACK_MAC and NETSTACK_NETWORK for implementing link layer security 2014-08-04 01:09:57 -07:00
Jim Paris 9b76c2fb17 aducrf101: Adjust default buffer sizes to fit better in available RAM 2014-07-29 18:25:55 -04:00
Adam Dunkels 62b8aafb03 Merge pull request #722 from royscheefhals/contiki-fix 
char * data to void * data parameter in process_start
 2014-07-28 22:04:36 +02:00
Nicolas Tsiftes 582bfcb8c6 Merge pull request #696 from sieben/doc 
Correct several doxygen tags (\file,...)
 2014-07-28 11:42:41 +02:00
Rémy Léone 8c3fa17ec0 Correct several doxygen tags (\file) 2014-07-28 11:11:45 +02:00
George Oikonomou 95e2cd9021 Merge pull request #732 from camilorodegheri/patch-1 
Update README.md
 2014-07-27 22:55:00 +01:00
Jim Paris 6db05caed9 Fix radio hangups when trying to transmit with radio off. 
The border-router tries to transmit and do other stuff after turning
the radio off, and the radio driver didn't handle that very well.
With this fix, it's no longer necessary to reset the border router
after starting tunslip6.
 2014-07-23 16:21:53 -04:00
Jim Paris 6937b29670 Add Windows build instructions for ev-aducrf101mkxz platform 2014-07-23 16:21:53 -04:00
Jim Paris 07201d13a3 Add IAR compiler support for ADuCRF101 2014-07-23 16:21:53 -04:00
Jim Paris 4f1fc3557c Add README.md for ev-aducrf101mkxz platform 2014-07-23 16:21:53 -04:00
Jim Paris ad141b00fb Implement rtimers for ADuCRF101 2014-07-22 21:18:16 -04:00
Jim Paris c8716f4d57 Add platform LED driver 2014-07-22 21:18:16 -04:00
Jim Paris 63692ba96d Add button sensor support (BOOT button) 2014-07-22 21:18:16 -04:00
Jim Paris 4cb97a3311 Move RF RX into its own process 2014-07-22 21:18:16 -04:00
Jim Paris b7373edf8c Add ADuCRF101 radio driver 2014-07-22 21:18:16 -04:00
Jim Paris 5673b46e86 Add initial EV-ADuCRF101MKxZ platform support 2014-07-22 21:18:16 -04:00
Nicolas Tsiftes 784b20c04d Merge pull request #739 from alignan/merge_z1sp_with_z1 
Merges Z1SP into Z1 platform
 2014-07-04 22:03:27 +02:00
Oliver Schmidt 9ee1bae150 Only wait for a keypress if the user is told to press a key. 2014-07-04 19:33:35 +02:00
Antonio Lignan 5467674fcc Merges Z1SP into Z1 platform 2014-07-04 10:41:05 +02:00
Pablo Corbalán a490986401 Add PLATFORM_HAS_RADIO in Sky Platform 
In order to use the er-server-example Radio resource it is required that the platform defines that it has a radio. This line might be required in other platforms.
 2014-07-03 14:59:13 +01:00
Rémy Léone f111058472 Removing trailing whitespaces 2014-06-30 20:01:05 +02:00
Ian Martin 6ae6c4768e rl78: Change RIMEADDR_CONF_SIZE to LINKADDR_CONF_SIZE because the rimeaddr module has been renamed to linkaddr. 2014-06-28 22:07:57 -04:00
Camilo Rodegheri a50e933f4b Update README.md 
Adding new command for ftdi_sio which applies to Kernel>3.12 used by Ubuntu 14.04 LTS
 2014-06-21 15:04:48 -03:00
Antonio Lignan 3d64b80e40 Added flags to enable 20-bit support from msp430-gcc 4.7.x 2014-06-17 12:55:08 +02:00
Nicolas Tsiftes 4c5fa6ff5d Merge pull request #713 from adamdunkels/pr/drop-iris 
Remove the unmaintained iris platform
 2014-06-13 12:57:52 +02:00
Roy Scheefhals 1058ea986a Changed the parameter 'char * data' of process_start to the 
type process_data_t. This was an artifact when the choice was
made to use the void * type for the data parameter in processes.

Changed parameter 'void * data' of process_post_synch to
process_data_t for consistency.

Checked all the uses of process_start() in contiki and fixed casts
of the data parameter.
 2014-06-12 13:40:28 +02:00
Adam Dunkels 9ceb059c21 Merge pull request #611 from nfi/cc2x20-sfd-config 
Corrected CC2x20 sfd config and startup message.
 2014-06-11 23:17:05 +02:00
Adam Dunkels d7e4443ab2 Remove the unmaintained iris platform 2014-06-11 19:52:19 +02:00
Nicolas Tsiftes da8e9a3e8d Merge pull request #655 from atiselsts/stm32_patches 
Fix inconsistent usage of short/long integer type in mbxxx platform's configuration file.
 2014-06-07 23:21:59 +02:00
Nicolas Tsiftes 350c83c947 Merge pull request #656 from atiselsts/native_platform_patches 
Minor improvements for the native platform
 2014-06-07 23:06:36 +02:00
George Oikonomou ba9c2d40eb Merge pull request #682 from g-oikonomou/watchdog-cc2538 
Confine CC2538 WDT on/off conf inside the driver
 2014-06-03 22:05:08 +01:00
George Oikonomou 25cd0788a6 Merge pull request #683 from g-oikonomou/sensinode-modules 
Fix MODULES for the Sensinode platform
 2014-06-03 22:03:42 +01:00
Adam Dunkels 64f65b4e45 Merge pull request #617 from nfi/extended-radio-api 
Extended radio API with support for setting channel, pan id, addressing modes, etc
 2014-06-03 21:32:53 +02:00
Nicolas Tsiftes 3650950460 Merge pull request #678 from simonduq/sky-disable-ndp 
Disable IPv6 Neighbor Discovery Protocol by default on the sky platform
 2014-06-02 10:52:07 +02:00
Rémy Léone 25c8b0835d Closing doxygen groups 2014-05-30 11:01:20 +02:00
Lars Schmertmann 50481722a8 Enabled 2nd button on platform econotag 2014-05-23 11:50:12 +02:00
George Oikonomou 6e08841e5c Fix MODULES for the Sensinode platform 2014-05-18 15:30:54 +02:00
George Oikonomou 807ee624e4 Confine CC2538 WDT on/off conf inside the driver 
Instead of requiring all calls to `watchdog_start` to be
wrapped inside `#if WATCHDOG_CONF_ENABLE` guards, we control
things from within the WDT driver itself.

This commit also includes some minor documentation and
indentation cleanups
 2014-05-18 14:12:16 +02:00
George Oikonomou b864ec2b71 Merge pull request #661 from hexluthor/watchdog-enable 
CC2538: Add WATCHDOG_CONF_ENABLE to optionally disable the watchdog timer
 2014-05-18 14:11:49 +02:00
George Oikonomou eabc244bff Merge pull request #641 from hexluthor/backdoor-conf 
CC2538: Add CONF parameters to select boot loader backdoor pin and logic level
 2014-05-18 13:29:02 +02:00
George Oikonomou 026864d129 Merge pull request #665 from hexluthor/cc2538-flash-conf 
CC2538: Add FLASH_CONF_ORIGIN and FLASH_CONF_SIZE config parameters.
 2014-05-18 13:12:49 +02:00
Simon Duquennoy 6e53ab6eb0 Disable IPv6 Neighbor Discovery Protocol by default on the sky platform 2014-05-14 17:29:18 +02:00
Claes Jakobsson 9c08f28956 Added EEPROM support for Cooja with a rudimentary hexdump -C like viewer in the mote interface view 2014-05-08 22:35:58 +02:00
Ian Martin 2abaeaa8cc CC2538: Add FLASH_CONF_ORIGIN and FLASH_CONF_SIZE config parameters. 2014-05-02 11:35:58 -04:00
Ian Martin 7081440eff CC2538: Add WATCHDOG_CONF_ENABLE to optionally disable the watchdog timer. 2014-05-02 10:28:30 -04:00
George Oikonomou 08c884afa0 Improve the CC2538 extended RF API implementation 
* Decouple 64-bit address from LINKADDR_SIZE
* get and set object from/to the start/end of the src/dest buffer
* We expect size == 8 (rather than size < 8) for both get_ and set_object. Error otherwise
* The RF no longer sets parameters by itself. We let the platform do this, using the extended API.
 2014-04-23 12:20:16 +01:00
George Oikonomou 3183805ba4 Implement extended RF API for the CC2530 RF 2014-04-23 12:16:50 +01:00
Atis Elsts 7dcfe77fba Fix inconsistent usage of short/long integer type in mbxxx platform's configuration file. 
The type used to store rtimer ticks on this platform is 32-bit integer, but the macro uses 16-bit comparison.
As a result, the output of the RTIMER_CLOCK_LT(a,b) macro was incorrect when used for comparisons between time values with sufficiently large difference.
The code to repeat this problem on mbxxx platform:

  rtimer_clock_t a = 6 * RTIMER_ARCH_SECOND;
  rtimer_clock_t b = 0;
  printf("%d\n", RTIMER_CLOCK_LT(a,b)); // expected output: "0", actual: "1"
 2014-04-22 14:52:50 +02:00
Atis Elsts 9cbfede2b6 Explicitly initialize queue buffer in the main startup routine only if uIP is used. 
The Rime stack already does this on its own, and there is no need to do it twice.
 2014-04-22 14:40:04 +02:00
Atis Elsts b9e15a5986 Make native platform's main loop less noisy. 2014-04-22 14:38:08 +02:00
Atis Elsts 6ea744421b Initialize the rtimer component on native platform's startup. 
Otherwise applications that use rtimers die when run as native code because of an unhandled signal.
 2014-04-22 14:35:01 +02:00
Ian Martin ee05810904 Changes suggested by @bthebaudeau. 2014-04-18 10:29:47 -04:00
George Oikonomou 49bf7cc241 Merge pull request #616 from hexluthor/listing 
CC2538: Add a Makefile rule to generate a final assembly listing.
 2014-04-17 22:13:52 +01:00
Benoît Thébaudeau d93d129da6 cc2538: uart: Make it possible to use several UARTs simultaneously 
This avoids the limitation of having a single UART available at runtime, without
duplicating code.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
 2014-04-17 18:53:44 +02:00
Ian Martin 2cf730a1c6 Un-indent preprocessor directives. 2014-04-17 10:39:00 -04:00
Ian Martin 23a3a7f004 Add a note about "make cc2538-demo.lst" to the platform README. 2014-04-16 10:47:01 -04:00
Ian Martin 16936d864c Rename FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PIN to FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PORT_A_PIN. 2014-04-16 10:19:37 -04:00
Ian Martin 1a63c47cf9 CC2538: Add CONF parameters to select boot loader backdoor pin and logic level. 2014-04-15 17:36:55 -04:00
Brad Campbell af27d2d252 [CC2538-SPI] Implement SPI_FLUSH, spi mode, !CS 
Because the CC2538 has a multi-byte SPI RX FIFO, flushing the buffer
requires more than just a single read. This adds a loop that empties the
entire RX buffer on a FLUSH().

Different SPI chips needs different SPI settings. This commit adds a
function that allows chip drivers to configure the SPI peripheral before
using it.

The frame pin the driver was using as a chip select does not work as
most devices expect it to. It toggles after every byte, and most chips
interpret that as end of message. To make drivers more reliable, each
chip driver should setup a GPIO and assert it as needed.
 2014-04-15 14:07:10 -04:00
George Oikonomou 33abe26ec8 Merge pull request #411 from ADVANSEE/cc2538-adc 
cc2538: Add adc driver and example
 2014-04-13 03:05:12 +01:00
George Oikonomou 22554e6d72 Merge pull request #596 from hexluthor/cc2538-uart-baudrate 
cc2538: Support any UART baudrate.
 2014-04-13 02:51:58 +01:00
Niclas Finne fc6814a104 Added stub for extended radio API for seedeye 2014-04-03 13:38:31 +02:00
Niclas Finne b8a23564a3 Added stub for extended radio API for Cooja 2014-04-03 13:38:29 +02:00
Niclas Finne b13b5fc9ac Fixed typo to correctly print the radio channel at startup 2014-03-28 11:54:12 +01:00
Ian Martin 336224633a Eliminate UART_CONF_IBRD and UART_CONF_FBRD. 2014-03-22 10:26:03 -04:00
François Revol 726bdd699a native: Add CTK to the module list 
It is needed for apps compiled WITH_GUI.
 2014-03-21 23:01:02 +01:00
Nicolas Tsiftes b78eb96a54 Merge pull request #590 from g-oikonomou/native-rpl-module 
Include the RPL module for the native platform
 2014-03-18 12:32:56 +01:00
Oliver Schmidt d1d6278f42 Added info on W5100 driver. 2014-03-15 16:56:08 +01:00
George Oikonomou 4704eeb919 Include the RPL module for the native platform 2014-03-09 03:29:43 +00:00
George Oikonomou 6dc9dfa6c2 Merge pull request #551 from JelmerT/feature-cc2538-bsl 
CC2538 serial boot loader python script
 2014-03-09 02:11:36 +00:00
Jelmer Tiete 34e48f4233 Added bootloader backdoor configuration for cc2538DK in contiki-conf.h and selector in startup-gcc.c. Updated Makefile.cc2538dk to support direct uploading. Also updated the platform readme to include the workflow with cc2538-bsl. 2014-03-07 15:44:08 +01:00
Brad Campbell d14f0d5eed CC2538: add secondary location to ieee address 
The CC2538 currently has two addressing options: a hardcoded address set
at compile time or the address stored in primary address section of the
info page. This commit adds the option to choose the secondary location
of the ieee address from the info page, or any memory address.

To use, define `IEEE_ADDR_CONF_USE_SECONDARY_LOCATION` in `project-conf.h`
or similar.

For example:

    #define IEEE_ADDR_CONF_USE_SECONDARY_LOCATION 1
 2014-03-06 10:31:30 -05: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
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
Adam Dunkels 45265249fc Changed the name of the rimeaddr module to linkaddr 2014-01-29 20:12:24 +01: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
Ian Martin f3cc607101 eval-adf7xxxmb4z: Use the nullrdc driver instead of sicslowmac. 2014-01-26 17:40:31 -05: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 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
Adam Dunkels 1be10f026a Handle the CONTIKI_NO_NET case so that the ravenusbstick example builds 2014-01-26 23:20:42 +01:00
Adam Dunkels 6594873753 Updated the path to uip-debug.h 2014-01-26 23:20:41 +01:00
Adam Dunkels 4c2bd9f120 A set of default modules for the cc253x platform 2014-01-26 23:20:41 +01:00
Adam Dunkels dee654cfe5 Put the cc253x custom makerules in its own customrules file 2014-01-26 23:20:41 +01:00
Adam Dunkels 7846eb2e2f Split the cc2430 custom rules into its own file 2014-01-26 23:20:40 +01:00
Adam Dunkels 36a5aadc9e Moved the 6502 custom rules into its own Makefile.customrules-6502 file 2014-01-26 23:20:40 +01:00
Fredrik Osterlind cf32063c0b introduced optional Makefile.customrules-$(TARGET), to contain custom platform make rules 2014-01-26 23:20:39 +01:00
Adam Dunkels 7a740b382f Moved the individual MODULE definitions from the top-level Makefile.include into the individual platforms' Makefiles 2014-01-26 23:20:36 +01:00
Adam Dunkels 0fe08205e1 Moved the rimeaddr.[ch] code from the core/net/rime module to the core/net module, as it is used not only by rime code 2014-01-26 23:20:36 +01:00
Adam Dunkels b02104e4c4 Add the sht11 device driver module to the z1 platform 2014-01-26 23:20:36 +01:00
Adam Dunkels aaf0f83120 Add cxmac module to the sky platform 2014-01-26 23:20:35 +01:00
Adam Dunkels 9851ff85dd Add a sensible set of modules for the sensinode platform 2014-01-26 23:20:35 +01:00
Adam Dunkels b40f1210e6 Don't use the sicslowmac code, use nullrdc instead 2014-01-26 23:20:34 +01:00
Adam Dunkels e556ecbc25 Don't use the sicslowmac code, use nullrdc instead 2014-01-26 23:20:34 +01:00
Adam Dunkels d7013524f9 Add a sensible set of modules for the micaz platform 2014-01-26 23:20:34 +01:00
Adam Dunkels ee5299fe6e Add a sensible set of modules for the exp5438 platform 2014-01-26 23:20:33 +01:00
Adam Dunkels 51efdd952a Define MODULES for the avr-raven and the avr-ravenusb platforms 2014-01-26 23:20:33 +01:00
Adam Dunkels 34d46fa533 Include driver modules 2014-01-26 23:20:32 +01:00
Adam Dunkels 25367fb08c Moved the ds2411 driver into a dev/ds2411 module 2014-01-26 23:20:31 +01:00
Adam Dunkels c9efe3c3c4 Moved the cc2520 driver into its own dev/cc2520 module 2014-01-26 23:20:31 +01:00
Adam Dunkels 4cfe6c4a5e Moved the sht11 driver to its own module 2014-01-26 23:20:30 +01:00
Adam Dunkels d91bab9104 Include a basic set of modules 2014-01-26 23:20:28 +01:00
Adam Dunkels 0b805e4763 Moved the cc2420 driver into a separate dev/cc2420 module 2014-01-26 23:20:27 +01:00
Adam Dunkels c80615913f Include the core/net and core/net/ip modules in the core/net/ipv4 module 2014-01-26 23:20:25 +01:00
Adam Dunkels 3a3e65a78d Use the MODULES mechanism for the native platform 2014-01-26 23:20:24 +01:00
Adam Dunkels 5f3fe7f7c7 Updated include paths for the moved files under net/ 2014-01-26 23:20:23 +01:00
Ian Martin ed4edab461 eval-adf7xxxmb4z: Corrections to the platform README, update URLs to point to the mainline Contiki. 2014-01-24 12:49:16 -05:00
Oliver Schmidt 0258c413cc Merge pull request #539 from oliverschmidt/master 
Added more flexibility to webbrowser -> wget forwarding.
 2014-01-24 08:08:08 -08:00
Oliver Schmidt 1f4613383f Added more flexibility to webbrowser -> wget forwarding. 
- Up to now the CTK program handler was necessary to start wget and forward the URL. Now alternatively the webbrowser uses the underlying OS to exec wget.

- Up to now windowed CTK was necessary to display the acknowledge dialog. Now alternatively the webbrowser displays the acknowledge text and buttons right in the webpage area.

- For now the targets 'win32' and 'c64' make use of the new capabilities.
 2014-01-24 16:09:30 +01:00
Oliver Schmidt 8baf2d7b42 Merge pull request #536 from oliverschmidt/master 
Copied 'contiki_arg[c|v]' from 'native' to the other desktop targets.
 2014-01-24 03:41:42 -08:00
Oliver Schmidt fc983e2e79 Copied 'contiki_arg[c|v]' from 'native' to the other desktop targets. 
- On the retro targets support for 'contiki_arg[c|v]' is optional as accesing arg[c|v] is rather expensive.
 2014-01-24 11:56:40 +01:00
Ian Martin a897426410 Increase the default baudrate to 38400 bps for RL78. 2014-01-22 18:42:18 -05:00
Oliver Schmidt 510678bed0 Added mouse support for the Atari. 2014-01-20 22:51:40 +01:00
Oliver Schmidt a24865de72 Add somewhat more support to use different mouse drivers. 
- The default mouse driver is now always named 'contiki.mou'.
- Alternative mouse drivers are present in the disk images.
- Users can select their mouse driver by renaming the files.
 2014-01-17 23:45:59 +01:00
Oliver Schmidt fb20cf5ee6 Added UIP_CONF_LLH_LEN. 2014-01-17 22:07:03 +01:00
Ian Martin 85b439e33a Add eval-adf7xxxmb4z platform makefile. 2014-01-10 15:03:38 -05:00
Ian Martin 174d4dd80c Adds support for ADF7023 sub-GHz radio from Analog Devices and RL78 series MCU from Renesas. 
This example platform for this port is the EVAL-ADF7XXXMB4Z w/ radio
daughter cards:

    http://www.analog.com/en/evaluation/eval-adf7023/eb.html

See the platform readme for usage and platform information:

    https://github.com/contiki-os/contiki/tree/master/platform/eval-adf7xxxmb4z/readme.md

All files provided by Analog Devices for this port are released under
the same license as Contiki and copyright Analog Devices Inc. per
agreement between Redwire Consulting, LLC and Analog Devices Inc. (SOW 08122013)
 2014-01-04 18:56:51 -05:00
Oliver Schmidt 63725eff36 Merge remote-tracking branch 'upstream/master' 2013-12-12 20:46:43 +01:00
Oliver Schmidt 3b2173e01f Have CBM DOS filetype of imported files match the one used by cc65. 
CFS_WRITE implies O_TRUNC which is implemented on CBM DOS by deleting an
exsisting file. Hoewever this succeeds only if the CBM DOS filetype matches.

We need a working O_TRUNC in order to be able to overwrite the contiki.cfg
configuration file.

Note: Now it has be clarified why overwriting the configuration file started to
fail the CBM PFS (platform file system) can be activated for the recently added
ethconfig program.
 2013-12-12 18:57:40 +01:00
Benoît Thébaudeau dbba311270 cc2538: Add adc driver and example 
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
 2013-12-06 22:07:45 +01:00
George Oikonomou f2c552bb55 Merge pull request #478 from ADVANSEE/cc2538-startup-cleanup 
cc2538: Startup cleanup
 2013-12-05 11:07:19 -08:00
George Oikonomou 63298843b3 Merge pull request #491 from g-oikonomou/remove-lpp-from-readme 
Remove LPP discussion from the cc2538 README
 2013-12-05 11:07:03 -08:00
George Oikonomou 17b2150081 Merge pull request #463 from ADVANSEE/cc2538-ports-pins 
cc2538: Clean up and improve port and pin definitions
 2013-12-05 10:31:29 -08:00
George Oikonomou 6f22fd6642 Remove LPP discussion from the cc2538 README 2013-12-05 18:16:22 +00:00
Benoît Thébaudeau a2686e581e cc2538: Add header file for flash CCA page and use it 
Create a dedicated header file with all the definitions for the flash lock bit
page and customer configuration area. This avoids duplicating those definitions
in the startup-gcc.c files of all CC2538-based platforms, and this also allows
to easily manipulate the CCA from outside startup-gcc.c (e.g. for on-the-air
firmware update).

The definitions are now complete contrary to what was in startup-gcc.c:
 - Definitions have been added to select the bootloader backdoor pin and active
   level if enabled.
 - Definitions have been added to access the page and debug lock bits. The debug
   lock bit can be used to prevent someone from reading back a programmed
   firmware through JTAG if the firmware binary image has to be confidential,
   which should be combined with a disabled bootloader backdoor.
 - The application entry point is now tied to the beginning of the .text section
   instead of to the beginning of the flash. This allows projects using custom
   linker scripts to place the application entry point anywhere in the flash,
   which can be useful e.g. for on-the-air firmware update.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
 2013-12-05 18:45:51 +01:00
Benoît Thébaudeau 65806f53eb cc2538dk: startup-gcc: Do not redefine SYS_CTRL_EMUOVR 
SYS_CTRL_EMUOVR is already defined in sys-ctrl.h, so #include this header file
instead of redefining SYS_CTRL_EMUOVR in startup-gcc.c.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
 2013-12-05 18:41:49 +01:00
George Oikonomou acebfa2932 Merge pull request #466 from ADVANSEE/cc2538dk-slip-enable 
cc2538dk: Make it possible to override SLIP_ARCH_CONF_ENABLED
 2013-12-05 09:11:38 -08:00
Mariano Alvira 590b3f48a9 Merge pull request #477 from MariaLauraStefanizzi/eeprom 
i2c and eeprom drivers for mbxxx boards
 2013-12-02 09:20:14 -08:00
Mariano Alvira 86c593b7cd Merge pull request #481 from ismb-pert/fix-sleep 
Fix sleep
 2013-12-02 09:19:25 -08:00
Mariano Alvira 2ab24f4fc3 Merge pull request #387 from chrta/mb950_1_rev_B 
Added support for STM32w boards MB950 and MB951 revision B.
 2013-12-02 09:11:50 -08:00
Gianfranco Costamagna ae27278714 Readded clock.c file, deleted in pull request #266, fixing issue #440 2013-12-02 11:38:07 +01:00
Adam Dunkels 0fd503af42 Removed the experimental checkpointing code 2013-11-28 14:09:17 +01:00
Maria Laura Stefanizzi 10c7066035 mbxxx eeprom driver 
This patch adds the eeprom driver needed to access M24C64
eeprom which is on some mbxxx boards.
Signed-off-by: Maria Laura Stefanizzi <laura28582@gmail.com>
 2013-11-27 15:40:07 +01:00
Maria Laura Stefanizzi 22f39ab4ff MEMS I2C integration. 
This patch allows the MEMS driver to use the i2c driver.
Signed-off-by: Maria Laura Stefanizzi <laura28582@gmail.com>
 2013-11-27 15:40:07 +01:00
Maria Laura Stefanizzi a9c0768fd6 Integrate I2C driver into board initializzation 
This patch add I2C initializzation for board with I2C devices.
Signed-off-by: Maria Laura Stefanizzi <laura28582@gmail.com>
 2013-11-27 15:40:07 +01:00
Maria Laura Stefanizzi c7b1248aac mbxxx I2C driver. 
This patch add the I2C driver for mbxxx platform to communicate with
devices connected to the SC2 I2C bus.
Signed-off-by: Maria Laura Stefanizzi <laura28582@gmail.com>
 2013-11-27 15:40:07 +01:00
Adam Dunkels 0d04db2b03 Merge pull request #428 from g-oikonomou/config-sanity 
Remove unnecessary stuff from various Makefiles (Config Sanity, Pt 1)
 2013-11-26 15:05:08 -08:00
Benoît Thébaudeau 436b585d7e cc2538dk: Make it possible to override SLIP_ARCH_CONF_ENABLED 
As the comment in contiki-conf.h says, the automatic definition of
SLIP_ARCH_CONF_ENABLED works only if UIP_FALLBACK_INTERFACE is tied to SLIP. If
UIP_FALLBACK_INTERFACE is set to another interface, SLIP_ARCH_CONF_ENABLED is
still automatically set to 1, leading to unwanted SLIP_END characters from
dbg.c:putchar() being printed on the UART.

This change makes it possible to force the definition of SLIP_ARCH_CONF_ENABLED
(e.g. from project-conf.h), so that it can be disabled if UIP_FALLBACK_INTERFACE
is used with something else than SLIP.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
 2013-11-25 20:48:52 +01:00
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