From dd4bae581fce7be0aacfdbe5c0e3afbf004e22d3 Mon Sep 17 00:00:00 2001 From: Nanosonde <2073569+nanosonde@users.noreply.github.com> Date: Fri, 17 Jul 2020 12:37:05 +0200 Subject: [PATCH] save work --- examples/knx-linux-coupler/CMakeLists.txt | 2 +- examples/knx-linux/CMakeLists.txt | 160 ++++++++++++---------- src/knx/bau_systemB_device.cpp | 5 + src/knx/bau_systemB_device.h | 1 + 4 files changed, 94 insertions(+), 74 deletions(-) diff --git a/examples/knx-linux-coupler/CMakeLists.txt b/examples/knx-linux-coupler/CMakeLists.txt index 7f5b86b..7d35ad2 100644 --- a/examples/knx-linux-coupler/CMakeLists.txt +++ b/examples/knx-linux-coupler/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.7) -project(knx-linux) +project(knx-linux-coupler) set(LIBRARIES_FROM_REFERENCES "") add_executable(knx-linux ../../src/knx/address_table_object.cpp diff --git a/examples/knx-linux/CMakeLists.txt b/examples/knx-linux/CMakeLists.txt index fe87d43..db8f902 100644 --- a/examples/knx-linux/CMakeLists.txt +++ b/examples/knx-linux/CMakeLists.txt @@ -2,61 +2,67 @@ cmake_minimum_required(VERSION 2.7) project(knx-linux) set(LIBRARIES_FROM_REFERENCES "") add_executable(knx-linux - ../../src/knx/address_table_object.cpp - ../../src/knx/address_table_object.h + ../../src/knx/address_table_object.cpp + ../../src/knx/address_table_object.h ../../src/knx/aes.c ../../src/knx/aes.h ../../src/knx/aes.hpp ../../src/knx/apdu.cpp - ../../src/knx/apdu.h - ../../src/knx/application_layer.cpp - ../../src/knx/application_layer.h - ../../src/knx/application_program_object.cpp - ../../src/knx/application_program_object.h - ../../src/knx/association_table_object.cpp - ../../src/knx/association_table_object.h - ../../src/knx/bau.cpp - ../../src/knx/bau.h - ../../src/knx/bau07B0.cpp - ../../src/knx/bau07B0.h - ../../src/knx/bau27B0.cpp - ../../src/knx/bau27B0.h - ../../src/knx/bau57B0.cpp - ../../src/knx/bau57B0.h - ../../src/knx/bau_systemB.cpp - ../../src/knx/bau_systemB.h - ../../src/knx/bits.cpp - ../../src/knx/bits.h - ../../src/knx/callback_property.h - ../../src/knx/cemi_frame.cpp - ../../src/knx/cemi_frame.h - ../../src/knx/cemi_server.cpp + ../../src/knx/apdu.h + ../../src/knx/application_layer.cpp + ../../src/knx/application_layer.h + ../../src/knx/application_program_object.cpp + ../../src/knx/application_program_object.h + ../../src/knx/association_table_object.cpp + ../../src/knx/association_table_object.h + ../../src/knx/bau.cpp + ../../src/knx/bau.h + ../../src/knx/bau07B0.cpp + ../../src/knx/bau07B0.h + ../../src/knx/bau091A.cpp + ../../src/knx/bau091A.h + ../../src/knx/bau27B0.cpp + ../../src/knx/bau27B0.h + ../../src/knx/bau57B0.cpp + ../../src/knx/bau57B0.h + ../../src/knx/bau_systemB.cpp + ../../src/knx/bau_systemB.h + ../../src/knx/bau_systemB_device.cpp + ../../src/knx/bau_systemB_device.h + ../../src/knx/bau_systemB_coupler.cpp + ../../src/knx/bau_systemB_coupler.h + ../../src/knx/bits.cpp + ../../src/knx/bits.h + ../../src/knx/callback_property.h + ../../src/knx/cemi_frame.cpp + ../../src/knx/cemi_frame.h + ../../src/knx/cemi_server.cpp ../../src/knx/cemi_server.h ../../src/knx/cemi_server_object.cpp ../../src/knx/cemi_server_object.h ../../src/knx/config.h ../../src/knx/data_link_layer.cpp - ../../src/knx/data_link_layer.h - ../../src/knx/data_property.cpp - ../../src/knx/data_property.h - ../../src/knx/device_object.cpp - ../../src/knx/device_object.h - ../../src/knx/dpt.cpp - ../../src/knx/dpt.h - ../../src/knx/dptconvert.cpp - ../../src/knx/dptconvert.h + ../../src/knx/data_link_layer.h + ../../src/knx/data_property.cpp + ../../src/knx/data_property.h + ../../src/knx/device_object.cpp + ../../src/knx/device_object.h + ../../src/knx/dpt.cpp + ../../src/knx/dpt.h + ../../src/knx/dptconvert.cpp + ../../src/knx/dptconvert.h ../../src/knx/function_property.h ../../src/knx/group_object.cpp - ../../src/knx/group_object.h - ../../src/knx/group_object_table_object.cpp - ../../src/knx/group_object_table_object.h - ../../src/knx/interface_object.cpp - ../../src/knx/interface_object.h - ../../src/knx/ip_data_link_layer.cpp - ../../src/knx/ip_data_link_layer.h - ../../src/knx/ip_parameter_object.cpp - ../../src/knx/ip_parameter_object.h - ../../src/knx/knx_ip_device_information_dib.cpp + ../../src/knx/group_object.h + ../../src/knx/group_object_table_object.cpp + ../../src/knx/group_object_table_object.h + ../../src/knx/interface_object.cpp + ../../src/knx/interface_object.h + ../../src/knx/ip_data_link_layer.cpp + ../../src/knx/ip_data_link_layer.h + ../../src/knx/ip_parameter_object.cpp + ../../src/knx/ip_parameter_object.h + ../../src/knx/knx_ip_device_information_dib.cpp ../../src/knx/knx_ip_device_information_dib.h ../../src/knx/knx_ip_dib.cpp ../../src/knx/knx_ip_dib.h @@ -74,44 +80,52 @@ add_executable(knx-linux ../../src/knx/ip_host_protocol_address_information.h ../../src/knx/knx_types.h ../../src/knx/knx_value.cpp - ../../src/knx/knx_value.h - ../../src/knx/memory.cpp - ../../src/knx/memory.h - ../../src/knx/network_layer.cpp - ../../src/knx/network_layer.h - ../../src/knx/npdu.cpp - ../../src/knx/npdu.h + ../../src/knx/knx_value.h + ../../src/knx/memory.cpp + ../../src/knx/memory.h + ../../src/knx/network_layer.cpp + ../../src/knx/network_layer.h + ../../src/knx/network_layer_coupler.cpp + ../../src/knx/network_layer_coupler.h + ../../src/knx/network_layer_device.cpp + ../../src/knx/network_layer_device.h + ../../src/knx/network_layer_entity.cpp + ../../src/knx/network_layer_entity.h + ../../src/knx/npdu.cpp + ../../src/knx/npdu.h ../../src/knx/platform.cpp - ../../src/knx/platform.h - ../../src/knx/property.cpp - ../../src/knx/property.h - ../../src/knx/rf_data_link_layer.cpp - ../../src/knx/rf_data_link_layer.h - ../../src/knx/rf_medium_object.cpp - ../../src/knx/rf_medium_object.h - ../../src/knx/rf_physical_layer.cpp - ../../src/knx/rf_physical_layer.h + ../../src/knx/platform.h + ../../src/knx/property.cpp + ../../src/knx/property.h + ../../src/knx/rf_data_link_layer.cpp + ../../src/knx/rf_data_link_layer.h + ../../src/knx/rf_medium_object.cpp + ../../src/knx/rf_medium_object.h + ../../src/knx/rf_physical_layer.cpp + ../../src/knx/rf_physical_layer.h + ../../src/knx/router_object.cpp + ../../src/knx/router_object.h ../../src/knx/secure_application_layer.cpp ../../src/knx/secure_application_layer.h ../../src/knx/security_interface_object.cpp ../../src/knx/security_interface_object.h + ../../src/knx/simple_functional.h ../../src/knx/simple_map.h - ../../src/knx/table_object.cpp ../../src/knx/save_restore.h - ../../src/knx/table_object.cpp - ../../src/knx/table_object.h - ../../src/knx/tpdu.cpp - ../../src/knx/tpdu.h - ../../src/knx/tpuart_data_link_layer.cpp - ../../src/knx/tpuart_data_link_layer.h - ../../src/knx/transport_layer.cpp - ../../src/knx/transport_layer.h - ../../src/knx/usb_tunnel_interface.cpp + ../../src/knx/table_object.cpp + ../../src/knx/table_object.h + ../../src/knx/tpdu.cpp + ../../src/knx/tpdu.h + ../../src/knx/tpuart_data_link_layer.cpp + ../../src/knx/tpuart_data_link_layer.h + ../../src/knx/transport_layer.cpp + ../../src/knx/transport_layer.h + ../../src/knx/usb_tunnel_interface.cpp ../../src/knx/usb_tunnel_interface.h ../../src/knx_facade.cpp - ../../src/knx_facade.h - ../../src/linux_platform.cpp - ../../src/linux_platform.h + ../../src/knx_facade.h + ../../src/linux_platform.cpp + ../../src/linux_platform.h fdsk.cpp fdsk.h main.cpp) diff --git a/src/knx/bau_systemB_device.cpp b/src/knx/bau_systemB_device.cpp index 641a552..018162f 100644 --- a/src/knx/bau_systemB_device.cpp +++ b/src/knx/bau_systemB_device.cpp @@ -34,6 +34,11 @@ ApplicationLayer& BauSystemBDevice::applicationLayer() return _appLayer; } +GroupObjectTableObject& BauSystemBDevice::groupObjectTable() +{ + return _groupObjTable; +} + void BauSystemBDevice::loop() { _transLayer.loop(); diff --git a/src/knx/bau_systemB_device.h b/src/knx/bau_systemB_device.h index 2261c00..ab645fe 100644 --- a/src/knx/bau_systemB_device.h +++ b/src/knx/bau_systemB_device.h @@ -22,6 +22,7 @@ class BauSystemBDevice : public BauSystemB BauSystemBDevice(Platform& platform); virtual void loop() override; virtual bool configured() override; + GroupObjectTableObject& groupObjectTable(); protected: virtual ApplicationLayer& applicationLayer() override;