Laurent Deru
1784338b2e
Add uip_clear_buf() macro and replace all instances of uip_len = 0; with it
2015-06-15 11:10:51 +02:00
Oliver Schmidt
74db518846
Set Win32 file i/o to binary mode.
...
This is i.e. necessary to have the file based webserver-example successfully read 'contiki.gif'.
2015-06-14 17:48:36 +02:00
Oliver Schmidt
c9edb9006b
Merge pull request #1112 from oliverschmidt/master
...
Various improvements of the HTTP client and web browser.
2015-06-14 16:12:24 +02:00
Benoît Thébaudeau
e8a268cd15
cc2538: aes: Add support for 192- and 256-bit keys
...
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-06-02 21:41:56 +02:00
Benoît Thébaudeau
117dc4e5e3
cc2538: Add crypto drivers and examples for AES-CCM and SHA-256
...
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-06-02 21:41:06 +02:00
Benoît Thébaudeau
aba0b8ab40
Merge pull request #1085 from alignan/pull/remote
...
New Zolertia Re-Mote platform (CC2538 + CC1120)
2015-05-30 00:11:57 +02:00
Antonio Lignan
330e450ba4
Zolertia Re-Mote platform ported to Contiki, developed whitin RERUM FP7 European project (grant #609094 ).
...
The port was done jointly by Zolertia and George Oikonomou (University of Bristol).
2015-05-29 22:04:43 +02:00
Benoît Thébaudeau
8c952e8026
Merge pull request #1082 from g-oikonomou/cc2538/readme-cdc
...
Update the CC2538DK README about a Win CDC driver
2015-05-26 00:29:50 +02:00
George Oikonomou
b86c26fff8
Update the CC2538DK README about a Win CDC driver
...
* The current version of the README points to a wrong URL
for the LUFA Virtual Serial driver.
* A driver is nowadays provided by TI with CC2538
Foundation Firmware
Thus, this pull updates the LUFA driver URL and also provides a
link to CC2538 Foundation Firmware
2015-05-25 22:06:25 +01:00
Nicolas Tsiftes
a14c78e1ce
Build the Wismote platform with ContikiMAC and CSMA enabled by default.
2015-05-25 17:04:39 +02:00
Nicolas Tsiftes
3d284f8ecd
Use the new path to a header file.
2015-05-25 16:52:12 +02:00
Matthieu Baerts
78b6b50194
Z1: tmp102: simple: fixed wrong cast
...
When using this code:
(int8_t)tmp102_read_temp_x100() / 100
Only the first value is casted into a int8_t type.
tmp102_read_temp_x100() returns the temperature in Celcius * 100. Most of
the time this value will be lower than -2^7 and higher than 2^7 (+/- 1.27°C).
The cast is not needed but a comment about this implicit cast has been added.
2015-05-22 18:15:26 +02:00
Harald Pichler
9b6bdd30b8
use all submodules
2015-05-21 21:31:18 +02:00
Antonio Lignan
2cee62eb33
Merge pull request #1074 from g-oikonomou/cc26xx/contrib/new-cc26xxware
...
Update to latest CC26xxware and add it as a submodule
2015-05-21 10:01:00 +02:00
Harald Pichler
6a0d407806
Merge branch 'contiki' into osd
2015-05-19 10:54:55 +02:00
Adam Dunkels
730bda2001
Merge pull request #883 from cmorty/pull/global-macros
...
Move MAX, MIN and ABS to contiki-macros
2015-05-18 21:33:00 +02:00
Ulf Knoblich
a388a1bcd7
CC2538: added support for SSI1
2015-05-18 10:02:55 +02:00
Moritz 'Morty' Strübe
0dab6926b3
Move MAX, MIN and ABS to sys/cc.h
2015-05-18 08:53:17 +02:00
George Oikonomou
541688235c
Update the CC26xx README in terms of CC26xxware
2015-05-17 15:01:02 +01:00
George Oikonomou
b4067560ba
Remove references to obsolete peripheral clock scaling functions
2015-05-17 15:01:01 +01:00
George Oikonomou
8b1f2ef33c
Reset I2C with HAPI call instead of register access
2015-05-17 15:01:00 +01:00
George Oikonomou
7a5b670f76
Remove references to IOC_JTAG_DISABLE
2015-05-17 14:09:52 +01:00
George Oikonomou
32840db66b
Update driverlib version macros
2015-05-17 14:09:51 +01:00
Benoît Thébaudeau
e88b3908ad
cc2538dk: README: Add URL of Sourcery G++ Lite 2008q3-66
...
Document the URL of the older Sourcery G++ Lite 2008q3-66 arm-none-eabi
toolchain mentioned by README.md so that users can easily find it if
needed.
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-05-17 01:53:09 +02:00
Antonio Lignan
32afadea77
Merge pull request #1047 from g-oikonomou/cc26xx/contrib/lpm
...
CC26xx Ultra Low Power Operation
2015-05-16 10:27:22 +02:00
Harald Pichler
877bf27f5a
Merge branch 'contiki' into osd
2015-05-15 20:48:26 +02:00
Antonio Lignan
402eabecca
Merge pull request #929 from lab11/delete-old-coap
...
Delete old CoAP implementation
2015-05-15 15:49:04 +02:00
George Oikonomou
7ae3cd49ba
Make sure SSI0 is powered and clocked before accessing it
...
* Fail all SSI0 operations if the module is not powered and clocked
* Make sure SERIAL is powered before trying to enable run mode clock
2015-05-15 11:38:20 +01:00
George Oikonomou
019143226b
Adjust main:
...
* Re-order OSC, VIMS cache, I/O latch configuration instructions
* Don't automatically enable UART RX: Let the example decide this
2015-05-15 09:21:04 +01:00
George Oikonomou
6e7d52b5df
Improve MPU power-cycling logic:
...
* Keep MPU_PWR low when the sensor is not in use
* Deselect the sensor when not in use, in order to restore the I2C ping state
* Explicitly control the MPU_INT pin
* Don't shutdown the sensor when it's shut down
* Remove explicit shutdown-related API extension. It is no longer required
2015-05-15 09:21:04 +01:00
George Oikonomou
dcf0d11050
Re-map tag UART-related IOID defines
2015-05-15 09:21:03 +01:00
George Oikonomou
2cc59c524a
Configure pins for unused tag peripherals
2015-05-15 09:21:03 +01:00
George Oikonomou
e893c914b6
Set SPI pins to a low leakage state
2015-05-15 09:21:03 +01:00
George Oikonomou
421fbfae25
Change the LPM locks API:
...
Instead of using a separate data structure to request that a PD remain powered during deep sleep,
we do the same within the main LPM data structure through an additional field.
This allows us to maintain only one linked list of LPM modules and overall improves code clarity
2015-05-15 09:21:02 +01:00
George Oikonomou
0e92b508b3
Don't clock GPT0 on device startup
2015-05-15 09:21:02 +01:00
George Oikonomou
6611acadc7
Don't fire-up SERIAL automatically
2015-05-15 09:21:02 +01:00
George Oikonomou
34be012661
Improve I2C power-cycling logic:
...
We only power, clock and enable the peripepheral when / if we need it
* We no longer automatically turn on the SERIAL PD when the CM3 is running
* Make sure the I2C peripheral is accessible (powered and clocked) before any operation
* If the peripheral is not accessible, automatically power it up and run the clock
* Put SDA, SCL, SDA HP and SCL HP in a low-leakage state when shutting down
* Don't automatically fire up the I2C controller when we wake up
2015-05-15 09:21:02 +01:00
George Oikonomou
0ad4b5f323
Add the ability to put the I2C in a known/default state
2015-05-15 09:21:01 +01:00
George Oikonomou
d1a1c16bd0
Define pins for more sensortag peripherals
2015-05-15 09:21:01 +01:00
George Oikonomou
4378217462
Improve sensortag external flash power management:
...
* Explicitly put in deep sleep on device startup
* Verify that the flash has actually dropped to deep sleep
* Update CLK pin to match the one used on the v1.2 sensortag
Obsoletes and Closes #988
2015-05-15 09:21:01 +01:00
George Oikonomou
cf99160706
Change lpm_shutdown() API call:
...
So that the caller can specify pin pull and wakeup state
2015-05-15 09:21:01 +01:00
George Oikonomou
5644e95fb6
Fix global interrupt manipulation
2015-05-15 09:21:00 +01:00
George Oikonomou
3f310e462f
Tidy-up clock configuration
2015-05-15 09:20:59 +01:00
George Oikonomou
450550a7d1
Explicitly configure Srf pins for unused peripherals
2015-05-15 09:20:59 +01:00
George Oikonomou
7a189d010b
Don't power on SERIAL in the Srf's board_init
2015-05-15 09:20:59 +01:00
George Oikonomou
00a6c31158
Improve OPT sensor driver and usage
...
* Query the sensor about its state, rather than using variables in the driver
* Correctly put the sensor to deep sleep
* Fix doxygen comments
* Don't turn off the sensor in examples since it is no longer needed
2015-05-15 09:20:59 +01:00
George Oikonomou
3ab1b836c4
Configure button pins with hysterisis
2015-05-15 09:20:58 +01:00
George Oikonomou
7641aa89f2
Tidy-up macro semicol usage
2015-05-15 09:20:58 +01:00
George Oikonomou
0b6813513c
Undefine CTS/RTS pins for the SmartRF
2015-05-15 09:20:58 +01:00
George Oikonomou
883c30b4ac
Handle the configuration of the TMP_RDY pin
2015-05-15 09:20:58 +01:00
George Oikonomou
cee6c190c5
Use the BMP in 'forced' mode and reduce startup delay
...
In forced mode, the BMP will turn itself off after a reading
2015-05-15 09:20:57 +01:00
Antonio Lignan
b50ae639b3
Merge pull request #986 from g-oikonomou/cc26xx-hdc-sensor
...
Replace STH21 with HDC1000 for the CC2650 SensorTag
2015-05-15 10:12:08 +02:00
Brad Campbell
6eaada0c3f
Delete old CoAP implementation
...
It seems that this implementation of CoAP in Contiki is no longer
maintained in favor of the `er-coap` implementation. This commit
removes the code to prevent confusion and further bit-rot.
2015-05-14 17:20:46 -04:00
Benoît Thébaudeau
c9324d133f
Merge pull request #1060 from g-oikonomou/cc26xx/contrib/ihex
...
Produce ihex files usable with TI's Flash Programmer
2015-05-14 19:24:36 +02:00
Benoît Thébaudeau
d64927397f
Merge pull request #968 from g-oikonomou/cc2538-contrib-on-chip-sensors
...
Move CC2538 VDD/3 and On-Chip Temp sensors to the CPU dir
2015-05-14 19:21:56 +02:00
Benoît Thébaudeau
71f22b1775
Merge pull request #966 from g-oikonomou/cc2538-startup-to-cpu-dir
...
Move cc2538 startup-gcc.c to the CPU dir
2015-05-14 18:43:39 +02:00
George Oikonomou
69c4f19336
Produce ihex files usable with TI's Flash Programmer
2015-05-14 13:22:11 +01:00
George Oikonomou
6507112b33
Remove SHT21 sources
2015-05-14 13:20:40 +01:00
George Oikonomou
d5f458509d
Adjust the CC26xx README to reflect new sensors
2015-05-14 13:20:39 +01:00
George Oikonomou
1384030d6e
Replace SHT21 with HDC1000 driver in the tag build
2015-05-14 13:20:39 +01:00
George Oikonomou
7e3b8d6fcc
Add a driver for the HDC1000 sensor
2015-05-14 13:20:39 +01:00
George Oikonomou
a32598f658
Merge pull request #1059 from g-oikonomou/cc26xx/contrib/xxware-instructions
...
Update CC26xxware download instructions
2015-05-13 12:21:48 +01:00
George Oikonomou
96e1647270
Move cc2538 startup-gcc.c to the CPU dir
2015-05-13 01:31:10 +01:00
George Oikonomou
4de471478a
Link and build tmp, vdd and als sensors
2015-05-12 23:42:20 +01:00
George Oikonomou
12ac8e1fb5
Initialise ADC in main, not in sensor drivers
2015-05-12 23:42:20 +01:00
George Oikonomou
3717522680
Re-work the CC2538 driver to be a driver for the Srf06 ALS only
2015-05-12 23:42:19 +01:00
Nicolas Tsiftes
44af0fa66b
Merge pull request #1003 from adamdunkels/pr/http-socket-dns64-tcp-socket
...
New HTTP socket, DNS64, IP64 Cooja tests
2015-05-10 17:14:31 +02:00
George Oikonomou
351b16c43c
Update CC26xxware download instructions
2015-05-10 14:53:05 +01:00
Adam Dunkels
64bae5b38d
Include the ip64-addr module, to make http-socket compile
2015-05-10 10:51:12 +02:00
Adam Dunkels
4a85d49a09
Include a subplatform-conf.h, which may override configuration parameters set by the cooja/contiki-conf.h
2015-05-10 10:51:12 +02:00
Adam Dunkels
81391c11a7
Need to specify the target name, which allows us to have platforms that inherit from the cooja platform, like the cooja-ip64 platform
2015-05-10 10:51:12 +02:00
Adam Dunkels
bab1c48912
New Cooja platform designed for runnig IP64 routers for automated testing
2015-05-10 10:51:11 +02:00
George Oikonomou
447be526ae
Merge pull request #1046 from g-oikonomou/cc26xx/contrib/slip-and-br
...
Enable slip-radio and rpl-border-router for CC26xx
2015-05-09 22:51:06 +01:00
George Oikonomou
598fd770b8
Merge pull request #960 from g-oikonomou/travis-arm-aapcs-tests
...
Test cc2538dk with the recommended toolchain
2015-05-09 22:31:18 +01:00
George Oikonomou
bd5e35c968
Merge pull request #1052 from simonduq/packetbuf-cleanup
...
Packetbuf cleanup
2015-05-09 22:30:21 +01:00
Simon Duquennoy
bb76bb8beb
Remove unused flag SICSLOWPAN_CONF_ACK_ALL. Include packetbuf attribute PACKETBUF_ATTR_RELIABLE only when RIME is compiled.
2015-05-06 16:34:26 +02:00
George Oikonomou
d808978149
Improve platform README
2015-05-03 22:36:04 +01:00
George Oikonomou
0327eea109
Printf Driverlib version at startup
2015-05-03 22:36:04 +01:00
George Oikonomou
77874dc02b
Remove unused configuration defines
2015-05-03 22:36:03 +01:00
George Oikonomou
f83c4e7286
Improve code style
2015-05-03 22:36:03 +01:00
George Oikonomou
1d97e7e11e
Improve Reed Relay macro and comments for clarity
2015-05-03 22:36:03 +01:00
George Oikonomou
8c55bc3f3d
Remove obsolete/unused make variables
2015-05-03 22:36:03 +01:00
George Oikonomou
a72d90e283
Control TCP MSS in the project's conf
2015-05-03 13:31:03 +01:00
George Oikonomou
364fc9cacf
Define button_sensor in contiki-conf.h
2015-05-03 13:30:59 +01:00
Oliver Schmidt
05d98ffca3
Adjusted some Win32 config values.
2015-05-02 00:17:53 +02:00
Oliver Schmidt
9aee07c9ad
Leverage the recently added exec() cmdline support in the cc65 C library for the Apple ][.
2015-04-26 21:45:33 +02:00
Oliver Schmidt
a824722862
Merge remote-tracking branch 'upstream/master'
2015-04-26 14:35:40 +02:00
David Rabel
29e62c4e20
SERVO_OFFSET deleted, SERVO_MIN added
2015-04-03 15:55:00 +02:00
David Rabel
41163406c2
Use OCR3 instead of OCR1 for servo
2015-04-03 15:49:17 +02:00
David Rabel
235f368340
Bugfix: missing braces added in serco_set()
2015-04-03 15:47:15 +02:00
Nicolas Tsiftes
8f50d9709d
Merge pull request #999 from adamdunkels/lebrush-rdnss-support-rebased
...
RDNSS support, again
2015-03-30 17:21:23 +02:00
George Oikonomou
7238a1628f
Merge pull request #1004 from alignan/z1-reed-sensor
...
Added Reed Sensor driver, example, and minor fix to the SHT25 sensor driver
2015-03-30 15:05:05 +01:00
Antonio Lignan
b9334a3b0e
Added Reed Sensor driver and example
2015-03-30 10:30:09 +02:00
Gaëtan Harter
d0232bb20d
Remove unused UIP_CONF_ND6_ defines in platforms
...
UIP_CONF_ND6_MAX_PREFIXE
UIP_CONF_ND6_MAX_DEFROUTERS
2015-03-24 13:09:29 +01:00
Gaëtan Harter
697d8c0d23
Remove siclowpan compressions define in platforms
...
Several platforms defined compressions modes values:
SICSLOWPAN_CONF_COMPRESSION_IPV6
SICSLOWPAN_CONF_COMPRESSION_HC1
SICSLOWPAN_CONF_COMPRESSION_HC01
instead of using the global SICSLOWPAN_COMPRESSION_LEVEL definitions
2015-03-24 11:40:32 +01:00
Gaëtan Harter
60719b8239
Remove unused SICSLOWPAN_CONF_CONVENTIONAL_MAC
2015-03-24 11:18:25 +01:00
Harald Pichler
560117e8f3
Merge branch 'contiki' into osd
2015-03-23 13:07:28 +01:00
Harald Pichler
0097d192be
move dht11 define to project.conf
2015-03-23 13:03:32 +01:00
Antonio Lignan
64fd000e5d
Removed duplicated condition in sht25 configuration
2015-03-11 14:25:23 +01:00
Antonio Lignan
1af29a5beb
Added SHT25 sensor
2015-03-10 15:33:58 +01:00
George Oikonomou
cd219e206c
Adjust the cc2538dk readme to reflect travis test changes
2015-03-02 08:41:53 +00:00
George Oikonomou
0ba7f8df52
Merge pull request #951 from hrzr/master
...
Make the CC2538DK button sensor clearer to work with
2015-02-28 15:14:53 +00:00
Jonas Olsson
c9071b6952
Add CC26xx common platform files
2015-02-25 13:12:20 +01:00
Jonas Olsson
b385933fa8
Add SensorTag CC2650 files
2015-02-25 13:11:09 +01:00
Jonas Olsson
c7d85c3ea5
Add Srf06EB + CC26xx EM files
2015-02-25 13:10:26 +01:00
Oliver Schmidt
da536cb07c
Removed superfluous AppleCommander parameters.
2015-02-21 17:16:08 +01:00
Mikhail Gaivoronskii
3f2869824c
Uncrustified platform/cc2538dk/dev/button-sensor.c
2015-02-20 21:53:33 +05:00
Harald Pichler
d31ecbf486
Merge branch 'contiki' into osd
2015-02-18 10:04:47 +01:00
Nicolas Tsiftes
e58aae1dcd
Merge pull request #950 from patoman007/master
...
Fix: Misconfigurations to compile for avr-zigbit platform
2015-02-17 09:41:20 +01:00
George Oikonomou
6bd8bb05f6
Improve wording
2015-02-16 10:17:58 +01:00
George Oikonomou
72914369e8
Re-structure CC2538 doxygen module hierarchy
2015-02-16 10:17:58 +01:00
George Oikonomou
8751e55c94
Improve wording, fix warnigs in the SSI/SPI docs
2015-02-16 10:17:58 +01:00
George Oikonomou
b6bd556805
Fix clock.h warnings caused by multiple, conflicting documentation blocks of clock functions
2015-02-15 21:48:30 +01:00
George Oikonomou
fb22e15844
Fix warnings caused by incorrect param names / undocumented params
2015-02-15 20:11:08 +01:00
Nicolas Tsiftes
277dc8e174
Merge pull request #826 from alignan/fix_octal
...
Remove leading zeros from node id
2015-02-11 22:35:02 +01:00
Harald Pichler
6730ec16c8
Merge branch 'contiki' into osd
2015-02-10 15:13:21 +01:00
Thomas Weber
f06bd06b79
corrected line - #if UIP_CONF_IPV6 - in contiki-rcb-main.c to - #if NETSTACK_CONF_WITH_IPV6 -
2015-02-02 22:08:35 +01:00
PAtO!
2c2b930648
Fix: Misconfigurations to compile for avr-zigbit platform
2015-01-29 14:31:47 -03:00
Ralf Schlatterbeck
c8be130f2e
Finally fix LED-Strip driver
...
.. and adapt led-strip.c to changed polarity (again).
2015-01-26 20:44:30 +01:00
Ralf Schlatterbeck
a2357e648e
Invert LED count, use fixed led driver
2015-01-25 19:04:04 +01:00
Ralf Schlatterbeck
e946cd4c13
Add LED strip example
...
.. not yet working
2015-01-25 18:31:17 +01:00
Thomas Weber
d575f1a6ce
added missing modules in Makefile.avr-rcb, added netstack init functions (to start the at86rf230, modified macros to increase the buffersize)
2015-01-17 19:19:16 +01:00
Harald Pichler
ff29ab2c94
bugfix define framer and llsec
2015-01-16 22:22:16 +01:00
Harald Pichler
000d37a7fc
update modules remove llsec
2015-01-16 15:03:37 +01:00
Víctor Ariño
ccc0d27da0
Integrates uip-nameserver API
...
On the same commit the src have been uncrustified and some typo
fixes as well as includes missing.
2015-01-09 09:44:06 +01:00
Harald Pichler
fb473237ce
bugfix modules
2014-12-29 11:02:51 +01:00
Harald Pichler
9efc5d41c1
Merge branch 'contiki' into osd
2014-12-29 08:20:00 +01:00
George Oikonomou
8fe5456588
Change default PAN ID for the CC2538DK platform to 0xABCD
2014-12-08 22:33:33 +00:00
George Oikonomou
73a133373a
Change CC2530DK default PAN ID to 0xABCD and make it configurable by project-conf.h
2014-12-08 22:33:11 +00:00
Harald Pichler
ed161d1905
NETSTACK_CONF_WITH_IPV6
2014-12-07 17:36:53 +01:00
Harald Pichler
a02be51f08
Merge branch 'contiki' into osd
2014-12-07 15:24:00 +01:00
Simon Duquennoy
c2ca3e9fdb
Cleanup UIP_CONF_IPV6_RPL configuration
2014-12-02 12:38:55 +01:00
Simon Duquennoy
6891bcdd20
Remove unneeded module inclusion from avr and seedeye platforms
2014-12-01 21:06:01 +01:00
Simon Duquennoy
0d9815e08b
WITH_UIP6 -> NETSTACK_CONF_WITH_IPV6
2014-12-01 21:04:54 +01:00
Simon Duquennoy
a9cc909794
Network layer configuration: replace UIP_CONF_* with NETSTACK_CONF_WITH_*
2014-12-01 21:02:57 +01:00
Simon Duquennoy
229c53a2e6
Cooja platform: do not include the rime module by default
2014-12-01 20:13:10 +01:00
Simon Duquennoy
e85f41ffa0
Get IPv6 to fit in micaz platform again
2014-12-01 20:13:09 +01:00
Simon Duquennoy
722b3258d1
Cleanup of the Contiki network layer configuration. Now using CONTIKI_WITH_IPV6, CONTIKI_WITH_IPV4, and CONTIKI_WITH_RIME in makefiles, and UIP_CONF_IPV6, UIP_CONF_IPV4, UIP_CONF_RIME in c code. Now only the stacks that are used are compiled (via makefile MODULES). Make IPv6 the default network stack.
2014-12-01 20:13:09 +01:00
Nicolas Tsiftes
d820feadd6
Merge pull request #792 from wchyan/master
...
atmega128rfa1: Fix the default build error
2014-11-28 19:23:26 +01:00
Nicolas Tsiftes
69c76c9f2f
Merge pull request #872 from Bocci83/master
...
Seedeye platform: add the explicit list of modules
2014-11-28 19:21:52 +01:00
Nicolas Tsiftes
9b90c378e8
Merge pull request #812 from kkrentz/packetbuf-holds-broadcast
...
packetbuf_holds_broadcast()
2014-11-28 19:15:19 +01:00
kkrentz
7b63217a32
ContikiMAC: Default to contikimac_framer when using Rime over ContikiMAC
2014-11-25 04:56:09 -08:00
Stefano
a5550fa083
Seedeye platform: add the explicit list of modules
2014-11-21 14:36:23 +01:00
Antonio Lignan
e8c49dd29e
Remove leading zeros from node id
2014-11-20 14:48:28 +01:00
Harald Pichler
a86f137cf5
add module llsec
2014-11-19 15:10:10 +01:00
Harald Pichler
5f18fc6955
set all colors to the same pin PE5
2014-11-19 13:54:35 +01:00
Harald Pichler
42d3b38c9c
optriac sensors use Arduino API
2014-11-19 13:54:28 +01:00
Harald Pichler
f7e987cbeb
change port manipulation to ardino commands and lets change the pin at runtime possible
2014-11-19 13:54:22 +01:00
Ralf Schlatterbeck
1a1aaa883e
Turn off JTAG in adc_init
2014-11-19 13:54:13 +01:00
Ralf Schlatterbeck
53cf5ab6cf
Fix A0-A5 ADC constants, use in example sketch
2014-11-19 13:53:59 +01:00
Ralf Schlatterbeck
fbe6ae6a60
Fix off-by-one error in digitalPinToTimer
2014-11-19 13:53:53 +01:00
Ralf Schlatterbeck
abdf6f8c6b
Refactor A/D conversion in adc.c
...
Now the necessary settings are in adc.h. Refactored to allow repeated
ADC reads without reinitialization. Arduino allows setting
analogReference, this is now also implemented.
ADC is now initialized to sane values in apps/arduino/arduino-process.c
dev/arduino/arduino-compat.h now has all hardware independent settings
for arduino (some moved from platform/osd-merkur/dev/hw-arduino.h).
turnOffPWM re-implemented with hw_timer, removed from wiring_digital.c
ADC-specific arduino stuff moved to arduino-compat.h
Arduinos wiring_analog no longer necessary.
arduino-sketch example now reads analog inputs 1 and 5 using analogRead.
2014-11-19 13:53:32 +01:00
Ralf Schlatterbeck
c46d6afa39
Make Arduino timer stuff work on Contiki
...
New discovery: Contiki also uses timer 0. With almost the same interface
as Arduino. So we now completely get rid of wiring.c (only the main
file, the other wiring_xxx stay) and implement Arduino timer, delay, etc
in terms of the corresponding Contiki routines. Verified that now delay
works as expected. The LED in examples/osd/arduino-sketch blinks!
Before this, the arduino_init routine in wiring.c destroyed the timer-0
initialization of contiki, making both, contiki timer implementation
*and* contiki timer implementation fail if the arduino_init routine was
called. Now both work.
Squashed with following bug-fix commit.
2014-11-19 13:50:58 +01:00
Ralf Schlatterbeck
b6be226e69
Add Arduino compatibility layer
...
We can now directly compile arduino sketches (.pde) files.
Arduino compatible analogWrite works now.
But there is still a long way to go, serial I/O and timer stuff (delay,
millis etc) currently don't work (not tested but I don't expect this to
work).
It can be used in an arduino sketch or in a normal contiki program.
We get a PWM frequency of 490.2 Hz (a period of 2.040 ms), that's
Arduino compatible. If you need different frequencies see native timer
usage in examples/osd/pwm-example
In a contiki program you have to call arduino_pwm_timer_init to
initialize the timer before pwm works. The arduino sketch wrapper
already does this.
For running a sketch, see examples/osd/arduino-sketch
2014-11-19 13:48:05 +01:00
Harald Pichler
5077010fc0
add i2c driver from Ingo
2014-11-19 13:46:58 +01:00
Harald Pichler
16fa63ebac
bugfix read analog
2014-11-19 13:46:14 +01:00
Harald Pichler
4461dca8f2
set 0xABCD default panid
2014-11-19 13:46:07 +01:00
Ralf Schlatterbeck
4ceffb090d
Make HW timer for contiki rtimer configurable
...
... and configure osd platform to use timer 5. With the new
configuration we can use timer 3 for generating hardware PWM.
2014-11-19 13:44:55 +01:00
Harald Pichler
38dbf611e6
add Arduino pin definition and commands
2014-11-19 13:42:57 +01:00
Harald Pichler
7c0cd36a77
bugfix define panid
2014-11-19 13:42:47 +01:00
Ralf Schlatterbeck
56f6f87c94
Allow changing bootloader_get_mac address
...
Current default in the Makefile is the *new* bootloader address.
But for backward compatibility we've modified the run*.sh files
to use the old address. The run*.sh also now explain how to change
the default.
2014-11-19 13:42:35 +01:00
Harald Pichler
1efbe0736a
change resources to simple and make climate2 default
2014-11-19 13:42:13 +01:00
Harald Pichler
d90e0d622d
get s/button ->show button status 0/1
2014-11-19 13:42:05 +01:00
Harald Pichler
affe81cc6d
bugfix includes and names
2014-11-19 13:40:29 +01:00
Harald Pichler
a16849120f
adapt new names and api
2014-11-19 13:40:09 +01:00
Harald Pichler
964164b157
remove t4 driver at the moment, config problem
2014-11-19 13:39:11 +01:00
Marcus Priesch
630bd8e9e4
Factored to support configurable amount of pwm's, fixes
2014-11-19 13:38:58 +01:00
Harald Pichler
11b13a7a7e
remove link status and bugfix params.c
2014-11-19 13:37:41 +01:00
Harald Pichler
9906e9736c
temp and hum sensors values xxxx -> xx.xx
2014-11-19 13:37:21 +01:00
Harald Pichler
1b04a24022
config panid over defines
2014-11-19 13:37:06 +01:00
Harald Pichler
8b323633cd
define new tria pins, configurable type ligt or shutter or plug
2014-11-19 13:36:58 +01:00
Harald Pichler
2408af0b93
remove xmac config
2014-11-19 13:36:35 +01:00
Harald Pichler
ab16ebd4ea
bugfix nbr name xmac
2014-11-19 13:35:04 +01:00
Harald Pichler
171c1290c3
update boarder router to new rpl tables
2014-11-19 13:34:47 +01:00
Harald Pichler
dd917c3260
bugfix server client demo
2014-11-19 13:34:37 +01:00
Harald Pichler
e2edd006d4
initial upload
2014-11-19 13:34:27 +01:00
Harald Pichler
837f70770a
cleanup plattform defines, disable energest, radiostatistics
2014-11-19 13:34:20 +01:00
Harald Pichler
34d64b4eb0
bugfix blockmode, 8 Hz dutycyle as standard
2014-11-19 13:34:07 +01:00
Harald Pichler
1093989aef
bugfix CS cast to uint8_t
2014-11-19 13:33:59 +01:00
Harald Pichler
29c7297591
bugfix RH03 sensor
2014-11-19 13:33:50 +01:00
Harald Pichler
45ede69308
add dht22 and RHT03 support
2014-11-19 13:33:40 +01:00
Harald Pichler
8f85f7fb0a
bugfix new dresden module 32khz
2014-11-19 13:33:31 +01:00
Harald Pichler
cead1c7ce0
use batmon in battery_sensor
2014-11-19 13:32:41 +01:00
Harald Pichler
ae732f4636
initial upload
2014-11-19 13:32:31 +01:00
Harald Pichler
db823713eb
bugfix packet loss
...
Conflicts:
platform/osd-merkur/contiki-main.c
2014-11-19 13:31:33 +01:00
Harald Pichler
48fff35bd9
update for new contiki fetch
2014-11-19 13:22:20 +01:00
Harald Pichler
e9c033688b
bugfix
2014-11-19 13:21:52 +01:00
Harald Pichler
1fc136d379
add BOOTLOADER_GET_MAC
...
Conflicts:
platform/osd-merkur/params.h
2014-11-19 13:19:44 +01:00
Harald Pichler
b1e1ef1ffd
periodic prints configurable
2014-11-19 13:14:20 +01:00
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