Commit graph

1456 commits

Author SHA1 Message Date
Simon Duquennoy
bef32c20fb jn516x examples: print out network state periodically 2015-12-03 13:57:26 +01:00
Oliver Schmidt
7288a364b0 Fixed C&P error. 2015-12-03 09:09:21 +01:00
Oliver Schmidt
922bebc68a Some targets only return from getchar() on newline. 2015-12-02 18:27:54 +01:00
Oliver Schmidt
48d1d74f1c Fixed dacef46b03 2015-12-02 18:24:44 +01:00
Niclas Finne
3dd11603a7 Implementation of OMA LWM2M Engine / IPSO Objects 2015-12-02 15:40:05 +01:00
Antonio Lignan
e47b309536 Added note in PWM driver and example about PM0 2015-11-30 09:43:35 +01:00
Harald Pichler
c493bc6618 initial upload 2015-11-29 22:34:24 +01:00
Harald Pichler
ba9d4ed578 add dallas ds1820 external sensor 2015-11-29 22:31:59 +01:00
Harald Pichler
67ed80e9fe move defines to servo.h 2015-11-28 18:45:15 +01:00
Antonio Lignan
37fcb927be Added PWM driver for the Zolertia Zoul module and CC2538 platforms 2015-11-25 23:56:29 +01:00
Marco Grella
e47c69c170 Merge remote-tracking branch 'upstream/master' into stm32nucleo-spirit1 2015-11-25 12:36:01 +01:00
Antonio Lignan
830f5fb60d Fixed warnings in Z1 examples 2015-11-24 22:02:05 +01:00
George Oikonomou
a30154c43e Fix code style: zoul examples 2015-11-24 21:15:34 +01:00
George Oikonomou
be1bd9a619 Fix code style: Z1 websense example 2015-11-24 21:15:34 +01:00
George Oikonomou
e1f6d39857 Fix code style: Z1 main examples 2015-11-24 21:15:34 +01:00
Antonio Lignan
27fd1a5eb8 Updated RE-Mote revision A support and cleaning up Zolertia platforms 2015-11-24 21:15:33 +01:00
Simon Duquennoy
673d1d103b JN516x: minor fixes 2015-11-21 10:23:15 +01:00
Harald Pichler
9b9958fb43 initial upload 2015-11-20 14:08:43 +01:00
Marco Grella
41f9ca08e2 Merge with updated master. 2015-11-11 13:42:35 +01:00
Simon Duquennoy
4c52b87ac1 Ported jn516x slip-bridge to new uip_fallback_interface 2015-11-10 09:30:36 +01:00
Simon Duquennoy
dacef46b03 wget.c: replace deprecated gets with safe fgets 2015-11-10 09:09:31 +01:00
Simon Duquennoy
fbd78a7e3b Merge pull request #1293 from simonduq/pr/fix-warnings
Fix a number of compiler warnings and enable -Werror in Travis
2015-11-10 08:49:11 +01:00
Oliver Schmidt
8e9da827c0 Several minor adjustments. 2015-11-03 22:09:24 +01:00
Oliver Schmidt
fb5d0b7ef0 Made 80 column display a cc65 application attribute.
So far 80 column display was an attribute of a cc65 platform. Now each cc65 application can ask for 80 column display by defining WITH_80COL. Of course this is ignored by platforms incapable of 80 column display.

I see three types of application:

* Applications not benefitting from 80 column at all and in fact looking better with 40 column display. These are now using 40 column display. Examples: ethconfig, ipconfig

* Applications taking advantage of 80 column display if it is available without drawbacks. These stay as they were. Examples: Telnet server, web server, wget

* Applications needing 80 column display so urgently that it is likely desirable even if the display becomes harder to read. These come now in both flavors allowing the user to choose. Examples: IRC, web browser

