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

1762 commits

Author SHA1 Message Date
alexstanoev 3a53d96526 Validate MQTT broker IP and escape quotes when displaying 
This commit implements address validation for the broker address in the MQTT configuration page of the CC26XX web demo example. Additionally, the Type ID, Org ID, Auth Token, Command Type and Event Type ID fields have quotes escaped (" -> ") to prevent XSS/broken page issues when displaying user-sourced input in HTML input fields.
 2017-06-03 00:04:01 +01:00
George Oikonomou c558e1a559 Revert "Validate MQTT broker IP and escape quotes when displaying" 2017-06-02 23:02:54 +01:00
George Oikonomou 3800cb18a9 Merge pull request #2216 from herjulf/CCA 
Atmel radio; Support for RADIO_PARAM_CCA_THRESHOLD plus rf_environment example
 2017-06-02 22:40:27 +01:00
alexstanoev 6b78ee9a4e MQTT: Validate broker IP and escape quotes when displaying 
This commit implements address validation for the broker address in the
MQTT configuration page. Additionally, the Type ID, Org ID, Auth Token,
Command Type and Event Type ID fields have quotes escaped (" -> ")
to prevent XSS issues when displaying user-sourced input.
 2017-06-02 15:13:58 +01:00
Robert Olsson b4ef18b2fa Keep cca scan function separated 
modified:   examples/rf_environment/rf_environment.c
 2017-05-23 21:07:59 +02:00
Robert Olsson 18cfaf7fa2 Reformat of table text for README 
modified:   examples/rf_environment/README.md
 2017-05-19 09:28:46 +02:00
Robert Olsson ef9b00103e Optimizing channel table size for CCA in rf_environment example 
modified:   examples/rf_environment/rf_environment.c
 2017-05-11 14:20:12 +02:00
Robert Olsson 71167f0ba6 Retrigger PR after Doxigen fix 2017-05-09 15:26:14 +02:00
Robert Olsson 4040005056 Retrigger regression test 
modified:   examples/rf_environment/README.md
 2017-05-08 14:25:59 +02:00
Robert Olsson 91928592d0 Updated README for rf_environment example 2017-05-08 13:11:22 +02:00
Robert Olsson 22975df423 examples/rf_environment for rf CCA (non-intrusive) monitoring added 2017-05-05 12:57:18 +02:00
Harald Pichler 5e15ec6488 bugfix store value to d_temp_s and enable debug prints as degfault 2017-05-04 16:29:55 +02:00
George Oikonomou 7b193ee014 Merge pull request #1932 from g-oikonomou/contrib/cc1350/lp-and-st 
Add support for the CC1350 LP and Sensortag
 2017-04-24 15:34:22 +01:00
Robert Olsson e9aed001bc Example project for Atmel radio AES128 cryto engine 2017-04-24 14:40:33 +02:00
Nicolas Tsiftes 391a84726f Merge pull request #2148 from niziak/master 
native-border-router: fix for disappearing timer 'uip_ds6_timer_perio…
 2017-04-18 15:19:57 +02:00
George Oikonomou e823ead4b0 Tidy up web demo ADC code style 2017-04-02 13:44:02 +01:00
George Oikonomou 474dc33e12 Wrap web demo ADC functionality inside #if blocks 2017-04-02 13:43:21 +01:00
chenek 22b262ce73 Add ADC example to cc26xx-web-demo 2017-04-02 13:43:12 +01:00
George Oikonomou e4da7c66e0 Merge pull request #2165 from alexandruioanp/check-ipv6addrconv-mqtt 
Check broker IP conversion. Adjust state machine accordingly
 2017-04-02 00:33:43 +01:00
George Oikonomou 6eac73103d Merge pull request #2164 from alexstanoev/web-demo-crash-fix 
Zero out httpd_state before deallocating
 2017-04-02 00:32:53 +01:00
