Commit Graph

428 Commits

Author SHA1 Message Date
Nanosonde
9db2524e5a Refactor master reset 2020-07-06 14:53:30 +02:00
Nanosonde
5efc450bc7 Merge branch 'master' into feat_datasecure (fix conflicts) 2020-07-06 14:11:51 +02:00
Nanosonde
e8645dc5ad Further cleanup. 2020-07-05 16:18:59 +02:00
Nanosonde
24b4a8d8a6 Cleanup comment and debug output 2020-07-05 15:28:08 +02:00
Nanosonde
53f6828872 SecIfObject: save/restore required for persisting STATE. Bugfix: use correct PID for group key table 2020-07-05 15:15:47 +02:00
nanosonde
8cfd67662f
Bugfixes for property startIndex 0 and PID_IO_LIST (#75)
* Bugfix for property entry 0 and PID_IO_LIST

* Remove unsused method

* Fix comment and add missing size adjustment in other method

* Callback properties must return valid data on startIndex 0. The return value must contain the actual element count within the property.
2020-07-05 12:11:44 +02:00
nanosonde
108e4d7275 pin platform for ESP8266 to specific version 2020-07-04 19:35:51 +02:00
nanosonde
4a5cab3cc7 Don't compile secapplayer if data secure not enabled 2020-07-04 17:07:39 +02:00
nanosonde
318a384532 Add printing of uint64_t 2020-07-04 16:32:18 +02:00
Nanosonde
b5b0f4f0d2 cleanup 2020-07-04 12:08:41 +02:00
Nanosonde
e88d13a97f cleanup 2020-07-04 11:38:43 +02:00
Nanosonde
7d348bd493 Bugfixes 2020-07-03 12:57:41 +02:00
Nanosonde
1955bbdf11 Revert "Revert "Merge master into feat_datasecure""
This reverts commit aa59253785.
2020-07-03 11:13:50 +02:00
Nanosonde
aa59253785 Revert "Merge master into feat_datasecure"
This reverts commit 0c8358692a.
2020-07-03 11:10:56 +02:00
Nanosonde
0c8358692a Merge master into feat_datasecure 2020-07-03 11:09:37 +02:00
Nanosonde
b1770e1df3 Merge branch 'master' into feat_datasecure 2020-07-03 11:07:07 +02:00
thelsing
6cd030203a
Update data_property.cpp 2020-07-03 00:47:29 +02:00
Nanosonde
bdc6df376e flashSize must be big enough. Security IF object contains a lot more data. 2020-07-02 21:17:22 +02:00
Nanosonde
31f8efc516 bugfix 2020-07-02 20:07:27 +02:00
Nanosonde
bb954f5b2c cleanup 2020-07-02 18:42:15 +02:00
Nanosonde
1dc95bf2be MILESTONE: working programming of secure device with IA and tables 2020-07-02 18:11:27 +02:00
Nanosonde
83df210df3 Remove obsolete code 2020-07-02 12:30:01 +02:00
Nanosonde
3297b53332 Move code from header to source file 2020-07-02 12:17:06 +02:00
Nanosonde
0834618843 Include simple_map.h in CmakeFile 2020-07-02 12:15:29 +02:00
Nanosonde
2c626dfb3c use simple_map 2020-07-02 12:15:01 +02:00
Nanosonde
b428863b4b Move map to own file 2020-07-02 12:01:01 +02:00
Nanosonde
f8252097c8 Add group object security handling 2020-07-02 11:51:43 +02:00
Nanosonde
0f794ab2ea save work 2020-07-01 22:27:47 +02:00
Nanosonde
0dc98b2a30 Merge branch 'master' into feat_datasecure 2020-07-01 21:51:43 +02:00
Nanosonde
ec3999357e save work 2020-07-01 21:48:28 +02:00
Nanosonde
8a34040631 Change comment. 2020-07-01 17:26:50 +02:00
Nanosonde
4089ddcaa6 Fix FunctionPropertyExt* and FunctionProperty for PDT_CONTROL 2020-07-01 15:04:10 +02:00
etrinh
fda8e64425
Add support for lambda for more platforms (#74)
* Fix Stm32 Eeprom handler
Fix missing parenthesis
Fix some type consistencies

* Fix #73
Add ability to override config.h with define NO_KNX_CONFIG

* change tabs to space

* coding style

* Allow lambda on platforms which support it, can be forced with HAS_FUNCTIONAL 0/1

* remove automatic detection of functional due to breakage with some platforms:
In file included from /home/travis/.arduino15/packages/arduino/tools/arm-none-eabi-gcc/7-2017q4/arm-none-eabi/include/c++/7.2.1/bits/char_traits.h:39:0,
                 from /home/travis/.arduino15/packages/arduino/tools/arm-none-eabi-gcc/7-2017q4/arm-none-eabi/include/c++/7.2.1/string:40,
                 from /home/travis/.arduino15/packages/arduino/tools/arm-none-eabi-gcc/7-2017q4/arm-none-eabi/include/c++/7.2.1/stdexcept:39,
                 from /home/travis/.arduino15/packages/arduino/tools/arm-none-eabi-gcc/7-2017q4/arm-none-eabi/include/c++/7.2.1/array:39,
                 from /home/travis/.arduino15/packages/arduino/tools/arm-none-eabi-gcc/7-2017q4/arm-none-eabi/include/c++/7.2.1/tuple:39,
                 from /home/travis/.arduino15/packages/arduino/tools/arm-none-eabi-gcc/7-2017q4/arm-none-eabi/include/c++/7.2.1/functional:54,
                 from /home/travis/arduino_ide/libraries/Adafruit_Test_Library/src/knx/group_object.h:37,
                 from /home/travis/arduino_ide/libraries/Adafruit_Test_Library/src/knx/group_object_table_object.h:4,
                 from /home/travis/arduino_ide/libraries/Adafruit_Test_Library/src/knx/bau_systemB.h:8,
                 from /home/travis/arduino_ide/libraries/Adafruit_Test_Library/src/knx/bau07B0.h:4,
                 from /home/travis/arduino_ide/libraries/Adafruit_Test_Library/src/knx_facade.h:12,
                 from /home/travis/arduino_ide/libraries/Adafruit_Test_Library/src/knx.h:86,
                 from /home/travis/build/thelsing/knx/examples/knx-bme680/knx-bme680.ino:4:
/home/travis/.arduino15/packages/arduino/tools/arm-none-eabi-gcc/7-2017q4/arm-none-eabi/include/c++/7.2.1/bits/stl_algobase.h:243:56: error: macro "min" passed 3 arguments, but takes just 2
     min(const _Tp& __a, const _Tp& __b, _Compare __comp)
                                                        ^
/home/travis/.arduino15/packages/arduino/tools/arm-none-eabi-gcc/7-2017q4/arm-none-eabi/include/c++/7.2.1/bits/stl_algobase.h:265:56: error: macro "max" passed 3 arguments, but takes just 2
     max(const _Tp& __a, const _Tp& __b, _Compare __comp)
                                                        ^
To be investigated...

Co-authored-by: etrinh <etrinh@zdionline.net>
2020-07-01 10:39:30 +02:00
Nanosonde
2164d3896f Handle PDT_CONTROL in FunctionPropertyExt* 2020-06-30 22:05:26 +02:00
Nanosonde
de87c2a3a3 Fix FunctionPropertyExtStateRead, fix restart. MILESTONE: Working physical programming of IA and toolkey with confirmed restart. Reading deviceinfos working. 2020-06-30 20:46:10 +02:00
Nanosonde
780001bd59 Add PropertyValueExt* AL services. Handle master reset in AL service RESTART. 2020-06-30 19:45:31 +02:00
etrinh
f880114da5
Stm32 port (#71)
* Fix Stm32 Eeprom handler
Fix missing parenthesis
Fix some type consistencies

* Fix #73
Add ability to override config.h with define NO_KNX_CONFIG

* change tabs to space

* coding style

Co-authored-by: etrinh <etrinh@zdionline.net>
2020-06-30 14:58:53 +02:00
Nanosonde
2463e6ffaf Fix FunctionPropertyExt*. Working T_DATA_CONNECTED with FunctionPropertyExt*. 2020-06-30 12:36:56 +02:00
Nanosonde
4316ead508 Add FunctionPropertyExt* AL services 2020-06-30 11:47:01 +02:00
Nanosonde
de643b34de First working secure broadcast mode with IA programming 2020-06-29 22:39:33 +02:00
Nanosonde
3290634215 save work 2020-06-27 22:22:37 +02:00
Nanosonde
604c1d6bdb Extend restart and masterreset for factory reset 2020-06-27 16:32:39 +02:00
Nanosonde
4b52f241ec save work 2020-06-27 12:23:31 +02:00
Nanosonde
df1449f2e5 Remove magic value and add comment 2020-06-27 11:53:53 +02:00
Nanosonde
60b3655ea6 save work 2020-06-27 11:46:47 +02:00
Nanosonde
b72d45c4d8 save work 2020-06-27 00:26:14 +02:00
Nanosonde
692cbf78cb save work 2020-06-27 00:20:46 +02:00
Nanosonde
318d350243 Merge branch 'master' into feat_datasecure 2020-06-25 21:28:51 +02:00
Nanosonde
23358eb8b9 save work 2020-06-25 21:26:59 +02:00
Nanosonde
eb11180858 save work 2020-06-25 21:22:48 +02:00