Commit graph

1765 commits

Author SHA1 Message Date
Harald Pichler 31ec8687e4 add resources-common res-rfchannel 2017-09-13 16:50:53 +02:00
Harald Pichler aaf1e8b2b1 initial upload 2017-09-12 16:28:05 +02:00
Harald Pichler 6694583291 cleanup code, move shell-merkur to apps/shell; move needed function from extended-rf-api to params 2017-09-12 14:39:38 +02:00
Harald Pichler fedd9cb0d7 bugfix set tx power from shell 2017-09-12 11:12:53 +02:00
Harald Pichler df2b297d91 bugix read tx power 2017-09-10 22:13:07 +02:00
Harald 4127d0993b Update README.md 2017-09-08 13:30:28 +02:00
Harald 11525b74ae Update README.md 2017-09-08 13:25:34 +02:00
Harald Pichler df282f348c cleanup code 2017-09-08 08:26:36 +02:00
Harald Pichler 3a560c79f9 change name saveparams to saverfparams 2017-09-07 21:07:24 +02:00
Harald Pichler a2f8424b74 add shell save parameter txpower, channel, panid 2017-09-07 11:44:54 +02:00
Harald Pichler f368875ea2 add params_save_channel 2017-09-06 16:54:56 +02:00
Harald Pichler 17e0b6f2cc add change cca thresholds 2017-09-05 22:48:57 +02:00
Harald Pichler 2ef7438131 add shell-merkur 2017-09-05 22:24:56 +02:00
Harald Pichler 8c5b66d715 work in progress -> rf settings shell 2017-09-05 16:38:55 +02:00
Harald Pichler 3f6cb4e795 Merge branch 'contiki' 2017-09-05 11:14:11 +02:00
Harald Pichler 7a6bab7b10 add shell comands 2017-09-01 11:18:20 +02:00
Harald Pichler 75e8c162ed initial upload settingsmanager example 2017-08-31 11:23:55 +02:00
Ralf Schlatterbeck 0c3a9c6b5a Fix OTA update
Image 0 did not work. We now get rid of bootloader_backup_irq_table and
do this manually: We may not write to address 0 while an image is
running. So for image 0 we write the lower 8 pages to the backup
address. For all other images (ony image 1 currently) we write to
*both*, the original address *and* the backup address. This is done
because some addresses in the lower 8 pages *are* used at the original
address and the bootloader doesn't (want to) know which addresses are
which.
There are more safeguards now: We refuse to write to the active or
boot_next image (if boot_next is not boot_default). We mark the uploaded
partition as not ok.
Needs latest bootloader with commit ID a5771ae033b57.
2017-08-27 15:00:04 +02:00
Harald Pichler 32afc08622 default programmer usb0 2017-08-24 13:56:24 +02:00
Harald Pichler d62fe15a26 bugfix upload to partition 0 2017-08-24 13:55:21 +02:00
Harald Pichler 3b56d718c6 bugfix make ota *.bin file 2017-08-23 13:19:42 +02:00
Harald Pichler 32bbd0cc71 add compile doku and fix compile warnings 2017-08-23 08:59:04 +02:00
Ralf Schlatterbeck 7ea0e3b933 Fix Makefiles, remove/fix flash targets
The target "flash" and related stuff is now in the platform makefiles.
2017-08-22 22:29:03 +02:00
Ralf Schlatterbeck 12ee7b7e39 Update README
Document resources and fix some outdated information.
2017-08-22 21:09:46 +02:00
Ralf Schlatterbeck cc48b88713 New method for determining active partition 2017-08-22 20:20:07 +02:00
Ralf Schlatterbeck 406fb7ea44 Add linker script
Also get rid of genbackupisr hack: We can achieve the same thing with
avr-objcopy which doesn't need additional software.
We use the new bootloader setting for irq-save area of 0x800.
2017-08-22 10:13:36 +02:00
Ralf Schlatterbeck edc7a59091 New make environment for new bootloader
Compatible with old bootloader. Adds an additional section with a copy
of the interrupt vector table to the end of the image. This is needed by
the new bootloader and should be ok for the old bootloader.

