Merge pull request #26 from bcmi-labs/chore/reduce-log-output

aentinger · web-flow · commit f7e72c2961da · 2024-09-25T10:56:21.000+02:00
Raise debug level to INFO and above.
diff --git a/extras/precompile/precompile.sh b/extras/precompile/precompile.sh
@@ -29,6 +29,7 @@ cmake -DCMAKE_C_COMPILER=arm-none-eabi-gcc \
       -DUA_ENABLE_AMALGAMATION=ON \
       -DUA_ENABLE_MALLOC_SINGLETON=ON \
       -DCMAKE_BUILD_TYPE=Release \
+      -DUA_LOGLEVEL=300 \
       ..
 make -j8
 
diff --git a/src/cortex-m7/libopen62541.a b/src/cortex-m7/libopen62541.a
diff --git a/src/io/analog/AnalogInput.cpp b/src/io/analog/AnalogInput.cpp
@@ -130,7 +130,7 @@ AnalogInput::onReadRequest(
   UA_Variant_setScalar(&in_x_val_opcua_variant, &in_x_val_opcua_value, &UA_TYPES[UA_TYPES_FLOAT]);
   UA_Server_writeValue(server, *node_id, in_x_val_opcua_variant);
   /* Some debug output. */
-  UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %f", __PRETTY_FUNCTION__, in_x_val);
+  UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %f", __PRETTY_FUNCTION__, in_x_val);
 }
 
 /**************************************************************************************
diff --git a/src/io/analog/AnalogOutput.cpp b/src/io/analog/AnalogOutput.cpp
@@ -150,7 +150,7 @@ AnalogOutput::onReadRequest(
   UA_Variant_setScalar(&in_x_val_opcua_variant, &in_x_val_opcua_value, &UA_TYPES[UA_TYPES_FLOAT]);
   UA_Server_writeValue(server, *node_id, in_x_val_opcua_variant);
   /* Some debug output. */
-  UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %f", __PRETTY_FUNCTION__, in_x_val);
+  UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %f", __PRETTY_FUNCTION__, in_x_val);
 }
 
 void
@@ -159,7 +159,7 @@ AnalogOutput::onWriteRequest(
   UA_NodeId const * node_id,
   float const voltage)
 {
-  UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: voltage = %0.2f", __PRETTY_FUNCTION__, voltage);
+  UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: voltage = %0.2f", __PRETTY_FUNCTION__, voltage);
   _on_write_request(voltage);
 }
 
diff --git a/src/io/button/UserButton.cpp b/src/io/button/UserButton.cpp
@@ -150,7 +150,7 @@ UserButton::onReadRequest(
   UA_Variant_setScalar(&in_x_val_opcua_variant, &in_x_val_opcua_value, &UA_TYPES[UA_TYPES_BOOLEAN]);
   UA_Server_writeValue(server, *node_id, in_x_val_opcua_variant);
   /* Some debug output. */
-  UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %d", __PRETTY_FUNCTION__, in_x_val);
+  UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %d", __PRETTY_FUNCTION__, in_x_val);
 }
 
 /**************************************************************************************
diff --git a/src/io/digital/DigitalInput.cpp b/src/io/digital/DigitalInput.cpp
@@ -131,7 +131,7 @@ DigitalInput::onReadRequest(
   UA_Variant_setScalar(&in_x_val_opcua_variant, &in_x_val_opcua_value, &UA_TYPES[UA_TYPES_BOOLEAN]);
   UA_Server_writeValue(server, *node_id, in_x_val_opcua_variant);
   /* Some debug output. */
-  UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %d", __PRETTY_FUNCTION__, in_x_val);
+  UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %d", __PRETTY_FUNCTION__, in_x_val);
 }
 
 /**************************************************************************************
diff --git a/src/io/led/Led.cpp b/src/io/led/Led.cpp
@@ -125,7 +125,7 @@ Led::onWriteRequest(
   UA_NodeId const * node_id,
   bool const value)
 {
-  UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %d", __PRETTY_FUNCTION__, value);
+  UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %d", __PRETTY_FUNCTION__, value);
   _on_set_led_state(value);
 }
 
diff --git a/src/io/pwm/PwmOutput.cpp b/src/io/pwm/PwmOutput.cpp
@@ -252,7 +252,7 @@ PwmOutput::onReadRequestPwmPeriod(
   UA_Variant_setScalar(&in_x_val_opcua_variant, &in_x_val_opcua_value, &UA_TYPES[UA_TYPES_UINT32]);
   UA_Server_writeValue(server, *node_id, in_x_val_opcua_variant);
   /* Some debug output. */
-  UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: pwm period = %d us", __PRETTY_FUNCTION__, _pwm_period_us);
+  UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: pwm period = %d us", __PRETTY_FUNCTION__, _pwm_period_us);
 }
 
 void
