Niclas Finne
05b10eb9ce
Initial WiSMote port based on code from Arago Systems.
2012-01-09 12:25:06 +01:00
Niclas Finne
367c82a5ab
added compiler flags and macros for IAR and mspgcc 4.4.5 compilers
2012-01-09 12:24:33 +01:00
David Kopf
b251619a2f
Add wpcap for cygwin/Windows native border router
2012-01-08 13:37:56 -05:00
Joakim Eriksson
5da8a9261b
fixed so that it works for non IPv6 applications
2012-01-06 03:59:43 -08:00
Joakim Eriksson
c3af79b795
Made native main loop sleep a bit more
2012-01-01 09:29:33 +01:00
Niclas Finne
8b83ffec67
Added native-border-router and slip-radio
2012-01-01 09:29:33 +01:00
Joakim Eriksson
0ea95c21b3
Added api for reading out tmp100 x100 temps
2012-01-01 09:29:10 +01:00
Niclas Finne
d14d90ea68
Moved variable definitions from header file
2011-12-20 05:09:31 +01:00
Niclas Finne
c0cf69ecbd
fixed compiler warnings
2011-12-20 05:09:28 +01:00
Niclas Finne
3661ff242e
io, signal and IAR-GCC checks have been moved into contiki include file
2011-12-20 05:09:16 +01:00
Nicolas Tsiftes
d0ebeb409e
Merge remote-tracking branch 'sf/master' into rpl-patch
...
Conflicts:
core/net/tcpip.c
2011-12-08 15:26:11 +01:00
Matthias Kovatsch
36763cabbd
Introduced PLATFORM_HAS_LIGHT, _BATTERY, and _SHT11.
2011-12-07 20:47:31 +01:00
Adam Dunkels
66c280039b
Removed obsolete platforms
2011-12-05 21:49:38 +01:00
Nicolas Tsiftes
0e32956a63
Merge remote-tracking branch 'sf/master' into rpl-patch
2011-11-21 14:59:31 +01:00
David Kopf
fb977cb9ef
Better fix for hardware FCS error on JTAG reset
...
Correct silly error introduced by trying to save two bytes.
2011-11-15 13:24:58 -05:00
David Kopf
3612fdff5b
Add params.c to Raven and sync with 128rfa1 contiki-conf.h
...
Contikimac works with mcu sleep on both platforms.
2011-11-14 11:56:34 -05:00
David Kopf
65032c4d35
Get better random seed on startup
2011-11-14 11:51:54 -05:00
David Kopf
bdd164e003
Reverse node_id bytes, patch from Geog von Zengen
2011-11-08 12:23:29 -05:00
Mariano Alvira
af4ef9531c
Add node_id to econotag
2011-10-25 10:09:28 -04:00
Niclas Finne
ed1780f9af
Removed quickstart rule for target 'clean' to avoid make warnings
2011-10-24 17:04:45 +02:00
nvt
d711887a1b
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-10-10 22:11:52 +02:00
nvt
4f3528f7ed
Move compower configuration out of the non-IPv6 conditional clause.
2011-10-10 22:11:29 +02:00
Matthias Kovatsch
efeebe953c
Enabled UDP checksums for minimal-net
2011-10-10 14:25:03 +02:00
simonduq
dd8576830e
Added bursts support in CSMA/ContikiMAC, and CFS-swapping in
...
queuebuf. Exemplified in examples/udp-stream.
2011-09-27 16:47:03 +02:00
Joakim Eriksson
5b1d9617c4
moved io and signal and IAR-GCC checks from driver files into contiki include file
2011-09-26 10:38:41 +02:00
Joakim Eriksson
95dde73618
fixed Sky platform for IAR compiler
2011-09-11 17:18:02 +02:00
David Kopf
f721f646fa
Adjust sleep time by ticks instead of seconds, proposed by Ivan Delamer
2011-09-10 12:44:49 -04:00
Mariano Alvira
3e5afa2b59
replace MAC_CONF_CHANNEL_CHECK_RATE with
...
NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE for redbee-dev and econotag
Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with
NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE)
2011-09-06 07:49:23 -04:00
Adam Dunkels
eeb25b9667
If no MAC is defined, create one from the node ID
2011-09-05 22:04:06 +02:00
Adam Dunkels
8fee2a507c
Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE)
2011-09-05 20:43:10 +02:00
Adam Dunkels
0f8145c78b
Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE)
2011-09-05 20:43:01 +02:00
Adam Dunkels
25c28e06cc
Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE)
2011-09-05 20:42:12 +02:00
Adam Dunkels
a06cf93e4c
Made the sky and z1 platform handling of PROJECT_CONF_H the same as the other platforms: the makefile should define PROJECT_CONF_H to be the name of the header file to include. This header file should #undef everything it #defines, as it is included after all the other configuration options in contiki-conf.h
2011-09-05 11:46:15 +02:00
Adam Dunkels
ee75ec3ced
Be a little more conservative in terms of what headers not to compress
2011-09-05 11:41:41 +02:00
Mariano Alvira
6c0bbc492b
change mc1322x rtimers to 32-bit
...
hardcode a close default value for the RTC
2011-09-02 12:32:47 -04:00
Adam Dunkels
6c607b702a
Use the SICSLOWPAN_CONF_COMPRESSION_THRESHOLD to avoid compressing IPv6 packets smaller than 60 bytes. This allows us to use ContikiMAC without its header, making it 802.15.4 compliant again.
2011-09-02 13:52:19 +02:00
Adam Dunkels
add8367947
Include stdlib.h for the NULL macro
2011-08-31 21:56:28 +02:00
David Kopf
3520cc0bae
flash led on tcp get, fix pingbacks on rpl build, patch web data for params
2011-08-31 12:13:31 -04:00
David Kopf
36b290a1cd
Refactor with params.c, h
2011-08-31 11:47:17 -04:00
David Kopf
d2aece89ef
Add settings manager with program flash defaults, random routine, periodic prints with ENERGEST, node-id.
2011-08-28 16:22:39 -04:00
David Kopf
bdec65b889
Fix typos and file endings
2011-08-28 16:04:36 -04:00
David Kopf
9fec648b3e
Allow selection of slip port
2011-08-25 14:43:18 -04:00
David Kopf
dff77aea61
Correct typo
2011-08-25 14:37:12 -04:00
David Kopf
94fc40f736
Move LEDONPORTE1 define to contiki-conf.h, fixing typo.
2011-08-24 11:35:58 -04:00
David Kopf
3c18372939
Add periodic prints and stack monitor
2011-08-24 10:55:58 -04:00
David Kopf
b55dddcd38
Free rtimer for contikimac, add print-stats option
2011-08-15 14:55:18 -04:00
David Kopf
83e3b99d54
Let RPL examples enable platform RPL
2011-08-15 14:45:44 -04:00
David Kopf
50d1086553
Add changes needed for contikimac
2011-08-13 11:38:38 -04:00
David Kopf
ea1345d3fe
Update to proper webserver define
2011-08-13 11:36:43 -04:00
David Kopf
f36c97a9a4
Get random seed from noisy ADC conversion at startup.
2011-08-13 11:31:20 -04:00
Adam Dunkels
40bf585af8
The Z1 platform has LEDs
2011-08-08 22:46:30 +02:00
David Kopf
c9b19ce655
Change timer setups for arbitrary CLOCK_CONF_SECOND
...
Change raven to 128 ticks and enable 32KHz crystal as default.
2011-08-05 15:14:35 -04:00
David Kopf
96c3c1093a
Assign aaaa:: prefix if HARD_CODED_ADDRESS not defined
2011-08-03 12:30:20 -04:00
David Kopf
6ae3e2bcb2
Restore micaz/dev/clock.c, mysteriously renamed to iris/dev/sensors/battery-sensor.c
2011-08-03 11:44:22 -04:00
David Kopf
e2ad2acde4
Add stk500 platform and changes suggested by Daniel Willmann
2011-08-03 11:18:55 -04:00
David Kopf
44f4ee9315
Use PROCESS_NAME_STRING macro to handle NO_PROCESS_NAMES
2011-08-03 11:08:40 -04:00
David Kopf
6ec85fe079
Add Iris port of Shinta Hatatani
2011-08-03 10:17:59 -04:00
Adam Dunkels
8962136b1a
Added a motelist target that is the same on both sky and z1
2011-07-29 13:06:00 +02:00
Adam Dunkels
aedf4fe8b5
Made ContikiMAC/8 default on z1 platform; enabled power profiling by default
2011-07-29 13:05:36 +02:00
David Kopf
0774fef827
Add explicit RADIOSTATS to platform contiki-conf.h
2011-07-25 15:12:12 -04:00
David Kopf
05c11d362b
Clock seconds since startup on minimal-net
2011-07-24 11:53:36 -04:00
David Kopf
0bb585fd60
Replace WEBSERVER by AVR_WEBSERVER
2011-07-24 11:43:17 -04:00
HATATANI Shinta
11d6bc78c5
some fix
2011-07-19 16:21:41 +09:00
Mariano Alvira
697af5ef08
adding tmp102 sensor for the econotag from Hedde Bosman.
...
This can be pulling in as a common driver if we can make a generic i2c
Contiki driver.
2011-07-18 07:30:49 -04:00
HATATANI Shinta
3c168cc395
merge iris and micaz
2011-07-17 10:36:35 +09:00
HATATANI Shinta
94a6f4087c
some trivial change
2011-07-15 16:36:25 +09:00
HATATANI Shinta
a7d713d253
Now iris port works with tunslip6 (Thanks to Suhas K)
2011-07-15 16:36:25 +09:00
HATATANI Shinta
f4740a062a
IRIS port is working with uIPv6
2011-07-15 16:36:25 +09:00
HATATANI Shinta
9a201f6934
create iris directory
2011-07-15 16:36:24 +09:00
David Kopf
6355545ded
Add template for AUTOSTART_PROCESS
2011-07-11 11:34:04 -04:00
Vincent Brillault
dc9cbe647d
Changes in RPL implementation :
...
- Structural modification of RPL data storage.
- Support multiple gateways (multiple DODAG-ID with a unique InstanceID)
- Use Lollipop counters
- Add leaf-only configuration option for RPL
Bugfix :
- Correctly send "Grounded" flag in DIO
2011-07-11 16:52:45 +02:00
Mariano Alvira
e80f9eb4b5
mc1322x: build fixes for uart2
2011-07-08 19:40:42 -04:00
Niclas Finne
4b26f92e04
Added platform configuration files with resource definitions for the JCreate and Sentilla USB platforms
2011-07-01 17:18:57 +02:00
Niclas Finne
1d07330ac0
Made the platform config file configurable.
2011-07-01 17:16:12 +02:00
Niclas Finne
d635c03b52
Fixed bug when reading temperature (abstemp was not always set).
2011-06-30 18:16:35 +02:00
David Kopf
6ea7250af7
Change ctimer startup order, add multihop to wpcap and minimal-net platform.
2011-06-30 12:12:07 -04:00
David Kopf
46de21e771
Allow ipv6 builds on win32 platform. (webserver6 builds with cygwin, needs changes for VC++ compiler)
2011-06-28 08:24:23 -04:00
David Kopf
c48b7ab78d
Add RPL nodes and border router to minimal-net platform (cygwin only)
2011-06-28 08:19:48 -04:00
dak664
d6db9e4e86
Add project-conf.h to platform contiki-conf.h files.
...
Fix jackdaw comments.
2011-06-08 09:12:57 -04:00
Niclas Finne
dc426d789b
msp430.h has been merged with msp430def.h for code to compile with IAR compiler
2011-06-07 18:54:57 +02:00
Joakim Eriksson
af601dfb23
improved support for IAR compiler for z1
2011-06-05 00:21:47 +02:00
Mariano Alvira
cb29a9c667
add leds and button capabilities to the econotag.
2011-05-27 11:01:54 -04:00
Joakim Eriksson
77ec0bfa0f
fixed the z1 platform and generic code used by z1 to work with IAR compiler
2011-05-25 17:21:51 +02:00
Niclas Finne
374722b2e0
Added resource definition for leds and button
2011-05-20 14:27:53 +02:00
dak664
55c1ce6e93
Fix ip4 hello-world build
2011-05-18 11:09:16 -04:00
Niclas Finne
41dd2d09f4
Added missing include
2011-05-10 15:28:30 +02:00
Mariano Alvira
e2d9082fc7
factor maca hw autoack and nullrdc hw autoack config
2011-05-08 09:50:57 -04:00
Mariano Alvira
65671c66c6
turn on insert ack packet by default
2011-05-08 09:50:57 -04:00
Salvatore Pitrulli
6e20a4c0ce
Added missing include.
2011-04-27 18:12:23 +02:00
Salvatore Pitrulli
5eabf33211
Added functions for deep sleep to mbxxx platform.
2011-04-27 18:12:23 +02:00
Salvatore Pitrulli
01a7a78a94
Fixed temperature ADC conversion bug on mbxxx.
...
The conversion was made from an incorrect source when
the GPIO pin was not PB7.
Added functions and macros used to select the correct
ADC channel.
2011-04-20 18:06:20 +02:00
Salvatore Pitrulli
aa968309af
Merge remote branch 'sf/master'
2011-04-16 16:27:10 +02:00
Salvatore Pitrulli
738c5dcd4b
Files for platform mbxxx.
...
MBXXX is a fake platform that actually include
all the platforms based on STM32W108 microcontroller.
Detection of the board is made at runtime, at the
expense of code size.
2011-04-14 08:11:54 +02:00
Salvatore Pitrulli
80605d4045
Change from DEV to PORT in login command for mb851.
...
DEV variable was already used in Makefile.include.
2011-04-14 08:07:15 +02:00
Salvatore Pitrulli
af8e58e063
Set LED pins to output when MB851 is in sleep mode.
...
This reduces power consumption.
2011-04-13 18:14:12 +02:00
Oliver Schmidt
b19fb0ac9e
Activate Telnet-server GUI-support only for project builds.
2011-04-10 17:08:50 +02:00
Oliver Schmidt
c6c0d6247b
Merge remote-tracking branch 'origin/master'
2011-04-10 13:23:13 +02:00
Oliver Schmidt
7c3adef1c8
Added dependency handling and README.VC
2011-04-10 13:21:39 +02:00
Oliver Schmidt
f2678ff7b4
Renamed README to README.1X
2011-04-10 12:43:24 +02:00
Oliver Schmidt
199d51275d
Removed section about (recently deleted) VC solution file.
2011-04-10 12:38:11 +02:00
dak664
2e14df3981
Options to extend mc1322x fifo to RAM buffer, or use hardware flow control with tunslip6.
2011-04-08 15:15:16 -04:00
Salvatore Pitrulli
6655c876f2
Added functions and example for deep sleep on mb851.
...
The added function let a process to make the system go
into deep sleep for maximum power saving.
The udp-ipv6-example shows how to use these new functions.
2011-04-08 11:53:48 +00:00
Niclas Finne
236c459ecf
Added missing include
2011-04-07 09:26:12 +02:00
Oliver Schmidt
eadd74ae5f
Removed VC++ project files.
...
Being able to build about any Contiki project in the WIN32 target using VC++ is _so_ much more useful than those project files not integrated in any way into the Contiki build system.
2011-04-03 22:37:03 +02:00
Oliver Schmidt
5da4faf71e
Allow VC++ to be used as alternative to GCC for building in the WIN32 target.
...
TODOs:
- Update README
- Add dependency handling
- Add rtimersupport
2011-04-03 22:32:11 +02:00
Oliver Schmidt
f83fb3704b
Replaced make-empty-symbols with empty-symbols.[c|h]
...
The symbol generation shell scripts cause CRLF issues on Windows/Cygwin again and again. Instead of fixing this yet again I opted to remove the symbol generation script at least for the "no symbols" scenario with two C source files to be copied.
2011-04-03 13:24:58 +02:00
Oliver Schmidt
4a731dfda9
Allow for non-GUI win32 apps.
2011-04-03 10:56:18 +02:00
dak664
4e8b4e408c
Temporary fix for RNDIS enumeration before the mac address is set up.
...
(Turn on RS232 debug to bypass the enumeration wait and let the mac address get set first)
2011-03-27 14:21:47 -04:00
Enric M. Calvo
4ba4d55e34
cleaned up main
2011-03-26 10:15:49 +01:00
Enric M. Calvo
aba380b960
removed modif. to sky files
2011-03-25 17:57:17 +01:00
Enric M. Calvo
1716d837fc
Merge branch 'master' of git://contiki.git.sourceforge.net/gitroot/contiki/contiki into master_cleanup
...
Makefile.z1 is broken into .common and .z1 to share it with Z1 Starter Platform
Conflicts:
.gitignore
platform/z1/Makefile.z1
2011-03-25 17:46:38 +01:00
dak664
fcb41fa5c2
Refactor with settings manager and better usb enumeration for debug prints
2011-03-23 18:10:49 -04:00
dak664
a9cbbb4570
Add sneezer mode and tx power change
2011-03-23 18:08:07 -04:00
Mariano Alvira
0af24040f1
econotag: add an option to use the watchdog timer
2011-03-22 16:35:54 -04:00
Salvatore Pitrulli
45db1a6faf
Reduced uip buffer size in order to compile all the examples.
2011-03-22 19:35:50 +01:00
Salvatore Pitrulli
eb588f1aec
New HAL and SimpleMAC for STM32W108.
2011-03-22 19:35:49 +01:00
Niclas Finne
ccc1687319
Made energest configuration configurable
2011-03-21 21:28:43 +01:00
dak664
5dd7500d0b
Add configurable auto cca threshold and implement driver cca call.
...
Show smallest rssi in jackdaw menu.
2011-03-21 11:10:30 -04:00
joakime
7984ec38ce
fixed so that accelerometer is initialized and the isr vector is included
2011-03-16 13:56:29 +01:00
Mariano Alvira
59768e7bc7
econotag: fix problem with how IAB based mac addresses are formed
2011-03-13 17:48:47 -04:00
dak664
16a73eafd9
Use uip-debug.h defines and print routines
...
Add print to show cause of startup
2011-03-13 14:07:17 -04:00
dak664
533a827adb
Defines need to be above their use in a conditional test
2011-03-11 16:28:02 -05:00
dak664
abf6f1a153
Include objects needed for slip rpl border router build
2011-03-11 15:08:55 -05:00
dak664
e4fcd7ebd7
Add files needed for slip rpl-border-router build.
2011-03-11 14:16:27 -05:00
dak664
02091b083a
MAC address to EEMEM, not PROGMEM
...
Sync atmega128rfa1 main routine to the raven (timed route prints, etc.)
2011-03-11 13:47:47 -05:00
dak664
69da4c8cfa
Fix unresolved references when built without webserver and/or tcp. Changes suggested by Harald Pichler.
2011-03-10 10:57:43 -05:00
dak664
ad67c573de
Fix unused variable warning
2011-03-10 10:37:15 -05:00
dak664
de7bcda99f
avrdude and makefile changes suggested by Georg von Zengen
2011-03-08 13:07:00 -05:00
Enric M. Calvo
127a3d03ad
Added IPv6 z1-websense demo w/MSP batt&temp sensor
2011-03-08 09:27:38 +01:00
Enric M. Calvo
13ff778d73
added temperature-sensor to Makefile.common
2011-03-08 09:20:35 +01:00
Enric M. Calvo
7fc41e1706
M Makefile.common to add tmp102 sensor by default
2011-03-07 21:23:58 +01:00
Niclas Finne
a199ae920e
Changed the order in which io.h and signal.h is included. Some versions of mspgcc4 seem to have a problem when signal.h is included before io.h.
2011-03-07 20:54:02 +01:00
Niclas Finne
ccc0a3f7c4
Changed LEDS_ALL to 8 leds for the JCreate platform
2011-03-07 20:12:26 +01:00
Fredrik Osterlind
dd7cec737d
removed obsolete leds_[color]() functions, replaced by leds_{on,off}()
...
allow LEDS_[COLOR] to be configured by platform-conf
2011-03-03 17:48:32 +01:00
Enric M. Calvo
0c6fd04f44
Modified contiki-conf.h and added sensys-scanner.
2011-03-03 13:44:28 +01:00
Fredrik Osterlind
499c13a357
removed execute flag of source files (avoids diff problems with egit)
2011-03-01 18:16:42 +01:00
dak664
7f3c198a78
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-02-28 16:32:48 -05:00
dak664
1e7479f8e4
Add periodic print of stack monitor and neighbors/routes.
...
Refactor PRINTFs.
2011-02-28 16:26:28 -05:00
Enric M. Calvo
701a42e239
Added dummy light driver. Now skywebsense likes Z1
...
The light sensor driver is mapped to the same pin as the potentiometer
in Z1 Starter Platform. sky-websense is untouched, though.
2011-02-27 21:28:25 +01:00
Enric M. Calvo
414d926966
Sky-websense compiles for Z1 (testing)
2011-02-27 20:10:09 +01:00
Enric M. Calvo
02d097674c
Corrected contiki-conf.h to include project-conf.h
2011-02-27 20:00:45 +01:00
Enric M. Calvo
a779cb4d0d
XXX Interrupts by cc2420 & adxl345 compatible now
...
Still remains to be seen why i2cmaster.c and adxl345.c need to be added
in the Makefile.common at the very beginnig with the env. var.
PROJECT_SOURCEFILES += i2cmaster.c adxl345.c
2011-02-27 18:02:12 +01:00
Enric M. Calvo
18e1f92f0e
Set QUEUEBUF_CONF_NUM to 4 to avoid .data overflow
2011-02-27 17:52:00 +01:00
Enric M. Calvo
fc51115ace
optional lines in Makefile.common
2011-02-27 17:14:27 +01:00
Enric M. Calvo
e0882d7769
corrected adxl345, ISR was not disabled, now it is.
2011-02-27 13:09:14 +01:00
Enric M. Calvo
404b735cc4
Fixed radio and contiki conf to get RIME working
...
cc2420 isr handled at cc2420-arch, disabled accel. interrupts and modified
platform/z1/contiki-conf.h to use same mac as sky.
Added example-broadcast-button, sends packets every second or when button pushed.
Works with other Z1s and Sky
2011-02-27 12:35:19 +01:00
Enric M. Calvo
9acdb98a56
Added a quick sht11 sensor driver support for Z1
...
Support for Sensirion SHT1x/SHT7x support is adapted from core for Z1 in the Ziglet port.
XXX TODO:
+ Remove SHT11_PWR
+ Lines are shared with I2C, hence port reconfiguration must be added at the driver level.
2011-02-26 12:41:56 +01:00
Enric M. Calvo
f1fe8782b0
Removed unwanted files
2011-02-25 16:29:55 +01:00
Enric M. Calvo
44ce1699f2
Definition of Z1 Starter Platform in contiki/platforms + LEDs + Potentiometer
2011-02-25 16:08:50 +01:00
Enric M. Calvo
3ec4143252
Added Potentiometer sensor in Z1 Platform
2011-02-25 16:01:40 +01:00
Enric M. Calvo
43db4fd10e
Added MAC overwriting/burning capability to the Z1
...
Added compilation parameter "nodemac=1234" that can be used
to overwrite the MAC at compilation time, and that combined
with the burn-nodeid app can record a prestablished MAC on ext. mem.
2011-02-25 15:35:41 +01:00
Enric M. Calvo
659f36eb79
Updated *-sensor.c files from the sky platform.
...
Fixed battery-sensor plus added simple test (XXX)
2011-02-25 15:35:41 +01:00
Mariano Alvira
05a4961604
econotag: generate EUI64 mac adresses properly
2011-02-23 15:20:08 -08:00
Mariano Alvira
e9c904a74c
econotag: turn DEBUG off by default
2011-02-23 15:19:44 -08:00
Mariano Alvira
c2c70a22df
mc1322x: setup hardware addresses and enable AUTOACK mode if
...
configured
2011-02-23 15:19:44 -08:00
Mariano Alvira
e826ccd3b9
add NULLRDC_CONF_802154_AUTOACK_HW for radios that only pass-up NOACK
...
status but not the actual ack packet.
2011-02-23 15:19:44 -08:00
dak664
ef4bb08c3e
Add stack monitor. Change internal uip address to 200 for RPL.
2011-02-23 14:14:21 -05:00
Lionel Debroux
5cb49e8b07
Several compiler warning fixes:
...
* msp430: fix "implicit declaration of function" warnings in clock.c, by including watchdog.h;
* sky: fix a couple pointer target signedness warnings;
* core: fix several signed/unsigned comparison warnings;
* framer-802154: "const static" -> "static const" to fix compiler warnings;
* core: comment or remove unused variables and function definitions.
Signed-off-by: Lionel Debroux <lionel_debroux@yahoo.fr>
Signed-off-by: Mariano Alvira <mar@devl.org>
2011-02-20 19:28:14 -05:00
Enric M. Calvo
1b2878baa4
Corrected some typos in the PORT1 ISR function.
2011-02-16 12:02:36 -05:00
Fredrik Osterlind
747eafd5f0
support for tinyos style node ids, to simplify testbed experiments
...
with automatic node ids
2011-02-11 15:27:14 +01:00
Fredrik Osterlind
a501816472
example of adding cooja-platform mote interface manually
2011-02-11 15:23:59 +01:00
Nicolas Tsiftes
39ea9405bb
Added a function for setting the I/O semantics on a Coffee file descriptor. Changed the configuration parameters slightly and updated the platform definitions to reflect this change.
2011-02-09 15:03:57 +01:00
Mariano Alvira
ad200384ac
add a dummy light sensor for econotag
2011-02-08 09:07:45 -05:00
Mariano Alvira
227b72c88d
add dummy node-id.h for econotag
2011-02-08 09:07:34 -05:00
Mariano Alvira
9572baa71b
fix mc13224v led driver to only touch gpio used for leds.
2011-02-08 09:07:11 -05:00
Mariano Alvira
dbe6407a22
change mc13224v button-sensor to use gpio structs
2011-02-08 09:07:03 -05:00
dak664
bbcd43a9aa
Merge branch 'master' of github.com:adamdunkels/contiki-2.x
2011-02-07 15:14:54 -05:00
dak664
71612fd6a4
Replace file, some problem with my local master line endings.
2011-02-07 15:12:54 -05:00
dak664
b33b89216f
Delete obsolete file
2011-02-07 14:35:19 -05:00
dak664
574feaa866
Test web-based commit, see if it fixes the line endings.
2011-02-07 11:25:07 -08:00
dak664
574927c776
Delete obsolete file
2011-02-07 14:07:37 -05:00
dak664
519cce0019
Add comments, bugfixes, merge avr-atmega128rfa1 platform changes to avr-raven
2011-02-07 14:06:53 -05:00
dak664
62b894e560
Add avr-atmega128rfa1 platform based on Michael Hartman's board (single LED peripheral)
2011-02-07 13:15:21 -05:00
David Kopf
ceea35f7a8
Test TortoiseGit commit from Vista laptop
2011-02-04 10:41:18 -05:00
David Kopf
16df31b143
Merge branch 'master' of https://github.com/adamdunkels/contiki-2.x
2011-02-04 10:39:34 -05:00
dak664
0b23116c30
Test TortoiseGit commit from windows 7
2011-02-04 09:03:03 -05:00
David Kopf
c18d12e8a4
Test git commit
2011-02-03 18:29:17 -05:00
oliverschmidt
10a7bb2579
Made Atari build compabile with make.exe from GnuWin32 and cmd.exe. cmd.exe comes with a builtin mkdir which doesn't understand -p. However -p isn't necessary as long as the disk creation works - and therefore the directory is successfully deleted.
2011-01-23 16:25:45 +00:00
nvt-se
375e1d76ef
Print the error if select fails
2011-01-21 14:19:57 +00:00
enricmcalvo
594d033c04
Added device drivers for tmp102 sensor for the Zolertia Z1 platform.
2011-01-20 10:28:00 +00:00
nifi
3d28da8813
Coffee no longer uses watchdog calls
2011-01-18 15:49:37 +00:00
nifi
1e69c4c795
Moved watchdog_periodic into the lowest level to avoid multiple redundant calls higher up
2011-01-18 15:48:38 +00:00
nvt-se
9ad02dbdd8
Removed header inclusion
2011-01-18 14:58:39 +00:00
nvt-se
28421f1fe2
Removed watchdog calls from Coffee
2011-01-18 14:06:33 +00:00
nvt-se
00ac8cfaa0
Moved watchdog_periodic into the lowest level to avoid multiple redundant calls higher up
2011-01-18 14:03:55 +00:00
adamdunkels
34f2d3e025
Disable timesynch by default - it is not well-tested enough yet.
2011-01-09 21:04:14 +00:00
adamdunkels
a6fe42f60f
Restart CC2420 SFD interrupt after DCO calibration only if it is enabled.
2011-01-09 21:03:42 +00:00
nvt-se
4003c3a8c9
do2unix conversion
2011-01-05 17:02:15 +00:00
joxe
2e1c856741
added support for avoiding sleeping in LPM3 when DCO needs to be running - needed for uart DMA
2011-01-05 12:04:23 +00:00
dak664
90a6d768ea
Keep track of sleeptime and display on status web page.
2010-12-23 19:41:07 +00:00
dak664
013c3ac2f8
Remove contitional on clock updating, it should always be done after a sleep!
2010-12-22 17:09:03 +00:00
dak664
44a2e34005
Resolve TIMER2 conflict between sleep and possible clock usage.
2010-12-22 16:50:30 +00:00
dak664
7b7ad4336e
Send text following ? in GET to Raven LCD
2010-12-20 20:06:06 +00:00
dak664
ac68ced90a
Add polyphonic ringtones for received messages.
2010-12-20 20:03:56 +00:00
dak664
8af150ec0b
Send temperature and voltage to 1294p webserver on startup by default.
2010-12-20 19:58:42 +00:00
dak664
b87694e272
Update documentation
2010-12-19 17:13:29 +00:00
dak664
6d1c060564
Modify menu chart for sleep and doze, add raven picture for doxygen
2010-12-19 17:12:13 +00:00
dak664
b438b78097
Fix configuration for RPL build (no packet queuing, default no TCP)
2010-12-18 22:37:02 +00:00
dak664
9575daede2
Add working cx-max configuration values.
2010-12-18 20:53:36 +00:00
dak664
d378d891c8
Add working cx-mac configuration values.
2010-12-18 20:46:14 +00:00
dak664
89d0ffffd2
Save radio ontime when webwser displays current cpu ontime for later display of corresponding value after possible TCP delays.
2010-12-18 20:44:02 +00:00
dak664
8586643d14
Implement SLEEP and DOZE commands from the 3290p menu.
...
Define serial commands the same as the 3290p for grepping.
2010-12-18 20:40:45 +00:00
dak664
555fab59a3
Add SLEEP and DOZE functions to the menu.
...
Give serial commands the same defines as in the 1284p for grepping.
2010-12-18 20:35:58 +00:00
adamdunkels
e55c3cd471
Enable DCO configuration override
2010-12-16 22:52:27 +00:00
adamdunkels
37e65264a8
Hack: reenable cc2420 SFD interrupts after resyncing the DCO. The DCO code currently messes up the SFD interrupt settings.
2010-12-16 22:52:12 +00:00
adamdunkels
6a80106236
Turn on timesynch by default
2010-12-16 22:51:22 +00:00
dak664
aa7ad8c807
Add rf230_listen_channel routine to force RX_ON state for sniffing and to read rssi for energy scan.
2010-12-15 16:50:44 +00:00
nvt-se
404230a047
Added a macro for portable watchdog calls.
2010-12-15 14:01:07 +00:00
salvopitru
5f40a5d63e
Added serialdump utility from sky folder to stm32w folder. It has one more option for limiting upload speed.
2010-12-15 11:18:09 +00:00
dak664
ced88c2eff
Give jackdaw fe80::0 address and number webservers from fe80::1
2010-12-14 23:22:01 +00:00
dak664
1d2a5ca671
Minor format and comment changes
2010-12-14 22:51:04 +00:00
dak664
d8fe44645c
Refactor, tune, add SICSLOWPAN_CONF_ACK_ALL defines for testing radio acks
2010-12-14 22:39:38 +00:00
dak664
a9dedfee4f
Refactor contiki-conf files, remove obsolete defines.
2010-12-13 23:31:13 +00:00
dak664
e06dada659
Update platform build for hello-world, includes patch from Tobias Schfer
2010-12-05 20:21:19 +00:00
dak664
8e38f5ee34
Fix comment, add WEBDIR=default to force rebuild with default web content
2010-12-05 17:32:50 +00:00
dak664
35b2ce0cdb
Add status page link, show correct rssi, fix indexing off array in ipv4 builds
2010-12-04 21:32:35 +00:00
kasunch
753cd22d56
Changing line ending to LF
2010-12-04 08:22:10 +00:00
dak664
1ca7f7f940
Apply patch from Tobias Schfer to enable hello-world build. Untested otherwise.
2010-12-03 21:39:33 +00:00
dak664
58b7a19803
Hardware/software radio HAL patch from Roger Larsson.
...
Use CHANNEL_802_15_4 define for RF channel on all AVR platforms, default 26.
Remove hopefully unnecessary interrupt disable wrapper on eeprom reads and writes.
2010-12-03 20:42:01 +00:00
dak664
09c45f0497
Add address, neighbor, routes cgi's
2010-12-02 15:37:13 +00:00
dak664
6f66d45917
Add status web page with addresses, neighbors, routes
2010-12-02 15:28:38 +00:00
dak664
30885ba4ce
Do clock init before any RS232 output
2010-12-01 16:30:34 +00:00
dak664
3d3ad9e2c2
Fixes to allow ipv4 (hello world) builds
2010-12-01 16:23:55 +00:00
dak664
c027c1664a
Informative error when bogus platform is used in a contiki build
2010-12-01 15:09:06 +00:00
zhitao
af7b81efdb
resolved conflict with type declaration
2010-12-01 10:19:58 +00:00
dak664
5a4fa388da
Refuse to play ping-pong with host interface
2010-11-29 21:22:41 +00:00
dak664
0735b431aa
Enable RPL neighbor webserver page
2010-11-29 21:21:36 +00:00
dak664
dc028b3f85
Get rssi correctly in either rx mode, clean up radio driver debugging
2010-11-26 20:39:15 +00:00
adamdunkels
353bb07cc9
Changed the RDC rate configuration name to the new configuration name
2010-11-26 12:09:04 +00:00
dak664
880233a451
RSSI read fix (use ED register in AACK mode), add reduced power configuration for miniature mesh testing.
2010-11-24 18:46:57 +00:00
nifi
3bd78893e5
Renamed nullrdc to nullrdc-noframer and nullrdc-framer to nullrdc.
...
nullrdc (previously nullrdc-framer) is now a RDC implementation that
does not do any radio duty cycling but supports link layer addresses
and frame format via framer (for example 802.15.4). nullrdc can now be
used in the same way as contikimac, xmac, etc.
nullrdc-noframer (previously nullrdc) is a null RDC implementation
that does not do any radio duty cycling, does not add any header of its
own to the packets, and does not support link layer addresses.
2010-11-23 18:11:00 +00:00
dak664
da8ad17c02
Save 256 bytes of RAM by excluding floating point routine
2010-11-21 17:56:36 +00:00
dak664
b3324c6d23
Add menu option to temporarily disable RS232 debug output for higher 6lowpan throughput.
...
Functional rpl with RNDIS/Ubuntu (tested on Raven single hops)
2010-11-19 20:02:25 +00:00
dak664
c6c81acede
Add optional pings to google and cisco
2010-11-19 19:44:10 +00:00
dak664
fe19719a16
Fix printf_P error
2010-11-18 14:33:10 +00:00
adamdunkels
9446d37285
Increased the default Cooja CFS size to 4000 bytes so that examples work (found by Roger Larsson)
2010-11-15 21:44:37 +00:00
enricmcalvo
f4c1953563
Added temporary definition of P1SEL2 for those mspgcc4 without complete port register definitions.
2010-11-14 21:59:02 +00:00
dak664
cc7fea92d2
Force ipv6 when building with fakeuip
2010-11-13 16:28:46 +00:00
dak664
72d49c20af
Allow non-ipv6 build (hello world)
2010-11-12 20:49:03 +00:00
dak664
9e94ba9803
Allow non-ipv6 build, e.g. Hello World
2010-11-12 17:15:00 +00:00
fros4943
0a8d898678
#ifndef'd elfloader's default memory usage
2010-11-11 13:56:02 +00:00
enricmcalvo
436e4dce1c
Updated accelerometer drivers to avoid conflicts with radio transceiver.
2010-11-10 13:46:39 +00:00
fros4943
3563089a91
reimplemented initial support for referencing contiki source files in cooja projects
2010-11-10 13:11:43 +00:00
maralvira
5b4c63440b
fix typos
2010-11-09 01:30:38 +00:00
oliverschmidt
7432afa036
Both apps/webbrowser and apps/webserver contain a http-strings.c so the object files generated overwrite each other. However, currently webserver/http-strings.c is a clean superset of webbrowser/http-strings.c so using only that one even in the www.prg project makes things (sort of) work.
2010-11-07 23:36:34 +00:00
maralvira
24b6071234
change maca_raw_mode to contiki_maca_raw_mode
2010-11-07 18:39:39 +00:00
maralvira
3747f9a7c5
use the nullmac and nullrdc with framer layer.
2010-11-07 18:36:52 +00:00
maralvira
e029fa8da0
fix defines for raw mode
2010-11-07 18:34:52 +00:00
maralvira
8cd50c90ba
initial commit for the redbee-dev platform
2010-11-07 13:56:17 +00:00
maralvira
26725e7c19
use sicslowmac_driver instead of contikimac_driver --- since contikimac
...
power saving doesn't seem to be working.
2010-11-07 13:46:03 +00:00
enricmcalvo
01f886dad9
Slight modification to clean properly
2010-11-07 08:40:24 +00:00
enricmcalvo
59bdebe842
Added I2C Master drivers and accelerometer drivers
2010-11-07 08:38:51 +00:00
dak664
acd9d516d8
Add RPL neighbors and routes printout to Jackdaw menu
2010-11-05 20:35:15 +00:00
joxe
f08e262055
fixed buggy config of phidget sensors for Z1
2010-11-05 10:31:57 +00:00
dak664
abf4791db4
Add Raven RPL build option
2010-11-03 16:51:55 +00:00
adamdunkels
896f627290
Made uIPv6 packet queueuing configuration configurable
2010-11-02 11:06:01 +00:00
oliverschmidt
0d1db1a78b
Since a few days the cc65 trunk contains a POSIX dirent implementation for the Atari. Until a new cc65 release is available - and Contiki has switched to that release - I'll borrow the implementation from the cc65 trunk.
2010-11-01 19:44:34 +00:00
dak664
9194b3ac69
Fix error when RS232 not enabled
2010-10-28 19:31:28 +00:00
dak664
ad6712736b
Fix Windows XP RNDIS+CDC serial port enumeration
2010-10-28 19:30:14 +00:00
oliverschmidt
0ef1171705
Just always call process_run() and etimer_request_poll() in turn - like the "major" platforms do.
2010-10-27 22:17:39 +00:00
dak664
258e3cc93a
Allow simultaneous use of RS232 and USB serial ports
2010-10-27 14:51:20 +00:00
salvopitru
d8711d32a3
Added configuration in order to run Rime.
2010-10-27 14:05:23 +00:00
oliverschmidt
46122f558f
Skip the CBM volume header.
2010-10-26 18:56:39 +00:00
joxe
dfff488a3d
configured tmote sky to use 5 retransmissions
2010-10-26 13:26:16 +00:00
salvopitru
ec5e3ce0d7
New Contiki port to STM32W108.
2010-10-25 09:03:38 +00:00
adamdunkels
726bd0e58e
Made collect neighbors, queuebuf number, uip-ds6 configuration settable through project-conf.h
2010-10-24 21:12:31 +00:00
dak664
123e3cae41
Fix compiler warnings
2010-10-23 15:26:46 +00:00
oliverschmidt
5e10cf2eed
Implemented cfs_opendir() and friends for CBMs based on cc65's cbm_opendir() and friends.
2010-10-23 13:48:06 +00:00
oliverschmidt
9e9eb4b55c
There's no point in pulling in cfs-posix-dir.c if the POSIX functions it depends on are dummies anyway.
2010-10-23 08:17:45 +00:00
joxe
a1e7d9c256
fixed some config params to avoid re-defining if already defined
2010-10-21 18:25:39 +00:00
adamdunkels
37a4200f40
Made a lot of things configurable via the (optional) project-conf.h
2010-10-20 22:21:16 +00:00
oliverschmidt
da7c9700cb
Added support for the FTP standalone client to the c128 target.
2010-10-19 22:41:24 +00:00
oliverschmidt
bcc2120570
Added support for the FTP standalone client to the c64 target.
2010-10-19 22:31:59 +00:00
oliverschmidt
842c6a018a
The recent global change regarding htons allowed to remove this hack :-)
2010-10-19 20:30:47 +00:00
adamdunkels
5585d72c86
A simple but substantial change: uIP used the htons()/HTONS() macro
...
functions for converting between host and network byte order. These
names are the de facto standard names for this functionality because
of the original BSD TCP/IP implementation. But they cause problems for
uIP/Contiki: some platforms define these names themselves (Mac OS,
most notably), causing compilation problems for Contiki on those
platforms.
This commit changes all htons to uip_htons instead. Same goes for
htonl, ntohs, and ntohl. All-caps versions as well.
2010-10-19 18:29:03 +00:00
kasunch
5a46c629de
Added missing slip.c file to CONTIKI_TARGET_SOURCEFILES
2010-10-19 17:05:45 +00:00
oliverschmidt
f4e2c41c76
Added support for the FTP standalone client to the atari target.
2010-10-16 11:42:40 +00:00
oliverschmidt
abe360e9fb
Added support for the FTP standalone client to the apple2enh target.
2010-10-16 10:41:46 +00:00
oliverschmidt
b943e73b9b
Made default IP config identical to minimal-net and log the IP config similar to minimal-net.
2010-10-15 21:14:18 +00:00
nifi
9a4d17fe7c
Bug fix: put device in standby mode at startup in case it has previously been put in deep power-down mode; patch by Martin Bor
2010-10-12 22:55:11 +00:00
oliverschmidt
a5df3e8d00
Removed unnecessary include.
2010-10-12 19:57:44 +00:00
oliverschmidt
284f7166b7
Allow standalone win32 programs to exit the Contiki process by calling LOAD_UNLOAD().
2010-10-12 11:03:53 +00:00
adamdunkels
93f6fda353
Updated configuration options to reflect recent changes. Increased number of queuebufs. Corrected the name of the collection neighbors option.
2010-10-03 20:40:42 +00:00
oliverschmidt
3c733a0c4e
Added section on 'dir2atr' now that there's an "official" download.
2010-10-03 11:01:32 +00:00
oliverschmidt
828378ab47
Replaced "retro" color scheme with ergonomic color scheme.
2010-10-03 10:30:53 +00:00
oliverschmidt
23aea9df35
On the Atari it seems reasonable to start on a clear b&w screen even for non-CTK apps.
2010-10-02 22:07:24 +00:00
oliverschmidt
5d54b6aba8
Now that I understand that the Atari is in fact monochrome using black & white seems the logical consequence.
2010-10-01 20:27:06 +00:00
oliverschmidt
f3b4024375
Give the use a chance to read an error message before returning to the DOS menu (like on the Apple II).
2010-09-29 21:11:21 +00:00
oliverschmidt
c839eacbdf
Added cc65 target 'atari' for Atari 8-bit machines. This addition was triggered by exsistence of http://www.atari8ethernet.com/ .
2010-09-29 19:44:01 +00:00
oliverschmidt
f70d4c600d
Minor wording change.
2010-09-29 12:07:02 +00:00
oliverschmidt
cd24e920b6
Made cfs-based webserver example compatible with 8.3 file systems.
2010-09-28 20:40:52 +00:00
oliverschmidt
8eeeef17d1
Made cfs-based webserver example compatible with 8.3 file systems.
2010-09-28 19:36:16 +00:00
oliverschmidt
b2fe3db298
Just name the binary always 'contiki'.
2010-09-28 19:23:30 +00:00
fros4943
93b953f815
moved contiki-specific initialization to separate function
2010-09-24 12:59:06 +00:00
kasunch
75e4e80df2
Adding machine dependent SLIP routines source file to the sources list
2010-09-20 18:34:14 +00:00
kasunch
ce8bb8df9c
Adding machine dependent SLIP routines for UART0.
2010-09-20 18:30:25 +00:00
kasunch
6104922c40
Added new network initialization source file to the sources list.
2010-09-20 18:22:28 +00:00
kasunch
4ebc114e90
Now, all network related initialization code segments are in one file
2010-09-20 18:15:27 +00:00
kasunch
3f1bea1ed3
1. Initialized SLIP when uIPv4 or uIPv6 is used.
...
2. Random number generator is initialized using both node id and unique hardware id
3. Printing MAC address is moved to network initialization section.
2010-09-20 18:07:25 +00:00
kasunch
cdc68b13e0
1. Added uIPv6 configuration options.
...
2. Fine tuned some configuration options to save RAM.
2010-09-20 17:56:14 +00:00
dak664
110bc0242e
Merge CDC-ECM, RNG, DFU bootloader, watchdog, settings manager, energy scan routines of Robert Quattlebaum
2010-09-17 21:59:09 +00:00
dak664
dc9f16131c
Make fake routines conditional on CONTIKI_NO_NET
2010-09-14 19:16:53 +00:00
dak664
6d3c276e7e
Add rpl configuration and webserver options.
2010-09-14 19:13:05 +00:00
dak664
b9b4f07ad9
Add internal webserver option
2010-09-14 17:03:29 +00:00
dak664
0858f71e6a
Add rpl webserver option
2010-09-14 16:59:44 +00:00
oliverschmidt
6e5e560e33
Up to now *all* Contiki apps for the Apple2 were built for maximal RAM - which means that they can't return to OS level but must reboot on exit. However many apps can get along well with 1kB less memory - which allows them to exit to the OS.
...
Therefore now the default is 1kB less memory - and apps actually needing maximal RAM can get it by adding WITH_REBOOT to their DEFINES.
2010-09-08 22:50:56 +00:00
joxe
f02cdc7c8f
minor polish to the phidget sensor driver
2010-08-27 12:58:57 +00:00
joxe
53840aca67
added basic phidget support for the Z1
2010-08-27 12:17:40 +00:00
nifi
91be7cebc4
Node ID is stored in external flash and restored on bootup
2010-08-26 22:08:11 +00:00
dak664
3bee71ad81
Add simple webserver for RPL status
2010-08-26 18:55:43 +00:00
joxe
a461eceff8
fixed configuration of button sensor
2010-08-26 16:01:20 +00:00
joxe
2c5f5cd849
added init of xmem for z1 platform
2010-08-26 09:16:39 +00:00
nifi
7d34fd1deb
Added Sentilla USB platform. This platform is similar to the Sky platform but without the sensors and with 2 leds.
2010-08-25 19:57:33 +00:00
nifi
14873a923b
Added temperature sensor for the builtin temperature sensor in MSP430
2010-08-25 19:34:06 +00:00
nifi
198db63c3b
Moved the ADC configuration to sky-sensors.c and sensors now only need to specify their sample channel. This helps to avoid conflicts when using multiple sensors.
2010-08-25 19:30:52 +00:00
joxe
d946fdd574
added Z1 xmem + coffee driver
2010-08-25 17:28:15 +00:00
joxe
645c48a332
added Z1 platform
2010-08-24 16:26:38 +00:00
joxe
b04ebb2b29
minor fix for making the msp430 makefile work for msp430X arch
2010-08-24 16:24:11 +00:00
oliverschmidt
164d55e39d
Reduced MTU size in order to allow for a reasonable (and full screen width) URL length.
2010-08-14 08:32:00 +00:00
dak664
885fee3561
Add RPL border router process
2010-08-06 17:39:31 +00:00
dak664
75de6f9fb0
Rerevert to misspelled HARWARE_REVISION
2010-08-03 21:42:05 +00:00
dak664
ea9e5bef1c
Revert mistaken hardware name change!
2010-08-03 20:18:54 +00:00
dak664
f2f7c169ea
Reduce RIME max time to fit in 16 bit timer
2010-08-03 20:01:21 +00:00
dak664
52feb47d5e
Change RIME max time to fit in 16 bit timer
2010-08-03 19:58:35 +00:00
dak664
3a8085b159
Change RF channel to 26 for econotag compatibility
2010-08-03 19:56:27 +00:00
dak664
b706c48efd
Add experimental RPL code
...
Change RF channel to 26 for econotag compatibility
2010-08-03 19:55:42 +00:00
maralvira
1cfa126568
enable sicslowpan fragmentation
2010-07-28 18:51:27 +00:00
maralvira
fe16506d1d
increase UIP buffer size to 1300 to allow full size ipv6 packets
2010-07-28 18:51:00 +00:00
maralvira
8dce85c308
don't need BLOCKING_TX anymore with the recent bugfixes
2010-07-28 18:50:07 +00:00
oliverschmidt
e53c34770a
Integrated latest enhancements contributed by Kajtar Zsolt:
...
- Use cc65 C library _filetype for writing instead of fixed 'p'.
- Support for fake O_TRUNC through SCRATCH.
2010-07-22 10:16:58 +00:00
oliverschmidt
8a6f7a1dcf
The cc65 C64 memory layout offers enough memory for larger URLs so have a nice scrolling URL text entry field.
2010-07-20 22:47:42 +00:00
oliverschmidt
cb929a3e5c
Adjusted assembler to reference uip_aligned_buf instead of uip_buf.
2010-07-20 20:42:25 +00:00
joxe
857883558b
adapted to the new spi and cc2420 naming - and split config file
2010-06-23 10:25:54 +00:00
joxe
80942abaf7
split hw config into platform-conf and adapted to new SPI and CC2420 naming
2010-06-23 10:18:05 +00:00
dak664
08897e1c1f
Add explicit queuebuf and packetbuf to build
2010-06-22 17:10:24 +00:00
joxe
365db27f92
moved CC2420 configuration into the conf file
2010-06-22 06:48:43 +00:00
joxe
47053c2cdb
added LOOP count configuration for cc2420dbk
2010-06-22 06:39:44 +00:00
joxe
f758f6569e
moved cc2420 config to platform config
2010-06-21 19:57:18 +00:00
joxe
80ec597f75
moved config from cc2420 to micaz
2010-06-21 19:53:58 +00:00
nifi
2ca32f9c76
Enabled 32-bit clock ticks to allow longer timeouts.
2010-06-21 15:15:10 +00:00
dak664
e51f03eeb1
Turn off radio DEBUGFLOW printing
2010-06-18 15:45:55 +00:00
dak664
ac6f837e4a
Use RF230BB for compilation - untested!
2010-06-18 15:33:15 +00:00
adamdunkels
3fa8ffda1a
Moved the modules packetbuf, queuebuf, and packetqueue from net/rime to net/, since they are not Rime-specific
2010-06-14 19:19:16 +00:00
adamdunkels
951fd78f6c
ctimer moved from net/rime to sys/
2010-06-14 18:58:45 +00:00
maralvira
994067aecd
bring econotag conf in-sync with sky.
...
Increase the size of the route and neighbor tables; remove the uIP
packet buffer queue for every neighbor to save RAM
2010-06-14 15:56:09 +00:00
adamdunkels
f81ca85157
Increase the size of the route and neighbor tables; remove the uIP packet buffer queue for every neighbor to save RAM
2010-06-14 07:04:20 +00:00
fros4943
8f1988e7fc
using OBJECTDIR instead of "obj_cooja" + bugfix: allow for externally defined CC
2010-06-11 15:17:26 +00:00
maralvira
c01421fbb5
update process initialization and call ctimer_init
2010-06-09 18:05:38 +00:00
maralvira
7aa44f14d9
initial redbee-econotag commit
...
based on commit aac3a355451d899f02737f2907af8c874ee4feba of
git://git.devl.org/git/malvira/contiki-mc1322x.git
2010-06-09 14:46:30 +00:00
joxe
c4278dedc2
replaced uip_buf with the new uip_aligned_buf
2010-06-03 11:37:50 +00:00
nifi
eb63cb21e0
Added make variable with command name to show in warning
2010-05-27 12:42:48 +00:00
joxe
97fc9d2ee8
no aaaa address if configured for RPL
2010-05-25 21:32:41 +00:00
joxe
50cca91d93
made use of the new link-local address api in ds6
2010-05-09 17:53:31 +00:00
dak664
6909f291af
Use siimple ethernet address translation for RF230BB by default.
...
That gets pings and webserver working again for Vista and W7.
Hopefully it won't break something that already works...
2010-05-08 17:17:17 +00:00
oliverschmidt
bf3ec8c452
Reverting to the "old" plain uip_buf allows the Apple2 to revert to the previous memory layout.
2010-05-08 07:26:20 +00:00
oliverschmidt
62ca797fad
The recent change turning uip_buf from an array to a pointer increases the code generated by cc65 significantly :-(
...
This change modifies the set of modules placed in the Apple2 Language Card to again make maximum use of that memory without overflow.
2010-05-07 21:02:35 +00:00
nifi
4aba60ad25
acc-sensor and ext-sensor moved to the jcreate platform
2010-05-06 13:55:21 +00:00
dak664
e78984aa25
Bugfixes and additional testing contributed by Mauro Greco. Still a probabe bug when coffee page size is a multiple of physical page size and FLASH_COMPLEMENT_DATA=0
2010-05-04 14:08:01 +00:00
nifi
ed472717f2
Added Sentilla Jcreate platform. This platform is similar to the Sky platform but with other sensors and 8 leds.
2010-05-03 21:57:35 +00:00
nifi
7cebc4ed99
added missing include
2010-05-03 13:55:26 +00:00
nifi
bf198ec695
Moved sensors setup to contiki-sky-platform.c and common make rules to Makefile.common for easier reuse in similar platforms
2010-05-03 13:51:11 +00:00
fros4943
79aa299531
fixed random seed for cooja motes
2010-05-02 09:42:15 +00:00
joxe
aa980e3f67
removed initialization of RPL from platform main
2010-05-01 13:07:31 +00:00
joxe
3c9256c39f
removed RPL routing state struct from platform config file
2010-05-01 12:04:13 +00:00
nvt-se
d529132002
Added missing parts of the RPL configuration
2010-04-30 15:06:00 +00:00
joxe
b0640af3a2
added rpl support for tmote sky - enabled by default
2010-04-30 13:52:14 +00:00
oliverschmidt
5dd5b5ac43
Adjusted typdefs to Cygwin 1.7 (now not compatible anymore with Cygwin 1.5).
2010-04-21 20:35:22 +00:00
oliverschmidt
5640f89259
In contrast to Cygwin 1.5 Cygwin 1.7 doesn't allow to get __argc out of thin air anymore. Instead of finding a workaround I opted to remove the whole command line checking here which was added so revisions ago. The reasoning:
...
The WinPcap driver presumes to be obligatory for the application. Therefore it quits the whole application if it can't initialize successfully.
In former times the WinPcap driver required a cmdline parameter to initialize properly. The netsim target presumably doesn't consider the WinPcap driver obligatory for its applications so it checks the cmdline and starts the WinPcap driver only if it finds the WinPcap cmdline parameter present. Thus it prevents the WinPcap driver from failing to initialize which brings down the whole application.
However recently the WinPcap driver was changed to just use some default value if its cmdline parameter isn't found. So there's no more need to keep WinPcap from starting just to make sure it doesn't bring down the whole application. The presumption behind all this reasoning is that a WinPcap driver running with some (potentially wrong) default isn't worse than a WinPcap driver not running at all.
2010-04-21 20:27:28 +00:00
oliverschmidt
8b6d34dbfc
Configure maximum number of C128 web server connections indirectly via maximum number of TCP connections.
2010-04-11 21:34:18 +00:00
oliverschmidt
67e775ecee
The maximum number of C64 web server connections is now equal to the (new) default as the CBM PFS allows for 10 open files.
2010-04-11 21:30:14 +00:00
oliverschmidt
8108585795
Configure maximum number of Apple2 web server connections indirectly via maximum number of TCP connections.
2010-04-11 21:23:45 +00:00
oliverschmidt
ce412471e4
Integrated latest fix contributed by Kajtar Zsolt.
2010-04-06 09:46:58 +00:00
oliverschmidt
f38a3ff06c
Added Platform-specific File System (PFS) for the C128 contributed by Kajtar Zsolt.
2010-04-05 15:25:49 +00:00
oliverschmidt
7089ce05e2
Added Platform-specific File System (PFS) for the C64 supporting IDE64 fast R/W contributed by Kajtar Zsolt.
2010-04-05 14:11:01 +00:00
fros4943
170e4d6a99
sky simulation bug workaround: explicit write to compare register wakes up timer scheduling again
2010-03-31 13:15:32 +00:00
fros4943
c21ff48788
ip forwarding only for ipv4
2010-03-31 10:22:33 +00:00
fros4943
c2354a5797
changed cooja platform default uip4 configuration to use uip_over_mesh with a slip gateway
2010-03-31 09:39:46 +00:00
oliverschmidt
8dd2b75383
Explicitly set CBM filetypes (PRG, USR).
2010-03-31 06:05:37 +00:00
fros4943
e640c61b78
commented unused functions
2010-03-29 12:57:57 +00:00
fros4943
e3e69afd15
changed to ds6 module, instead of obsolete netif module
2010-03-29 11:52:08 +00:00
fros4943
9dfce4bea1
removed bad uip-netif.h include
2010-03-29 10:43:03 +00:00
fros4943
540f30d855
improved support for checkpointing operations via serial, several minor fixes
2010-03-29 09:48:06 +00:00
oliverschmidt
54e19782ae
Moved PFS header from Apple2 directory to 6502 directory as we're going to have other PFS implementations.
2010-03-27 15:16:57 +00:00
oliverschmidt
6769e6a99f
- Moved PFS header from Apple2 directory to 6502 directory as we're going to have other PFS implementations.
...
- Completed declarations.
2010-03-27 14:46:08 +00:00
fros4943
a5092220b4
fixed next timer variable types
2010-03-25 09:12:03 +00:00
adamdunkels
2a3d0dc042
Bugfix: data that has been prepared with the prepare() method must be possible to send multiple times
2010-03-23 15:19:55 +00:00
adamdunkels
432a3fd12e
Bugfix: the return values from the cca method were switched
2010-03-23 15:10:27 +00:00
fros4943
1322195921
defining rtimer_clock_t to the same as clock_time_t
2010-03-23 13:34:00 +00:00
fros4943
c66dd0b1bf
implemented rtimer library for simulated contiki motes
2010-03-23 13:13:17 +00:00
fros4943
49526e100f
added simulated interrupt thread, currently only used to implement rtimer functionality
2010-03-23 13:12:41 +00:00
fros4943
bee0ea4834
temporarily turning on radio for sending a packet
2010-03-23 12:13:43 +00:00
adamdunkels
03d1388c0d
Print out MAC and RDC when booting cooja nodes
2010-03-23 12:08:05 +00:00
adamdunkels
cd3a7c7a73
Dummy watchdog implementation for cooja nodes
2010-03-23 12:07:03 +00:00
nifi
58e47d1d97
activated workaround for memcpy/memset bug in mspgcc
2010-03-21 10:44:58 +00:00
joxe
29335f2f7d
added possibility to hard-code 7 bytes of the MAC address - last byte picked from nodeid
2010-03-19 14:08:15 +00:00
adamdunkels
fc61ee5dbb
Bugfix: turn on watchdog before starting processes to avoid a process hanging in its startup phase
2010-03-19 13:28:27 +00:00
adamdunkels
91afe5b0f4
Turned on broadcast announcements by default, turn on announcements for collect
2010-03-19 13:27:46 +00:00
dak664
9bcf982d87
Update minimal net to new ds6 interface
2010-03-18 20:11:54 +00:00
dak664
d1f1fae689
update to ds6 calls
2010-03-18 14:52:50 +00:00
dak664
f03600d4e3
update to uip-ds6.c
2010-03-18 14:36:00 +00:00
dak664
de2f5aaddc
change for ds6 calls
2010-03-17 20:19:33 +00:00
joxe
7d220c910a
removed uip_router
2010-03-16 15:45:20 +00:00
nifi
0299aab5e4
Fixed to use sky-sensors to setup ADC12
2010-03-15 23:37:01 +00:00
dak664
cae40439d7
Add optional RS232 debugging
2010-03-15 18:56:13 +00:00
joxe
fd3d6c44d0
integration of new uip6 code from Mathilde and Julien - adds routing and improved interface handling
2010-03-15 16:41:24 +00:00
fros4943
645d505f46
contiki-cooja-main.c requires CLASSNAME
2010-03-15 11:03:17 +00:00
fros4943
5b2caf2050
removed the use of a template source file when compiling for the cooja platform, instead compiling against contiki-cooja-main.c.
...
this change simplifies access to the contiki main source, and makes the cooja platform more similar to other contiki targets
2010-03-15 11:02:57 +00:00
fros4943
89d7d926c4
added ipv4 and ipv6 default configuration
2010-03-10 12:18:29 +00:00
fros4943
7465fb812a
removed explicit init-net*.c for cooja platform, instead performed in main file (contiki-template.c)
2010-03-10 12:18:07 +00:00
fros4943
f8488925eb
added uip-driver (for both ivp4 and ipv6), setting WITH_UIP* compiler flags in Makefile
2010-03-10 12:15:52 +00:00
fros4943
f36cfffc99
Makefile target for uploading precompiled firmware, example:
...
make upload-ihex FILE=myfile.ihex
2010-03-10 11:46:57 +00:00
fros4943
98929bd2f5
cooja-platform netstack conf example
2010-03-10 07:35:49 +00:00
fros4943
45a6740782
radio sensor was removed
2010-03-10 07:35:09 +00:00
fros4943
48d6d1fd6d
removed no longer used cooja/contiki synchronization variables
2010-03-09 08:14:31 +00:00
fros4943
0cc96ae481
net stack update: currently fixed to null* and rime.
2010-03-09 08:14:06 +00:00
fros4943
f87458c558
removed radio "sensor" (only used for signal strengths, also available in radio driver)
2010-03-09 08:12:15 +00:00
fros4943
07753fb01f
updated radio driver, simplified code
2010-03-09 08:11:05 +00:00
oliverschmidt
8ca206aa6b
Changed ETH64 base address from $DE10 to $DE00 as this is the default base address according to the manufacturer.
2010-03-06 13:05:16 +00:00
nvt-se
0fc1c00f09
Use LPP for radio duty cycling. 1 Hz channel check rate
2010-03-04 15:04:28 +00:00
nvt-se
20cae40694
use CSMA
2010-03-04 14:36:48 +00:00
nvt-se
2aa9d22f34
Switched to the NETSTACK API.
2010-03-04 14:16:30 +00:00
nifi
efe8f200af
Updated to match the new netstack api
2010-03-02 22:40:39 +00:00
dak664
d3697344ec
Update for NETSTACK_CONF_FRAMER
2010-03-02 16:25:47 +00:00
dak664
7c020468b5
Remove frame.h include, expose raven_ping6 for external calls
2010-03-02 15:15:03 +00:00
nifi
1025e7337c
Added configurable router module
2010-03-01 14:46:57 +00:00
nifi
5e43a6998b
Replaced old framer (framer_get/framer_set) with new NETSTACK style configuration. Added nullrdc-framer that is a nullrdc with framer support.
2010-03-01 13:30:21 +00:00
dak664
feb6aa0ed2
Change back to SICSLOWPAN_COMPRESSION_HC06 from SICSLOWPAN_COMPRESSION_HC01
2010-02-28 21:39:40 +00:00
dak664
39e6f6a830
Clean up, functional webserver for further testing of low power protocols
2010-02-28 21:29:19 +00:00
dak664
5debc183a9
Enable radio stats in sensor cgi as default
2010-02-26 21:38:57 +00:00
dak664
844b3a34f7
Platform 0 was matching by default
2010-02-26 21:15:28 +00:00
c_oflynn
b5b77ac47a
Use new HC06
2010-02-26 10:55:00 +00:00
joxe
80b289f7c1
updated sky platform for new sicslowpan
2010-02-25 15:51:37 +00:00
kasunch
350fb21ff7
Adding a Makfile for example applications.
2010-02-24 09:14:46 +00:00
kasunch
80a408526f
Adding an example application for battery sensor
2010-02-24 09:13:56 +00:00
kasunch
c90b76427a
Adding ADC sources and battery sensor source to CONTIKI_TARGET_SOURCEFILES.
2010-02-24 09:09:35 +00:00
kasunch
0c9612b7b9
Adding battery sensor
2010-02-24 09:05:40 +00:00
kasunch
ea53e5b845
Adding ADC functions
2010-02-24 09:04:58 +00:00
nifi
07ee8458e7
Fixed bootup printf() with 32-bit timer values
2010-02-23 21:02:30 +00:00
nifi
bb9d430138
added bootup print of NETSTACK_RDC name
2010-02-23 20:54:09 +00:00
adamdunkels
85a9f7db42
Fix bootup printf() with 32-bit timer values
2010-02-23 18:45:16 +00:00
adamdunkels
eadfe5f3d6
Enabled 32-bit clock ticks to allow longer timeouts; experimentally disabled polite announcements in favour of a non-announcement based collect protocol
2010-02-23 18:44:52 +00:00
adamdunkels
69a5b67523
Updated netsim to new netstack API
2010-02-23 18:44:08 +00:00
adamdunkels
08f06d8039
Updated to new sensors API
2010-02-23 18:43:43 +00:00
adamdunkels
757ca59511
Added netstack init to native platform
2010-02-23 18:43:21 +00:00
adamdunkels
ebea184116
Added netstack config for CC2420 radio driver, and also for cxmac RDC layer (which is not confirmed if it runs on real hardware, only tested in simulation)
2010-02-23 18:42:41 +00:00
dak664
e695e4860d
Allow build with original radio driver using $make RF230BB=0
2010-02-23 17:43:20 +00:00
dak664
64d57a3dd8
Update jackdaw to new radio driver interface
2010-02-23 17:35:49 +00:00
dak664
a64a8674bc
Remove debug print
2010-02-23 02:22:25 +00:00
dak664
cbb8621e30
update to new driver format
2010-02-22 22:23:18 +00:00
adamdunkels
60425aa355
ESB uses tr1001 radio
2010-02-18 23:53:21 +00:00
adamdunkels
fa4d4db329
Use the common netstack_init
2010-02-18 23:19:03 +00:00
adamdunkels
927aa821c3
Updated to new MAC api
2010-02-18 23:10:06 +00:00
adamdunkels
459c550cbd
Updated to match the new netstack api
2010-02-18 23:04:54 +00:00
adamdunkels
e34eb54960
A work-in-progress rework of the Contiki MAC and radio layers. The
...
main ideas are:
* Separates the Contiki low-layer network stack into four layers:
network (e.g. sicslowpan / rime), Medium Access Control MAC
(e.g. CSMA), Radio Duty Cycling RDC (e.g. ContikiMAC, X-MAC), and
radio (e.g. cc2420).
* Introduces a new way to configure the network stack. Four #defines
that specify what mechanism/protocol/driver to use at the four
layers: NETSTACK_CONF_NETWORK, NETSTACK_CONF_MAC, NETSTACK_CONF_RDC,
NETSTACK_CONF_RADIO.
* Adds a callback mechanism to inform the MAC and network layers about
the fate of a transmitted packet: if the packet was not possible to
transmit, the cause of the failure is reported, and if the packets
was successfully transmitted, the number of tries before it was
finally transmitted is reported.
* NULL-protocols at both the MAC and RDC layers: nullmac and nullrdc,
which can be used when MAC and RDC functionality is not needed.
* Extends the radio API with three new functions that enable more
efficient radio duty cycling protocols: channel check, pending
packet, and receiving packet.
* New initialization mechanism, which takes advantage of the NETSTACK
#defines.
2010-02-18 21:48:39 +00:00
dak664
6df1e0ca58
add experimental cxmac code
2010-02-18 17:24:12 +00:00
dak664
38c5922294
experimental cxmac code
2010-02-18 17:23:19 +00:00
dak664
72e1528ea7
Make sicslowmac the default!
2010-02-16 23:42:06 +00:00
dak664
1da06eff83
Specify mac driver in contiki-conf.h
2010-02-16 22:22:13 +00:00
dak664
53801ffbb1
Add optional RF230BB radio driver
2010-02-16 22:17:51 +00:00
dak664
1bdff78e6e
Remove compiler warnings
2010-02-15 20:54:37 +00:00
joxe
3a2eec2b1a
fixed ext-sensor for jcreate
2010-02-13 11:20:48 +00:00
oliverschmidt
a66821f1d1
Explicitly turn on forms and centering for consistency reasons.
2010-02-13 10:46:36 +00:00
oliverschmidt
7ef7efecd8
Without forms, centering and history we can just squeeze in DNS.
2010-02-13 10:44:23 +00:00
dak664
dd4bf06430
Add serial command to send voltage measurement to webserver
2010-02-12 16:46:39 +00:00
dak664
ed76239525
Add RADIOSTATS to sensors cgi
2010-02-12 16:42:59 +00:00
dak664
c0e12ffa54
Enable ADC2 for optional external supply voltage measurement
2010-02-11 21:58:51 +00:00
dak664
cc47c556e7
Optionally measure ADC2 along with temperature
2010-02-11 20:49:31 +00:00
dak664
e9d760bf9e
Convert <CR><CR><LF> line endings to <LF>
2010-02-11 20:42:36 +00:00
dak664
e4ec444611
Send optional ADC2 measurement to 1284p
2010-02-11 20:35:22 +00:00
dak664
4576b7b671
Add option to measure external supply voltage on ADC2
2010-02-11 20:22:11 +00:00
dak664
e7d2b64894
Convert <CR><CR><LF> line endings to <LF>
2010-02-11 20:19:51 +00:00
dak664
97ea7b0376
Add SEND_ADC2 command definition
2010-02-11 18:37:21 +00:00
dak664
6a2d1c057a
Allow cygwin remakes and cleans
2010-02-11 18:34:39 +00:00
dak664
c321531021
Document temperature and voltage measurement features and/or bugs
2010-02-11 18:31:27 +00:00
dak664
5eacbeedba
*** empty log message ***
2010-02-10 22:53:55 +00:00
oliverschmidt
50be40768b
Removed closing of stdin, stdout (and stderr on the Apple2). It was introduced in order to maximize the number of available file handles for the webserver. However none of the target machine DOSes allows to open a single file several times diminishing the intended effect very much. One the other hand not being able to "just printf() something" causes trouble over and again - i.e. hello-world seemingly not working...after all a typical case of german over-enigneering ;-)
2010-02-10 07:43:25 +00:00
dak664
fe8417bd8a
Clarify defines for RF230 and effect on program size
2010-02-09 17:03:55 +00:00
dak664
282ffaf343
Add conditional boot messages and file logging
2010-02-09 14:43:16 +00:00
dak664
03c0245465
Expose httpd-cgi ipv6 address print to other modules
2010-02-09 14:41:18 +00:00
nifi
a6c6522548
Updated documentation for new APIs.
2010-02-09 08:29:58 +00:00
nifi
27d5e2338a
Added convenient flag to include codeprop
2010-02-09 07:34:37 +00:00
nifi
dbacc71c7d
Added missing uip-ipchksum when using IP
2010-02-09 07:04:11 +00:00
nifi
665c38e7f4
Set elfloader to use flash instead of ram for storage as default.
2010-02-09 06:52:26 +00:00
dak664
e12e794a74
QUEUEBUF fragmentation defines
2010-02-08 22:22:27 +00:00
adamdunkels
6414bf3a55
Enabled sicslowpan fragmentation and reassembly by default on the sky platform
2010-02-08 22:12:29 +00:00
dak664
1911dc4956
Defines for fragmentation handling
2010-02-08 22:09:25 +00:00
adamdunkels
590b4786c5
Added queuebuf statistics option, since it is used by the examples/rime/example-rudolph1.c code (on the netsim target)
2010-02-08 21:39:15 +00:00
nifi
978d383395
Corrected include path
2010-02-08 00:02:39 +00:00
nifi
9ee6406824
minor code style cleanup
2010-02-08 00:00:45 +00:00
adamdunkels
091483c150
Added dummy watchdog functions for all AVR platforms
2010-02-07 07:43:35 +00:00
joxe
1da7c3eccd
convert registers upto 9 instead of upto 4
2010-02-06 18:28:26 +00:00
adamdunkels
3717c39431
Updated the ext-sensor to use the new sensor API; patch by Jesper Karlsson
2010-02-06 14:41:24 +00:00
adamdunkels
aaab082f27
Correctly print out the aaaa: address, if enabled
2010-02-06 10:00:49 +00:00
adamdunkels
37f7770bd8
Made it possible to override the SICSLOWPAN_CONF_FRAG option. Increased the default uIP buffer size on IPv6 to provide some room for fragmented packets
2010-02-06 10:00:25 +00:00
nifi
d210d930fd
added missing end bracket
2010-02-05 16:45:56 +00:00
nifi
c67a4155d5
Changed to use tcpip_icmp6_event for ICMP notifications.
2010-02-05 15:16:02 +00:00
ksb
217eaaa071
Generic STM32F103 platform
2010-02-05 14:47:42 +00:00
nvt-se
32c5fcb583
avoid broadcast storms during the test
2010-02-05 11:52:37 +00:00
fros4943
b9bf06c2a7
decreased default cooja CFS size
2010-02-05 08:59:51 +00:00
c_oflynn
95d0b09954
-Fix that can cause USB stick to freeze up
...
-Add EEM Support
2010-02-04 10:40:00 +00:00