Merge pull request #522 from tock/uncrustify-config-2025-06

Uncrustify: Update and include new config options

Author: ppannuto

examples/ble-uart/ble_nus.c

@@ -11,6 +11,7 @@
  */
 
 #include "ble_nus.h"
+
 #include "ble_srv_common.h"
 #include "sdk_common.h"
 
@@ -21,7 +22,7 @@
 #define BLE_NUS_MAX_TX_CHAR_LEN        BLE_NUS_MAX_DATA_LEN        /**< Maximum length of the TX Characteristic (in bytes). */
 
 #define NUS_BASE_UUID                  {{0x9E, 0xCA, 0xDC, 0x24, 0x0E, 0xE5, 0xA9, 0xE0, 0x93, 0xF3, 0xA3, 0xB5, 0x00, \
-      0x00, 0x40, 0x6E}}                                                                                                                  /**< Used vendor specific UUID. */
+            0x00, 0x40, 0x6E}}                                                                                                            /**< Used vendor specific UUID. */
 
 /**@brief Function for handling the @ref BLE_GAP_EVT_CONNECTED event from the S110 SoftDevice.
  *

examples/ble-uart/main.c

@@ -5,17 +5,15 @@
 #include <unistd.h>
 
 #include <ble_advdata.h>
+#include <eddystone.h>
 #include <nordic_common.h>
 #include <nrf_error.h>
-
-#include <eddystone.h>
 #include <simple_adv.h>
 #include <simple_ble.h>
 
-#include <libtock/net/nrf51_serialization.h>
-
 #include <libtock-sync/interface/console.h>
 #include <libtock/interface/console.h>
+#include <libtock/net/nrf51_serialization.h>
 #include <libtock/tock.h>
 
 #include "ble_nus.h"

examples/ip_sense/main.c

@@ -1,14 +1,13 @@
 #include <stdbool.h>
 #include <stdio.h>
 
+#include <libtock-sync/net/ieee802154.h>
+#include <libtock-sync/net/udp.h>
 #include <libtock-sync/sensors/ambient_light.h>
 #include <libtock-sync/sensors/humidity.h>
 #include <libtock-sync/sensors/temperature.h>
 #include <libtock-sync/services/alarm.h>
 
-#include <libtock-sync/net/ieee802154.h>
-#include <libtock-sync/net/udp.h>
-
 static unsigned char BUF_BIND_CFG[2 * sizeof(sock_addr_t)];
 
 void print_ipv6(ipv6_addr_t*);

examples/lua-hello/main.c

@@ -2,12 +2,12 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include <libtock-sync/services/alarm.h>
-
 #include <lua/lauxlib.h>
 #include <lua/lua.h>
 #include <lua/lualib.h>
 
+#include <libtock-sync/services/alarm.h>
+
 // POSIX wrapper for `nanosleep` to make this compilable and runnable on
 // Linux/OS X/BSD for testing.
 #if defined(__unix__)
@@ -18,6 +18,7 @@ void libtocksync_alarm_delay_ms(int ms) {
   ts.tv_nsec = (long)ms * 1000 * 1000;
   nanosleep(&ts, NULL);
 }
+
 #endif
 
 int main(void) {

examples/lvgl/lvgl_driver.c

@@ -1,8 +1,9 @@
+#include <lvgl/lvgl.h>
+
 #include <libtock-sync/display/screen.h>
 #include <libtock/sensors/touch.h>
 #include <libtock/services/alarm.h>
 #include <libtock/tock.h>
-#include <lvgl/lvgl.h>
 
 #include "lvgl_driver.h"
 

examples/lvgl/main.c

@@ -1,10 +1,10 @@
 #include <stdio.h>
 
+#include <lvgl/lvgl.h>
+
 #include <libtock-sync/display/screen.h>
 #include <libtock-sync/services/alarm.h>
 
-#include <lvgl/lvgl.h>
-
 #include "lvgl_driver.h"
 
 static uint32_t seconds = 0;
@@ -59,7 +59,6 @@ int main(void) {
       uint32_t time_till_next = lv_timer_handler();
       libtocksync_alarm_delay_ms(time_till_next);
     }
-
   } else {
     printf("lvgl init error: %s\n", tock_strrcode(status));
   }

examples/lwip_ethernet_tap/main.c

@@ -1,8 +1,8 @@
 /* vim: set sw=2 expandtab tw=80: */
 
-#include <libtock/services/alarm.h>
-#include <libtock/tock.h>
-#include <libtock/util/streaming_process_slice.h>
+#include <stdio.h>
+#include <string.h>
+
 #include <lwip/apps/httpd.h>
 #include <lwip/dhcp.h>
 #include <lwip/err.h>
@@ -11,8 +11,10 @@
 #include <lwip/prot/ethernet.h>
 #include <lwip/sys.h>
 #include <lwip/timeouts.h>
-#include <stdio.h>
-#include <string.h>
+
+#include <libtock/services/alarm.h>
+#include <libtock/tock.h>
+#include <libtock/util/streaming_process_slice.h>
 
 // ########## Settings
 
