Use feature groups

Show up in picotool info as well, and removes the arbitrary 0x1234 0x5678 tag and ID

Author: will-v-pi

binary_info/blink_any/blink_any.c

@@ -15,15 +15,18 @@
 // Note that LED_TYPE == 1 is only supported when initially compiled for
 // a board with PICO_CYW43_SUPPORTED (eg pico_w), else the required
 // libraries won't be present
+bi_decl(bi_program_feature_group(0x1111, 0, "LED Configuration"));
 #if defined(PICO_DEFAULT_LED_PIN)
-    bi_decl(bi_ptr_int32(0x1234, 0x5678, LED_TYPE, 0));
-    bi_decl(bi_ptr_int32(0x1234, 0x5678, LED_PIN, PICO_DEFAULT_LED_PIN));
+    // the tag and id are not important as picotool filters based on the
+    // variable name, so just set them to 0
+    bi_decl(bi_ptr_int32(0x1111, 0, LED_TYPE, 0));
+    bi_decl(bi_ptr_int32(0x1111, 0, LED_PIN, PICO_DEFAULT_LED_PIN));
 #elif defined(CYW43_WL_GPIO_LED_PIN)
-    bi_decl(bi_ptr_int32(0x1234, 0x5678, LED_TYPE, 1));
-    bi_decl(bi_ptr_int32(0x1234, 0x5678, LED_PIN, CYW43_WL_GPIO_LED_PIN));
+    bi_decl(bi_ptr_int32(0x1111, 0, LED_TYPE, 1));
+    bi_decl(bi_ptr_int32(0x1111, 0, LED_PIN, CYW43_WL_GPIO_LED_PIN));
 #else
-    bi_decl(bi_ptr_int32(0x1234, 0x5678, LED_TYPE, 0));
-    bi_decl(bi_ptr_int32(0x1234, 0x5678, LED_PIN, 25));
+    bi_decl(bi_ptr_int32(0x1111, 0, LED_TYPE, 0));
+    bi_decl(bi_ptr_int32(0x1111, 0, LED_PIN, 25));
 #endif
 
 #ifndef LED_DELAY_MS

binary_info/hello_anything/hello_anything.c

@@ -10,24 +10,28 @@
 #include "hardware/uart.h"
 
 int main() {
+    // create feature groups to group configuration settings
+    // these will also show up in picotool info, not just picotool config
+    bi_decl(bi_program_feature_group(0x1111, 0, "UART Configuration"));
+    bi_decl(bi_program_feature_group(0x1111, 1, "Enabled Interfaces"));
     // stdio_uart configuration and initialisation
-    bi_decl(bi_ptr_int32(0x1234, 1, use_uart, 1));
-    bi_decl(bi_ptr_int32(0x1234, 2, uart_num, 0));
-    bi_decl(bi_ptr_int32(0x1234, 3, uart_tx, 0));
-    bi_decl(bi_ptr_int32(0x1234, 4, uart_rx, 1));
-    bi_decl(bi_ptr_int32(0x1234, 5, uart_baud, 115200));
+    bi_decl(bi_ptr_int32(0x1111, 1, use_uart, 1));
+    bi_decl(bi_ptr_int32(0x1111, 0, uart_num, 0));
+    bi_decl(bi_ptr_int32(0x1111, 0, uart_tx, 0));
+    bi_decl(bi_ptr_int32(0x1111, 0, uart_rx, 1));
+    bi_decl(bi_ptr_int32(0x1111, 0, uart_baud, 115200));
     if (use_uart) {
         stdio_uart_init_full(UART_INSTANCE(uart_num), uart_baud, uart_tx, uart_rx);
     }
 
     // stdio_usb initialisation
-    bi_decl(bi_ptr_int32(0x1234, 6, use_usb, 1));
+    bi_decl(bi_ptr_int32(0x1111, 1, use_usb, 1));
     if (use_usb) {
         stdio_usb_init();
     }
 
     // default printed string
-    bi_decl(bi_ptr_string(0x1234, 7, text, "Hello, world!", 256));
+    bi_decl(bi_ptr_string(0, 0, text, "Hello, world!", 256));
 
     while (true) {
         printf("%s\n", text);