From 0faaf298f5a02f3a945cbbec3da32d088721574e Mon Sep 17 00:00:00 2001 From: mdellen Date: Thu, 11 Jun 2015 18:28:46 +0200 Subject: [PATCH 1/5] =?UTF-8?q?changed=20=E2=80=9C\=E2=80=9D=20to=20?= =?UTF-8?q?=E2=80=9C/=E2=80=9C=20to=20work=20on=20OS=20X.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Nodo/Base.ino | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Nodo/Base.ino b/Nodo/Base.ino index 5bf05bd..d0b47f9 100644 --- a/Nodo/Base.ino +++ b/Nodo/Base.ino @@ -111,18 +111,18 @@ byte dummy=0; // t.b.v. includen Config_xx.c files #define stringify(x) #x -#define CONFIGFILE2(a, b) stringify(a\Config\b) +#define CONFIGFILE2(a, b) stringify(a/Config/b) #define CONFIGFILE(a, b) CONFIGFILE2(a, b) #include CONFIGFILE(SKETCH_PATH,CONFIG_FILE) #define stringify(x) #x -#define HARDWAREFILE2(a, b) stringify(a\Hardware\HW-b.h) +#define HARDWAREFILE2(a, b) stringify(a/Hardware/HW-b.h) #define HARDWAREFILE(a, b) HARDWAREFILE2(a, b) #include HARDWAREFILE(SKETCH_PATH,HARDWARE_CONFIG) // Tweede maal includen zodat HARDWARE_xxxx overruled regels worden geset. #define stringify(x) #x -#define CONFIGFILE2(a, b) stringify(a\Config\b) +#define CONFIGFILE2(a, b) stringify(a/Config/b) #define CONFIGFILE(a, b) CONFIGFILE2(a, b) #include CONFIGFILE(SKETCH_PATH,CONFIG_FILE) From a09a16d60b3d49f23db6b5e6dd6fc0eff2fec7b9 Mon Sep 17 00:00:00 2001 From: mdellen Date: Thu, 11 Jun 2015 18:29:08 +0200 Subject: [PATCH 2/5] Added LCD PLUGIN (021) --- Nodo/Config/Config_01.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/Nodo/Config/Config_01.c b/Nodo/Config/Config_01.c index b3626c4..0a44047 100644 --- a/Nodo/Config/Config_01.c +++ b/Nodo/Config/Config_01.c @@ -48,6 +48,31 @@ #define PLUGIN_023 // RGB-Led aansturing +#define PLUGIN_021 +#define PLUGIN_021_CORE 2 +#define PLUGIN_021_LABEL_04 "Alarm On" +#define PLUGIN_021_LABEL_05 "Alarm Off" +#define PLUGIN_021_LABEL_06 "Alarm Pending..." +#define PLUGIN_021_LABEL_07 "Intruder!" +#define PLUGIN_021_LABEL_08 "Alert!" +#define PLUGIN_021_LABEL_09 "Temp: " +#define PLUGIN_021_LABEL_10 "Hum: " +#define PLUGIN_021_LABEL_11 {0xDF, 0} +#define PLUGIN_021_LABEL_12 "%" +#define PLUGIN_021_LABEL_13 "" +#define PLUGIN_021_LABEL_14 "" +#define PLUGIN_021_LABEL_15 "" +#define PLUGIN_021_LABEL_16 "" +#define PLUGIN_021_LABEL_17 "" +#define PLUGIN_021_LABEL_18 "" +#define PLUGIN_021_LABEL_19 "" +#define PLUGIN_021_LABEL_20 "" +#define plugin_254 "" +#define plugin_254_CORE "" + + + + //======================================================================================================================= // Eventueel mogen hardware opties worden uitgeschakeld door remarks '//' voor onderstaande regels weg te halen // bijvoorbeeld om niet gebruike opties uit te schakelen en geheugenruimte vrij te maken voor plugins. From cb45e557b1c423849855bbe59b859c3b4378fd90 Mon Sep 17 00:00:00 2001 From: mdellen Date: Thu, 11 Jun 2015 18:29:27 +0200 Subject: [PATCH 3/5] Changed path and config to match setup --- Nodo/Nodo.ino | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Nodo/Nodo.ino b/Nodo/Nodo.ino index 1f2ca79..359038c 100644 --- a/Nodo/Nodo.ino +++ b/Nodo/Nodo.ino @@ -58,7 +58,7 @@ // compileren.Geef het volledige pad op. // Let op: Bij Linux/Unix zijn de namen case-sensitive. -#define SKETCH_PATH D:\User\Paul\GitHub\Nodo-Core\Nodo +#define SKETCH_PATH /Volumes/1 TB HDD/Dropbox/Arduino/Nodo-Core/Nodo/ // ################################### Stap-2 ##################################################### @@ -80,7 +80,7 @@ // In de config-file wordt tevens opgegeven welke plugins in de Nodo geladen moeten worden. // Kijk voor verdere info in de config-files. -#define CONFIG_FILE Config_16.c +#define CONFIG_FILE Config_01.c // ################################### Stap-3 ##################################################### @@ -101,7 +101,8 @@ // regel worden voorafgegaan door de comment tekens '//' om zo geheugen // te besparen. Voor een Nodo-Mega is het gebruik van een SDCard verplicht. -// #include + +#include // ################################### Stap-4 ##################################################### From 18c4d425de4901df7f678d9b770095a0ea80cd77 Mon Sep 17 00:00:00 2001 From: mdellen Date: Thu, 11 Jun 2015 18:30:21 +0200 Subject: [PATCH 4/5] =?UTF-8?q?=E2=80=9Cprog=5Fchar=E2=80=9D=20is=20deprec?= =?UTF-8?q?iated,=20changed=20to=20const=20char=20to=20work=20with=20Ardui?= =?UTF-8?q?no=20IDE=201.6.4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Nodo/Plugins/Plugin_021.c | 44 +++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/Nodo/Plugins/Plugin_021.c b/Nodo/Plugins/Plugin_021.c index 09f343f..001b81f 100644 --- a/Nodo/Plugins/Plugin_021.c +++ b/Nodo/Plugins/Plugin_021.c @@ -46,30 +46,30 @@ #define PLUGIN_ID 21 #define PLUGIN_NAME "LCDWrite" -prog_char PROGMEM LCD_01[] = "Nodo Domotica"; -prog_char PROGMEM LCD_02[] = "Mega R:%03d U:%d"; -prog_char PROGMEM LCD_03[] = "Small R:%03d U:%d"; -prog_char PROGMEM LCD_04[] = PLUGIN_021_LABEL_04; -prog_char PROGMEM LCD_05[] = PLUGIN_021_LABEL_05; -prog_char PROGMEM LCD_06[] = PLUGIN_021_LABEL_06; -prog_char PROGMEM LCD_07[] = PLUGIN_021_LABEL_07; -prog_char PROGMEM LCD_08[] = PLUGIN_021_LABEL_08; -prog_char PROGMEM LCD_09[] = PLUGIN_021_LABEL_09; -prog_char PROGMEM LCD_10[] = PLUGIN_021_LABEL_10; -prog_char PROGMEM LCD_11[] = PLUGIN_021_LABEL_11; -prog_char PROGMEM LCD_12[] = PLUGIN_021_LABEL_12; -prog_char PROGMEM LCD_13[] = PLUGIN_021_LABEL_13; -prog_char PROGMEM LCD_14[] = PLUGIN_021_LABEL_14; -prog_char PROGMEM LCD_15[] = PLUGIN_021_LABEL_15; -prog_char PROGMEM LCD_16[] = PLUGIN_021_LABEL_16; -prog_char PROGMEM LCD_17[] = PLUGIN_021_LABEL_17; -prog_char PROGMEM LCD_18[] = PLUGIN_021_LABEL_18; -prog_char PROGMEM LCD_19[] = PLUGIN_021_LABEL_19; -prog_char PROGMEM LCD_20[] = PLUGIN_021_LABEL_20; +const char PROGMEM LCD_01[] = "Nodo Domotica"; +const char PROGMEM LCD_02[] = "Mega R:%03d U:%d"; +const char PROGMEM LCD_03[] = "Small R:%03d U:%d"; +const char PROGMEM LCD_04[] = PLUGIN_021_LABEL_04; +const char PROGMEM LCD_05[] = PLUGIN_021_LABEL_05; +const char PROGMEM LCD_06[] = PLUGIN_021_LABEL_06; +const char PROGMEM LCD_07[] = PLUGIN_021_LABEL_07; +const char PROGMEM LCD_08[] = PLUGIN_021_LABEL_08; +const char PROGMEM LCD_09[] = PLUGIN_021_LABEL_09; +const char PROGMEM LCD_10[] = PLUGIN_021_LABEL_10; +const char PROGMEM LCD_11[] = PLUGIN_021_LABEL_11; +const char PROGMEM LCD_12[] = PLUGIN_021_LABEL_12; +const char PROGMEM LCD_13[] = PLUGIN_021_LABEL_13; +const char PROGMEM LCD_14[] = PLUGIN_021_LABEL_14; +const char PROGMEM LCD_15[] = PLUGIN_021_LABEL_15; +const char PROGMEM LCD_16[] = PLUGIN_021_LABEL_16; +const char PROGMEM LCD_17[] = PLUGIN_021_LABEL_17; +const char PROGMEM LCD_18[] = PLUGIN_021_LABEL_18; +const char PROGMEM LCD_19[] = PLUGIN_021_LABEL_19; +const char PROGMEM LCD_20[] = PLUGIN_021_LABEL_20; #define LCDI2C_MSG_MAX 20 -PROGMEM const char *LCDText_tabel[]={LCD_01,LCD_02,LCD_03,LCD_04,LCD_05,LCD_06,LCD_07,LCD_08,LCD_09,LCD_10,LCD_11,LCD_12,LCD_13,LCD_14,LCD_15,LCD_16,LCD_17,LCD_18,LCD_19,LCD_20}; +PROGMEM const char *const LCDText_tabel[]={LCD_01,LCD_02,LCD_03,LCD_04,LCD_05,LCD_06,LCD_07,LCD_08,LCD_09,LCD_10,LCD_11,LCD_12,LCD_13,LCD_14,LCD_15,LCD_16,LCD_17,LCD_18,LCD_19,LCD_20}; #define LCD_I2C_ADDRESS 0x27 @@ -259,7 +259,7 @@ boolean Plugin_021(byte function, struct NodoEventStruct *event, char *string) #if NODO_MEGA #ifdef ethernetserver_h case CMD_NODO_IP: // Display IP on Mega - sprintf(TempString,"%u.%u.%u.%u", EthernetNodo.localIP()[0],EthernetNodo.localIP()[1],EthernetNodo.localIP()[2],EthernetNodo.localIP()[3]); + //sprintf(TempString,"%u.%u.%u.%u", EthernetNodo.localIP()[0],EthernetNodo.localIP()[1],EthernetNodo.localIP()[2],EthernetNodo.localIP()[3]); break; case CMD_PORT_INPUT: // Display Port on Mega From bc744b7a39bb4486c743812746e6a97a9bfbf284 Mon Sep 17 00:00:00 2001 From: mdellen Date: Thu, 11 Jun 2015 18:59:41 +0200 Subject: [PATCH 5/5] revert back to original --- Nodo/Base.ino | 6 +++--- Nodo/Config/Config_01.c | 25 ------------------------- Nodo/Nodo.ino | 7 +++---- 3 files changed, 6 insertions(+), 32 deletions(-) diff --git a/Nodo/Base.ino b/Nodo/Base.ino index d0b47f9..5bf05bd 100644 --- a/Nodo/Base.ino +++ b/Nodo/Base.ino @@ -111,18 +111,18 @@ byte dummy=0; // t.b.v. includen Config_xx.c files #define stringify(x) #x -#define CONFIGFILE2(a, b) stringify(a/Config/b) +#define CONFIGFILE2(a, b) stringify(a\Config\b) #define CONFIGFILE(a, b) CONFIGFILE2(a, b) #include CONFIGFILE(SKETCH_PATH,CONFIG_FILE) #define stringify(x) #x -#define HARDWAREFILE2(a, b) stringify(a/Hardware/HW-b.h) +#define HARDWAREFILE2(a, b) stringify(a\Hardware\HW-b.h) #define HARDWAREFILE(a, b) HARDWAREFILE2(a, b) #include HARDWAREFILE(SKETCH_PATH,HARDWARE_CONFIG) // Tweede maal includen zodat HARDWARE_xxxx overruled regels worden geset. #define stringify(x) #x -#define CONFIGFILE2(a, b) stringify(a/Config/b) +#define CONFIGFILE2(a, b) stringify(a\Config\b) #define CONFIGFILE(a, b) CONFIGFILE2(a, b) #include CONFIGFILE(SKETCH_PATH,CONFIG_FILE) diff --git a/Nodo/Config/Config_01.c b/Nodo/Config/Config_01.c index 0a44047..b3626c4 100644 --- a/Nodo/Config/Config_01.c +++ b/Nodo/Config/Config_01.c @@ -48,31 +48,6 @@ #define PLUGIN_023 // RGB-Led aansturing -#define PLUGIN_021 -#define PLUGIN_021_CORE 2 -#define PLUGIN_021_LABEL_04 "Alarm On" -#define PLUGIN_021_LABEL_05 "Alarm Off" -#define PLUGIN_021_LABEL_06 "Alarm Pending..." -#define PLUGIN_021_LABEL_07 "Intruder!" -#define PLUGIN_021_LABEL_08 "Alert!" -#define PLUGIN_021_LABEL_09 "Temp: " -#define PLUGIN_021_LABEL_10 "Hum: " -#define PLUGIN_021_LABEL_11 {0xDF, 0} -#define PLUGIN_021_LABEL_12 "%" -#define PLUGIN_021_LABEL_13 "" -#define PLUGIN_021_LABEL_14 "" -#define PLUGIN_021_LABEL_15 "" -#define PLUGIN_021_LABEL_16 "" -#define PLUGIN_021_LABEL_17 "" -#define PLUGIN_021_LABEL_18 "" -#define PLUGIN_021_LABEL_19 "" -#define PLUGIN_021_LABEL_20 "" -#define plugin_254 "" -#define plugin_254_CORE "" - - - - //======================================================================================================================= // Eventueel mogen hardware opties worden uitgeschakeld door remarks '//' voor onderstaande regels weg te halen // bijvoorbeeld om niet gebruike opties uit te schakelen en geheugenruimte vrij te maken voor plugins. diff --git a/Nodo/Nodo.ino b/Nodo/Nodo.ino index 359038c..1f2ca79 100644 --- a/Nodo/Nodo.ino +++ b/Nodo/Nodo.ino @@ -58,7 +58,7 @@ // compileren.Geef het volledige pad op. // Let op: Bij Linux/Unix zijn de namen case-sensitive. -#define SKETCH_PATH /Volumes/1 TB HDD/Dropbox/Arduino/Nodo-Core/Nodo/ +#define SKETCH_PATH D:\User\Paul\GitHub\Nodo-Core\Nodo // ################################### Stap-2 ##################################################### @@ -80,7 +80,7 @@ // In de config-file wordt tevens opgegeven welke plugins in de Nodo geladen moeten worden. // Kijk voor verdere info in de config-files. -#define CONFIG_FILE Config_01.c +#define CONFIG_FILE Config_16.c // ################################### Stap-3 ##################################################### @@ -101,8 +101,7 @@ // regel worden voorafgegaan door de comment tekens '//' om zo geheugen // te besparen. Voor een Nodo-Mega is het gebruik van een SDCard verplicht. - -#include +// #include // ################################### Stap-4 #####################################################