riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sys/auto_init: update dht auto_init

Browse Source
This commit is contained in:
Alexandre Abadie 2018-02-28 16:34:28 +01:00
parent fffd6a2e07
commit d0b34af788
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/auto_init/saul/auto_init_dht.c
View File

@ -29,29 +29,36 @@
/** /**
* @brief Define the number of configured sensors * @brief Define the number of configured sensors
*/ */
#define DHT_NUMOF (sizeof(dht_params) / sizeof(dht_params[0])) #define DHT_NUM (sizeof(dht_params) / sizeof(dht_params[0]))
/** /**
* @brief Allocate memory for the device descriptors * @brief Allocate memory for the device descriptors
*/ */
static dht_t dht_devs[DHT_NUMOF]; static dht_t dht_devs[DHT_NUM];
/** /**
* @brief Import SAUL endpoints * @brief Memory for the SAUL registry entries
*/
static saul_reg_t saul_entries[DHT_NUM * 2];
/**
* @brief Define the number of saul info
*/
#define DHT_INFO_NUM (sizeof(dht_saul_info) / sizeof(dht_saul_info[0]))
/**
* @name Import SAUL endpoints
* @{ * @{
*/ */
extern const saul_driver_t dht_temp_saul_driver; extern const saul_driver_t dht_temp_saul_driver;
extern const saul_driver_t dht_hum_saul_driver; extern const saul_driver_t dht_hum_saul_driver;
/** @} */ /** @} */
/**
* @brief Memory for the SAUL registry entries
*/
static saul_reg_t saul_entries[DHT_NUMOF * 2];
void auto_init_dht(void) void auto_init_dht(void)
{ {
for (unsigned int i = 0; i < DHT_NUMOF; i++) { assert(DHT_INFO_NUM == DHT_NUM);
for (unsigned int i = 0; i < DHT_NUM; i++) {
LOG_DEBUG("[auto_init_saul] initializing dht #%u\n", i); LOG_DEBUG("[auto_init_saul] initializing dht #%u\n", i);
if (dht_init(&dht_devs[i], &dht_params[i]) != DHT_OK) { if (dht_init(&dht_devs[i], &dht_params[i]) != DHT_OK) {
@ -60,10 +67,10 @@ void auto_init_dht(void)
} }
saul_entries[(i * 2)].dev = &(dht_devs[i]); saul_entries[(i * 2)].dev = &(dht_devs[i]);
saul_entries[(i * 2)].name = dht_saul_reg_info[i].name; saul_entries[(i * 2)].name = dht_saul_info[i].name;
saul_entries[(i * 2)].driver = &dht_temp_saul_driver; saul_entries[(i * 2)].driver = &dht_temp_saul_driver;
saul_entries[(i * 2) + 1].dev = &(dht_devs[i]); saul_entries[(i * 2) + 1].dev = &(dht_devs[i]);
saul_entries[(i * 2) + 1].name = dht_saul_reg_info[i].name; saul_entries[(i * 2) + 1].name = dht_saul_info[i].name;
saul_entries[(i * 2) + 1].driver = &dht_hum_saul_driver; saul_entries[(i * 2) + 1].driver = &dht_hum_saul_driver;
saul_reg_add(&(saul_entries[(i * 2)])); saul_reg_add(&(saul_entries[(i * 2)]));
saul_reg_add(&(saul_entries[(i * 2) + 1])); saul_reg_add(&(saul_entries[(i * 2) + 1]));