From e6f472b96b54532ecd090156d49b3a9b61e012f5 Mon Sep 17 00:00:00 2001
From: jay <jayz28@gmail.com>
Date: Mon, 19 Oct 2015 10:07:30 -0700
Subject: [PATCH] increase print move cache, attempt i2c init tweaks

---
 src/ArduinoAVR/Repetier/Configuration.h      |   6 +++---
 src/ArduinoAVR/Repetier/Repetier-OLP.v12.suo | Bin 18432 -> 20480 bytes
 src/ArduinoAVR/Repetier/u8glib_ex.h          |   3 +++
 src/ArduinoAVR/Repetier/ui.cpp               |   4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/ArduinoAVR/Repetier/Configuration.h b/src/ArduinoAVR/Repetier/Configuration.h
index 1df868635..1d18303fa 100644
--- a/src/ArduinoAVR/Repetier/Configuration.h
+++ b/src/ArduinoAVR/Repetier/Configuration.h
@@ -1101,7 +1101,7 @@ Overridden if EEPROM activated.
 This number of moves can be cached in advance. If you wan't to cache more, increase this. Especially on
 many very short moves the cache may go empty. The minimum value is 5.
 */
-#define PRINTLINE_CACHE_SIZE 16
+#define PRINTLINE_CACHE_SIZE 20
 
 /** \brief Low filled cache size.
 
@@ -1486,7 +1486,7 @@ computations, so do not enable it if your display works stable!
 //#define TRY_AUTOREPAIR_LCD_ERRORS
 
 // This is line 2 of the status display at startup. Change to your like.
-#define UI_PRINTER_NAME "DreamMaker Overlord Pro"
+#define UI_PRINTER_NAME "Overlord Pro"
 #define UI_PRINTER_COMPANY "DFRobot"
 
 
@@ -1497,7 +1497,7 @@ computations, so do not enable it if your display works stable!
 #define UI_PAGES_DURATION 4000
 
 /** Delay of start screen in milliseconds */
-#define UI_START_SCREEN_DELAY 15000
+#define UI_START_SCREEN_DELAY 1000
 /** Uncomment if you don't want automatic page switching. You can still switch the
 info pages with next/previous button/click-encoder */
 #define UI_DISABLE_AUTO_PAGESWITCH 1
