* new submenu Maintenance -> Preferences

* adjustable click sound
TinkerGnome · Jul 1, 2015 · a73822c · a73822c
1 parent e2f5a12
commit a73822c
Show file tree

Hide file tree

Showing 12 changed files with 476 additions and 450 deletions.
diff --git a/Marlin/UltiLCD2.cpp b/Marlin/UltiLCD2.cpp
@@ -52,7 +52,7 @@ void lcd_init()
     }
     lcd_material_read_current_material();
 
-    glow_millis = millis() + 600;
+    glow_millis = millis() + 750;
     led_glow = led_glow_dir = 0;
 
     // initialize menu stack and show start animation
@@ -151,14 +151,17 @@ void lcd_menu_startup()
 {
     lcd_lib_encoder_pos = ENCODER_NO_SELECTION;
 
+    if (!lcd_lib_update_ready())
+        led_glow = 0;
+
     LED_GLOW();
     lcd_lib_clear();
 
+    lcd_lib_draw_gfx(0, 22, ultimakerTextGfx);
     lcd_lib_draw_string_centerP(BOTTOM_MENU_YPOS, PSTR(STRING_CONFIG_H_AUTHOR));
 
-    if (led_glow < 84)
+    if ((led_glow > 0) && (led_glow < 84))
     {
-        lcd_lib_draw_gfx(0, 22, ultimakerTextGfx);
         for(uint8_t n=0;n<10;n++)
         {
             if (led_glow*2 >= n + 20)
@@ -175,12 +178,14 @@ void lcd_menu_startup()
         //lcd_lib_clear_gfx(0, 22, ultimakerTextGfx);
         lcd_lib_draw_gfx(0, 22, ultimakerTextGfx);
     */
-    }else{
-        //led_glow--;
-        //lcd_lib_draw_gfx(80, 0, ultimakerRobotGfx);
-        //lcd_lib_clear_gfx(0, 22, ultimakerTextOutlineGfx);
-        lcd_lib_draw_gfx(0, 22, ultimakerTextGfx);
     }
+//    else
+//    {
+//        //led_glow--;
+//        //lcd_lib_draw_gfx(80, 0, ultimakerRobotGfx);
+//        //lcd_lib_clear_gfx(0, 22, ultimakerTextOutlineGfx);
+//        lcd_lib_draw_gfx(0, 22, ultimakerTextGfx);
+//    }
     lcd_lib_update_screen();
 
     if (led_mode == LED_MODE_ALWAYS_ON)

diff --git a/Marlin/UltiLCD2_hi_lib.cpp b/Marlin/UltiLCD2_hi_lib.cpp
@@ -209,7 +209,10 @@ void lcd_scroll_menu(const char* menuNameP, int8_t entryCount, scrollDrawCallbac
 
     lcd_lib_clear_string_centerP(1, menuNameP);
 
-	entryDetailsCallback(selIndex);
+    if (entryDetailsCallback)
+    {
+        entryDetailsCallback(selIndex);
+    }
 
     lcd_lib_update_screen();
 }

diff --git a/Marlin/UltiLCD2_low_lib.cpp b/Marlin/UltiLCD2_low_lib.cpp
@@ -819,30 +819,44 @@ void lcd_lib_clear_gfx(uint8_t x, uint8_t y, const uint8_t* gfx)
     }
 }
 
+#define _BEEP(c, n) for(int8_t _i=0;_i<c;_i++) { WRITE(BEEPER, HIGH); _delay_us(n); WRITE(BEEPER, LOW); _delay_us(n); }
+void lcd_lib_keyclick()
+{
+    if (ui_mode & UI_BEEP_OFF)
+    {
+        return;
+    }
+    else if (ui_mode & UI_BEEP_SHORT)
+    {
+        _BEEP(15, 60);
+        _BEEP(10, 50);
+    }
+    else
+    {
+        lcd_lib_beep();
+    }
+}
+
 void lcd_lib_beep()
 {
-#define _BEEP(c, n) for(int8_t _i=0;_i<c;_i++) { WRITE(BEEPER, HIGH); _delay_us(n); WRITE(BEEPER, LOW); _delay_us(n); }
     _BEEP(20, 366);
     _BEEP(10, 150);
-#undef _BEEP
 }
 
 //-----------------------------------------------------------------------------------------------------------------
 // very short tick for UI feedback -- 1 millisecond  long
-void lcd_lib_tick( )
+void lcd_lib_tick()
 {
-#if EXTENDED_BEEP
-	for (int a =0; a<10; ++a)
-    {
-        WRITE(BEEPER, HIGH);
-        _delay_us (50);
-        WRITE(BEEPER, LOW);
-        _delay_us(50);
-    }
-	// WRITE(BEEPER,0);
-#endif
-
+    _BEEP(10, 50);
+//	for (int a =0; a<10; ++a)
+//    {
+//        WRITE(BEEPER, HIGH);
+//        _delay_us (50);
+//        WRITE(BEEPER, LOW);
+//        _delay_us(50);
+//    }
 }
+#undef _BEEP
 
 
 int8_t lcd_lib_encoder_pos_interrupt = 0;

diff --git a/Marlin/UltiLCD2_low_lib.h b/Marlin/UltiLCD2_low_lib.h
@@ -32,6 +32,7 @@ void lcd_lib_clear_gfx(uint8_t x, uint8_t y, const uint8_t* gfx);
 
 void lcd_lib_beep();
 void lcd_lib_tick();
+void lcd_lib_keyclick();
 void lcd_lib_buttons_update();
 void lcd_lib_buttons_update_interrupt();
 void lcd_lib_led_color(uint8_t r, uint8_t g, uint8_t b);

diff --git a/Marlin/UltiLCD2_menu_first_run.cpp b/Marlin/UltiLCD2_menu_first_run.cpp
@@ -399,7 +399,7 @@ static void lcd_menu_first_run_material_load_forward()
 
     if (!blocks_queued())
     {
-        lcd_lib_beep();
+        lcd_lib_keyclick();
         // led_glow_dir = led_glow = 0;
         digipot_current(2, motor_current_setting[2]*2/3);//Set E motor power lower so the motor will skip instead of grind.
         menu.replace_menu(menu_t(lcd_menu_first_run_material_load_wait));