Skip to content
GitLab

Link against libsduid for dsuid_t header inclusion

Merged andreas.fenkart requested to merge taw/dsm-api:MR_link_dsuid into master
Compare
and
+ 64
− 74
src/lib-v2/CMakeLists.txt
+ 5
− 7
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules)
find_package(PkgConfig)
pkg_check_modules(DS485CLIENT REQUIRED libds485-client)
set(API_VERSION 3.0.1)
set(API_VERSION_HEX 0x0300)
add_definitions(-DAPI_VERSION=${API_VERSION_HEX})
@@ -33,7 +30,7 @@ IF (WITH_SCRIPTING)
SET_SOURCE_FILES_PROPERTIES(dsm-api-py.i PROPERTIES SWIG_FLAGS "${SWIG_FLAG_PROPERTIES}")
SET_SOURCE_FILES_PROPERTIES(dsm-api-py.i PROPERTIES GENERATED "1")
SWIG_ADD_MODULE(dsmapi2 python dsm-api-py.i ${DSMLIB_SRC})
SWIG_LINK_LIBRARIES(dsmapi2 ${PYTHON_LIBRARIES} dsm-api-v2 ds485-client)
SWIG_LINK_LIBRARIES(dsmapi2 ${PYTHON_LIBRARIES} ${DSM_API2_LIBRARIES})
if (NOT PYTHON_LIBRARY_PATH)
execute_process(COMMAND python -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='${CMAKE_INSTALL_EXEC_PREFIX}')" OUTPUT_VARIABLE PYTHON_LIBRARY_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
endif (NOT PYTHON_LIBRARY_PATH)
@@ -51,7 +48,7 @@ IF (WITH_SCRIPTING)
SET_SOURCE_FILES_PROPERTIES(dsm-api-lua.i PROPERTIES SWIG_FLAGS "${SWIG_FLAG_PROPERTIES}")
SET_SOURCE_FILES_PROPERTIES(dsm-api-lua.i PROPERTIES GENERATED "1")
SWIG_ADD_MODULE(dsmapi2 lua dsm-api-lua.i ${DSMLIB_SRC})
SWIG_LINK_LIBRARIES(dsmapi2 ${LUA_LIBRARIES} dsm-api-v2 ds485-client)
SWIG_LINK_LIBRARIES(dsmapi2 ${LUA_LIBRARIES} ${DSM_API2_LIBRARIES})
SET_TARGET_PROPERTIES(${SWIG_MODULE_dsmapi2_REAL_NAME} PROPERTIES PREFIX "")
INSTALL(TARGETS ${SWIG_MODULE_dsmapi2_REAL_NAME} LIBRARY DESTINATION lib/lua/5.1)
ENDIF (LUA51_FOUND AND SWIG_FOUND)
@@ -97,11 +94,12 @@ else (CYGWIN)
# create shared library
add_library(dsm-api-v2 SHARED ${DSMLIB_SRC})
endif (CYGWIN)
target_link_libraries(dsm-api-v2 ds485-client)
target_link_libraries(dsm-api-v2 ${DS485CLIENT_LIBRARIES} ${LIBDSUID_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT})
set_target_properties(dsm-api-v2 PROPERTIES VERSION ${API_VERSION} SOVERSION ${API_SO_VERSION})
add_executable(libtest test.c)
target_link_libraries(libtest dsm-api-v2 ds485-client)
target_link_libraries(libtest ${DSM_API2_LIBRARIES})
install(TARGETS dsm-api-v2 LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
src/lib-v2/dsm-api-static.c
+ 16
− 11
@@ -19,15 +19,20 @@
#include "dsm-api.h"
#include <stdlib.h>
#include <stdbool.h>
#include <errno.h>
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <unistd.h>
#include <utlist.h>
#include <uthash.h>
#include <digitalSTROM/ds.h> /* BusMemberDevice */
#include <digitalSTROM/dsuid.h>
#include <digitalSTROM/ds485-client-interface.h>
#include "dsm-macros.h"
typedef struct {
@@ -319,13 +324,13 @@ int DsmApiGetBusMembersPerType(DsmApiHandle_t handle, dsuid_t *device_list, int
dsuid_t ownDsuid;
if (DsmApiGetOwnDSUID(handle, &ownDsuid) != ERROR_OK) {
SetNullDsuid(ownDsuid);
ownDsuid = DSUID_NULL;
}
uint8_t i;
int list_size = 0;
for (i = 0; i < list_count; i++) {
uint8_t busMemberType;
if (IsEqualDsuid(tmp_device_list[i], ownDsuid)) {
if (dsuid_equal(&tmp_device_list[i], &ownDsuid)) {
busMemberType = BusMember_ds485d;
} else {
if (BusMember_get_type(handle, tmp_device_list[i], &busMemberType) != ERROR_OK) {
@@ -751,7 +756,7 @@ static void SyncDeviceStatistics_handler(uint8_t error_code, void *arg, dsuid_t
{
if (data != NULL &&
data->state == WAITING &&
IsEqualDsuid(data->dsmId, sourceId) &&
dsuid_equal(&data->dsmId, &sourceId) &&
data->device == DeviceId &&
data->offset == Offset)
{
@@ -829,7 +834,7 @@ static void SyncDeviceConfig_16_handler(uint8_t error_code, void *arg, dsuid_t s
{
if (data != NULL &&
data->state == WAITING &&
IsEqualDsuid(data->dsmId, sourceId) &&
dsuid_equal(&data->dsmId, &sourceId) &&
data->device == DeviceId &&
data->bank == ConfigClass)
{
@@ -924,7 +929,7 @@ static void SyncDeviceConfig_set_handler(uint8_t error_code, void *arg, dsuid_t
{
if (data != NULL &&
data->state == WAITING &&
IsEqualDsuid(data->dsmId, sourceId) &&
dsuid_equal(&data->dsmId, &sourceId) &&
data->device == DeviceId &&
data->bank == ConfigClass &&
data->offset == ConfigIndex)
@@ -998,7 +1003,7 @@ static void SyncDeviceSet_handler(uint8_t error_code, void *arg, dsuid_t sourceI
{
if (data != NULL &&
data->state == WAITING &&
IsEqualDsuid(data->dsmId, sourceId) &&
dsuid_equal(&data->dsmId, &sourceId) &&
data->device == DeviceId)
{
data->error = error_code;
@@ -1384,7 +1389,7 @@ static void SyncTestTransmissionQuality_handler(uint8_t error_code, void *arg, d
{
if (data != NULL &&
data->state == WAITING &&
IsEqualDsuid(data->dsmId, sourceId) &&
dsuid_equal(&data->dsmId, &sourceId) &&
data->device == DeviceId)
{
data->result = UpstreamQuality;
@@ -1458,7 +1463,7 @@ static void SyncDeviceSensor_get_handler(uint8_t error_code, void *arg, dsuid_t
{
if (data != NULL &&
data->state == WAITING &&
IsEqualDsuid(data->dsmId, sourceId) &&
dsuid_equal(&data->dsmId, &sourceId) &&
data->device == DeviceId &&
data->SensorIndex == SensorIndex)
{
@@ -1524,7 +1529,7 @@ static void SyncDSLink_response_handler(uint8_t error_code, void *arg, dsuid_t s
{
if (data != NULL &&
data->state == WAITING &&
IsEqualDsuid(data->dsmId, sourceId) &&
dsuid_equal(&data->dsmId, &sourceId) &&
data->device == DeviceId)
{
data->result = Value;
src/lib-v2/test.c
+ 27
− 48
@@ -5,21 +5,12 @@
* Author: christian
*/
#include "dsm-api.h"
#include "dsm-api-const.h"
#include <digitalSTROM/ds.h>
#include <stdio.h>
#include <unistd.h>
#include <digitalSTROM/dsuid.h>
static void dsuidToString(dsuid_t *dsuid, char *dsuid_str)
{
char *p;
uint8_t i;
p = dsuid_str;
for (i = 0; i < sizeof(dsuid_t); ++i) {
p += sprintf(p, "%02x", dsuid->id[i]);
}
sprintf(p, "\0");
}
#include "dsm-api.h"
#include "dsm-api-const.h"
void BusChange_callback(void *arg, dsuid_t *id, int flag)
{
@@ -62,39 +53,31 @@ void BusState_callback(void *arg, bus_state_t state)
void EventDeviceAccessibility_on(uint8_t error_code, void *arg, dsuid_t sourceId, dsuid_t destinationId, uint16_t DeviceId, uint16_t ZoneId, uint16_t VendorId, uint16_t ProductId, uint16_t FunctionId, uint16_t version, dsuid_t dsuid)
{
int i;
char dsuid_str[35];
dsuidToString(&dsuid, dsuid_str);
printf("Device 0x%s (DeviceId: %d in Zone: %d) became active on dSM", dsuid_str, DeviceId, ZoneId);
for (i = 0; i < sizeof(dsuid_t); i++)
{
printf(" %02x", sourceId.id[i]);
}
printf("\n");
DSUID_STR(dsuid_dev_str);
DSUID_STR(dsuid_dsm_str);
dsuid_to_string(&dsuid, dsuid_dev_str);
dsuid_to_string(&sourceId, dsuid_dsm_str);
printf("Device 0x%s (DeviceId: %d in Zone: %d) became active on dSM",
dsuid_dev_str, DeviceId, ZoneId, dsuid_dsm_str);
}
void EventDeviceAccessibility_off(uint8_t error_code, void *arg, dsuid_t sourceId, dsuid_t destinationId, uint16_t DeviceId, uint16_t ZoneId, uint16_t VendorId, uint16_t ProductId, uint16_t FunctionId, uint16_t version, dsuid_t dsuid)
{
int i;
char dsuid_str[35];
dsuidToString(&dsuid, dsuid_str);
printf("Device 0x%s (DeviceId: %d in Zone: %d) became inactive on dSM", dsuid_str, DeviceId, ZoneId);
for (i = 0; i < sizeof(dsuid_t); i++)
{
printf(" %02x", sourceId.id[i]);
}
printf("\n");
DSUID_STR(dsuid_dev_str);
DSUID_STR(dsuid_dsm_str);
dsuid_to_string(&dsuid, dsuid_dev_str);
dsuid_to_string(&sourceId, dsuid_dsm_str);
printf("Device 0x%s (DeviceId: %d in Zone: %d) became inactive on dSM",
dsuid_dev_str, DeviceId, ZoneId, dsuid_dsm_str);
}
void ZoneCount_callback(uint8_t error_code, void *arg, dsuid_t sourceId, dsuid_t destinationId, uint8_t ZoneCount)
{
int i;
printf("dSM:");
for (i = 0; i < sizeof(dsuid_t); i++)
{
printf(" %02x", sourceId.id[i]);
}
printf(" has ZoneCount: %d (result: %d)\n", ZoneCount, error_code);
DSUID_STR(dsuid_dsm_str);
dsuid_to_string(&sourceId, dsuid_dsm_str);
printf("dSM: %s has ZoneCount: %d (result: %d)\n", dsuid_dsm_str,
ZoneCount, error_code);
}
void EventDeviceStatistics(uint8_t error_code, void *arg, dsuid_t sourceId, dsuid_t destinationId, uint16_t DeviceIndex, uint8_t Offset, uint16_t Value)
@@ -106,13 +89,11 @@ void ZoneGroupActionRequest_action_call_scene_request(uint8_t error_code, void *
dsuid_t destinationId, uint16_t ZoneId, uint8_t GroupId,
uint16_t OriginDeviceId, uint8_t SceneId)
{
int i;
printf("Call scene %d in zone %d and group %d from dSM: ", SceneId, ZoneId, GroupId);
for (i = 0; i < sizeof(dsuid_t); i++)
{
printf(" %02x", sourceId.id[i]);
}
printf("\n");
DSUID_STR(dsuid_dsm_str);
dsuid_to_string(&sourceId, dsuid_dsm_str);
printf("Call scene %d in zone %d and group %d from dSM: %s\n", SceneId,
ZoneId, GroupId, dsuid_dsm_str);
}
@@ -122,8 +103,6 @@ int main(int argc, char* argv[])
const char connection[] = "tcp://192.168.2.124:8442";
DsmApiCallback_t callback;
dsuid_t dsuid = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
dsuid_t broadcast;
SetBroadcastDsuid(broadcast);
DsmApiHandle_t handle = DsmApiInitialize();
@@ -168,7 +147,7 @@ int main(int argc, char* argv[])
sleep(10);
ZoneCount(handle, broadcast, NULL);
ZoneCount(handle, DSUID_BROADCAST, NULL);
sleep(3600);
}
src/tools/CGenerator.py
+ 0
− 1
@@ -476,7 +476,6 @@ class CGenerator:
#ifndef DSM_API_H
#define DSM_API_H
#include <digitalSTROM/ds.h>
#include <digitalSTROM/ds485-client-interface.h>
#ifdef __cplusplus
src/tools/LuaGenerator.py
+ 1
− 2
@@ -152,9 +152,8 @@ class LuaGenerator:
swig_str = self.license
swig_str += """%module dsmapi2
%{
#include <stdint.h>
#include "dsm-api-const.h"
#include <digitalSTROM/ds.h>
#include "stdint.h"
static void printhex(unsigned char *p, int len)
{