@@ -38,11 +40,11 @@
 
 const uint32_t tap_driver_num = 0x30007;
 
-#define debug_print(...)   \
-  do {                     \
-    if (DEBUG)             \
-    printf(__VA_ARGS__); \
-  } while (0)
+#define debug_print(...)       \
+        do {                   \
+          if (DEBUG)           \
+          printf(__VA_ARGS__); \
+        } while (0)
 
 // Transmission metadata feedback buffer len:
 #if TX_FRAME_INFO_ENABLE
@@ -61,9 +63,9 @@ static uint8_t tx_frame_buffer[ETHERNET_MTU];
 // to hold a streaming process slice header, and `RX_FRAME_BUFFER_FRAMES / 2`
 // Ethernet frames (encoded as TAP_DRIVER_FRAME_HEADER_LEN + payload, assumed to
 // be ETHERNET_MTU bytes).
-#define RX_FRAME_BUFFER_LEN \
-  STREAMING_PROCESS_SLICE_HEADER_LEN \
-  + ((ETHERNET_MTU + TAP_DRIVER_FRAME_HEADER_LEN) * (RX_FRAME_BUFFER_FRAMES / 2))
+#define RX_FRAME_BUFFER_LEN                \
+        STREAMING_PROCESS_SLICE_HEADER_LEN \
+        + ((ETHERNET_MTU + TAP_DRIVER_FRAME_HEADER_LEN) * (RX_FRAME_BUFFER_FRAMES / 2))
 static uint8_t rx_frames_streaming_buffer_a[RX_FRAME_BUFFER_LEN];
 static uint8_t rx_frames_streaming_buffer_b[RX_FRAME_BUFFER_LEN];
 

examples/music/main.c

@@ -28,7 +28,6 @@ int melody[] = {
   NOTE_G6, 4,  NOTE_F6, 4,  NOTE_E6, 4,  NOTE_D6, 4,
   NOTE_C6, 4,  NOTE_C6, 4,  NOTE_D6, 4,  NOTE_E6, 4,
   NOTE_D6, -4,  NOTE_C6, 8,  NOTE_C6, 2
-
 };
 
 #define TEMPO 114

examples/openthread/openthread_hello/main.c

@@ -1,4 +1,6 @@
 #include <assert.h>
+#include <stdio.h>
+#include <string.h>
 
 #include <libopenthread/platform/openthread-system.h>
 #include <libopenthread/platform/plat.h>
@@ -11,9 +13,6 @@
 
 #include <libtock/tock.h>
 
-#include <stdio.h>
-#include <string.h>
-
 // helper utility demonstrating network config setup
 static void setNetworkConfiguration(otInstance* aInstance);
 
@@ -60,7 +59,6 @@ int main(__attribute__((unused)) int argc, __attribute__((unused)) char* argv[])
     if (!otTaskletsArePending(instance) && !openthread_platform_pending_work()) {
       yield();
     }
-
   }
 
   return 0;
@@ -87,7 +85,6 @@ void setNetworkConfiguration(otInstance* aInstance) {
 
   otError error = otDatasetSetActive(aInstance, &aDataset);
   assert(error == 0);
-
 }
 
 static void stateChangeCallback(uint32_t flags, void* context) {
@@ -127,5 +124,4 @@ static void print_ip_addr(otInstance* instance) {
     otIp6AddressToString(&ip6_addr, addr_string, sizeof(addr_string));
     printf("%s\n", addr_string);
   }
-
 }

examples/openthread/openthread_udp_rx/main.c

@@ -1,4 +1,6 @@
 #include <assert.h>
+#include <stdio.h>
+#include <string.h>
 
 #include <libopenthread/platform/openthread-system.h>
 #include <libopenthread/platform/plat.h>
@@ -13,9 +15,6 @@
 
 #include <libtock/tock.h>
 
-#include <stdio.h>
-#include <string.h>
-
 #define UDP_PORT 1212
 
 static otUdpSocket sUdpSocket;
@@ -74,7 +73,6 @@ int main(__attribute__((unused)) int argc, __attribute__((unused)) char* argv[])
     if (!otTaskletsArePending(instance) && !openthread_platform_pending_work()) {
       yield();
     }
-
   }
 
   return 0;
@@ -101,7 +99,6 @@ void setNetworkConfiguration(otInstance* aInstance) {
 
   otError error = otDatasetSetActive(aInstance, &aDataset);
   assert(error == 0);
-
 }
 
 void initUdp(otInstance* aInstance) {
@@ -137,7 +134,6 @@ void handleUdpReceive(void* aContext, otMessage* aMessage,
   }
 
   printf("\n");
-
 }
 
 static void stateChangeCallback(uint32_t flags, void* context) {
@@ -177,5 +173,4 @@ static void print_ip_addr(otInstance* instance) {
     otIp6AddressToString(&ip6_addr, addr_string, sizeof(addr_string));
     printf("%s\n", addr_string);
   }
-
 }