Note: This change doesn't actually introduce any 80 column display with drawbacks. This if left to a subsequent change.
2015-10-30 12:42:58 +01:00
Marco Grella
e261cda8dc Compilation flags update: BOARD=ids01a4/5 SENSORBOARD=iks01a1 2015-10-27 12:12:59 +01:00
Rémy Léone
f2440235b5 Fix CSC & XML export to match .gitattributes 2015-10-22 16:05:40 +02:00
Benoît Thébaudeau
bf41de1be5 Merge pull request #1078 from drandreas/cc2538-crypto
cc2538: Add PKA drivers, ECC algorithms and examples
2015-10-21 11:24:35 +02:00
Simon Duquennoy
2daa3d7377 Merge pull request #1269 from tadodotcom/tmp-uip-fallback-iface
More flexibility for the fallback interface
2015-10-20 11:33:14 +02:00
Simon Duquennoy
8f954fbab5 res-b1-sep-b2.c: fix type of iterator 2015-10-20 10:11:50 +02:00
Simon Duquennoy
1634acf2c4 jn516x examples: fix compiler warnings to enable -Wall -Werror compilation 2015-10-20 10:11:46 +02:00
Adam Dunkels
9b6377ecdc Fix compiler warnings 2015-10-20 10:11:37 +02:00
Adam Dunkels
afe3612c0c Fix compiler warnings 2015-10-20 10:11:36 +02:00
Simon Duquennoy
e3303c7e99 Added missing undef in examples/cc2528dk/sinffer/project-conf.h 2015-10-20 09:37:10 +02:00
Simon Duquennoy
c8ec08732c Fix broken printf in examples/er-rest-example/resource/res-b1-sep-b2.c 2015-10-20 09:37:09 +02:00
Simon Duquennoy
9c15d1c42f Merge pull request #1063 from simonduq/configure-na
Default NDP configuration
2015-10-18 20:26:55 +02:00
Simon Duquennoy
10bd49a71a Merge pull request #756 from sieben/dos2unix
dos2unix fix
2015-10-18 20:26:07 +02:00
AntiCat
d631270af4 cc2538: Add PKA drivers, ECC algorithms and examples 2015-10-18 20:14:17 +02:00
Konrad Krentz
0a6b1cb646 llsec: Added AEAD mode to CCM* 2015-10-14 08:22:44 -07:00
Konrad Krentz
c656a4d1c5 llsec: Fixed style issues in CCM* 2015-10-14 08:22:44 -07:00
Konrad Krentz
2059b6559e llsec: Let llsec_drivers define their own framer 2015-10-14 08:21:40 -07:00
Marco Grella
4e81c87c3a Fix to sensor-demo license and Readme file. 2015-10-13 12:21:21 +02:00
Harald Pichler
fd24ecd26e add index and struct for messured values 2015-10-11 15:30:30 +02:00
Harald Pichler
e8471445ed add struct for sensors, add sketch.h 2015-10-11 15:22:49 +02:00
Marco Grella
fc65757114 License headers and code style fixes. 2015-10-09 19:40:39 +02:00
Harald Pichler
0a4938243e cleanup resources 2015-10-08 21:14:43 +02:00
Harald Pichler
4ff973a0cc mult. DS18B20 Temp demo 2015-10-07 16:14:00 +02:00
Simon Duquennoy
2231cc9b0f Merge pull request #1266 from drugo72/avr-revival
AVR revival: new battery and temperature sensors and er-rest-example for the Raven
2015-09-28 17:52:26 +02:00
Simon Duquennoy
2834b41ed6 Merge pull request #1267 from drugo72/rest
REST:  new observable, periodic temperature resource
2015-09-28 17:52:05 +02:00
Mariano Alvira
94daacd244 Merge pull request #817 from SmallLars/econotag-ecc
Addet ECC functions on elliptic curve secp256r1.
2015-09-28 09:45:11 -05:00
Simon Duquennoy
f9537b6355 Merge pull request #1219 from simonduq/jn516x-port
NXP JN516x Platform
2015-09-25 12:09:52 +02:00
Lars Schmertmann
17ff3bb466 Added ECC functions on elliptic curve secp256r1 2015-09-24 14:11:20 +02:00
Simon Duquennoy
0780e1a051 Added NXP JN516x examples 2015-09-23 14:38:41 +02:00
Víctor Ariño
76e293c289 Fixes ret value for output fallback iface in tun-bridge.c 2015-09-22 12:53:04 +02:00
Víctor Ariño
561e70b18e Updated current fallback_interface(s) to return int. 2015-09-22 12:53:04 +02:00
Cristiano De Alti
6e91cb3a39 Activate battery and temperature resources
if they are supported by the platform.
2015-09-21 23:20:45 +02:00
Cristiano De Alti
ba3c167cef Add a new periodic temperature resource.
The temperature sensor is sampled once per second.
If observed, temperature readings are reported on change or every
Max-Age interval (default: 60s).
2015-09-21 23:12:16 +02:00
Cristiano De Alti
5a829d818d er-rest-example leveraging the new rave sensors. 2015-09-21 22:53:48 +02:00
Harald Pichler
1a309e6632 bugfix project conf, do not sleep git add project-conf.h 2015-09-21 16:09:28 +02:00
Harald Pichler
a2e70d49f3 remove first space from converted string 2015-09-16 10:31:52 +02:00
Harald Pichler
6b41f23d59 make mcusleep variable, use mcusleepcycle 2015-09-15 09:52:06 +02:00
Lars Schmertmann
46ffc509c1 Added App/Tool/Example for usage of additional flash on econotag/mc1322x 2015-09-14 20:43:12 +02:00
Harald Pichler
7404e75213 bugfix float resources, save energy enabled 2015-09-14 16:55:18 +02:00
Harald Pichler
e3ffbe36c8 bugfix printf and float 2015-09-14 10:51:16 +02:00
Harald Pichler
617d42663c add htu21d sensor and resources and set mesure inteval to 10 seconds 2015-09-11 21:41:24 +02:00
Ralf Schlatterbeck
7f09f96e88 Fix compile error
Wire.h is a C++ include-file and may not be within 'extern "C"'.
2015-09-11 15:10:28 +02:00
Marco Grella
87970a88a4 Comments and documentation fixes. 2015-09-10 14:28:08 +02:00
Marco Grella
b7459a12c1 Added radio sensor. 2015-09-07 19:59:03 +02:00
Rémy Léone
7a5071dd30 Adding a gitattributes and correcting line-endings
https://help.github.com/articles/dealing-with-line-endings/
2015-09-07 15:40:02 +02:00
Marco Grella
17aafb9daa Align to current master 2015-09-04 17:01:04 +02:00
Harald Pichler
910dc981b5 initial upload 2015-09-04 14:04:11 +02:00
Nicolas Tsiftes
607303ecdd Merge pull request #1081 from pablocorbalan/light
Remove old unused light drivers
2015-08-28 14:13:00 +02:00
Adam Dunkels
bfb29d2f11 Merge pull request #1116 from cetic/pr-uip-clear-buffer
Add uip_clear_buf() macro and replace all instances of uip_len = 0
2015-08-27 10:27:08 +02:00
Harald Pichler
500078ef9a update to contiki 3.0 2015-08-26 16:01:57 +02:00
Jonas Olsson
67045d4012 Export RSSI to default parent in the CC26xx web demo
The current version of the CC26xx web demo publishes over MQTT the default parent's IPv6 address and the last observed RSSI of this link. This is collected by active probing (periodic ping).

