Skip to content

Commit 32bd812

Browse files
thelsingthelsing
committed
fix build
1 parent 74036ba commit 32bd812

File tree

7 files changed

+40
-167
lines changed

7 files changed

+40
-167
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ project(knx VERSION 1.5)
55
add_subdirectory(src)
66
add_subdirectory(examples/knx-linux)
77
add_subdirectory(examples/knx-linux-coupler)
8-
#add_subdirectory(examples/knxPython)
8+
add_subdirectory(examples/knxPython)

‎examples/knx-cc1310/CMakeLists.txt

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ find_package(SimpleLinkCC13X0SDKnortos REQUIRED)
3838
set(${PROJECT_NAME}_SOURCES
3939
../../src/knx/address_table_object.cpp
4040
../../src/knx/address_table_object.h
41-
../../src/knx/aes.c
42-
../../src/knx/aes.h
43-
../../src/knx/aes.hpp
41+
../../src/knx/util/aes.c
42+
../../src/knx/util/aes.h
43+
../../src/knx/util/aes.hpp
4444
../../src/knx/apdu.cpp
4545
../../src/knx/apdu.h
4646
../../src/knx/application_layer.cpp
@@ -94,26 +94,26 @@ set(${PROJECT_NAME}_SOURCES
9494
../../src/knx/group_object_table_object.h
9595
../../src/knx/interface_object.cpp
9696
../../src/knx/interface_object.h
97-
../../src/knx/ip_data_link_layer.cpp
98-
../../src/knx/ip_data_link_layer.h
99-
../../src/knx/ip_parameter_object.cpp
100-
../../src/knx/ip_parameter_object.h
101-
../../src/knx/knx_ip_device_information_dib.cpp
102-
../../src/knx/knx_ip_device_information_dib.h
103-
../../src/knx/knx_ip_dib.cpp
104-
../../src/knx/knx_ip_dib.h
105-
../../src/knx/knx_ip_frame.cpp
106-
../../src/knx/knx_ip_frame.h
107-
../../src/knx/knx_ip_routing_indication.cpp
108-
../../src/knx/knx_ip_routing_indication.h
109-
../../src/knx/knx_ip_search_request.cpp
110-
../../src/knx/knx_ip_search_request.h
111-
../../src/knx/knx_ip_search_response.cpp
112-
../../src/knx/knx_ip_search_response.h
113-
../../src/knx/knx_ip_supported_service_dib.cpp
114-
../../src/knx/knx_ip_supported_service_dib.h
115-
../../src/knx/ip_host_protocol_address_information.cpp
116-
../../src/knx/ip_host_protocol_address_information.h
97+
../../src/knx/ip/ip_data_link_layer.cpp
98+
../../src/knx/ip/ip_data_link_layer.h
99+
../../src/knx/ip/ip_parameter_object.cpp
100+
../../src/knx/ip/ip_parameter_object.h
101+
../../src/knx/ip/knx_ip_device_information_dib.cpp
102+
../../src/knx/ip/knx_ip_device_information_dib.h
103+
../../src/knx/ip/knx_ip_dib.cpp
104+
../../src/knx/ip/knx_ip_dib.h
105+
../../src/knx/ip/knx_ip_frame.cpp
106+
../../src/knx/ip/knx_ip_frame.h
107+
../../src/knx/ip/knx_ip_routing_indication.cpp
108+
../../src/knx/ip/knx_ip_routing_indication.h
109+
../../src/knx/ip/knx_ip_search_request.cpp
110+
../../src/knx/ip/knx_ip_search_request.h
111+
../../src/knx/ip/knx_ip_search_response.cpp
112+
../../src/knx/ip/knx_ip_search_response.h
113+
../../src/knx/ip/knx_ip_supported_service_dib.cpp
114+
../../src/knx/ip/knx_ip_supported_service_dib.h
115+
../../src/knx/ip/ip_host_protocol_address_information.cpp
116+
../../src/knx/ip/ip_host_protocol_address_information.h
117117
../../src/knx/knx_types.h
118118
../../src/knx/knx_value.cpp
119119
../../src/knx/knx_value.h
@@ -133,20 +133,20 @@ set(${PROJECT_NAME}_SOURCES
133133
../../src/knx/platform.h
134134
../../src/knx/property.cpp
135135
../../src/knx/property.h
136-
../../src/knx/rf_data_link_layer.cpp
137-
../../src/knx/rf_data_link_layer.h
138-
../../src/knx/rf_medium_object.cpp
139-
../../src/knx/rf_medium_object.h
140-
../../src/knx/rf_physical_layer_cc1310.cpp
141-
../../src/knx/rf_physical_layer_cc1310.h
142-
../../src/knx/rf_physical_layer.h
136+
../../src/knx/rf/rf_data_link_layer.cpp
137+
../../src/knx/rf/rf_data_link_layer.h
138+
../../src/knx/rf/rf_medium_object.cpp
139+
../../src/knx/rf/rf_medium_object.h
140+
../../src/knx/rf/rf_physical_layer_cc1310.cpp
141+
../../src/knx/rf/rf_physical_layer_cc1310.h
142+
../../src/knx/rf/rf_physical_layer.h
143143
../../src/knx/router_object.cpp
144144
../../src/knx/router_object.h
145145
../../src/knx/secure_application_layer.cpp
146146
../../src/knx/secure_application_layer.h
147147
../../src/knx/security_interface_object.cpp
148148
../../src/knx/security_interface_object.h
149-
../../src/knx/simple_map.h
149+
../../src/knx/util/simple_map.h
150150
../../src/knx/save_restore.h
151151
../../src/knx/table_object.cpp
152152
../../src/knx/table_object.h
@@ -160,7 +160,7 @@ set(${PROJECT_NAME}_SOURCES
160160
../../src/knx/usb_tunnel_interface.h
161161
../../src/knx_facade.cpp
162162
../../src/knx_facade.h
163-
../../src/cc1310_platform.cpp
163+
../../src/knx/platform/cc1310_platform.cpp
164164
../../src/knx_facade.cpp
165165
./RTT/SEGGER_RTT_Conf.h
166166
./RTT/SEGGER_RTT_printf.c

‎examples/knx-linux-coupler/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ set(SOURCES
77
fdsk.h
88
main.cpp)
99

10-
include_directories(../../src)
11-
1210
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wno-unknown-pragmas -g -O0")
1311
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wno-unknown-pragmas -g -O0")
1412

‎examples/knxPython/CMakeLists.txt

Lines changed: 2 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -5,138 +5,12 @@ add_subdirectory(pybind11)
55

66
pybind11_add_module(knxPython
77
knxmodule.cpp
8-
../../src/knx/address_table_object.cpp
9-
../../src/knx/address_table_object.h
10-
../../src/knx/aes.c
11-
../../src/knx/aes.h
12-
../../src/knx/aes.hpp
13-
../../src/knx/apdu.cpp
14-
../../src/knx/apdu.h
15-
../../src/knx/application_layer.cpp
16-
../../src/knx/application_layer.h
17-
../../src/knx/application_program_object.cpp
18-
../../src/knx/application_program_object.h
19-
../../src/knx/association_table_object.cpp
20-
../../src/knx/association_table_object.h
21-
../../src/knx/bau.cpp
22-
../../src/knx/bau.h
23-
../../src/knx/bau07B0.cpp
24-
../../src/knx/bau07B0.h
25-
../../src/knx/bau091A.cpp
26-
../../src/knx/bau091A.h
27-
../../src/knx/bau27B0.cpp
28-
../../src/knx/bau27B0.h
29-
../../src/knx/bau2920.cpp
30-
../../src/knx/bau2920.h
31-
../../src/knx/bau57B0.cpp
32-
../../src/knx/bau57B0.h
33-
../../src/knx/bau_systemB.cpp
34-
../../src/knx/bau_systemB.h
35-
../../src/knx/bau_systemB_device.cpp
36-
../../src/knx/bau_systemB_device.h
37-
../../src/knx/bau_systemB_coupler.cpp
38-
../../src/knx/bau_systemB_coupler.h
39-
../../src/knx/bits.cpp
40-
../../src/knx/bits.h
41-
../../src/knx/callback_property.h
42-
../../src/knx/cemi_frame.cpp
43-
../../src/knx/cemi_frame.h
44-
../../src/knx/cemi_server.cpp
45-
../../src/knx/cemi_server.h
46-
../../src/knx/cemi_server_object.cpp
47-
../../src/knx/cemi_server_object.h
48-
../../src/knx/config.h
49-
../../src/knx/data_link_layer.cpp
50-
../../src/knx/data_link_layer.h
51-
../../src/knx/data_property.cpp
52-
../../src/knx/data_property.h
53-
../../src/knx/device_object.cpp
54-
../../src/knx/device_object.h
55-
../../src/knx/dpt.cpp
56-
../../src/knx/dpt.h
57-
../../src/knx/dptconvert.cpp
58-
../../src/knx/dptconvert.h
59-
../../src/knx/function_property.h
60-
../../src/knx/group_object.cpp
61-
../../src/knx/group_object.h
62-
../../src/knx/group_object_table_object.cpp
63-
../../src/knx/group_object_table_object.h
64-
../../src/knx/interface_object.cpp
65-
../../src/knx/interface_object.h
66-
../../src/knx/ip_data_link_layer.cpp
67-
../../src/knx/ip_data_link_layer.h
68-
../../src/knx/ip_parameter_object.cpp
69-
../../src/knx/ip_parameter_object.h
70-
../../src/knx/knx_ip_device_information_dib.cpp
71-
../../src/knx/knx_ip_device_information_dib.h
72-
../../src/knx/knx_ip_dib.cpp
73-
../../src/knx/knx_ip_dib.h
74-
../../src/knx/knx_ip_frame.cpp
75-
../../src/knx/knx_ip_frame.h
76-
../../src/knx/knx_ip_routing_indication.cpp
77-
../../src/knx/knx_ip_routing_indication.h
78-
../../src/knx/knx_ip_search_request.cpp
79-
../../src/knx/knx_ip_search_request.h
80-
../../src/knx/knx_ip_search_response.cpp
81-
../../src/knx/knx_ip_search_response.h
82-
../../src/knx/knx_ip_supported_service_dib.cpp
83-
../../src/knx/knx_ip_supported_service_dib.h
84-
../../src/knx/ip_host_protocol_address_information.cpp
85-
../../src/knx/ip_host_protocol_address_information.h
86-
../../src/knx/knx_types.h
87-
../../src/knx/knx_value.cpp
88-
../../src/knx/knx_value.h
89-
../../src/knx/memory.cpp
90-
../../src/knx/memory.h
91-
../../src/knx/network_layer.cpp
92-
../../src/knx/network_layer.h
93-
../../src/knx/network_layer_coupler.cpp
94-
../../src/knx/network_layer_coupler.h
95-
../../src/knx/network_layer_device.cpp
96-
../../src/knx/network_layer_device.h
97-
../../src/knx/network_layer_entity.cpp
98-
../../src/knx/network_layer_entity.h
99-
../../src/knx/npdu.cpp
100-
../../src/knx/npdu.h
101-
../../src/knx/platform.cpp
102-
../../src/knx/platform.h
103-
../../src/knx/property.cpp
104-
../../src/knx/property.h
105-
../../src/knx/rf_data_link_layer.cpp
106-
../../src/knx/rf_data_link_layer.h
107-
../../src/knx/rf_medium_object.cpp
108-
../../src/knx/rf_medium_object.h
109-
../../src/knx/rf_physical_layer_cc1101.cpp
110-
../../src/knx/rf_physical_layer_cc1101.h
111-
../../src/knx/rf_physical_layer.h
112-
../../src/knx/router_object.cpp
113-
../../src/knx/router_object.h
114-
../../src/knx/secure_application_layer.cpp
115-
../../src/knx/secure_application_layer.h
116-
../../src/knx/security_interface_object.cpp
117-
../../src/knx/security_interface_object.h
118-
../../src/knx/simple_map.h
119-
../../src/knx/save_restore.h
120-
../../src/knx/table_object.cpp
121-
../../src/knx/table_object.h
122-
../../src/knx/tpdu.cpp
123-
../../src/knx/tpdu.h
124-
../../src/knx/tpuart_data_link_layer.cpp
125-
../../src/knx/tpuart_data_link_layer.h
126-
../../src/knx/transport_layer.cpp
127-
../../src/knx/transport_layer.h
128-
../../src/knx/usb_tunnel_interface.cpp
129-
../../src/knx/usb_tunnel_interface.h
130-
../../src/knx_facade.cpp
131-
../../src/knx_facade.h
132-
../../src/linux_platform.cpp
133-
../../src/linux_platform.h
1348
)
1359
include_directories(src pybind11/include)
136-
include_directories(../../src)
13710

13811
#set(outdir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
13912
#set_target_properties(knx PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${outdir})
14013
set_target_properties(knxPython PROPERTIES OUTPUT_NAME knx)
14114
set_property(TARGET knxPython PROPERTY CXX_STANDARD 11)
142-
target_compile_definitions(knxPython PUBLIC -DMASK_VERSION=0x57B0)
15+
#target_compile_definitions(knxPython PUBLIC -DMASK_VERSION=0x57B0)
16+
target_link_libraries(knxPython PRIVATE knx)

‎src/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,8 @@ knx_facade.h
184184
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wno-unknown-pragmas -g -O0")
185185
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wno-unknown-pragmas -g -O0")
186186

187-
add_library(knx ${SOURCES})
187+
add_library(knx SHARED ${SOURCES})
188188
target_include_directories(knx PUBLIC .)
189189
set_property(TARGET knx PROPERTY CXX_STANDARD 11)
190-
target_compile_definitions(knx PUBLIC -DUSE_RF -DUSE_USB -DUSE_TP -D_USE_IP -DUSE_CEMI_SERVER -DKNX_TUNNELING=1 -DUSE_DATASECURE -DALL_MASKS)
190+
target_compile_definitions(knx PUBLIC -DUSE_RF -DUSE_USB -DUSE_TP -D_USE_IP -DUSE_CEMI_SERVER
191+
-DKNX_TUNNELING=1 -DUSE_DATASECURE -DALL_MASKS)

‎src/knx/rf/rf_physical_layer_cc1310.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <ti/drivers/rf/RF.h>
1717
#include "smartrf_settings/smartrf_settings.h"
1818

19-
#include "cc1310_platform.h"
19+
#include "../platform/cc1310_platform.h"
2020
#include "Board.h"
2121

2222
#include "bits.h"

‎src/knx/rf/rf_physical_layer_cc1310.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#ifdef DeviceFamily_CC13X0
44

5-
#include "config.h"
5+
#include "../config.h"
66

77
#include <stdint.h>
88

0 commit comments

Comments
 (0)