From 8c792c7b22bd612c2e8b38ca8b23de936398a14b Mon Sep 17 00:00:00 2001 From: AnHardt Date: Mon, 26 Jan 2015 15:40:44 +0100 Subject: [PATCH 1/5] Make STRING_VERSION and VERSION_STRING the same --- Marlin/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 4e0786199..3aaa5887e 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -24,11 +24,11 @@ // User-specified version info of this build to display in [Pronterface, etc] terminal window during // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this // build by the user have been successfully uploaded into firmware. -#define STRING_VERSION "v1.0.2" +#define STRING_VERSION "1.0.2" #define STRING_URL "reprap.org" #define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. -#define STRING_SPLASH STRING_VERSION " - " STRING_URL // will be shown during bootup +#define STRING_SPLASH "v" STRING_VERSION " - " STRING_URL // will be shown during bootup // SERIAL_PORT selects which serial port should be used for communication with the host. // This allows the connection of wireless adapters (for instance) to non-default port pins. From 59315330dd4e42aab06de7fd8a9260965fa5ad7b Mon Sep 17 00:00:00 2001 From: AnHardt Date: Mon, 26 Jan 2015 15:52:01 +0100 Subject: [PATCH 2/5] Remove definition of VERSION_STRING and replace where usend with STRING_VERSION --- Marlin/Marlin_main.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 1401e7571..7c4405e0d 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -61,8 +61,6 @@ #include #endif -#define VERSION_STRING "1.0.0" - // look here for descriptions of G-codes: http://linuxcnc.org/handbook/gcode/g-code.html // http://objects.reprap.org/wiki/Mendel_User_Manual:_RepRapGCodes @@ -587,7 +585,7 @@ void setup() MCUSR=0; SERIAL_ECHOPGM(MSG_MARLIN); - SERIAL_ECHOLNPGM(VERSION_STRING); + SERIAL_ECHOLNPGM(STRING_VERSION); #ifdef STRING_VERSION_CONFIG_H #ifdef STRING_CONFIG_H_AUTHOR SERIAL_ECHO_START; From 0d219b3e14f7ef8715f63f2c3c191b1c5193e826 Mon Sep 17 00:00:00 2001 From: AnHardt Date: Mon, 26 Jan 2015 16:00:10 +0100 Subject: [PATCH 3/5] Make centering of STRING_SPLASH work --- Marlin/dogm_lcd_implementation.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h index 6f595ce77..5908d7b43 100644 --- a/Marlin/dogm_lcd_implementation.h +++ b/Marlin/dogm_lcd_implementation.h @@ -118,7 +118,7 @@ static void lcd_implementation_init() // Show splashscreen int off = (u8g.getWidth() - START_BMPWIDTH) / 2; - int txtX = (u8g.getWidth() - sizeof(STRING_SPLASH) - 1) / 2; + int txtX = (u8g.getWidth() - (sizeof(STRING_SPLASH) - 1)*5) / 2; // 5 is fontwidth in pixel int txtY = u8g.getHeight() - 10; u8g.firstPage(); do { From aa48056c037373b5ace55378541d6962d777d623 Mon Sep 17 00:00:00 2001 From: AnHardt Date: Mon, 26 Jan 2015 17:26:22 +0100 Subject: [PATCH 4/5] Made centering of bootlogo work and removed contraproductiv setScale2x2() in dogm_lcd_implementation.h --- Marlin/dogm_lcd_implementation.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h index 5908d7b43..ffc323c5a 100644 --- a/Marlin/dogm_lcd_implementation.h +++ b/Marlin/dogm_lcd_implementation.h @@ -117,18 +117,13 @@ static void lcd_implementation_init() } while(u8g.nextPage()); // Show splashscreen - int off = (u8g.getWidth() - START_BMPWIDTH) / 2; + int offx = (u8g.getWidth() - START_BMPWIDTH) / 2; + int offy = (u8g.getHeight() - 18 - START_BMPHEIGHT) / 2; int txtX = (u8g.getWidth() - (sizeof(STRING_SPLASH) - 1)*5) / 2; // 5 is fontwidth in pixel int txtY = u8g.getHeight() - 10; u8g.firstPage(); do { - #ifdef START_BMPHIGH - u8g.drawBitmapP(off, off, START_BMPBYTEWIDTH, START_BMPHEIGHT, start_bmp); - #else - u8g.setScale2x2(); - u8g.drawBitmapP(off, off, START_BMPBYTEWIDTH, START_BMPHEIGHT, start_bmp); - u8g.undoScale(); - #endif + u8g.drawBitmapP(offx, offy, START_BMPBYTEWIDTH, START_BMPHEIGHT, start_bmp); u8g.setFont(u8g_font_5x8); u8g.drawStr(txtX, txtY, STRING_SPLASH); From 75cf302da3eb622090673df1475ca8ed6a4c6a59 Mon Sep 17 00:00:00 2001 From: AnHardt Date: Tue, 27 Jan 2015 00:01:33 +0100 Subject: [PATCH 5/5] example configurations changed to meet Configuration.h --- Marlin/example_configurations/K8200/Configuration.h | 2 +- Marlin/example_configurations/SCARA/Configuration.h | 3 +++ Marlin/example_configurations/delta/Configuration.h | 3 +++ Marlin/example_configurations/makibox/Configuration.h | 3 +++ Marlin/example_configurations/tvrrug/Round2/Configuration.h | 3 +++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 8ee5d24fe..888835e7b 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -28,7 +28,7 @@ #define STRING_URL "reprap.org" #define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_CONFIG_H_AUTHOR "(K8200, CONSULitAS)" // Who made the changes. -#define STRING_SPLASH STRING_VERSION " - " STRING_URL // will be shown during bootup +#define STRING_SPLASH "v" STRING_VERSION " - " STRING_URL // will be shown during bootup // SERIAL_PORT selects which serial port should be used for communication with the host. // This allows the connection of wireless adapters (for instance) to non-default port pins. diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index d38abd26a..7d52562c4 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -42,8 +42,11 @@ // User-specified version info of this build to display in [Pronterface, etc] terminal window during // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this // build by the user have been successfully uploaded into firmware. +#define STRING_VERSION "1.0.2" +#define STRING_URL "reprap.org" #define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. +#define STRING_SPLASH "v" STRING_VERSION " - " STRING_URL // will be shown during bootup // SERIAL_PORT selects which serial port should be used for communication with the host. // This allows the connection of wireless adapters (for instance) to non-default port pins. diff --git a/Marlin/example_configurations/delta/Configuration.h b/Marlin/example_configurations/delta/Configuration.h index 6c530e923..347c34609 100644 --- a/Marlin/example_configurations/delta/Configuration.h +++ b/Marlin/example_configurations/delta/Configuration.h @@ -17,8 +17,11 @@ // User-specified version info of this build to display in [Pronterface, etc] terminal window during // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this // build by the user have been successfully uploaded into firmware. +#define STRING_VERSION "1.0.2" +#define STRING_URL "reprap.org" #define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. +#define STRING_SPLASH "v" STRING_VERSION " - " STRING_URL // will be shown during bootup // SERIAL_PORT selects which serial port should be used for communication with the host. // This allows the connection of wireless adapters (for instance) to non-default port pins. diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 1aa77f98f..0781ed60a 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -24,8 +24,11 @@ // User-specified version info of this build to display in [Pronterface, etc] terminal window during // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this // build by the user have been successfully uploaded into firmware. +#define STRING_VERSION "1.0.2" +#define STRING_URL "reprap.org" #define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. +#define STRING_SPLASH "v" STRING_VERSION " - " STRING_URL // will be shown during bootup // SERIAL_PORT selects which serial port should be used for communication with the host. // This allows the connection of wireless adapters (for instance) to non-default port pins. diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 6bea624ff..b362753e8 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -24,8 +24,11 @@ // User-specified version info of this build to display in [Pronterface, etc] terminal window during // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this // build by the user have been successfully uploaded into firmware. +#define STRING_VERSION "1.0.2" +#define STRING_URL "reprap.org" #define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. +#define STRING_SPLASH "v" STRING_VERSION " - " STRING_URL // will be shown during bootup // SERIAL_PORT selects which serial port should be used for communication with the host. // This allows the connection of wireless adapters (for instance) to non-default port pins.