diff options
Diffstat (limited to 'HAL-afb/HAL_MOST_UNICENS/ucs2-vol')
6 files changed, 9 insertions, 9 deletions
diff --git a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/CMakeLists.txt b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/CMakeLists.txt index 8735677..c734639 100644 --- a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/CMakeLists.txt +++ b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/CMakeLists.txt @@ -18,7 +18,7 @@ -# Define subproject targets +# Define subproject targets ADD_SUBDIRECTORY(src) diff --git a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/device_value.h b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/device_value.h index 21fdbdc..5364662 100644 --- a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/device_value.h +++ b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/device_value.h @@ -69,7 +69,7 @@ public: bool RequiresUpdate(); // returns true if target is not actual value // returns true if success, false if failed // -> stop transmission - bool FireUpdateMessage(lib_most_volume_writei2c_cb_t writei2c_fptr, + bool FireUpdateMessage(lib_most_volume_writei2c_cb_t writei2c_fptr, lib_most_volume_writei2c_result_cb_t result_fptr, void *result_user_ptr);// fires message & updates actual value diff --git a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/libmostvolume.h b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/libmostvolume.h index 1d7249d..94d5a1c 100644 --- a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/libmostvolume.h +++ b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/libmostvolume.h @@ -60,13 +60,13 @@ typedef void (*lib_most_volume_writei2c_result_cb_t)(uint8_t result, void *user_ * \return Returns \c 0 for success, other value on failure. */ typedef int (*lib_most_volume_writei2c_cb_t)(uint16_t node, uint8_t *data_ptr, uint8_t data_sz, - lib_most_volume_writei2c_result_cb_t result_fptr, + lib_most_volume_writei2c_result_cb_t result_fptr, void *result_user_ptr); typedef struct lib_most_volume_init_ { lib_most_volume_service_cb_t service_cb; lib_most_volume_writei2c_cb_t writei2c_cb; - + } lib_most_volume_init_t; diff --git a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_container.cpp b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_container.cpp index cef25b1..40177fc 100644 --- a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_container.cpp +++ b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_container.cpp @@ -112,7 +112,7 @@ void CDeviceContainer::Update() { return; } - + for (cnt = 0u; cnt < this->_values_sz; cnt++) /* just run one cycle */ { IncrementProcIndex(); diff --git a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_value.cpp b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_value.cpp index b8c681e..5a74354 100644 --- a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_value.cpp +++ b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_value.cpp @@ -93,14 +93,14 @@ bool CDeviceValue::RequiresUpdate() return false; } -bool CDeviceValue::FireUpdateMessage(lib_most_volume_writei2c_cb_t writei2c_fptr, +bool CDeviceValue::FireUpdateMessage(lib_most_volume_writei2c_cb_t writei2c_fptr, lib_most_volume_writei2c_result_cb_t result_fptr, void *result_user_ptr) { int ret; ApplyMostValue(this->_target_value, _type, _tx_payload); - ret = writei2c_fptr(this->_address, &_tx_payload[0], _tx_payload_sz, + ret = writei2c_fptr(this->_address, &_tx_payload[0], _tx_payload_sz, result_fptr, result_user_ptr); diff --git a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/libmostvolume.cpp b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/libmostvolume.cpp index a90b5b1..72d2b04 100644 --- a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/libmostvolume.cpp +++ b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/libmostvolume.cpp @@ -72,7 +72,7 @@ extern "C" uint8_t lib_most_volume_set(enum lib_most_volume_channel_t channel, u } extern "C" uint8_t lib_most_volume_service(void) -{ +{ uint8_t success = 1U; /*std::cerr << "lib_most_volume_service(): called" << std::endl;*/ @@ -81,6 +81,6 @@ extern "C" uint8_t lib_most_volume_service(void) CSetup::GetInstance()->Update(); success = 0U; } - + return success; } |