diff --git a/include/arke-c.h b/include/arke-c.h index 7ab9973..bc7c428 100644 --- a/include/arke-c.h +++ b/include/arke-c.h @@ -1,34 +1,34 @@ #pragma once #include "arke.h" #ifdef __cplusplus extern "C" { #endif void ArkeZeusSetTargetHumidity(ArkeZeusSetPoint * sp,float humidity); void ArkeZeusSetTargetTemperature(ArkeZeusSetPoint * sp,float humidity); - void ArkeZeusSetTargetWind(const ArkeZeusSetPoint * sp,uint8_t power); + void ArkeZeusSetTargetWind(ArkeZeusSetPoint * sp,uint8_t power); float ArkeZeusGetTargetHumidity(const ArkeZeusSetPoint * sp); float ArkeZeusGetTargetTemperature(const ArkeZeusSetPoint * sp); uint8_t ArkeZeusGetTargetWind(const ArkeZeusSetPoint * sp); float ArkeZeusGetHumidity(const ArkeZeusReport * r); float ArkeZeusGetTemperature1(const ArkeZeusReport * r); float ArkeZeusGetTemperature2(const ArkeZeusReport * r); float ArkeZeusGetTemperature3(const ArkeZeusReport * r); float ArkeZeusGetTemperature4(const ArkeZeusReport * r); #ifdef __cplusplus } #endif diff --git a/src-c/CMakeLists.txt b/src-c/CMakeLists.txt index 1c538c6..be6fbcf 100644 --- a/src-c/CMakeLists.txt +++ b/src-c/CMakeLists.txt @@ -1,13 +1,13 @@ -add_library(arke arke-src-all.c) +add_library(arke STATIC arke-src-all.c) set(TEST_SRC_FILES main-check.cpp arke-private-conversion-test.cpp) set(TEST_HDR_FILES) add_executable(libarke-tests EXCLUDE_FROM_ALL ${TEST_SRC_FILES} ${TEST_HDR_FILES}) target_link_libraries(libarke-tests gtest Threads::Threads) add_test(libarke-tests libarke-tests) add_dependencies(check libarke-tests) diff --git a/src-c/arke.c b/src-c/arke.c index 2f54dff..5ae0fe9 100644 --- a/src-c/arke.c +++ b/src-c/arke.c @@ -1,52 +1,52 @@ #include "arke-c.h" #include "arke-private-conversion.h" void ArkeZeusSetTargetHumidity(ArkeZeusSetPoint * sp,float value) { sp->Humidity = float_to_humidity(value); } void ArkeZeusSetTargetTemperature(ArkeZeusSetPoint * sp,float value) { sp->Temperature = float_to_hih6030_temperature(value); } void ArkeZeusSetTargetWind(ArkeZeusSetPoint * sp,uint8_t power) { - sp->Power = power; + sp->Wind = power; } float ArkeZeusGetTargetHumidity(const ArkeZeusSetPoint * sp) { return humidity_to_float(sp->Humidity); } float ArkeZeusGetTargetTemperature(const ArkeZeusSetPoint * sp) { return hih6030_temperature_to_float(sp->Temperature); } uint8_t ArkeZeusGetTargetWind(const ArkeZeusSetPoint * sp) { return sp->Wind; } float ArkeZeusGetHumidity(const ArkeZeusReport * r) { return humidity_to_float(r->Humidity); } float ArkeZeusGetTemperature1(const ArkeZeusReport * r) { return hih6030_temperature_to_float(r->Temperature1); } float ArkeZeusGetTemperature2(const ArkeZeusReport * r) { - + return tmp1075_to_float(r->Temperature2); } float ArkeZeusGetTemperature3(const ArkeZeusReport * r) { - + return tmp1075_to_float(r->Temperature3); } float ArkeZeusGetTemperature4(const ArkeZeusReport * r) { - + return tmp1075_to_float(r->Temperature4); }