[Cleanup] Fix issues compile caused by uncrustify

Bbillyben · Jan 12, 2021 · d2c2038 · d2c2038
1 parent db02098
commit d2c2038
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 18 deletions.
diff --git a/src/_C001.ino b/src/_C001.ino
@@ -139,9 +139,9 @@ bool CPlugin_001(CPlugin::Function function, struct EventStruct *event, String&
 // Uncrustify may change this into multi line, which will result in failed builds
 // *INDENT-OFF*
 bool do_process_c001_delay_queue(int controller_number, const C001_queue_element& element, ControllerSettingsStruct& ControllerSettings);
-// *INDENT-ON*
 
 bool do_process_c001_delay_queue(int controller_number, const C001_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
+// *INDENT-ON*
   WiFiClient client;
 
   if (!try_connect_host(controller_number, client, ControllerSettings)) {

diff --git a/src/_C003.ino b/src/_C003.ino
@@ -78,9 +78,9 @@ bool CPlugin_003(CPlugin::Function function, struct EventStruct *event, String&
 // Uncrustify may change this into multi line, which will result in failed builds
 // *INDENT-OFF*
 bool do_process_c003_delay_queue(int controller_number, const C003_queue_element& element, ControllerSettingsStruct& ControllerSettings);
-// *INDENT-ON*
 
 bool do_process_c003_delay_queue(int controller_number, const C003_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
+// *INDENT-ON*
   bool success = false;
 
   // Use WiFiClient class to create TCP connections

diff --git a/src/_C004.ino b/src/_C004.ino
@@ -89,9 +89,9 @@ bool CPlugin_004(CPlugin::Function function, struct EventStruct *event, String&
 // Uncrustify may change this into multi line, which will result in failed builds
 // *INDENT-OFF*
 bool do_process_c004_delay_queue(int controller_number, const C004_queue_element& element, ControllerSettingsStruct& ControllerSettings);
-// *INDENT-ON*
 
 bool do_process_c004_delay_queue(int controller_number, const C004_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
+// *INDENT-ON*
   WiFiClient client;
 
   if (!try_connect_host(controller_number, client, ControllerSettings)) {

diff --git a/src/_C007.ino b/src/_C007.ino
@@ -84,9 +84,9 @@ bool CPlugin_007(CPlugin::Function function, struct EventStruct *event, String&
 // Uncrustify may change this into multi line, which will result in failed builds
 // *INDENT-OFF*
 bool do_process_c007_delay_queue(int controller_number, const C007_queue_element& element, ControllerSettingsStruct& ControllerSettings);
-// *INDENT-ON*
 
 bool do_process_c007_delay_queue(int controller_number, const C007_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
+// *INDENT-ON*
   WiFiClient client;
 
   if (!try_connect_host(controller_number, client, ControllerSettings)) {

diff --git a/src/_C008.ino b/src/_C008.ino
@@ -129,9 +129,9 @@ bool CPlugin_008(CPlugin::Function function, struct EventStruct *event, String&
 // Uncrustify may change this into multi line, which will result in failed builds
 // *INDENT-OFF*
 bool do_process_c008_delay_queue(int controller_number, const C008_queue_element& element, ControllerSettingsStruct& ControllerSettings);
-// *INDENT-ON*
 
 bool do_process_c008_delay_queue(int controller_number, const C008_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
+// *INDENT-ON*
   while (element.txt[element.valuesSent] == "") {
     // A non valid value, which we are not going to send.
     // Increase sent counter until a valid value is found.

diff --git a/src/_C009.ino b/src/_C009.ino
@@ -102,9 +102,9 @@ bool CPlugin_009(CPlugin::Function function, struct EventStruct *event, String&
 // Uncrustify may change this into multi line, which will result in failed builds
 // *INDENT-OFF*
 bool do_process_c009_delay_queue(int controller_number, const C009_queue_element& element, ControllerSettingsStruct& ControllerSettings);
-// *INDENT-ON*
 
 bool do_process_c009_delay_queue(int controller_number, const C009_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
+// *INDENT-ON*
   WiFiClient client;
 
   if (!try_connect_host(controller_number, client, ControllerSettings)) {

diff --git a/src/_C010.ino b/src/_C010.ino
@@ -121,9 +121,9 @@ bool CPlugin_010(CPlugin::Function function, struct EventStruct *event, String&
 // Uncrustify may change this into multi line, which will result in failed builds
 // *INDENT-OFF*
 bool do_process_c010_delay_queue(int controller_number, const C010_queue_element& element, ControllerSettingsStruct& ControllerSettings);
-// *INDENT-ON*
 
 bool do_process_c010_delay_queue(int controller_number, const C010_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
+// *INDENT-ON*
   while (element.txt[element.valuesSent] == "") {
     // A non valid value, which we are not going to send.
     // Increase sent counter until a valid value is found.

diff --git a/src/_C011.ino b/src/_C011.ino
@@ -183,9 +183,9 @@ bool CPlugin_011(CPlugin::Function function, struct EventStruct *event, String&
 // Uncrustify may change this into multi line, which will result in failed builds
 // *INDENT-OFF*
 bool do_process_c011_delay_queue(int controller_number, const C011_queue_element& element, ControllerSettingsStruct& ControllerSettings);
-// *INDENT-ON*
 
 bool do_process_c011_delay_queue(int controller_number, const C011_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
+// *INDENT-ON*
   WiFiClient client;
 
   if (!NetworkConnected()) { return false; }

diff --git a/src/_C012.ino b/src/_C012.ino
@@ -100,9 +100,9 @@ bool CPlugin_012(CPlugin::Function function, struct EventStruct *event, String&
 // Uncrustify may change this into multi line, which will result in failed builds
 // *INDENT-OFF*
 bool do_process_c012_delay_queue(int controller_number, const C012_queue_element& element, ControllerSettingsStruct& ControllerSettings);
-// *INDENT-ON*
 
 bool do_process_c012_delay_queue(int controller_number, const C012_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
+// *INDENT-ON*
   while (element.txt[element.valuesSent] == "") {
     // A non valid value, which we are not going to send.
     // Increase sent counter until a valid value is found.

diff --git a/src/_C015.ino b/src/_C015.ino
@@ -234,10 +234,9 @@ bool CPlugin_015(CPlugin::Function function, struct EventStruct *event, String&
 // Uncrustify may change this into multi line, which will result in failed builds
 // *INDENT-OFF*
 bool do_process_c015_delay_queue(int controller_plugin_number, const C015_queue_element& element, ControllerSettingsStruct& ControllerSettings);
-// *INDENT-ON*
 
-bool do_process_c015_delay_queue(int controller_plugin_number, const C015_queue_element& element,
-                                 ControllerSettingsStruct& ControllerSettings) {
+bool do_process_c015_delay_queue(int controller_plugin_number, const C015_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
+// *INDENT-ON*
   if (!Settings.ControllerEnabled[element.controller_idx]) {
     // controller has been disabled. Answer true to flush queue.
     return true;

diff --git a/src/_C016.ino b/src/_C016.ino
@@ -133,9 +133,9 @@ bool CPlugin_016(CPlugin::Function function, struct EventStruct *event, String&
 // Uncrustify may change this into multi line, which will result in failed builds
 // *INDENT-OFF*
 bool do_process_c016_delay_queue(int controller_number, const C016_queue_element& element, ControllerSettingsStruct& ControllerSettings);
-// *INDENT-ON*
 
 bool do_process_c016_delay_queue(int controller_number, const C016_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
+// *INDENT-ON*
   return true;
 
   // FIXME TD-er: Hand over data to wherever it needs to be.

diff --git a/src/_C017.ino b/src/_C017.ino
@@ -85,10 +85,10 @@ bool CPlugin_017(CPlugin::Function function, struct EventStruct *event, String&
 
 // Uncrustify may change this into multi line, which will result in failed builds
 // *INDENT-OFF*
-bool do_process_c017_delay_queue(int controller_number, const C017_queue_element &element, ControllerSettingsStruct &ControllerSettings);
-// *INDENT-ON*
+bool do_process_c017_delay_queue(int controller_number, const C017_queue_element& element, ControllerSettingsStruct& ControllerSettings);
 
 bool do_process_c017_delay_queue(int controller_number, const C017_queue_element& element, ControllerSettingsStruct& ControllerSettings)
+// *INDENT-ON*
 {
   if (element.valueCount == 0) {
     return true; // exit if we don't have anything to send.

diff --git a/src/_C018.ino b/src/_C018.ino
@@ -843,9 +843,9 @@ bool C018_init(struct EventStruct *event) {
 // Uncrustify may change this into multi line, which will result in failed builds
 // *INDENT-OFF*
 bool do_process_c018_delay_queue(int controller_number, const C018_queue_element& element, ControllerSettingsStruct& ControllerSettings);
-// *INDENT-ON*
 
 bool do_process_c018_delay_queue(int controller_number, const C018_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
+// *INDENT-ON*
   uint8_t pl           = (element.packed.length() / 2);
   float   airtime_ms   = C018_data->getLoRaAirTime(pl);
   bool    mustSetDelay = false;

diff --git a/src/src/ControllerQueue/C015_queue_element.h b/src/src/ControllerQueue/C015_queue_element.h
@@ -20,8 +20,7 @@ class C015_queue_element {
 
   C015_queue_element();
 
-  C015_queue_element(const struct EventStruct *event,
-                     byte                      value_count);
+  C015_queue_element(const struct EventStruct *event, byte value_count);
 
   bool   checkDone(bool succesfull) const;