diff --git a/LICENSE b/LICENSE index 794d075..379b76e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) [2021] [Jomelo] +Copyright (c) [2021] [Nils Feldkämper] Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 470043a..20a65f4 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ Images: MIT License -Copyright (c) [2021] [Jomelo] +Copyright (c) [2021] [Nils Feldkämper] Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/examples/00_beginners/LCDML_000_serialMonitor/LCDML_000_serialMonitor.ino b/examples/00_beginners/LCDML_000_serialMonitor/LCDML_000_serialMonitor.ino index 3d01025..20667c0 100644 --- a/examples/00_beginners/LCDML_000_serialMonitor/LCDML_000_serialMonitor.ino +++ b/examples/00_beginners/LCDML_000_serialMonitor/LCDML_000_serialMonitor.ino @@ -44,15 +44,6 @@ LCDMenuLib2_menu LCDML_0 (255, 0, 0, NULL, NULL); // root menu element (do not change) LCDMenuLib2 LCDML(LCDML_0, _LCDML_DISP_rows-_LCDML_DSIP_use_header, _LCDML_DISP_cols, lcdml_menu_display, lcdml_menu_clear, lcdml_menu_control); -// ********************************************************************* -// LCDML MENU/DISP -// ********************************************************************* - // LCDML_0 => layer 0 - // LCDML_0_X => layer 1 - // LCDML_0_X_X => layer 2 - // LCDML_0_X_X_X => layer 3 - // LCDML_0_... => layer ... - // ********************************************************************* // LCDML MENU/DISP // ********************************************************************* @@ -85,7 +76,7 @@ // Example for one function and different parameters // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ... // the parameter change can also be released with dynParams on the next example - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (16 , LCDML_0 , 5 , NULL, "Parameter" , NULL, 0, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (17 , LCDML_0_5 , 1 , NULL, "Parameter 1" , mFunc_para, 10, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (18 , LCDML_0_5 , 2 , NULL, "Parameter 2" , mFunc_para, 20, _LCDML_TYPE_default); // NULL = no menu function @@ -97,13 +88,13 @@ // 1. set the string to "" // 2. use type _LCDML_TYPE_dynParam instead of _LCDML_TYPE_default // this function type can not be used in combination with different parameters - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (21 , LCDML_0 , 6 , NULL, "" , mDyn_para, 0, _LCDML_TYPE_dynParam); // NULL = no menu function // Example for conditions (for example for a screensaver) // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed // 2. set the function name as callback (remove the braces '()' it gives bad errors) - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (22 , LCDML_0 , 7 , COND_hide, "screensaver" , mFunc_screensaver, 0, _LCDML_TYPE_default); // this menu function can be found on "LCDML_display_menuFunction" tab // Example function for event handling (only serial output in this example) diff --git a/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_001_liquidCrystal.ino b/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_001_liquidCrystal.ino index 744893c..ea6a328 100644 --- a/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_001_liquidCrystal.ino +++ b/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_001_liquidCrystal.ino @@ -98,7 +98,7 @@ // Example for one function and different parameters // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ... // the parameter change can also be released with dynParams on the next example - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (16 , LCDML_0 , 5 , NULL, "Parameter" , NULL, 0, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (17 , LCDML_0_5 , 1 , NULL, "Parameter 1" , mFunc_para, 10, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (18 , LCDML_0_5 , 2 , NULL, "Parameter 2" , mFunc_para, 20, _LCDML_TYPE_default); // NULL = no menu function @@ -110,13 +110,13 @@ // 1. set the string to "" // 2. use type _LCDML_TYPE_dynParam instead of _LCDML_TYPE_default // this function type can not be used in combination with different parameters - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (21 , LCDML_0 , 6 , NULL, "" , mDyn_para, 0, _LCDML_TYPE_dynParam); // NULL = no menu function // Example for conditions (for example for a screensaver) // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed // 2. set the function name as callback (remove the braces '()' it gives bad errors) - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (22 , LCDML_0 , 7 , COND_hide, "screensaver" , mFunc_screensaver, 0, _LCDML_TYPE_default); // this menu function can be found on "LCDML_display_menuFunction" tab // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element. diff --git a/examples/01_backend/LCDML_010_simpleThread/LCDML_010_simpleThread.ino b/examples/01_backend/LCDML_010_simpleThread/LCDML_010_simpleThread.ino index 8060947..fe9ea8f 100644 --- a/examples/01_backend/LCDML_010_simpleThread/LCDML_010_simpleThread.ino +++ b/examples/01_backend/LCDML_010_simpleThread/LCDML_010_simpleThread.ino @@ -53,15 +53,6 @@ LCDMenuLib2_menu LCDML_0 (255, 0, 0, NULL, NULL); // root menu element (do not change) LCDMenuLib2 LCDML(LCDML_0, _LCDML_DISP_rows, _LCDML_DISP_cols, lcdml_menu_display, lcdml_menu_clear, lcdml_menu_control); -// ********************************************************************* -// LCDML MENU/DISP -// ********************************************************************* - // LCDML_0 => layer 0 - // LCDML_0_X => layer 1 - // LCDML_0_X_X => layer 2 - // LCDML_0_X_X_X => layer 3 - // LCDML_0_... => layer ... - // ********************************************************************* // LCDML MENU/DISP // ********************************************************************* @@ -94,7 +85,7 @@ // Example for one function and different parameters // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ... // the parameter change can also be released with dynParams on the next example - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (16 , LCDML_0 , 5 , NULL, "Parameter" , NULL, 0, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (17 , LCDML_0_5 , 1 , NULL, "Parameter 1" , mFunc_para, 10, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (18 , LCDML_0_5 , 2 , NULL, "Parameter 2" , mFunc_para, 20, _LCDML_TYPE_default); // NULL = no menu function @@ -106,13 +97,13 @@ // 1. set the string to "" // 2. use type _LCDML_TYPE_dynParam instead of _LCDML_TYPE_default // this function type can not be used in combination with different parameters - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (21 , LCDML_0 , 6 , NULL, "" , mDyn_para, 0, _LCDML_TYPE_dynParam); // NULL = no menu function // Example for conditions (for example for a screensaver) // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed // 2. set the function name as callback (remove the braces '()' it gives bad errors) - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (22 , LCDML_0 , 7 , COND_hide, "screensaver" , mFunc_screensaver, 0, _LCDML_TYPE_default); // this menu function can be found on "LCDML_display_menuFunction" tab // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element. diff --git a/examples/01_backend/LCDML_011_TaskScheduler/LCDML_011_TaskScheduler.ino b/examples/01_backend/LCDML_011_TaskScheduler/LCDML_011_TaskScheduler.ino index 9a270f0..84eb026 100644 --- a/examples/01_backend/LCDML_011_TaskScheduler/LCDML_011_TaskScheduler.ino +++ b/examples/01_backend/LCDML_011_TaskScheduler/LCDML_011_TaskScheduler.ino @@ -48,15 +48,6 @@ LCDMenuLib2_menu LCDML_0 (255, 0, 0, NULL, NULL); // root menu element (do not change) LCDMenuLib2 LCDML(LCDML_0, _LCDML_DISP_rows, _LCDML_DISP_cols, lcdml_menu_display, lcdml_menu_clear, lcdml_menu_control); -// ********************************************************************* -// LCDML MENU/DISP -// ********************************************************************* - // LCDML_0 => layer 0 - // LCDML_0_X => layer 1 - // LCDML_0_X_X => layer 2 - // LCDML_0_X_X_X => layer 3 - // LCDML_0_... => layer ... - // ********************************************************************* // LCDML MENU/DISP // ********************************************************************* @@ -89,7 +80,7 @@ // Example for one function and different parameters // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ... // the parameter change can also be released with dynParams on the next example - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (16 , LCDML_0 , 5 , NULL, "Parameter" , NULL, 0, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (17 , LCDML_0_5 , 1 , NULL, "Parameter 1" , mFunc_para, 10, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (18 , LCDML_0_5 , 2 , NULL, "Parameter 2" , mFunc_para, 20, _LCDML_TYPE_default); // NULL = no menu function @@ -101,13 +92,13 @@ // 1. set the string to "" // 2. use type _LCDML_TYPE_dynParam instead of _LCDML_TYPE_default // this function type can not be used in combination with different parameters - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (21 , LCDML_0 , 6 , NULL, "" , mDyn_para, 0, _LCDML_TYPE_dynParam); // NULL = no menu function // Example for conditions (for example for a screensaver) // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed // 2. set the function name as callback (remove the braces '()' it gives bad errors) - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (22 , LCDML_0 , 7 , COND_hide, "screensaver" , mFunc_screensaver, 0, _LCDML_TYPE_default); // this menu function can be found on "LCDML_display_menuFunction" tab // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element. diff --git a/examples/02_functionality/LCDML_020_filelist/LCDML_020_filelist.ino b/examples/02_functionality/LCDML_020_filelist/LCDML_020_filelist.ino index c213028..ff3a437 100644 --- a/examples/02_functionality/LCDML_020_filelist/LCDML_020_filelist.ino +++ b/examples/02_functionality/LCDML_020_filelist/LCDML_020_filelist.ino @@ -43,15 +43,6 @@ LCDMenuLib2_menu LCDML_0 (255, 0, 0, NULL, NULL); // root menu element (do not change) LCDMenuLib2 LCDML(LCDML_0, _LCDML_DISP_rows, _LCDML_DISP_cols, lcdml_menu_display, lcdml_menu_clear, lcdml_menu_control); -// ********************************************************************* -// LCDML MENU/DISP -// ********************************************************************* - // LCDML_0 => layer 0 - // LCDML_0_X => layer 1 - // LCDML_0_X_X => layer 2 - // LCDML_0_X_X_X => layer 3 - // LCDML_0_... => layer ... - // ********************************************************************* // LCDML MENU/DISP // ********************************************************************* @@ -84,7 +75,7 @@ // Example for one function and different parameters // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ... // the parameter change can also be released with dynParams on the next example - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (16 , LCDML_0 , 5 , NULL, "Parameter" , NULL, 0, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (17 , LCDML_0_5 , 1 , NULL, "Parameter 1" , mFunc_para, 10, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (18 , LCDML_0_5 , 2 , NULL, "Parameter 2" , mFunc_para, 20, _LCDML_TYPE_default); // NULL = no menu function @@ -96,13 +87,13 @@ // 1. set the string to "" // 2. use type _LCDML_TYPE_dynParam instead of _LCDML_TYPE_default // this function type can not be used in combination with different parameters - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (21 , LCDML_0 , 6 , NULL, "" , mDyn_para, 0, _LCDML_TYPE_dynParam); // NULL = no menu function // Example for conditions (for example for a screensaver) // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed // 2. set the function name as callback (remove the braces '()' it gives bad errors) - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (22 , LCDML_0 , 7 , COND_hide, "screensaver" , mFunc_screensaver, 0, _LCDML_TYPE_default); // this menu function can be found on "LCDML_display_menuFunction" tab // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element. diff --git a/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_021_dynUpdatedContent.ino b/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_021_dynUpdatedContent.ino index 2b11735..b19c626 100644 --- a/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_021_dynUpdatedContent.ino +++ b/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_021_dynUpdatedContent.ino @@ -88,7 +88,7 @@ // Example for one function and different parameters // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ... // the parameter change can also be released with dynParams on the next example - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (16 , LCDML_0 , 5 , NULL, "Parameter" , NULL, 0, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (17 , LCDML_0_5 , 1 , NULL, "Parameter 1" , mFunc_para, 10, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (18 , LCDML_0_5 , 2 , NULL, "Parameter 2" , mFunc_para, 20, _LCDML_TYPE_default); // NULL = no menu function @@ -100,7 +100,7 @@ // 1. set the string to "" // 2. use type _LCDML_TYPE_dynParam instead of _LCDML_TYPE_default // this function type can not be used in combination with different parameters - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (21 , LCDML_0 , 6 , NULL, "" , mDyn_para, 0, _LCDML_TYPE_dynParam); // NULL = no menu function // 2. Example for dyn content @@ -113,7 +113,7 @@ // Example for conditions (for example for a screensaver) // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed // 2. set the function name as callback (remove the braces '()' it gives bad errors) - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (23 , LCDML_0 , 8 , COND_hide, "screensaver" , mFunc_screensaver, 0, _LCDML_TYPE_default); // this menu function can be found on "LCDML_display_menuFunction" tab // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element. diff --git a/examples/02_functionality/LCDML_022_multiLanguage/LCDML_022_multiLanguage.ino b/examples/02_functionality/LCDML_022_multiLanguage/LCDML_022_multiLanguage.ino index 2dac7e8..6ed59af 100644 --- a/examples/02_functionality/LCDML_022_multiLanguage/LCDML_022_multiLanguage.ino +++ b/examples/02_functionality/LCDML_022_multiLanguage/LCDML_022_multiLanguage.ino @@ -45,15 +45,6 @@ LCDMenuLib2_menu LCDML_0 (255, 0, 0, NULL, NULL); // root menu element (do not change) LCDMenuLib2 LCDML(LCDML_0, _LCDML_DISP_rows, _LCDML_DISP_cols, lcdml_menu_display, lcdml_menu_clear, lcdml_menu_control); -// ********************************************************************* -// LCDML MENU/DISP -// ********************************************************************* - // LCDML_0 => layer 0 - // LCDML_0_X => layer 1 - // LCDML_0_X_X => layer 2 - // LCDML_0_X_X_X => layer 3 - // LCDML_0_... => layer ... - // ********************************************************************* // LCDML MENU/DISP // ********************************************************************* @@ -119,7 +110,7 @@ // Example for one function and different parameters // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ... // the parameter change can also be released with dynParams on the next example - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (16 , LCDML_0 , 5 , NULL, "Parameter" , NULL, 0, _LCDML_TYPE_default); // NULL = no menu function LCDML_langDef (16, DE, "Parameter"); @@ -139,7 +130,7 @@ // 1. set the string to "" // 2. use type _LCDML_TYPE_dynParam instead of _LCDML_TYPE_default // this function type can not be used in combination with different parameters - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (21 , LCDML_0 , 6 , NULL, "" , mDyn_para, 0, _LCDML_TYPE_dynParam); // NULL = no menu function LCDML_langDef (21, DE, ""); @@ -147,7 +138,7 @@ // Example for conditions (for example for a screensaver) // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed // 2. set the function name as callback (remove the braces '()' it gives bad errors) - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (22 , LCDML_0 , 7 , COND_hide, "" , mFunc_screensaver, 0, _LCDML_TYPE_default); // this menu function can be found on "LCDML_display_menuFunction" tab LCDML_langDef (22, DE, ""); diff --git a/examples/02_functionality/LCDML_024_condetions/LCDML_024_condetions.ino b/examples/02_functionality/LCDML_024_condetions/LCDML_024_condetions.ino index f188feb..3c16bab 100644 --- a/examples/02_functionality/LCDML_024_condetions/LCDML_024_condetions.ino +++ b/examples/02_functionality/LCDML_024_condetions/LCDML_024_condetions.ino @@ -55,9 +55,6 @@ // LCDML_0_X_X_X => layer 3 // LCDML_0_... => layer ... - - - // For beginners // LCDML_add(id, prev_layer, new_num, lang_char_array, callback_function) LCDML_add (0 , LCDML_0 , 1 , "Information" , mFunc_information); // this menu function can be found on "LCDML_display_menuFunction" tab @@ -73,13 +70,13 @@ // 1. set the string to "" // 2. use type _LCDML_TYPE_dynParam instead of _LCDML_TYPE_default // this function type can not be used in combination with different parameters - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (8 , LCDML_0 , 5 , NULL, "" , mDyn_change_condetion, 0, _LCDML_TYPE_dynParam); // NULL = no menu function // Example for conditions (for example for a screensaver) // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed // 2. set the function name as callback (remove the braces '()' it gives bad errors) - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (9 , LCDML_0 , 6 , COND_hide, "screensaver" , mFunc_screensaver, 0, _LCDML_TYPE_default); // this menu function can be found on "LCDML_display_menuFunction" tab diff --git a/examples/03_displaytypes/lcd/LCDML_i2c_display_20x4/LCDML_i2c_display_20x4.ino b/examples/03_displaytypes/01_lcd/LCDML_03011_i2c_display_20x4/LCDML_03011_i2c_display_20x4.ino similarity index 100% rename from examples/03_displaytypes/lcd/LCDML_i2c_display_20x4/LCDML_i2c_display_20x4.ino rename to examples/03_displaytypes/01_lcd/LCDML_03011_i2c_display_20x4/LCDML_03011_i2c_display_20x4.ino diff --git a/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_control.ino b/examples/03_displaytypes/01_lcd/LCDML_03011_i2c_display_20x4/LCDML_control.ino similarity index 100% rename from examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_control.ino rename to examples/03_displaytypes/01_lcd/LCDML_03011_i2c_display_20x4/LCDML_control.ino diff --git a/examples/03_displaytypes/lcd/LCDML_i2c_display_20x4/LCDML_display_menu.ino b/examples/03_displaytypes/01_lcd/LCDML_03011_i2c_display_20x4/LCDML_display_menu.ino similarity index 100% rename from examples/03_displaytypes/lcd/LCDML_i2c_display_20x4/LCDML_display_menu.ino rename to examples/03_displaytypes/01_lcd/LCDML_03011_i2c_display_20x4/LCDML_display_menu.ino diff --git a/examples/03_displaytypes/lcd/LCDML_i2c_display_20x4/LCDML_display_menuFunction.ino b/examples/03_displaytypes/01_lcd/LCDML_03011_i2c_display_20x4/LCDML_display_menuFunction.ino similarity index 100% rename from examples/03_displaytypes/lcd/LCDML_i2c_display_20x4/LCDML_display_menuFunction.ino rename to examples/03_displaytypes/01_lcd/LCDML_03011_i2c_display_20x4/LCDML_display_menuFunction.ino diff --git a/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_liquidcrystal_20x4.ino b/examples/03_displaytypes/01_lcd/LCDML_03012_liquidcrystal_20x4/LCDML_03012_liquidcrystal_20x4.ino similarity index 95% rename from examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_liquidcrystal_20x4.ino rename to examples/03_displaytypes/01_lcd/LCDML_03012_liquidcrystal_20x4/LCDML_03012_liquidcrystal_20x4.ino index a3b7dd2..c08ee51 100644 --- a/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_liquidcrystal_20x4.ino +++ b/examples/03_displaytypes/01_lcd/LCDML_03012_liquidcrystal_20x4/LCDML_03012_liquidcrystal_20x4.ino @@ -94,7 +94,7 @@ // Example for one function and different parameters // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ... // the parameter change can also be released with dynParams on the next example - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (16 , LCDML_0 , 5 , NULL, "Parameter" , NULL, 0, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (17 , LCDML_0_5 , 1 , NULL, "Parameter 1" , mFunc_para, 10, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (18 , LCDML_0_5 , 2 , NULL, "Parameter 2" , mFunc_para, 20, _LCDML_TYPE_default); // NULL = no menu function @@ -106,13 +106,13 @@ // 1. set the string to "" // 2. use type _LCDML_TYPE_dynParam instead of _LCDML_TYPE_default // this function type can not be used in combination with different parameters - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (21 , LCDML_0 , 6 , NULL, "" , mDyn_para, 0, _LCDML_TYPE_dynParam); // NULL = no menu function // Example for conditions (for example for a screensaver) // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed // 2. set the function name as callback (remove the braces '()' it gives bad errors) - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (22 , LCDML_0 , 7 , COND_hide, "screensaver" , mFunc_screensaver, 0, _LCDML_TYPE_default); // this menu function can be found on "LCDML_display_menuFunction" tab // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element. diff --git a/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_condition.ino b/examples/03_displaytypes/01_lcd/LCDML_03012_liquidcrystal_20x4/LCDML_condition.ino similarity index 100% rename from examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_condition.ino rename to examples/03_displaytypes/01_lcd/LCDML_03012_liquidcrystal_20x4/LCDML_condition.ino diff --git a/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_control.ino b/examples/03_displaytypes/01_lcd/LCDML_03012_liquidcrystal_20x4/LCDML_control.ino similarity index 100% rename from examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_control.ino rename to examples/03_displaytypes/01_lcd/LCDML_03012_liquidcrystal_20x4/LCDML_control.ino diff --git a/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_display_dynFunction.ino b/examples/03_displaytypes/01_lcd/LCDML_03012_liquidcrystal_20x4/LCDML_display_dynFunction.ino similarity index 100% rename from examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_display_dynFunction.ino rename to examples/03_displaytypes/01_lcd/LCDML_03012_liquidcrystal_20x4/LCDML_display_dynFunction.ino diff --git a/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_display_menu.ino b/examples/03_displaytypes/01_lcd/LCDML_03012_liquidcrystal_20x4/LCDML_display_menu.ino similarity index 100% rename from examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_display_menu.ino rename to examples/03_displaytypes/01_lcd/LCDML_03012_liquidcrystal_20x4/LCDML_display_menu.ino diff --git a/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_display_menuFunction.ino b/examples/03_displaytypes/01_lcd/LCDML_03012_liquidcrystal_20x4/LCDML_display_menuFunction.ino similarity index 100% rename from examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_display_menuFunction.ino rename to examples/03_displaytypes/01_lcd/LCDML_03012_liquidcrystal_20x4/LCDML_display_menuFunction.ino diff --git a/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_u8g2lib.ino b/examples/03_displaytypes/02_glcd/LCDML_03021_u8g2lib/LCDML_03021_u8g2lib.ino similarity index 96% rename from examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_u8g2lib.ino rename to examples/03_displaytypes/02_glcd/LCDML_03021_u8g2lib/LCDML_03021_u8g2lib.ino index a123e38..f81d531 100644 --- a/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_u8g2lib.ino +++ b/examples/03_displaytypes/02_glcd/LCDML_03021_u8g2lib/LCDML_03021_u8g2lib.ino @@ -119,7 +119,7 @@ // Example for one function and different parameters // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ... // the parameter change can also be released with dynParams on the next example - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (16 , LCDML_0 , 5 , NULL, "Parameter" , NULL, 0, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (17 , LCDML_0_5 , 1 , NULL, "Parameter 1" , mFunc_para, 10, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (18 , LCDML_0_5 , 2 , NULL, "Parameter 2" , mFunc_para, 20, _LCDML_TYPE_default); // NULL = no menu function @@ -131,13 +131,13 @@ // 1. set the string to "" // 2. use type _LCDML_TYPE_dynParam instead of _LCDML_TYPE_default // this function type can not be used in combination with different parameters - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (21 , LCDML_0 , 6 , NULL, "" , mDyn_para, 0, _LCDML_TYPE_dynParam); // NULL = no menu function // Example for conditions (for example for a screensaver) // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed // 2. set the function name as callback (remove the braces '()' it gives bad errors) - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (22 , LCDML_0 , 7 , COND_hide, "screensaver" , mFunc_screensaver, 0, _LCDML_TYPE_default); // this menu function can be found on "LCDML_display_menuFunction" tab // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element. diff --git a/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_condition.ino b/examples/03_displaytypes/02_glcd/LCDML_03021_u8g2lib/LCDML_condition.ino similarity index 100% rename from examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_condition.ino rename to examples/03_displaytypes/02_glcd/LCDML_03021_u8g2lib/LCDML_condition.ino diff --git a/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_control.ino b/examples/03_displaytypes/02_glcd/LCDML_03021_u8g2lib/LCDML_control.ino similarity index 100% rename from examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_control.ino rename to examples/03_displaytypes/02_glcd/LCDML_03021_u8g2lib/LCDML_control.ino diff --git a/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_display_dynFunction.ino b/examples/03_displaytypes/02_glcd/LCDML_03021_u8g2lib/LCDML_display_dynFunction.ino similarity index 100% rename from examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_display_dynFunction.ino rename to examples/03_displaytypes/02_glcd/LCDML_03021_u8g2lib/LCDML_display_dynFunction.ino diff --git a/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_display_menu.ino b/examples/03_displaytypes/02_glcd/LCDML_03021_u8g2lib/LCDML_display_menu.ino similarity index 100% rename from examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_display_menu.ino rename to examples/03_displaytypes/02_glcd/LCDML_03021_u8g2lib/LCDML_display_menu.ino diff --git a/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_display_menuFunction.ino b/examples/03_displaytypes/02_glcd/LCDML_03021_u8g2lib/LCDML_display_menuFunction.ino similarity index 100% rename from examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_display_menuFunction.ino rename to examples/03_displaytypes/02_glcd/LCDML_03021_u8g2lib/LCDML_display_menuFunction.ino diff --git a/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_u8glib.ino b/examples/03_displaytypes/02_glcd/LCDML_03022_u8glib/LCDML_03022_u8glib.ino similarity index 96% rename from examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_u8glib.ino rename to examples/03_displaytypes/02_glcd/LCDML_03022_u8glib/LCDML_03022_u8glib.ino index 0be9922..5ac993e 100644 --- a/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_u8glib.ino +++ b/examples/03_displaytypes/02_glcd/LCDML_03022_u8glib/LCDML_03022_u8glib.ino @@ -108,7 +108,7 @@ // Example for one function and different parameters // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ... // the parameter change can also be released with dynParams on the next example - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (16 , LCDML_0 , 5 , NULL, "Parameter" , NULL, 0, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (17 , LCDML_0_5 , 1 , NULL, "Parameter 1" , mFunc_para, 10, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (18 , LCDML_0_5 , 2 , NULL, "Parameter 2" , mFunc_para, 20, _LCDML_TYPE_default); // NULL = no menu function @@ -120,13 +120,13 @@ // 1. set the string to "" // 2. use type _LCDML_TYPE_dynParam instead of _LCDML_TYPE_default // this function type can not be used in combination with different parameters - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (21 , LCDML_0 , 6 , NULL, "" , mDyn_para, 0, _LCDML_TYPE_dynParam); // NULL = no menu function // Example for conditions (for example for a screensaver) // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed // 2. set the function name as callback (remove the braces '()' it gives bad errors) - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (22 , LCDML_0 , 7 , COND_hide, "screensaver" , mFunc_screensaver, 0, _LCDML_TYPE_default); // this menu function can be found on "LCDML_display_menuFunction" tab // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element. diff --git a/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_condition.ino b/examples/03_displaytypes/02_glcd/LCDML_03022_u8glib/LCDML_condition.ino similarity index 100% rename from examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_condition.ino rename to examples/03_displaytypes/02_glcd/LCDML_03022_u8glib/LCDML_condition.ino diff --git a/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_control.ino b/examples/03_displaytypes/02_glcd/LCDML_03022_u8glib/LCDML_control.ino similarity index 100% rename from examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_control.ino rename to examples/03_displaytypes/02_glcd/LCDML_03022_u8glib/LCDML_control.ino diff --git a/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_display_dynFunction.ino b/examples/03_displaytypes/02_glcd/LCDML_03022_u8glib/LCDML_display_dynFunction.ino similarity index 100% rename from examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_display_dynFunction.ino rename to examples/03_displaytypes/02_glcd/LCDML_03022_u8glib/LCDML_display_dynFunction.ino diff --git a/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_display_menu.ino b/examples/03_displaytypes/02_glcd/LCDML_03022_u8glib/LCDML_display_menu.ino similarity index 100% rename from examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_display_menu.ino rename to examples/03_displaytypes/02_glcd/LCDML_03022_u8glib/LCDML_display_menu.ino diff --git a/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_display_menuFunction.ino b/examples/03_displaytypes/02_glcd/LCDML_03022_u8glib/LCDML_display_menuFunction.ino similarity index 100% rename from examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_display_menuFunction.ino rename to examples/03_displaytypes/02_glcd/LCDML_03022_u8glib/LCDML_display_menuFunction.ino diff --git a/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_adafruit_gfx_ssd1306.ino b/examples/03_displaytypes/03_gfx/LCDML_03031_adafruit_gfx_ssd1306/LCDML_03031_adafruit_gfx_ssd1306.ino similarity index 95% rename from examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_adafruit_gfx_ssd1306.ino rename to examples/03_displaytypes/03_gfx/LCDML_03031_adafruit_gfx_ssd1306/LCDML_03031_adafruit_gfx_ssd1306.ino index 38eb76a..a441022 100644 --- a/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_adafruit_gfx_ssd1306.ino +++ b/examples/03_displaytypes/03_gfx/LCDML_03031_adafruit_gfx_ssd1306/LCDML_03031_adafruit_gfx_ssd1306.ino @@ -44,9 +44,7 @@ // settings for u8g lib and lcd #define _LCDML_ADAFRUIT_lcd_w 128 // lcd width #define _LCDML_ADAFRUIT_lcd_h 64 // lcd height - - - + #define OLED_RESET 4 // not used / nicht genutzt bei diesem Display Adafruit_SSD1306 display(OLED_RESET); @@ -117,7 +115,7 @@ // Example for one function and different parameters // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ... // the parameter change can also be released with dynParams on the next example - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (16 , LCDML_0 , 5 , NULL, "Parameter" , NULL, 0, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (17 , LCDML_0_5 , 1 , NULL, "Parameter 1" , mFunc_para, 10, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (18 , LCDML_0_5 , 2 , NULL, "Parameter 2" , mFunc_para, 20, _LCDML_TYPE_default); // NULL = no menu function @@ -129,13 +127,13 @@ // 1. set the string to "" // 2. use type _LCDML_TYPE_dynParam instead of _LCDML_TYPE_default // this function type can not be used in combination with different parameters - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (21 , LCDML_0 , 6 , NULL, "" , mDyn_para, 0, _LCDML_TYPE_dynParam); // NULL = no menu function // Example for conditions (for example for a screensaver) // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed // 2. set the function name as callback (remove the braces '()' it gives bad errors) - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (22 , LCDML_0 , 7 , COND_hide, "screensaver" , mFunc_screensaver, 0, _LCDML_TYPE_default); // this menu function can be found on "LCDML_display_menuFunction" tab // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element. diff --git a/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_condition.ino b/examples/03_displaytypes/03_gfx/LCDML_03031_adafruit_gfx_ssd1306/LCDML_condition.ino similarity index 100% rename from examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_condition.ino rename to examples/03_displaytypes/03_gfx/LCDML_03031_adafruit_gfx_ssd1306/LCDML_condition.ino diff --git a/examples/03_displaytypes/lcd/LCDML_i2c_display_20x4/LCDML_control.ino b/examples/03_displaytypes/03_gfx/LCDML_03031_adafruit_gfx_ssd1306/LCDML_control.ino similarity index 100% rename from examples/03_displaytypes/lcd/LCDML_i2c_display_20x4/LCDML_control.ino rename to examples/03_displaytypes/03_gfx/LCDML_03031_adafruit_gfx_ssd1306/LCDML_control.ino diff --git a/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_display_dynFunction.ino b/examples/03_displaytypes/03_gfx/LCDML_03031_adafruit_gfx_ssd1306/LCDML_display_dynFunction.ino similarity index 100% rename from examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_display_dynFunction.ino rename to examples/03_displaytypes/03_gfx/LCDML_03031_adafruit_gfx_ssd1306/LCDML_display_dynFunction.ino diff --git a/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_display_menu.ino b/examples/03_displaytypes/03_gfx/LCDML_03031_adafruit_gfx_ssd1306/LCDML_display_menu.ino similarity index 100% rename from examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_display_menu.ino rename to examples/03_displaytypes/03_gfx/LCDML_03031_adafruit_gfx_ssd1306/LCDML_display_menu.ino diff --git a/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_display_menuFunction.ino b/examples/03_displaytypes/03_gfx/LCDML_03031_adafruit_gfx_ssd1306/LCDML_display_menuFunction.ino similarity index 100% rename from examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_display_menuFunction.ino rename to examples/03_displaytypes/03_gfx/LCDML_03031_adafruit_gfx_ssd1306/LCDML_display_menuFunction.ino diff --git a/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_adafruit_gfx_st7735.ino b/examples/03_displaytypes/03_gfx/LCDML_03032_adafruit_gfx_st7735/LCDML_03032_adafruit_gfx_st7735.ino similarity index 97% rename from examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_adafruit_gfx_st7735.ino rename to examples/03_displaytypes/03_gfx/LCDML_03032_adafruit_gfx_st7735/LCDML_03032_adafruit_gfx_st7735.ino index 759c24e..59afd67 100644 --- a/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_adafruit_gfx_st7735.ino +++ b/examples/03_displaytypes/03_gfx/LCDML_03032_adafruit_gfx_st7735/LCDML_03032_adafruit_gfx_st7735.ino @@ -126,7 +126,7 @@ // Example for one function and different parameters // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ... // the parameter change can also be released with dynParams on the next example - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (16 , LCDML_0 , 5 , NULL, "Parameter" , NULL, 0, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (17 , LCDML_0_5 , 1 , NULL, "Parameter 1" , mFunc_para, 10, _LCDML_TYPE_default); // NULL = no menu function LCDML_addAdvanced (18 , LCDML_0_5 , 2 , NULL, "Parameter 2" , mFunc_para, 20, _LCDML_TYPE_default); // NULL = no menu function @@ -138,7 +138,7 @@ // 1. set the string to "" // 2. use type _LCDML_TYPE_dynParam instead of _LCDML_TYPE_default // this function type can not be used in combination with different parameters - // LCDMenuLib_add(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) + // LCDMenuLib_addAdvanced(id, prev_layer, new_num, condition, lang_char_array, callback_function, parameter (0-255), menu function type ) LCDML_addAdvanced (21 , LCDML_0 , 6 , NULL, "" , mDyn_para, 0, _LCDML_TYPE_dynParam); // NULL = no menu function // Example for conditions (for example for a screensaver) diff --git a/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_condition.ino b/examples/03_displaytypes/03_gfx/LCDML_03032_adafruit_gfx_st7735/LCDML_condition.ino similarity index 100% rename from examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_condition.ino rename to examples/03_displaytypes/03_gfx/LCDML_03032_adafruit_gfx_st7735/LCDML_condition.ino diff --git a/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_control.ino b/examples/03_displaytypes/03_gfx/LCDML_03032_adafruit_gfx_st7735/LCDML_control.ino similarity index 100% rename from examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_control.ino rename to examples/03_displaytypes/03_gfx/LCDML_03032_adafruit_gfx_st7735/LCDML_control.ino diff --git a/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_display_dynFunction.ino b/examples/03_displaytypes/03_gfx/LCDML_03032_adafruit_gfx_st7735/LCDML_display_dynFunction.ino similarity index 100% rename from examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_display_dynFunction.ino rename to examples/03_displaytypes/03_gfx/LCDML_03032_adafruit_gfx_st7735/LCDML_display_dynFunction.ino diff --git a/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_display_menu.ino b/examples/03_displaytypes/03_gfx/LCDML_03032_adafruit_gfx_st7735/LCDML_display_menu.ino similarity index 100% rename from examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_display_menu.ino rename to examples/03_displaytypes/03_gfx/LCDML_03032_adafruit_gfx_st7735/LCDML_display_menu.ino diff --git a/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_display_menuFunction.ino b/examples/03_displaytypes/03_gfx/LCDML_03032_adafruit_gfx_st7735/LCDML_display_menuFunction.ino similarity index 100% rename from examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_display_menuFunction.ino rename to examples/03_displaytypes/03_gfx/LCDML_03032_adafruit_gfx_st7735/LCDML_display_menuFunction.ino diff --git a/keywords.txt b/keywords.txt index 912bfaa..7ca27f2 100644 --- a/keywords.txt +++ b/keywords.txt @@ -4,7 +4,7 @@ # # MIT License # -# Copyright (c) [2021] [Jomelo] +# Copyright (c) [2021] [Nils Feldkämper] # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/library.properties b/library.properties index 5fe40e5..9438284 100644 --- a/library.properties +++ b/library.properties @@ -1,6 +1,6 @@ name=LCDMenuLib2 -version=2.2.7 beta-5 -author=Jomelo +version=2.2.7 +author=Nils Feldkämper maintainer=Community https://github.com/Jomelo/LCDMenuLib2 sentence=Easy creation of a multi layer tree menu with screensaver and other stuff. paragraph=Examples for the basic function and different output types [console (serial monitor), lcd displays, glcd displays, gfx displays] diff --git a/src/LCDMenuLib2.cpp b/src/LCDMenuLib2.cpp index 3da038e..9033c19 100644 --- a/src/LCDMenuLib2.cpp +++ b/src/LCDMenuLib2.cpp @@ -4,7 +4,7 @@ * * MIT License * - * Copyright (c) [2021] [Jomelo] + * Copyright (c) [2021] [Nils Feldkämper] * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/LCDMenuLib2.h b/src/LCDMenuLib2.h index bb74af2..c4fd728 100644 --- a/src/LCDMenuLib2.h +++ b/src/LCDMenuLib2.h @@ -4,7 +4,7 @@ * * MIT License * - * Copyright (c) [2021] [Jomelo] + * Copyright (c) [2021] [Nils Feldkämper] * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -80,7 +80,7 @@ #endif // Version - #define _LCDML_VERSION "LCDML2 v2.2.7 beta-5" + #define _LCDML_VERSION "LCDML2 v2.2.7" // this makro is for unused variables which exists for compatibility things ... #define LCDML_UNUSED(expr) do { (void)(expr); } while (0) diff --git a/src/LCDMenuLib2_macros.h b/src/LCDMenuLib2_macros.h index 7cefaa1..391f13f 100644 --- a/src/LCDMenuLib2_macros.h +++ b/src/LCDMenuLib2_macros.h @@ -4,7 +4,7 @@ * * MIT License * - * Copyright (c) [2021] [Jomelo] + * Copyright (c) [2021] [Nils Feldkämper] * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/LCDMenuLib2_menu.cpp b/src/LCDMenuLib2_menu.cpp index 83f6cd0..395f080 100644 --- a/src/LCDMenuLib2_menu.cpp +++ b/src/LCDMenuLib2_menu.cpp @@ -4,7 +4,7 @@ * * MIT License * - * Copyright (c) [2021] [Jomelo] + * Copyright (c) [2021] [Nils Feldkämper] * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/LCDMenuLib2_menu.h b/src/LCDMenuLib2_menu.h index c18489a..743aa66 100644 --- a/src/LCDMenuLib2_menu.h +++ b/src/LCDMenuLib2_menu.h @@ -4,7 +4,7 @@ * * MIT License * - * Copyright (c) [2021] [Jomelo] + * Copyright (c) [2021] [Nils Feldkämper] * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/LCDMenuLib2_typedef.h b/src/LCDMenuLib2_typedef.h index 9d6ab0d..080e907 100644 --- a/src/LCDMenuLib2_typedef.h +++ b/src/LCDMenuLib2_typedef.h @@ -4,7 +4,7 @@ * * MIT License * - * Copyright (c) [2021] [Jomelo] + * Copyright (c) [2021] [Nils Feldkämper] * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal