Bläddra i källkod

Minor tweeks

Magic constants moved to one place, fixed gcode for reseting Live
adjusting Z
michalprusa 8 år sedan
förälder
incheckning
4ce950c994
4 ändrade filer med 12 tillägg och 11 borttagningar
  1. 8 1
      Firmware/Configuration.h
  2. 3 3
      Firmware/Marlin_main.cpp
  3. 1 1
      Firmware/stepper.cpp
  4. 0 6
      Firmware/ultralcd.h

+ 8 - 1
Firmware/Configuration.h

@@ -5,10 +5,17 @@
 #include "Configuration_prusa.h"
 
 // Firmware version
-#define FW_version "2.2.3"
+#define FW_version "2.2.4a"
 
 
 
+#define EEPROM_SILENT 4095
+#define EEPROM_BABYSTEP_X 4093
+#define EEPROM_BABYSTEP_Y 4091
+#define EEPROM_BABYSTEP_Z 4089
+#define EEPROM_LANG 4088
+
+
 // This configuration file contains the basic settings.
 // Advanced settings can be found in Configuration_adv.h
 // BASIC SETTINGS: select your board type, temperature sensor type, axis scaling, and endstop configuration

+ 3 - 3
Firmware/Marlin_main.cpp

@@ -1441,8 +1441,8 @@ void process_commands()
 
     } else if(code_seen('Lang')) {
       lcd_force_language_selection();
-    } else if(code_seen('LiveZ')) {
-      EEPROM_save_B(4089,0);
+    } else if(code_seen('Lz')) {
+      EEPROM_save_B(EEPROM_BABYSTEP_Z,0);
     }
 
   }
@@ -1924,7 +1924,7 @@ void process_commands()
       endstops_hit_on_purpose();
 
       if(card.sdprinting) {
-        EEPROM_read_B(4089,&babystepLoad[2]);
+        EEPROM_read_B(EEPROM_BABYSTEP_Z,&babystepLoad[2]);
 
         if(babystepLoad[2] != 0){
 

+ 1 - 1
Firmware/stepper.cpp

@@ -1261,7 +1261,7 @@ void EEPROM_read_st(int pos, uint8_t* value, uint8_t size)
 void digipot_init() //Initialize Digipot Motor Current
 {
 
-  EEPROM_read_st(4095,(uint8_t*)&SilentMode,sizeof(SilentMode));
+  EEPROM_read_st(EEPROM_SILENT,(uint8_t*)&SilentMode,sizeof(SilentMode));
 
   #if defined(DIGIPOTSS_PIN) && DIGIPOTSS_PIN > -1
     if(SilentMode == 0){

+ 0 - 6
Firmware/ultralcd.h

@@ -3,12 +3,6 @@
 
 #include "Marlin.h"
 
-#define EEPROM_SILENT 4095
-#define EEPROM_BABYSTEP_X 4093
-#define EEPROM_BABYSTEP_Y 4091
-#define EEPROM_BABYSTEP_Z 4089
-#define EEPROM_LANG 4088
-
 #ifdef ULTRA_LCD
 
   void lcd_update();