From 4ce950c99461bd12dbc065e38fa734b5ad4bb60f Mon Sep 17 00:00:00 2001
From: michalprusa <git@michalprusa.cz>
Date: Tue, 8 Mar 2016 16:24:50 +0100
Subject: [PATCH] Minor tweeks
Magic constants moved to one place, fixed gcode for reseting Live
adjusting Z
---
Firmware/Configuration.h | 9 ++++++++-
Firmware/Marlin_main.cpp | 6 +++---
Firmware/stepper.cpp | 2 +-
Firmware/ultralcd.h | 6 ------
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h
index a7a496a5..0f15a87f 100644
--- a/Firmware/Configuration.h
+++ b/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
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 0cb8bdca..8446fadd 100644
--- a/Firmware/Marlin_main.cpp
+++ b/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){
diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp
index 287664a9..ac94f18d 100644
--- a/Firmware/stepper.cpp
+++ b/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){
diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h
index 9984c6b5..9b0ad6f9 100644
--- a/Firmware/ultralcd.h
+++ b/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();