@@ -262,7 +262,7 @@ PwmOutput::onWriteRequestPwmPeriod(
   uint32_t const pwm_period_us)
 {
   _pwm_period_us = pwm_period_us;
-  UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: pwm period = %d us, pulse width = %d us", __PRETTY_FUNCTION__, _pwm_period_us, _pwm_pulse_width_us);
+  UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: pwm period = %d us, pulse width = %d us", __PRETTY_FUNCTION__, _pwm_period_us, _pwm_pulse_width_us);
   _set_pwm_func(_pwm_period_us, _pwm_pulse_width_us);
 }
 
@@ -280,7 +280,7 @@ PwmOutput::onReadRequestPwmPulseWidth(
   UA_Variant_setScalar(&in_x_val_opcua_variant, &in_x_val_opcua_value, &UA_TYPES[UA_TYPES_UINT32]);
   UA_Server_writeValue(server, *node_id, in_x_val_opcua_variant);
   /* Some debug output. */
-  UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: pwm pulse width = %d us", __PRETTY_FUNCTION__, _pwm_pulse_width_us);
+  UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: pwm pulse width = %d us", __PRETTY_FUNCTION__, _pwm_pulse_width_us);
 }
 
 void
@@ -290,7 +290,7 @@ PwmOutput::onWriteRequestPwmPulseWidth(
   uint32_t const pwm_pulse_width_us)
 {
   _pwm_pulse_width_us = pwm_pulse_width_us;
-  UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: pwm period = %d us, pulse width = %d us", __PRETTY_FUNCTION__, _pwm_period_us, _pwm_pulse_width_us);
+  UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: pwm period = %d us, pulse width = %d us", __PRETTY_FUNCTION__, _pwm_period_us, _pwm_pulse_width_us);
   _set_pwm_func(_pwm_period_us, _pwm_pulse_width_us);
 }
 
diff --git a/src/io/relay/Relay.cpp b/src/io/relay/Relay.cpp
@@ -125,7 +125,7 @@ Relay::onWriteRequest(
   UA_NodeId const * node_id,
   bool const value)
 {
-  UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %d", __PRETTY_FUNCTION__, value);
+  UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %d", __PRETTY_FUNCTION__, value);
   _on_set_relay_state(value);
 }
 
diff --git a/src/open62541.h b/src/open62541.h
@@ -2,8 +2,8 @@
  * visit http://open62541.org/ for information about this software
  * Git-Revision: v1.4.0-dirty
  */
-/*
 
+/*
  * Copyright (C) 2014-2021 the contributors as stated in the AUTHORS file
  *
  * This file is part of open62541. open62541 is free software: you can
@@ -57,7 +57,7 @@
  * ---------------
  * Changing the feature options has no effect on a pre-compiled library. */
 
