From ddbbf71c49df548f07103b82a87ff5e0e1ea2e77 Mon Sep 17 00:00:00 2001
From: Alexandre Abadie <alexandre.abadie@inria.fr>
Date: Wed, 28 Feb 2018 16:51:05 +0100
Subject: [PATCH 1/2] drivers/grove_ledbar: use new driver params scheme

---
 .../include/grove_ledbar_params.h             | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/drivers/grove_ledbar/include/grove_ledbar_params.h b/drivers/grove_ledbar/include/grove_ledbar_params.h
index f9089595c0..bd0020c710 100644
--- a/drivers/grove_ledbar/include/grove_ledbar_params.h
+++ b/drivers/grove_ledbar/include/grove_ledbar_params.h
@@ -54,23 +54,24 @@ extern "C"
 /**
  * @brief   Default parameter settings
  */
-#define GROVE_LEDBAR_PARAMS {       \
-    .leds       = 10,               \
-    .dir        = GROVE_LEDBAR_DIR, \
-    .clk        = GROVE_LEDBAR_CLK, \
-    .dat        = GROVE_LEDBAR_DAT, \
-}
+#ifndef GROVE_LEDBAR_PARAMS
+#define GROVE_LEDBAR_PARAMS     { .leds = 10,               \
+                                  .dir  = GROVE_LEDBAR_DIR, \
+                                  .clk  = GROVE_LEDBAR_CLK, \
+                                  .dat  = GROVE_LEDBAR_DAT }
+#endif
+
+/**
+ * @brief   SAUL info
+ */
+#define GROVE_LEDBAR_SAUL_INFO  { .name = "Grove LED bar" }
 
 /**
  * @brief   Grove LED bar configuration
  */
 static const grove_ledbar_params_t grove_ledbar_params[] =
 {
-#ifdef GROVE_LEDBAR_CUSTOM
-    GROVE_LEDBAR_CUSTOM,
-#else
     GROVE_LEDBAR_PARAMS,
-#endif
 };
 
 /**
@@ -78,9 +79,7 @@ static const grove_ledbar_params_t grove_ledbar_params[] =
  */
 static const saul_reg_info_t grove_ledbar_saul_info[] =
 {
-    {
-        .name = "Grove LED bar"
-    }
+    GROVE_LEDBAR_SAUL_INFO
 };
 
 #ifdef __cplusplus

From 9f120f2ad6da9b3063d977eb7a13e6f39a36c19e Mon Sep 17 00:00:00 2001
From: Alexandre Abadie <alexandre.abadie@inria.fr>
Date: Wed, 28 Feb 2018 16:44:53 +0100
Subject: [PATCH 2/2] sys/auto_init: update grove_ledbar auto_init

---
 sys/auto_init/saul/auto_init_grove_ledbar.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/sys/auto_init/saul/auto_init_grove_ledbar.c b/sys/auto_init/saul/auto_init_grove_ledbar.c
index 6c64497038..0afa7b4fcf 100644
--- a/sys/auto_init/saul/auto_init_grove_ledbar.c
+++ b/sys/auto_init/saul/auto_init_grove_ledbar.c
@@ -42,6 +42,11 @@ static grove_ledbar_t grove_ledbar_devs[GROVE_LEDBAR_NUM];
  */
 static saul_reg_t saul_entries[GROVE_LEDBAR_NUM];
 
+/**
+ * @brief   Define the number of saul info
+ */
+#define GROVE_LEDBAR_INFO_NUM (sizeof(grove_ledbar_saul_info) / sizeof(grove_ledbar_saul_info[0]))
+
 /**
  * @brief   Reference the driver struct
  */
@@ -49,6 +54,8 @@ extern const saul_driver_t grove_ledbar_saul_driver;
 
 void auto_init_grove_ledbar(void)
 {
+    assert(GROVE_LEDBAR_NUM == GROVE_LEDBAR_INFO_NUM);
+
     for (unsigned i = 0; i < GROVE_LEDBAR_NUM; i++) {
         LOG_DEBUG("[auto_init_saul] initializing Grove LED bar #%u: ", i);