This commit brings the probing functionality to the example's main code module. The MQTT client keeps publishing as previously, but we now also export the same information through CoAP resources. Configuration is still possible through the example's web server.
2015-08-23 20:41:12 +01:00
Jonas Olsson
bad7eb2bc8 Add a very sleepy CC26xx/CC13xx demo
This demonstraties how to combine CC13xx tick suppression, RPL leaf mode and turning off ContikiMAC duty cycling to build an extremely low-consuming firmware.
2015-08-23 20:41:12 +01:00
Jonas Olsson
72b586cb7d Modify cc26xx examples to play nicely with the CC13xx addition 2015-08-23 20:41:11 +01:00
Oliver Schmidt
902b21a326 Merge pull request #1188 from oliverschmidt/master
Some finishing touch on the CBM retro targets.
2015-08-08 16:33:59 +02:00
Oliver Schmidt
757809196e Some finishing touch on the CBM retro targets. 2015-08-08 15:41:24 +02:00
Pablo Corbalán
5db5524b7f Remove unneeded headers in sky-shell-exec 2015-08-04 20:39:09 +01:00
Joe Andrieu
e0f72b9545 Clarified that a newline is needed for the echo 2015-07-26 16:17:34 -07:00
Marco Grella
86f35536a4 Added new stm32nucleo-spirit1 platform 2015-07-24 16:30:10 +02:00
Oliver Schmidt
a0be26d9f1 Merge pull request #1150 from oliverschmidt/master
Several retrocomputing config changes.
2015-07-06 09:42:55 +02:00
Simon Duquennoy
3315d3069d Merge pull request #1108 from phoenix-frozen/generify-ccm-star
generalised CCM module into lib
2015-07-01 10:44:41 +02:00
Oliver Schmidt
00f9eebfab Changed Telnet server configuration for the Apple II.
Having the Telnet server reboot on exit (via ctrl-reset) allows to bring back the full MTU.
2015-06-28 22:25:28 +02:00
Oliver Schmidt
a70fbf1bbf Reconfigured Telnet server.
In order to have the wget command make some sense the write command should be present too.
- On the Apple][ reduction of the MTU seems to gain just enough RAM to have the (rather heavy-weight) full-blown C library file I/O working.
- On the C128 there's way too little RAM so there's no wget command but only the file commands.
- On the CBMs a dummy lseek() was necessary to have the read command link.
2015-06-21 21:07:41 +02:00
Oliver Schmidt
fc9d38caba Reduced default for number of connections.
Save some memory by reducing the the default for number of connections from 10 to 2.
2015-06-21 20:58:51 +02:00
Laurent Deru
1f0fd3f38b Add uip_ext_len definition in fakeuip.c for ravenusbstick 2015-06-15 15:15:59 +02:00
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
Justin King-Lacroix
3ce8f26eea generalised CCM module into lib
introduced convenience functions for LLSEC modules
2015-06-10 18:07:41 +01: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
801315e819 cc2538: aes: Make it possible to have several keys stored at once
Several keys can be kept at the same time in the key store, and several
keys can be loaded at once. Give access to these features.

The ccm-test example is also improved to better demonstrate the use of
the key store.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-06-02 21:41:07 +02:00
Benoît Thébaudeau
b92a5afcc4 cc2538: ccm: Make it possible to use the interrupt
Using the AES interrupt allows the user process not to waste time
polling for the completion of the operation. This time can be used by
the user process to do something else, or to let the system enter PM0.

Since the system is now free to perform various operations during a
crypto operation, a protection of the crypto resource is added, and PM1+
is prohibited in order not to stall crypto operations.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-06-02 21:41:07 +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
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
Harald Pichler
72c6c2c492 bugfix add status led 2015-05-21 22:14:39 +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
Moritz 'Morty' Strübe
0dab6926b3 Move MAX, MIN and ABS to sys/cc.h 2015-05-18 08:53:17 +02:00
George Oikonomou
5f4154a0e3 Adjust AON BatMon usage 2015-05-17 14:09:51 +01: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
82d03d0ebf bugfix no framer 2015-05-15 20:59:59 +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
7e00eeb76a Achieve lowest consumption with the CC26xx demo:
This changes the CC26xx simple demo so that a devices running this firmware will achieve the lowest possible energy consumption without requiring any changes to the example
2015-05-15 09:21:05 +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
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
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
869768902b seedeye powerswitch: update coap
The powerswitch app was using old an older implementation of er-coap.
This updates it.
2015-05-14 17:20:46 -04: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
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
George Oikonomou
e4722bb0ea Replace SHT21 with HDC1000 in the web demo 2015-05-14 13:20:39 +01:00
George Oikonomou
62f978b993 Replace SHT21 with HDC1000 in the simple demo 2015-05-14 13:20:39 +01:00
George Oikonomou
11a5e0a49a Merge pull request #1051 from simonduq/fix-warning
Fixed a number of compiler warnings
2015-05-13 00:52:40 +01:00
George Oikonomou
49d1782a06 Adjust the MQTT demo to use re-engineered sensors 2015-05-12 23:42:20 +01:00
George Oikonomou
ac459df128 Re-work the CC2538 demo to use the 3 separate ADC sensors 2015-05-12 23:42:20 +01:00
Simon Duquennoy
1ac5d85042 Enable NA in examples that need it 2015-05-10 19:56:38 +02: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
Adam Dunkels
bc222ed85c Code for building an IP64 router 2015-05-10 10:51:11 +02:00
Adam Dunkels
33372945a3 HTTP socket code with support for GET and POST 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
6e3197b0bf Merge pull request #1008 from g-oikonomou/cc26xx/contrib/web-demo-httpd
Improve HTTPD in the CC26xx web demo
2015-05-09 22:46:26 +01:00
George Oikonomou
bd5e35c968 Merge pull request #1052 from simonduq/packetbuf-cleanup
Packetbuf cleanup
2015-05-09 22:30:21 +01:00
George Oikonomou
33526be5ab Merge pull request #985 from g-oikonomou/cc26xx-minor-updates
Minor Updates to the CC26xx Port
2015-05-09 22:29:30 +01:00
George Oikonomou
38b3b8b74a Merge pull request #981 from g-oikonomou/cc2538-sniffer-fix
Turn on the CC2538 RF explicitly in the sniffer example
2015-05-09 21:56:23 +01:00
Simon Duquennoy
4a93f5148d Fixed a number of compiler warnings 2015-05-08 09:07:20 +02:00
Simon Duquennoy
290fc829ea Consistently use PACKETBUF_ATTR_MAC_SEQNO for MAC sequence number, both input and output. Disable PACKETBUF_ATTR_PACKET_ID in the non-Rime case. 2015-05-06 16:34:44 +02: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
f83c4e7286 Improve code style 2015-05-03 22:36:03 +01:00
Nicolas Tsiftes
f7ca4b41a9 Merge pull request #1001 from adamdunkels/pr/queuebuf-no-ref
Cleanup: remove the obsolete reference packetbuf
2015-05-03 16:35:17 +02:00
George Oikonomou
a72d90e283 Control TCP MSS in the project's conf 2015-05-03 13:31:03 +01:00
Harald Pichler
b2847f4756 add coap18 2015-04-29 15:58:42 +02:00
Harald Pichler
b97d6878c0 add coap18 2015-04-28 20:56:52 +02:00
Harald Pichler
a1423c28fc add coap18 2015-04-28 19:53:43 +02:00
Harald Pichler
12fe0d8442 change to coap18 2015-04-22 14:18:10 +02:00
David Rabel
65c50195c4 ressource handlers for servos corrected 2015-04-03 15:46:05 +02:00
David Rabel
0980393d22 Fix servo example 2015-04-03 14:31:25 +02:00
David Rabel
3ba9009f50 Use servo instead of t4-servo 2015-04-03 14:29:52 +02:00
Adam Dunkels
7acf747c1a Removed packetbuf references. This was a feature that is not used anymore and only made the code more complex. 2015-04-01 21:33:02 +02:00
Antonio Lignan
b9334a3b0e Added Reed Sensor driver and example 2015-03-30 10:30:09 +02:00
George Oikonomou
7730215f99 Point all form action attributes to the current html page 2015-03-27 20:18:58 +00:00
George Oikonomou
7637164ae7 Parse filename for POST requests
so we can return it in the "Location:" header subsequently
2015-03-27 20:18:58 +00:00
George Oikonomou
54c1cd05e8 Simplify the page name to script mapping 2015-03-27 20:18:58 +00:00
George Oikonomou
90a3cd8e14 Change the way we handle HTTP response headers 2015-03-27 20:18:58 +00:00
George Oikonomou
733378679f Prettify httpd top matter in the web demo 2015-03-27 20:11:44 +00: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
1af29a5beb Added SHT25 sensor 2015-03-10 15:33:58 +01:00
George Oikonomou
1fc06b6581 Turn on the CC2538 RF explicitly 2015-02-28 15:01:32 +00:00
Nicolas Tsiftes
bfd2a90e08 Merge pull request #933 from alessandrelli/coap-observe-client
Erbium: client-side support for CoAP Observe
2015-02-26 10:06:58 +01:00
Jonas Olsson
0f567e499f Add CC26xx examples 2015-02-25 13:15:35 +01:00
Daniele Alessandrelli
b6e716233a er-coap-example: add example for client-side CoAP observe 2015-02-24 22:48:12 +01:00
Harald Pichler
d31ecbf486 Merge branch 'contiki' into osd 2015-02-18 10:04:47 +01:00
Jonas Olsson
2bb7fcc0cb Fixed doxygen formatting 2015-02-17 16:11:45 +01:00
Jonas Olsson
4fb2bd410f Add title to doxygen group 2015-02-17 16:07:37 +01:00
Jonas Olsson
6112ec54d3 Add MQTT demo for the cc2538dk platform 2015-02-17 15:58:50 +01:00
George Oikonomou
72914369e8 Re-structure CC2538 doxygen module hierarchy 2015-02-16 10:17:58 +01:00
Harald Pichler
117f737f8d Merge branch 'osd' of https://github.com/osdomotics/osd-contiki into osd 2015-02-10 20:17:36 +01:00
Harald Pichler
9dd81946d3 add coap 18 2015-02-10 20:16:51 +01:00
Harald Pichler
6730ec16c8 Merge branch 'contiki' into osd 2015-02-10 15:13:21 +01:00
Michael Richardson
5699127c9a additional edits to further clarify interface between native-border-router and slip-radio 2015-02-07 10:51:41 -05:00
Harald Pichler
c30493e535 add Buzzer 2015-02-05 13:44:05 +01:00
Michael Richardson
a0ac6bceb6 added some documentation of native-border-router and slip-radio relationship 2015-02-03 11:05:13 -05:00
Ralf Schlatterbeck
451e2df0f5 Fix IP-Address output (endianness!) 2015-01-27 16:41:30 +01:00
Ralf Schlatterbeck
5ff9b7c989 Don't re-init coap connection 2015-01-27 16:04:07 +01:00
Ralf Schlatterbeck
058ae7bae3 Alleged race-condition was a bug in receiver
Handling put-requests was missing a trailing \0 in the parsed string.
2015-01-27 10:43:03 +01:00
Ralf Schlatterbeck
16afb4b74c Workaround for race-condition 2015-01-27 10:06:22 +01: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
301d8d77bb Non-blocking send 2015-01-26 17:59:14 +01:00
Ralf Schlatterbeck
42f985a297 Add potentiometer app for setting led intensity 2015-01-26 17:27:12 +01:00
Ralf Schlatterbeck
a2357e648e Invert LED count, use fixed led driver 2015-01-25 19:04:04 +01:00
Ralf Schlatterbeck
f6c158a139 Merge branch 'osd' of github.com:osdomotics/osd-contiki into osd 2015-01-25 18:32:07 +01:00
Ralf Schlatterbeck
e946cd4c13 Add LED strip example
.. not yet working
2015-01-25 18:31:17 +01:00
Harald Pichler
df220072f4 initial upload 2015-01-22 14:03:29 +01:00
Harald Pichler
801316badc update coap 18 macros 2015-01-22 14:01:36 +01:00
Harald Pichler
7b25177a3d Merge branch 'osd' of https://github.com/osdomotics/osd-contiki into osd 2015-01-22 08:56:16 +01:00
Ralf Schlatterbeck
baaa2c5741 Factor/Fix generic resources
Now the old GENERIC_RESOURCE macros works again (but usage has changed).
Common resources (battery, leds, radio) are now in resources-common.
2015-01-21 15:41:21 +01:00
Harald Pichler
75d577c9b5 blocksize 64 2015-01-21 15:08:23 +01:00
Harald Pichler
76e39b2b5d update coap 18 2015-01-21 14:46:36 +01:00
Harald Pichler
a8728413b2 initial upload 2014-12-31 10:00:09 +01:00
Harald Pichler
2d52ca9051 inital upload 2014-12-31 09:56:05 +01:00
Harald Pichler
2d3cd057c4 initial upload 2014-12-31 09:55:31 +01:00
Harald Pichler
d742fc4b76 changes for coap18 2014-12-31 09:53:24 +01:00
Harald Pichler
2b8aeee115 save energy 2014-12-29 13:05:50 +01:00
Harald Pichler
365fe31b02 coap 18 2014-12-29 08:16:47 +01:00
Harald Pichler
aaaa0aa138 cleanup code, batterie value Volt 2014-12-29 08:11:51 +01:00
Harald Pichler
a8c87e3f54 read better values 2014-12-29 08:10:10 +01:00
Harald Pichler
df95393980 remove init pwm per default, switch moisture sensor on and off to save energy 2014-12-12 08:47:01 +01:00
Harald Pichler
76ea945fd7 add power save mode RDC_CONF_PT_YIELD_OFF 2014-12-09 16:42:45 +01:00
Harald Pichler
248a1e3882 add leds and battery 2014-12-09 14:36:06 +01:00
Harald Pichler
cc0539ee90 remove unused examples 2014-12-07 21:55:43 +01:00
Harald Pichler
fed6fe019c change to coap18 2014-12-07 21:39:46 +01:00
Harald Pichler
13aa2a1415 add coap18 2014-12-07 21:32:03 +01:00
Harald Pichler
d6144bfebe cleanup makefile, add avr-size 2014-12-07 20:10:53 +01: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
74f6ae3751 slip-radio: remove unneeded definition of NETSTACK_CONF_WITH_RPL (now set from makefile with CONTIKI_WITH_RPL) 2014-12-01 21:04:25 +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
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
bb645b6287 Merge pull request #877 from gebart/for-upstream/rpl-border-router-webserver-tcp
examples/ipv6/rpl-border-router: Add -DUIP_CONF_TCP=1 to CFLAGS
2014-11-28 19:00:46 +01:00
Nicolas Tsiftes
4a41f147d3 Merge pull request #879 from alignan/fix_rssi_app
Fixed rssi scanner application and moved into single example
2014-11-28 19:00:23 +01:00
Harald Pichler
9c90608d3c bugfix hum temp 2014-11-28 14:04:39 +01:00
Antonio Lignan
4f744d858a Fixed rssi scanner application and moved into single example 2014-11-28 13:07:26 +01:00
Harald Pichler
730d9e2d11 add battery 2014-11-27 15:01:07 +01:00
Harald Pichler
1dacefce01 add coap18 2014-11-27 14:07:14 +01:00
Harald Pichler
41f8a9c661 add coap18 2014-11-27 09:30:36 +01:00
Harald Pichler
698d8dce90 add coap18 2014-11-26 21:47:00 +01:00
Joakim Gebart
1e03cdd553 examples/ipv6/rpl-border-router: Add -DUIP_CONF_TCP=1 to CFLAGS
The example used to rely on the default value being set to 1 which
caused build failures on platforms which have a default UIP_CONF_TCP=0

Signed-off-by: Joakim Gebart <joakim.gebart@eistec.se>
2014-11-26 19:05:32 +01:00
Joakim Gebart
64a4755354 examples/webserver-ipv6: Add UIP_CONF_TCP=1 to DEFINES.
TCP is mandatory for this HTTP server.

Fixes builds for platforms which have TCP turned off by default (mulle)

Signed-off-by: Joakim Gebart <joakim.gebart@eistec.se>
2014-11-26 19:03:51 +01:00
Harald Pichler
824eca3b61 cleanup code, move ds1820 to resources 2014-11-26 17:12:34 +01:00
Harald Pichler
7a666307cf add coap 18 2014-11-26 16:46:13 +01:00
Harald Pichler
9eb0c5466f initial uplaod 2014-11-21 09:44:25 +01:00
Harald Pichler
6167835689 use contiki mac 2014-11-20 16:32:22 +01:00
Harald Pichler
e58322260f update llayer 2014-11-20 13:43:53 +01:00
Harald Pichler
d8e0dd7005 update to coap rfc 2014-11-19 22:06:38 +01:00
Harald Pichler
8966f7d509 update project to coap 13 2014-11-19 13:59:05 +01:00
Harald Pichler
0620eb86d0 initial upload 2014-11-19 13:58:56 +01:00
Harald Pichler
0c7328b59d initial upload 2014-11-19 13:58:50 +01:00
Harald Pichler
dfaa8c0f32 initial upload 2014-11-19 13:58:32 +01:00
Harald Pichler
914f5b931b initial upload 2014-11-19 13:58:24 +01:00
Harald Pichler
1b40bccb00 initial upload 2014-11-19 13:58:02 +01:00
powermik
8bb7d82a2d UNSUPPORTED_MADIA_TYPE is a typo 2014-11-19 13:55:59 +01:00
Harald Pichler
21bbe79079 use Arduino like optotriac driver 2014-11-19 13:54:53 +01:00
Harald Pichler
026b961d5e simplify code, bugfixes PE3 2014-11-19 13:54:42 +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
ddbfd6712c Remove obsolet macro in example 2014-11-19 13:53:44 +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
d5284eebe1 Factor resources, fix time
Now there is a generic resource that can generate and parse
application/json as well as text/plain. It can be re-used, only the
from_string and to_string routines have to be written and the resource
properly set up. A new resource format is specified, see
GENERIC_RESOURCE in, e.g., examples/osd/pwm-example. This is now used in
all my examples, namely pwm-example, arduino-sketch, wallclock-time.

There was an off by one error for the month in time formatting (in
gmtime and localtime). And the leap-year computation was broken. Both
fixed now, so we get a correct date. For localtime we are still 2 hours
off because daylight saving isn't implemented yet.

Also renamed gmtime to utc.
2014-11-19 13:53:12 +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
Ralf Schlatterbeck
cfec3c6e2d Initial implementation of avr hardware timer
Mainly for PWM use for now.
With example to set the LED to different brightness via COAP.
We switch the LED with 50 kHz (20µs) in this example.
2014-11-19 13:47:37 +01:00
Ralf Schlatterbeck
b4fb8c3f52 Add wallclock time handling
New application and new example.
We use the built-in timer routines and add an offset to get the
wallclock time. The offset can be set by time-changing routines
(currently only settimeofday).
We also maintain an offset for timezone handling but this isn't
currently fully implemented.
2014-11-19 13:43:45 +01:00
Harald Pichler
b886a1faaf initial upload 2014-11-19 13:43:19 +01:00
Harald Pichler
15bab74093 initial upload 2014-11-19 13:43:12 +01:00
Harald Pichler
465eb28382 cleanup code 2014-11-19 13:43:05 +01:00
Harald Pichler
38dbf611e6 add Arduino pin definition and commands 2014-11-19 13:42:57 +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
c106898d2b add 0.5s delay between off and on 2014-11-19 13:41:54 +01:00
Harald Pichler
94d764e4cb add timer and shutter functionality 2014-11-19 13:41:48 +01:00
Harald Pichler
4d383eb923 change to port F6,F7 2014-11-19 13:41:18 +01:00
Harald Pichler
678891a1a9 change battery and cpttem format to xx.xx 2014-11-19 13:41:08 +01:00
Harald Pichler
a656cf1dcd add shutter control resources, reset,timer 2014-11-19 13:41:00 +01:00
Harald Pichler
03a4081913 add contiki led, remove led1,led2 2014-11-19 13:40:52 +01:00
Harald Pichler
8905f35d72 simplify project-conf.h 2014-11-19 13:40:45 +01:00
Harald Pichler
26b1e874d6 bugfix statusled include 2014-11-19 13:40:38 +01:00