-#define UA_LOGLEVEL 100
+#define UA_LOGLEVEL 300
 #ifndef UA_ENABLE_AMALGAMATION
 #define UA_ENABLE_AMALGAMATION
 #endif

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ AnalogInput::onReadRequest(`
`130`	`130`	`UA_Variant_setScalar(&in_x_val_opcua_variant, &in_x_val_opcua_value, &UA_TYPES[UA_TYPES_FLOAT]);`
`131`	`131`	`UA_Server_writeValue(server, *node_id, in_x_val_opcua_variant);`
`132`	`132`	`/* Some debug output. */`
`133`		`- UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %f", __PRETTY_FUNCTION__, in_x_val);`
	`133`	`+ UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %f", __PRETTY_FUNCTION__, in_x_val);`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`/**************************************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ AnalogOutput::onReadRequest(`
`150`	`150`	`UA_Variant_setScalar(&in_x_val_opcua_variant, &in_x_val_opcua_value, &UA_TYPES[UA_TYPES_FLOAT]);`
`151`	`151`	`UA_Server_writeValue(server, *node_id, in_x_val_opcua_variant);`
`152`	`152`	`/* Some debug output. */`
`153`		`- UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %f", __PRETTY_FUNCTION__, in_x_val);`
	`153`	`+ UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %f", __PRETTY_FUNCTION__, in_x_val);`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`void`
`@@ -159,7 +159,7 @@ AnalogOutput::onWriteRequest(`
`159`	`159`	`UA_NodeId const * node_id,`
`160`	`160`	`float const voltage)`
`161`	`161`	`{`
`162`		`- UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: voltage = %0.2f", __PRETTY_FUNCTION__, voltage);`
	`162`	`+ UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: voltage = %0.2f", __PRETTY_FUNCTION__, voltage);`
`163`	`163`	`_on_write_request(voltage);`
`164`	`164`	`}`
`165`	`165`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ UserButton::onReadRequest(`
`150`	`150`	`UA_Variant_setScalar(&in_x_val_opcua_variant, &in_x_val_opcua_value, &UA_TYPES[UA_TYPES_BOOLEAN]);`
`151`	`151`	`UA_Server_writeValue(server, *node_id, in_x_val_opcua_variant);`
`152`	`152`	`/* Some debug output. */`
`153`		`- UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %d", __PRETTY_FUNCTION__, in_x_val);`
	`153`	`+ UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %d", __PRETTY_FUNCTION__, in_x_val);`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`/**************************************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ DigitalInput::onReadRequest(`
`131`	`131`	`UA_Variant_setScalar(&in_x_val_opcua_variant, &in_x_val_opcua_value, &UA_TYPES[UA_TYPES_BOOLEAN]);`
`132`	`132`	`UA_Server_writeValue(server, *node_id, in_x_val_opcua_variant);`
`133`	`133`	`/* Some debug output. */`
`134`		`- UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %d", __PRETTY_FUNCTION__, in_x_val);`
	`134`	`+ UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %d", __PRETTY_FUNCTION__, in_x_val);`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`/**************************************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ Led::onWriteRequest(`
`125`	`125`	`UA_NodeId const * node_id,`
`126`	`126`	`bool const value)`
`127`	`127`	`{`
`128`		`- UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %d", __PRETTY_FUNCTION__, value);`
	`128`	`+ UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %d", __PRETTY_FUNCTION__, value);`
`129`	`129`	`_on_set_led_state(value);`
`130`	`130`	`}`
`131`	`131`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ PwmOutput::onReadRequestPwmPeriod(`
`252`	`252`	`UA_Variant_setScalar(&in_x_val_opcua_variant, &in_x_val_opcua_value, &UA_TYPES[UA_TYPES_UINT32]);`
`253`	`253`	`UA_Server_writeValue(server, *node_id, in_x_val_opcua_variant);`
`254`	`254`	`/* Some debug output. */`
`255`		`- UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: pwm period = %d us", __PRETTY_FUNCTION__, _pwm_period_us);`
	`255`	`+ UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: pwm period = %d us", __PRETTY_FUNCTION__, _pwm_period_us);`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`void`
`@@ -262,7 +262,7 @@ PwmOutput::onWriteRequestPwmPeriod(`
`262`	`262`	`uint32_t const pwm_period_us)`
`263`	`263`	`{`
`264`	`264`	`_pwm_period_us = pwm_period_us;`
`265`		`- UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: pwm period = %d us, pulse width = %d us", __PRETTY_FUNCTION__, _pwm_period_us, _pwm_pulse_width_us);`
	`265`	`+ UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: pwm period = %d us, pulse width = %d us", __PRETTY_FUNCTION__, _pwm_period_us, _pwm_pulse_width_us);`
`266`	`266`	`_set_pwm_func(_pwm_period_us, _pwm_pulse_width_us);`
`267`	`267`	`}`
`268`	`268`
`@@ -280,7 +280,7 @@ PwmOutput::onReadRequestPwmPulseWidth(`
`280`	`280`	`UA_Variant_setScalar(&in_x_val_opcua_variant, &in_x_val_opcua_value, &UA_TYPES[UA_TYPES_UINT32]);`
`281`	`281`	`UA_Server_writeValue(server, *node_id, in_x_val_opcua_variant);`
`282`	`282`	`/* Some debug output. */`
`283`		`- UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: pwm pulse width = %d us", __PRETTY_FUNCTION__, _pwm_pulse_width_us);`
	`283`	`+ UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: pwm pulse width = %d us", __PRETTY_FUNCTION__, _pwm_pulse_width_us);`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`void`
`@@ -290,7 +290,7 @@ PwmOutput::onWriteRequestPwmPulseWidth(`
`290`	`290`	`uint32_t const pwm_pulse_width_us)`
`291`	`291`	`{`
`292`	`292`	`_pwm_pulse_width_us = pwm_pulse_width_us;`
`293`		`- UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: pwm period = %d us, pulse width = %d us", __PRETTY_FUNCTION__, _pwm_period_us, _pwm_pulse_width_us);`
	`293`	`+ UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: pwm period = %d us, pulse width = %d us", __PRETTY_FUNCTION__, _pwm_period_us, _pwm_pulse_width_us);`
`294`	`294`	`_set_pwm_func(_pwm_period_us, _pwm_pulse_width_us);`
`295`	`295`	`}`
`296`	`296`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ Relay::onWriteRequest(`
`125`	`125`	`UA_NodeId const * node_id,`
`126`	`126`	`bool const value)`
`127`	`127`	`{`
`128`		`- UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %d", __PRETTY_FUNCTION__, value);`
	`128`	`+ UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: value = %d", __PRETTY_FUNCTION__, value);`
`129`	`129`	`_on_set_relay_state(value);`
`130`	`130`	`}`
`131`	`131`