Commit Graph

389 Commits

Author SHA1 Message Date
Nanosonde
79354f2394 save work 2020-07-16 20:15:43 +02:00
Nanosonde
68b38feaea save work 2020-07-16 18:58:24 +02:00
Nanosonde
3595e53aab save work 2020-07-16 18:42:06 +02:00
Nanosonde
2793813d4d move comment 2020-07-16 18:40:33 +02:00
Nanosonde
7bedb0e672 Filter table setting/clearing 2020-07-16 18:39:16 +02:00
Nanosonde
592e4bb2a8 Fix wrong pointer arithmetic in TableObject 2020-07-16 16:57:59 +02:00
Nanosonde
c19548ff4f save work 2020-07-16 16:57:40 +02:00
Nanosonde
a68439b1f3 save work 2020-07-16 08:26:14 +02:00
Nanosonde
c5904ec707 derive from TableObject instead of InterfaceObject 2020-07-15 18:08:47 +02:00
Nanosonde
ddff1d3ffc save work 2020-07-15 17:53:05 +02:00
Nanosonde
f21709923c save work 2020-07-15 17:51:47 +02:00
Nanosonde
b8d938518f save work 2020-07-15 17:51:22 +02:00
Nanosonde
9a6d5cecf4 save work 2020-07-15 17:50:54 +02:00
Nanosonde
bc09622a77 save work 2020-07-15 17:33:44 +02:00
Nanosonde
de7742a444 save work 2020-07-15 17:32:16 +02:00
Nanosonde
5ced388133 save work 2020-07-15 17:21:10 +02:00
Nanosonde
fb5fb42d8a move comment 2020-07-15 16:33:27 +02:00
Nanosonde
255ee7f1c4 save work 2020-07-15 16:32:04 +02:00
Nanosonde
c70e552991 Move crc16Ccitt to bits.c as it also used for PID_MCB 2020-07-15 16:31:06 +02:00
Nanosonde
e3ff81ea99 Remove forgotten code. 2020-07-15 16:30:16 +02:00
Nanosonde
9acd1537bd save work 2020-07-14 17:37:03 +02:00
Nanosonde
a005e8f654 Add more comments about cleanup 2020-07-14 13:45:50 +02:00
Nanosonde
18a705f8d5 Remove include 2020-07-14 13:26:46 +02:00
Nanosonde
e970ef4dcd Add simple alternative to std::function without smart pointers or move semantics 2020-07-14 13:25:16 +02:00
Nanosonde
6a3f5273ca Use default value from PID_ROUTING_COUNT 2020-07-12 13:47:53 +02:00
Nanosonde
50b63edda4 save work 2020-07-12 13:34:06 +02:00
Nanosonde
d17fe1003b save work 2020-07-12 11:41:11 +02:00
Nanosonde
2d0b0d05e5 save work 2020-07-10 21:37:28 +02:00
Nanosonde
373d44d29b Remember which interface received the cemi frame 2020-07-10 16:49:02 +02:00
Nanosonde
a4599f4f9d save work 2020-07-10 16:36:42 +02:00
Nanosonde
f3d9af5576 save work 2020-07-09 21:56:20 +02:00
Nanosonde
283db3f616 save work 2020-07-09 21:51:56 +02:00
Nanosonde
62f18e725b save work 2020-07-09 21:45:41 +02:00
Nanosonde
27433fe5e1 save work. 2020-07-09 21:08:38 +02:00
nanosonde
96884f768e
Add support for KNX data secure (#66)
* initial comic

* save work

* Handle SystemBroadcast and Broadcast for TP and IP

* Rework

* Fix comment

* save work

* save work

* save work

* save work

* save work

* Restore old broadcast structure

* Readd systembroadcast methods

* Make sure that services from SystemBroadcast are also available from Broadcast on closed media

* save work

* Save work

* save work

* Save work

* save work

* save work

* save work

* save work

* save work

* Change maximum number of elements for the key tables, etc.

* save work

* First working seqno sync with ETS

* save work

* save work

* save work

* save work

* save work

* save work

* Remove magic value and add comment

* save work

* Extend restart and masterreset for factory reset

* save work

* First working secure broadcast mode with IA programming

* Add FunctionPropertyExt* AL services

* Fix FunctionPropertyExt*. Working T_DATA_CONNECTED with FunctionPropertyExt*.

* Add PropertyValueExt* AL services. Handle master reset in AL service RESTART.

* Fix FunctionPropertyExtStateRead, fix restart. MILESTONE: Working physical programming of IA and toolkey with confirmed restart. Reading deviceinfos working.

* Handle PDT_CONTROL in FunctionPropertyExt*

* Fix FunctionPropertyExt* and FunctionProperty for PDT_CONTROL

* Change comment.

* save work

* save work

* Add group object security handling

* Move map to own file

* use simple_map

* Include simple_map.h in CmakeFile

* Move code from header to source file

* Remove obsolete code

* MILESTONE: working programming of secure device with IA and tables

* cleanup

* bugfix

* flashSize must be big enough. Security IF object contains a lot more data.

* Merge master into feat_datasecure

* Revert "Merge master into feat_datasecure"

This reverts commit 0c8358692a.

* Revert "Revert "Merge master into feat_datasecure""

This reverts commit aa59253785.

* Bugfixes

* cleanup

* cleanup

* Add printing of uint64_t

* Don't compile secapplayer if data secure not enabled

* pin platform for ESP8266 to specific version

* SecIfObject: save/restore required for persisting STATE. Bugfix: use correct PID for group key table

* Cleanup comment and debug output

* Further cleanup.

* Refactor master reset

* Remove unused IP data link layer test code

* Only reset TOOL kkey to FDSK on factory reset

* Modify .gitignore and remove vscode config file

* Correct comment

* Handle SBC flag (systembroadcast) in SCF field. Couplers between open and closed media need this.

* Remove code that slipped in.
2020-07-06 19:16:54 +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
thelsing
6cd030203a
Update data_property.cpp 2020-07-03 00:47:29 +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
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
Thomas Kunze
4677044f46 add some fixes and enhancements by leoujz
fix build
2020-06-25 20:36:02 +02:00
Thomas Kunze
87a12fa26a Merge branch 'master' of https://github.com/thelsing/knx 2020-06-24 23:03:21 +02:00
Thomas Kunze
f450d87d05 refactor RfMediumObject to use properties 2020-06-24 23:03:12 +02:00
thelsing
eacc944e7c
remove __has_include because of build failure 2020-06-24 22:14:45 +02:00
thelsing
084657cb7a
fix #46 2020-06-24 18:48:55 +02:00
thelsing
5855f35eef
fix #50 2020-06-23 00:21:00 +02:00
thelsing
d3788d3ee4
Merge pull request #68 from etrinh/master
Merge STM32 platform
2020-06-23 00:15:18 +02:00
thelsing
08957720a3
Update library.properties 2020-06-19 21:57:46 +02:00
thelsing
2ff07d29e3
Update bits.h 2020-06-18 11:26:59 +02:00
nanosonde
cadc6c6124
Refactor broadcast/systembroadcast (#62)
* Add missing source files

* Fix comment

* Refactor Broadcast/SystemBroadcast

* Add empty confirm methods

* Remove unclean solution to suppress warning about unsed var

* Restore old structure

* Fix issues

* Add more missing source files

* Make sure that services from SystemBroadcast are also available from Broadcast on closed media

* Make sure that sent broadcast/systembroadcast frames are always marked as broadcast frames on closed media
2020-06-09 21:06:13 +02:00
thelsing
fa269a259d
Merge pull request #65 from nanosonde/disable_ci_8266
Disable Travis-CI 8266 Arduino test
2020-06-08 18:04:29 +02:00