diff --git a/src/ArduinoAVR/Repetier/Repetier-OLP.v12.suo b/src/ArduinoAVR/Repetier/Repetier-OLP.v12.suo
index 5fef66a725f6f4aa0d46910f8d56278c0ae7f936..6527cb2627b36f9c7001666fa02ed49473b81164 100644
GIT binary patch
delta 1064
zcmb_a-%C?b96#sI&5Lf=X~}HrcHMOTNNp;jma(Zf3nJ7K1Qii7#ZpVVm6;C<dTWU8
z`_O|Xc8L)CLGJnzl_>3@2cd!<LV5`Qfr1JW!u9>;R)dIMI`H9hzMu2C-}5==p1?E@
zEbzxeg7o3uwf9pgZ@7gq7I46XFu||tUxh+mAfjSL>_nr{T;v=?9zsH-A+ixE&>&_X
zHsdT6;Xt4{nvP6gWg#cWG}7I%c|LLh!h_gZZX4hsVMtoovAz2<h{?&zXme^G4@9kK
zP#`BFF_4i0)lndF*pVqfJdi1-%g7XhJQS1$1#-ctVq5NQ=i!t&4s)62>T{?LA;>j?
zd>(NjR*xZHM5wX)GV&F~INZr}ht0>hNC%|ea9zp=e^C;QTNXjKFN(#93tz15B3<+^
zr<#5vIf4QXh*l^TR*Ewj5qIcnWsrw677hPBpKZfT7eRk6z8R=lEzo4BFb<%&2HTcm
z&}uy5{sfEhEEczSm+UTx2;S6TR5lSfVAR<K0Xa$UQ8cdQm_qeU7FL1_0wTVPuGR;+
zmM?|uFaLczJfd$`B@3Eg&}xN{B!iaafK`LZOz*QSp{sEei?<l8kk>(;^_1}v)?3h)
zb{rzov#<;QQBi^&)S4hRg)wKR-r3yG`8=#Ev(T-S&h#e1l&?}>ZJg(NcXQv*r7|A`
zDqN^LV9n=;-n701v{M&4HuNYZzdvu}@LFz#)`MO?4zFta-6z=**1!~Y0=b+Gvp)7<
zX*T1@UFYYG?>D<94INendEy?(J>=#qu<pH|t>P;iMDJ;~x8>8rr{9*mRnPU6>gDE=
wUFVd~!ylpZ7M!WG?kh*{2)^5y=?>@M+`#7110N^1UWmcCw-naATYo#l4~W!d(EtDd

delta 737
zcmZozz}PT>aYGIh--UB(ORTvrGV(GoFdUGYT*Xwyn6>#UlRD$X1eQ!$py0p%|Nl!t
zX>K6R2gLk9EDgj!ssBPiS{R5$fLIiW#erB7h!ugD1Bm5;m<Najff!^K7mx<&lK|2(
zK&%AB3X=<+q&FtSFiv91;cGY*w8seQA_j<y(l>u)lV{`=04fC;!3LydCl^Wy^CCNj
zeX=8qv@Wu>AZtL@f@oH#UXZmQKFC@*n6;a@<}glv!Ywl~!DADT2O|r}qR9fj8j~F~
zSSDA9pPqb}$&fV}D0psiqmK7v7wbKfC+N5UX`4xWhdCLQfifB}EnoOTSU`>d>o4JN
zVLY+<r{H>Ki19Yqj6cJo2~ywSs57}l!XIo`I#A#M%&tj%Cs=SA&wc`^6bLr|mu6(!
zWCL_O$cGTiZ6SvF0|kz3{;AB)H%Y*mlTi)GRe-A5Tq4lJIJv=0V6%Y92S#-5J&P=u
zCV4docvV%(>TX@)RKdUf@w3U?Wt%4`6);Xx0-B`?G=~XpmJ-mc3km@$r3}RksSHI7
z1q_)Cc|f)vLk5FPNZd--EndQf*CWk$d->%~E|8L#+~;hxd7l##<75Xnhec*g<Y=D9
bxH(2@3F9Q`n9VT`DU6d3=*mo9qo4u+#ktTa

diff --git a/src/ArduinoAVR/Repetier/u8glib_ex.h b/src/ArduinoAVR/Repetier/u8glib_ex.h
index afb9a39ac..aac26bcf4 100644
--- a/src/ArduinoAVR/Repetier/u8glib_ex.h
+++ b/src/ArduinoAVR/Repetier/u8glib_ex.h
@@ -162,6 +162,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* comment the following line to generate more compact but interrupt unsafe code */
 #define U8G_INTERRUPT_SAFE 1
 
+// explicit defines for ease of debug, not necessary
+#define ARDUINO 10605 
+#define __AVR__
 
 #include <stddef.h>
 
diff --git a/src/ArduinoAVR/Repetier/ui.cpp b/src/ArduinoAVR/Repetier/ui.cpp
index 8aada87d7..6da5a164d 100644
--- a/src/ArduinoAVR/Repetier/ui.cpp
+++ b/src/ArduinoAVR/Repetier/ui.cpp
@@ -782,7 +782,7 @@ void initializeLCD()
     u8g_InitSPI(&u8g,&u8g_dev_ssd1306_128x64_sw_spi,  UI_DISPLAY_D4_PIN, UI_DISPLAY_ENABLE_PIN, UI_DISPLAY_RS_PIN, U8G_PIN_NONE, U8G_PIN_NONE);
 #endif
 #ifdef U8GLIB_SSD1309_I2C
-	u8g_InitI2C(&u8g,&u8g_dev_ssd1309_128x64_i2c,U8G_I2C_OPT_NO_ACK);
+	u8g_InitI2C(&u8g,&u8g_dev_ssd1309_128x64_i2c,U8G_I2C_OPT_DEV_0 & U8G_I2C_OPT_NO_ACK & U8G_I2C_OPT_FAST);
 #endif
 #ifdef U8GLIB_KS0108_FAST
     u8g_Init8Bit(&u8g,&u8g_dev_ks0108_128x64_fast,UI_DISPLAY_D0_PIN,UI_DISPLAY_D1_PIN,UI_DISPLAY_D2_PIN,UI_DISPLAY_D3_PIN,UI_DISPLAY_D4_PIN,UI_DISPLAY_D5_PIN,UI_DISPLAY_D6_PIN,UI_DISPLAY_D7_PIN,UI_DISPLAY_ENABLE_PIN,UI_DISPLAY_CS1,UI_DISPLAY_CS2,
@@ -891,7 +891,7 @@ void UIDisplay::initialize()
 #if defined(USER_KEY4_PIN) && USER_KEY4_PIN > -1
     UI_KEYS_INIT_BUTTON_LOW(USER_KEY4_PIN);
 #endif
-#if UI_DISPLAY_TYPE == DISPLAY_I2C
+#if UI_DISPLAY_TYPE == DISPLAY_I2C 
     // I don't know why but after power up the lcd does not come up
     // but if I reinitialize i2c and the lcd again here it works.
     HAL::delayMilliseconds(10);