Robert Olsson 417f32c65d Adding sensniff support for Atmel via avr-rss2 platform 2017-03-31 20:00:20 +02:00
Alexandru-Ioan Pop f15b86158b Check broker IP conversion. Adjust state machine accordingly 
The result of converting the IP address of the broker wasn't checked. As a result, the pointer was left uninitialised and the IPv6 address used for connecting was some random data. The function now returns an error. Before connect_to_broker is called, mqtt_register is executed, which memsets conn to 0, making its state 0 (MQTT_CONN_STATE_ERROR). In order to recover from this error state, the extra check was added in the MQTT_CLIENT_STATE_NEWCONFIG state.

This was discovered using [CodeSonar](https://www.grammatech.com/products/codesonar)
 2017-03-31 17:33:29 +01:00
alexstanoev a30364189a Zero out httpd_state before deallocating 
When a connection is aborted by the HTTP server while it's still being processed it is possible to hit a null pointer dereference issue by jumping back to a protothread (outputpt) after its httpd_state has been freed. This can be triggered by sending a POST to any form in the CC26xx web demo server using Firefox.
This patch prevents that by zeroing out httpd_state structs before freeing them, thus also clearing the httpd_state->outputpt field.
Tested using Firefox 55.0a1 on a CC2650 LaunchPad.
 2017-03-31 16:44:11 +01:00
Ralf Schlatterbeck dca85a7b6b Add valve example 
Used for gardena valves with 9V power supply.
 2017-03-24 20:10:37 +01:00
Harald Pichler c56142ccec add save energie 2017-03-24 16:11:28 +01:00
Harald Pichler afde635051 initial upload 2017-03-24 11:08:45 +01:00
Wojciech Nizinski 5a0d085451 native-border-router: fix for disappearing timer 'uip_ds6_timer_periodic' 
When UIP_ND6_SEND_NS is enabled, I've noticed that unreachable
neighbours still remains in REACHABLE state even if lifetime
(nbr->reachable) expired.

During network init 'tcpip_process' is scheduling
'uip_ds6_timer_periodic' is to tick every 100ms and make necessary
expirations.

When MAC addres is received from slip-radio (from 'etimer_process'
context), network is "reinitialized" and timer 'uip_ds6_timer_periodic'
is set again with wrong process.
 2017-03-21 13:13:10 +01:00
Harald Pichler 918b20f3cf set loop to 30 2017-03-18 20:42:47 +01:00
Harald Pichler 2942868799 bugfix format 2017-03-03 11:45:46 +01:00
Harald Pichler 362eadd821 bugfix format 2017-03-03 11:40:13 +01:00
Harald Pichler 14baf5df6c bugfix format 2017-03-03 11:37:09 +01:00
Harald Pichler c954d22d81 bugfix format 2017-03-03 11:29:32 +01:00
Harald Pichler f36183f2b5 Merge branch 'master' of https://github.com/osdomotics/osd-contiki 2017-03-03 11:26:28 +01:00
Harald Pichler 314c46b91a bugfix format 2017-03-03 11:24:32 +01:00
Harald Pichler 6af70ee511 bugfix warning -Wwrite-strings 2017-03-03 11:21:43 +01:00
Harald Pichler 7000323c74 bugfix format 2017-03-03 11:17:33 +01:00
Harald Pichler ae6375d900 add humidity resource, bugfix pressure string variable 2017-02-24 10:28:35 +01:00
Harald Pichler 2137a12971 Merge branch 'master' of https://github.com/osdomotics/osd-contiki 2017-02-24 10:07:20 +01:00
Harald Pichler 4151c09e2c cleanup code 2017-02-23 22:36:32 +01:00
Harald Pichler 6677fac2ab bugfix use bmp280 and not bme280 2017-02-23 22:22:40 +01:00
Harald Pichler 8e07bab71f initial upload 2017-02-23 16:48:37 +01:00
Harald Pichler 85f3814f67 add i2c address 2017-02-23 08:59:49 +01:00
Harald Pichler 42dee52e65 initial upload 2017-02-23 08:49:02 +01:00
Harald Pichler 352f078be7 initial upload 2017-02-22 14:53:05 +01:00
Harald Pichler 5ea65cab08 temperature convert time is to short set from 50ms to 60ms 2017-02-21 20:06:15 +01:00
Harald Pichler 201a8174c6 print buffer text and hex format 2017-02-01 16:17:48 +01:00
Harald Pichler 6a9b6ae77b initial upload 2017-02-01 11:26:50 +01:00
Harald Pichler 9fb2352b08 bugfix buffer overflow 2017-02-01 10:28:02 +01:00
Harald Pichler 2f8549aaae Merge branch 'contiki' 
Conflicts:
	cpu/cc26xx-cc13xx/lib/cc13xxware
	cpu/cc26xx-cc13xx/lib/cc26xxware
 2017-01-31 15:00:59 +01:00
Nicolas Tsiftes 5eb2ac15ff Merge pull request #2073 from cetic/pr-fix-send-na 
Fix semantic of UIP_ND6_SEND_NA and add UIP_ND6_SEND_NS
 2017-01-20 13:18:43 +01:00
Yasuyuki Tanaka 2d44b47050 Print an entry for the root node as well as other entries 2017-01-19 14:36:59 +01:00
Laurent Deru 12c930893c Fix semantic of UIP_ND6_SEND_NA and add UIP_ND6_SEND_NS 2017-01-16 15:48:14 +01:00
George Oikonomou 82fd325b7a Merge pull request #2069 from alignan/pull/light-example-verbatim 
Explicitly specify light sensor model in example
 2017-01-15 11:52:09 +00:00
Antonio Lignan 999b246fd2 Explicitly specify light sensor model in example 2017-01-14 22:57:08 +01:00
Michael Karlsson 22d10ba03a Added Cooja target config to rime-tsch example 2017-01-11 16:35:16 +01:00
Yasuyuki Tanaka 667dd6a210 TSCH: put tsch_ prefix to definitions in the global scope 
struct asn_t         -> struct tsch_asn_t
  struct asn_divisor_t -> tsch_asn_divisor_t
  ASN_ macros          -> TSCH_ASN_ macros
  current_asn          -> tsch_current_asn
 2017-01-10 11:45:59 +01:00
George Oikonomou 960b81d484 Merge pull request #2024 from alignan/pull/eth-gw 
Zolertia Orion ethernet router with active POE support
 2017-01-09 21:03:45 +00:00
Thanos Tsakiris 92ad29ab33 Minor typo change 2016-12-30 13:13:53 +02:00
Antonio Lignan 579620ce0e Added Zolertia Orion ethernet router with active POE support 2016-12-29 13:07:53 +01:00
Antonio Lignan 2464cdadc9 Merge pull request #1973 from g-oikonomou/contrib/sensniff-submodule 
Add sensniff as a submodule
 2016-12-25 19:42:18 +01:00
Harald Pichler 1ec48fcf37 bugfix repalce the same tag 2016-12-16 13:03:44 +01:00
Yasuyuki Tanaka 8b3f29325d Update example-collect.c 
- bugfix: more frequent transmissions than expected (every 30 seconds)
- indentation: replace tabs with spaces
 2016-12-14 12:38:55 +01:00
George Oikonomou a6b14a0731 Add documentation for the new boards 2016-12-11 20:44:26 +00:00
Antonio Lignan ac2a31455e Merge pull request #1957 from alignan/pull/bme280-sensor 
sensors: bme280 weather sensor
 2016-12-10 18:37:21 +01:00
Antonio Lignan bd3f8fa3c5 Merge pull request #1939 from bthebaudeau/re-mote-sd-fat 
Add global SD/MMC and FAT support, with RE-Mote as an example
 2016-12-10 18:32:39 +01:00
Harald Pichler 0812b89909 bugfix only one event if pressed 2016-12-09 15:59:22 +01:00
Harald Pichler d41197e1e7 add button code 2016-12-08 22:22:56 +01:00
Harald Pichler 52c26d31c4 initial upload 2016-12-07 09:20:49 +01:00
Harald Pichler 5fc05b102b add sencond button 2016-12-07 09:18:10 +01:00
Harald Pichler 95b8c2683e cleanup examples 2016-12-06 21:37:58 +01:00
Harald Pichler 994badaef9 cleanup code 2016-12-06 21:37:03 +01:00
Harald Pichler 353cfe723c initial upload 2016-12-06 21:32:33 +01:00
Nicolas Tsiftes f09e84976a Merge pull request #1950 from yatch/pr/update-for-tsch-cooja-mote 
Miscellaneous updates for tsch-cooja-mote
 2016-12-05 18:40:28 +01:00
Antonio Lignan 95f69d92a8 Merge pull request #1918 from adamdunkels/pr-websocket-2 
Contiki websocket client
 2016-12-05 06:46:43 +01:00
George Oikonomou bad3384365 Update sensniff example documentation 2016-12-04 19:07:40 +00:00
George Oikonomou aaf0d1eb86 Automatically specify a correct baudrate for jn516x 2016-12-04 19:07:40 +00:00
George Oikonomou 7ef5902c3d Add the sniff make target 
We can now run make sniff and this will provide correct command line arguments for all supported devices.
 2016-12-04 18:51:57 +00:00
George Oikonomou 44edc187bc Specify default baudrate for CC2538DK 2016-12-04 18:43:41 +00:00
Harald Pichler 4f7476c084 bugfix type 2016-12-04 15:49:14 +01:00
Harald Pichler f8a399d346 initial upload 2016-12-04 15:47:40 +01:00
Mohamed seliem 452666b43e add missing include 2016-12-04 03:29:49 +02:00
Mohamed Seliem 82b5fb5073 Fix the leftover mentions of aaaa as a prefix to be UIP_DS6_DEFAULT_PREFIX (now fd00) 2016-12-04 03:29:49 +02:00
Antonio Lignan 94854177e2 Merge pull request #1961 from jdede/uart-init 
Do not initialize and use the wrong UART (z1)
 2016-12-02 15:41:32 +01:00
Jens Dede 0d3ff7b785 Rm unnecessary uart commands 2016-12-01 15:12:23 +01:00
Pablo Corbalán 983d858570 Remove definitions of outdated RPL_CONF_OF 2016-12-01 13:13:41 +01:00
Antonio Lignan 5e7acd4dc2 Merge pull request #1643 from akshaypm/zoul-uart-example 
Zoul UART example
 2016-12-01 11:42:44 +01:00
akshaypm cd75e50c28 cc2538 uart example 2016-12-01 12:45:10 +05:30
Antonio Lignan f9b32f8139 bme280: reworked to allow platform-specific I2C implementations 2016-11-30 12:04:57 +01:00
Antonio Lignan bd1a6bf94e zoul: Added bme280 example 2016-11-30 12:04:57 +01:00
Robert Olsson cfed856720 I2C fixes 
modified:   examples/avr-rss2/hello-sensors/hello-sensors.c
 2016-11-30 12:04:57 +01:00
Robert Olsson 5c25ec4d11 Example modified to use BME280 2016-11-30 12:04:57 +01:00
Benoît Thébaudeau a6d348917d Add FAT example 
Zoul RE-Mote revision B is supported.

Signed-off-by: Benoît Thébaudeau <benoit@wsystem.com>
 2016-11-27 22:50:45 +01:00
Benoît Thébaudeau 12ea1bd492 zoul: remote: Factor out duplicate RTC init 
Signed-off-by: Benoît Thébaudeau <benoit@wsystem.com>
 2016-11-27 22:50:44 +01:00
Yasuyuki Tanaka 87337e12fc Revert coordinator selection based on node-id for Cooja mote 
(example/ipv6/rpl-tsch/node.c)
 2016-11-26 11:47:59 +01:00
Nicolas Tsiftes a69d78ac73 Merge pull request #1948 from zhitaoh/zoul-example-readme 
correct shell arguments
 2016-11-25 16:13:02 +01:00
Zhitao He 7ba88a6800 correct shell arguments 2016-11-25 14:59:30 +01:00
Benoît Thébaudeau ab1491be69 CC2538: Use CMSIS-CORE 
Switch to CMSIS-CORE and remove the duplicate code.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-11-24 22:30:26 +01:00
Simon Duquennoy ecd1d57eec Merge pull request #1661 from yatch/pr-tsch-cooja-mote 
TSCH on Cooja mote
 2016-11-23 11:59:29 +01:00
Harald Pichler b708fac68d Merge branch 'contiki' 2016-11-15 08:29:23 +01:00
Harald Pichler 9f40b0734c add rfid resources 2016-11-14 11:13:07 +01:00
Harald Pichler 1398ff0de6 print date to serial1 2016-11-09 15:39:24 +01:00
Harald Pichler d2a1f8937e add coap resoure ip 2016-11-06 16:17:16 +01:00
Harald Pichler d8bb685989 bugfix post led/RGB 2016-11-05 19:34:07 +01:00
Harald Pichler 646bb077ef move res_red .. to resources folder 2016-11-04 08:40:58 +01:00
Harald Pichler d66e402cad bugfix linker problem mix c cpp function 2016-11-03 16:20:22 +01:00
Harald Pichler 5ea437c170 initial upload 2016-11-03 15:46:00 +01:00
Harald Pichler 20820a11e0 move rgb resource to resource folder 2016-11-03 11:27:42 +01:00
Harald Pichler d2a650f514 cleanup code 2016-11-03 08:38:21 +01:00
Harald Pichler 79b69334df cleanup code 2016-11-03 08:11:42 +01:00
Adam Dunkels 869df3bc36 Updated copyright statements 2016-11-02 21:54:02 +01:00
Adam Dunkels 5625a01baf Example node.js websocket server, to be used with the Contiki websocket client 2016-11-02 15:16:00 +01:00
Adam Dunkels 4f13d637e6 Example code for the Contiki websocket client 2016-11-02 15:16:00 +01:00
Harald Pichler 17520dc4e0 add resource res_rgb 2016-10-27 14:17:26 +02:00
Harald Pichler e6dbb8c3f2 Merge branch 'master' into osd 
Conflicts:
	examples/osd/triggerbaord/sketch.pde
 2016-10-26 17:03:37 +02:00
Antonio Lignan 94174be708 Renamed driver and reworked to support both TSL2561/TSL2563 2016-10-19 23:13:25 +02:00
Harald Pichler 8891a0ec44 reduce power consumtion 2016-10-19 09:45:45 +02:00
Harald Pichler b7b3f0a33a add mcusleep set parameter to save energie 2016-10-19 08:32:21 +02:00
Harald Pichler ed1ae480f1 initial uplaod 2016-10-17 08:24:14 +02:00
Harald Pichler fd37296cdf more range, we have power 2016-10-17 08:22:38 +02:00
Harald Pichler 3b28df58da eliminate c++ string warnings 2016-10-17 08:20:16 +02:00
Harald Pichler 47760c57e6 add parameter to save more power 2016-10-16 22:08:18 +02:00
Oliver Schmidt b8d753d35e Merge pull request #1889 from oliverschmidt/master 
Several retrotarget changes
 2016-10-16 13:12:24 +02:00
Oliver Schmidt d864e73579 Added directory functions to the Commodore Platform File System. 
They reduce the Telnet server's run size by 1231 bytes.
 2016-10-15 18:36:54 +02:00
Oliver Schmidt c25e965b0c Avoid unnecessary key presses. 
The recently added doesclrscrafterexit() allows cc65 programs to determine if the screen will be cleared after exit(). If that isn't the case then there's no need to ask the user to press a key in order to allow him to read the final program output.
 2016-10-15 15:27:42 +02:00
Harald Pichler a152a30958 add mac layer security 2016-10-13 12:41:02 +02:00
Harald Pichler e4ab78369e initial upload 2016-10-13 12:36:53 +02:00
Harald Pichler 8f5a033c48 move arduino app code to project 2016-10-12 10:16:41 +02:00
Harald Pichler 548bf32990 initial upload 2016-10-12 10:02:59 +02:00
Zhitao He 7bb10dc2a0 fix comment with 6LoWPAN typo and break long lines 2016-10-03 15:53:28 +02:00
Harald Pichler 9226facda8 remove warnings 2016-10-02 22:49:22 +02:00
Harald Pichler fa11a55a45 initial upload 2016-10-02 22:35:56 +02:00
Harald Pichler 5d76c0a6af add rgb resource 2016-10-02 22:32:58 +02:00
Harald Pichler cfca07489d coap client test 2016-09-27 18:13:03 +02:00
Harald Pichler 8302b1f762 bugfix constrain return value 2016-09-27 17:03:15 +02:00
Harald Pichler ee5cd039a1 add ChainableLED 2016-09-27 09:51:26 +02:00
Harald Pichler a37fd79426 disable mcusleep 2016-09-26 21:06:14 +02:00
Harald Pichler 916bebd102 reduce power consumtion 2016-09-26 21:04:05 +02:00
Antonio Lignan e658bdfcfe Merge pull request #1860 from alignan/pull/remote-power-mgmt 
Zoul: power management driver for the RE-Mote revision B
 2016-09-23 08:30:56 +02:00
Antonio Lignan 95ed9a9a91 Merge pull request #1859 from alignan/pull/remote-rtcc-update 
Zoul: RTCC with trigger selection and second-based time increase
 2016-09-23 08:30:20 +02:00
Antonio Lignan 268330c7e5 Zoul: power management driver for the RE-Mote revision B 2016-09-22 21:45:54 +02:00
Harald Pichler a5b59e8cbb Merge branch 'contiki' 
Conflicts:
	.gitmodules
	core/net/mac/contikimac/contikimac.c
	cpu/cc26xx-cc13xx/lib/cc13xxware
 2016-09-21 21:09:29 +02:00
Harald Pichler 2fd23f99ed config as hostnode, add coap client 2016-09-20 21:49:52 +02:00
Harald Pichler 8b1745214c bugfix answear speed 2016-09-20 21:22:11 +02:00
Harald Pichler 28f2b2caa8 add coap client function 2016-09-20 21:20:34 +02:00
Harald Pichler c663bb527e add UIP_CONF_ROUTER to project.conf 2016-09-16 14:12:37 +02:00
George Oikonomou 94d900a76f Merge pull request #1857 from alignan/pull/remote-revb 
Zoul: RE-Mote revision B
 2016-09-14 06:52:02 +01:00
Antonio Lignan 072bf74aa2 Added RTCC function to increase current time in seconds 2016-09-13 15:16:54 +02:00
Antonio Lignan d1a7740a2c Updated RTCC driver with selectable INT1/INT2 trigger 2016-09-13 15:16:54 +02:00
Antonio Lignan 980de99472 Zoul: Removed misplaced project target 2016-09-13 15:15:24 +02:00
Nicolas Tsiftes 2d49edfc57 Merge pull request #1849 from MohamedSeliem/patch3 
Make UIP_CONF_DS6_ROUTE_NBU and DS6_NBR_NBU, DS6_ROUTE_NBU obsolete
 2016-09-12 14:25:59 +02:00