From 7cafe6cccb8b43d54f9bb309bc42246ad5cf1da7 Mon Sep 17 00:00:00 2001 From: Ronald Schaten Date: Mon, 11 Apr 2016 21:09:31 +0200 Subject: [PATCH] elegant array handling --- things/things.ino | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/things/things.ino b/things/things.ino index 38a44b1..7af355a 100644 --- a/things/things.ino +++ b/things/things.ino @@ -19,26 +19,23 @@ DeviceLdr deviceLdr(PIN_LDR); #define TYPE_DHT DHT22 DeviceDht deviceDht(PIN_DHT, TYPE_DHT); -Device * devices[3]; +Device* devices[] = { &deviceLed, &deviceLdr }; void setupHandler() { - for (int i = 0; i < 2; i++) { + for (int i = 0; i < sizeof(devices) / sizeof(*devices); i++) { devices[i]->deviceSetup(); } } void loopHandler() { - for (int i = 0; i < 2; i++) { + for (int i = 0; i < sizeof(devices) / sizeof(*devices); i++) { devices[i]->deviceLoop(); } } void setup() { Homie.setFirmware("things", "1.0.0"); - devices[0] = &deviceLed; - devices[1] = &deviceLdr; - //devices[2] = &deviceDht; - for (int i = 0; i < 2; i++) { + for (int i = 0; i < sizeof(devices) / sizeof(*devices); i++) { devices[i]->deviceRegister(); } Homie.setSetupFunction(setupHandler);