dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Run clang-format and enable CI check for it (#755)

Browse Source 
* pre-commit: Update and enable clang-format check

There is newer version from clang-format so use that. We do not yet want
18 as that is little bit too new.

* Format some thing by hand which clang-format "breaks"

Clang-format will format some things little bit off in some cases.
Format some things by hand so we get cleaner end result.

* Run clang-format with

```
pre-commit run --all-files clang-format
```

We have already in previously checked places where clang-format does not
make good format and ignored those (hopefully most of the things).

---------

Co-authored-by: Kari Argillander <kari.argillander@fidelix.com>
This commit is contained in:
Kari Argillander
2024-08-30 19:20:58 +03:00
committed by GitHub
parent 622a9e609e
commit f806c5829b
547 changed files with 18286 additions and 16575 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/basic/object/lo.c
+57 -52
View File
@@ -197,8 +197,7 @@ unsigned Lighting_Output_Instance_To_Index(uint32_t object_instance)
* 0 to N for individual array members
* @return the priority-array active status for the specific priority
*/
static bool
Priority_Array_Active(
static bool Priority_Array_Active(
const struct object_data *pObject, BACNET_ARRAY_INDEX priority)
{
bool active = false;
@@ -219,8 +218,7 @@ Priority_Array_Active(
* 0 to N for individual array members
* @return The priority-array value for the specific priority
*/
static float
Priority_Array_Value(
static float Priority_Array_Value(
const struct object_data *pObject, BACNET_ARRAY_INDEX priority)
{
float real_value = 0.0;
@@ -536,9 +534,11 @@ Lighting_Command_Warn_Relinquish(struct object_data *pObject, unsigned priority)
* @param value [in] BACnet lighting value
* @param fade_time [in] BACnet lighting fade time
*/
static void
Lighting_Command_Fade_To(struct object_data *pObject,
unsigned priority, float value, uint32_t fade_time)
static void Lighting_Command_Fade_To(
struct object_data *pObject,
unsigned priority,
float value,
uint32_t fade_time)
{
unsigned current_priority;
@@ -562,9 +562,11 @@ Lighting_Command_Fade_To(struct object_data *pObject,
* @param value [in] BACnet lighting value
* @param ramp_rate [in] BACnet lighting ramp rate
*/
static void
Lighting_Command_Ramp_To(struct object_data *pObject,
unsigned priority, float value, float ramp_rate)
static void Lighting_Command_Ramp_To(
struct object_data *pObject,
unsigned priority,
float value,
float ramp_rate)
{
unsigned current_priority;
@@ -994,8 +996,7 @@ static bool Lighting_Output_Lighting_Command_Write(
*error_code = ERROR_CODE_WRITE_ACCESS_DENIED;
return status;
}
if ((priority < BACNET_MIN_PRIORITY) ||
(priority > BACNET_MAX_PRIORITY)) {
if ((priority < BACNET_MIN_PRIORITY) || (priority > BACNET_MAX_PRIORITY)) {
*error_class = ERROR_CLASS_PROPERTY;
*error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
return status;
@@ -1007,41 +1008,43 @@ static bool Lighting_Output_Lighting_Command_Write(
}
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
debug_printf("LO[%u]: Lighting-Command@%u: %s\n",
object_instance, priority,
debug_printf(
"LO[%u]: Lighting-Command@%u: %s\n", object_instance, priority,
bactext_lighting_operation_name(value->operation));
switch (value->operation) {
case BACNET_LIGHTS_NONE:
status = true;
break;
case BACNET_LIGHTS_FADE_TO:
debug_printf("LO[%u]: Lighting-Command@%u Fade-To "
debug_printf(
"LO[%u]: Lighting-Command@%u Fade-To "
"Target=%f Fade=%u\n",
object_instance, priority,
(double)value->target_level, value->fade_time);
Lighting_Command_Fade_To(pObject, priority,
value->target_level, value->fade_time);
object_instance, priority, (double)value->target_level,
value->fade_time);
Lighting_Command_Fade_To(
pObject, priority, value->target_level, value->fade_time);
status = true;
break;
case BACNET_LIGHTS_RAMP_TO:
debug_printf("LO[%u]: Lighting-Command@%u Ramp-To "
debug_printf(
"LO[%u]: Lighting-Command@%u Ramp-To "
"Target=%f Ramp-Rate=%f\n",
object_instance, priority,
(double)value->target_level, (double)value->ramp_rate);
Lighting_Command_Ramp_To(pObject, priority,
value->target_level, value->ramp_rate);
object_instance, priority, (double)value->target_level,
(double)value->ramp_rate);
Lighting_Command_Ramp_To(
pObject, priority, value->target_level, value->ramp_rate);
status = true;
break;
case BACNET_LIGHTS_STEP_UP:
case BACNET_LIGHTS_STEP_DOWN:
case BACNET_LIGHTS_STEP_ON:
case BACNET_LIGHTS_STEP_OFF:
debug_printf("LO[%u]: Lighting-Command@%u Step "
debug_printf(
"LO[%u]: Lighting-Command@%u Step "
"Step-Increment=%f\n",
object_instance, priority,
(double)value->step_increment);
Lighting_Command_Step(pObject,priority,
value->operation,value->step_increment);
object_instance, priority, (double)value->step_increment);
Lighting_Command_Step(
pObject, priority, value->operation, value->step_increment);
status = true;
break;
case BACNET_LIGHTS_WARN:
@@ -1544,8 +1547,7 @@ static bool Lighting_Output_Default_Step_Increment_Write(
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
(void)priority;
if (isgreaterequal(value, 0.1f) &&
islessequal(value, 100.0f)) {
if (isgreaterequal(value, 0.1f) && islessequal(value, 100.0f)) {
pObject->Default_Step_Increment = value;
status = true;
} else {
@@ -2185,8 +2187,8 @@ bool Lighting_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
if (status) {
status = Lighting_Output_Lighting_Command_Write(
wp_data->object_instance, &value.type.Lighting_Command,
wp_data->priority,
&wp_data->error_class, &wp_data->error_code);
wp_data->priority, &wp_data->error_class,
&wp_data->error_code);
if (!status) {
wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
@@ -2324,10 +2326,10 @@ Lighting_Output_Fade_Handler(uint32_t object_instance, uint16_t milliseconds)
Lighting_Output_Write_Present_Value_Callback(
object_instance, old_value, pObject->Tracking_Value);
} else {
debug_printf("LO[%u] Fade Handler Operation=%s Value=%f\n",
object_instance,
debug_printf(
"LO[%u] Fade Handler Operation=%s Value=%f\n", object_instance,
bactext_lighting_operation_name(
pObject->Lighting_Command.operation),
pObject->Lighting_Command.operation),
(double)pObject->Tracking_Value);
}
}
@@ -2391,7 +2393,8 @@ Lighting_Output_Ramp_Handler(uint32_t object_instance, uint16_t milliseconds)
pObject->Lighting_Command.operation = BACNET_LIGHTS_STOP;
}
} else if (isgreater(old_value, target_value)) {
debug_printf("LO[%u] Ramp Handler Down steps=%f tracking=%f\n",
debug_printf(
"LO[%u] Ramp Handler Down steps=%f tracking=%f\n",
object_instance, (double)steps, (double)old_value);
if (isgreater(old_value, steps)) {
step_value = old_value - steps;
@@ -2403,7 +2406,8 @@ Lighting_Output_Ramp_Handler(uint32_t object_instance, uint16_t milliseconds)
pObject->Lighting_Command.operation = BACNET_LIGHTS_STOP;
}
} else {
debug_printf("LO[%u] Ramp Handler at target=%f tracking=%f\n",
debug_printf(
"LO[%u] Ramp Handler at target=%f tracking=%f\n",
object_instance, (double)target_value, (double)old_value);
/* stop ramping */
step_value = target_value;
@@ -2427,10 +2431,10 @@ Lighting_Output_Ramp_Handler(uint32_t object_instance, uint16_t milliseconds)
Lighting_Output_Write_Present_Value_Callback(
object_instance, old_value, pObject->Tracking_Value);
} else {
debug_printf("LO[%u] Ramp Handler Operation=%s Value=%f\n",
object_instance,
debug_printf(
"LO[%u] Ramp Handler Operation=%s Value=%f\n", object_instance,
bactext_lighting_operation_name(
pObject->Lighting_Command.operation),
pObject->Lighting_Command.operation),
(double)pObject->Tracking_Value);
}
}
@@ -2475,10 +2479,11 @@ static void Lighting_Output_Step_Up_Handler(uint32_t object_instance)
Lighting_Output_Write_Present_Value_Callback(
object_instance, old_value, pObject->Tracking_Value);
} else {
debug_printf("LO[%u] Step Up Handler Operation=%s Value=%f\n",
debug_printf(
"LO[%u] Step Up Handler Operation=%s Value=%f\n",
object_instance,
bactext_lighting_operation_name(
pObject->Lighting_Command.operation),
pObject->Lighting_Command.operation),
(double)pObject->Tracking_Value);
}
}
@@ -2526,10 +2531,10 @@ static void Lighting_Output_Step_Down_Handler(uint32_t object_instance)
Lighting_Output_Write_Present_Value_Callback(
object_instance, old_value, pObject->Tracking_Value);
} else {
debug_printf("LO[%u] Step Down Handler Operation=%s Value=%f\n",
object_instance,
debug_printf(
"LO[%u] Step Down Handler Operation=%s Value=%f\n", object_instance,
bactext_lighting_operation_name(
pObject->Lighting_Command.operation),
pObject->Lighting_Command.operation),
(double)pObject->Tracking_Value);
}
}
@@ -2572,10 +2577,10 @@ static void Lighting_Output_Step_On_Handler(uint32_t object_instance)
Lighting_Output_Write_Present_Value_Callback(
object_instance, old_value, pObject->Tracking_Value);
} else {
debug_printf("LO[%u] Step On Handler Operation=%s Value=%f\n",
object_instance,
debug_printf(
"LO[%u] Step On Handler Operation=%s Value=%f\n", object_instance,
bactext_lighting_operation_name(
pObject->Lighting_Command.operation),
pObject->Lighting_Command.operation),
(double)pObject->Tracking_Value);
}
}
@@ -2623,10 +2628,10 @@ static void Lighting_Output_Step_Off_Handler(uint32_t object_instance)
Lighting_Output_Write_Present_Value_Callback(
object_instance, old_value, pObject->Tracking_Value);
} else {
debug_printf("LO[%u] Step Off Handler Operation=%s Value=%f\n",
object_instance,
debug_printf(
"LO[%u] Step Off Handler Operation=%s Value=%f\n", object_instance,
bactext_lighting_operation_name(
pObject->Lighting_Command.operation),
pObject->Lighting_Command.operation),
(double)pObject->Tracking_Value);
}
}