Note that for this to work, everybody needs python installed with
the IntelHex python package. On Linux this can be achieved with

pip install IntelHex
2017-08-20 20:57:17 +02:00
Ralf Schlatterbeck d890a492bb Set arduino LOOP_INTERVAL in project-conf.h 2017-08-20 19:42:42 +02:00
Ralf Schlatterbeck 3defa16553 Output min and max address on stderr 2017-08-20 19:41:34 +02:00
Ralf Schlatterbeck 6141e26999 Allow a second upload, reset state 2017-08-20 16:43:11 +02:00
Ralf Schlatterbeck dd9ba9e0ef Add missing resources.h 2017-08-20 15:09:22 +02:00
Ralf Schlatterbeck e3784fa9c7 Add query parameter to generic resouce macros
Modify all callback functions to use new signature.
ota-update now uses this to pass the partition to some get/put methods.
2017-08-20 15:01:30 +02:00
Ralf Schlatterbeck 954da749eb Factor irq methods
Now methods that need interrupts turned off are wrapped.
Make genbackupisr.py executable.
New resources for bootloader-related information.
2017-08-20 11:47:13 +02:00
Marcus Priesch 6eced34422 fixed size_t, irq 2017-08-20 00:12:57 +02:00
Marcus Priesch 140f43f4c1 work in progress 2017-08-19 22:11:13 +02:00
Ralf Schlatterbeck ed638a5f5a Add genbackupisr 2017-08-19 21:05:39 +02:00
Ralf Schlatterbeck b774d61713 First sketch of image uploader 2017-08-19 19:26:27 +02:00
Marcus Priesch 0859e3442c added 2017-08-08 14:36:44 +02:00
Harald Pichler 5e20a17131 initial upload 2017-08-07 15:46:53 +02:00
Harald Pichler f576ef27ce update redme 2017-08-02 10:26:54 +02:00
Ralf Schlatterbeck c35be7c066 First stab at OTA-update
Introduce new testing-app example.
Add a new coap error code for blockwise transfer.
Add include-file for bootloader callbacks (jumptable).
Note that only the bootloader for osd-merkur-256 will support
OTA-update, the -128 simply has not enough flash memory, so only
in the -256 we have the bootloader functions in the jump-table
of the bootloader and in the bootloader-if.h include-file.
2017-07-31 13:26:29 +02:00
Marcus Priesch 1384aad51a fixed leds 2017-07-30 13:04:56 +02:00
Ralf Schlatterbeck 181e2c436e Add description of new H-brigde breakout-board 2017-07-29 14:42:13 +02:00
Harald Pichler fd442fb9da set direction 2017-07-25 20:16:55 +02:00
Harald Pichler 4b1580cc70 init arduino pwm driver 2017-07-21 13:31:44 +02:00
Harald Pichler a6670d99a8 set speed 2017-07-20 17:00:16 +02:00
Harald Pichler 38430ac259 set speed 2017-07-20 16:26:38 +02:00
Harald Pichler 60c6495fa3 initial upload 2017-07-20 15:16:01 +02:00
Harald Pichler 578dbaa431 add joystick, add BB-L Bridge 2017-07-20 15:14:45 +02:00
Harald Pichler 223ea26eb4 add led bar 2017-07-20 14:03:42 +02:00
Harald Pichler c39e10b2e7 initial upload 2017-07-20 10:33:19 +02:00
Nicolas Tsiftes f0bddb277c Merge pull request #2203 from herjulf/AES128HW
Atmel radio AES128 crypto engine support.
2017-06-22 14:14:17 +02:00
Robert Olsson e97f3bca26 Fix misspelled copyright for AES128HW_test pointed out by Nicolas Tsiftes 2017-06-16 10:48:52 +02:00
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