From 02ca6c6eb7fbb94d15bb4ef9699078905145242e Mon Sep 17 00:00:00 2001 From: Dean Brestel Date: Sun, 23 Apr 2017 16:50:10 -0700 Subject: [PATCH 1/2] Fixed an array memory overrun related to currentPosition in Printer.cpp --- Repetier Firmware/Repetier/Printer.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Repetier Firmware/Repetier/Printer.cpp b/Repetier Firmware/Repetier/Printer.cpp index 53e413c..fcc907c 100644 --- a/Repetier Firmware/Repetier/Printer.cpp +++ b/Repetier Firmware/Repetier/Printer.cpp @@ -859,9 +859,12 @@ void Printer::setup() Extruder::initExtruder(); // sets autoleveling in eeprom init EEPROM::init(); // Read settings from eeprom if wanted - for(uint8_t i = 0; i < E_AXIS_ARRAY; i++) + for(uint8_t i = 0; i < sizeof(currentPositionSteps)/sizeof(currentPositionSteps[0]); i++) { currentPositionSteps[i] = 0; + } + for(uint8_t i = 0; i < sizeof(currentPosition)/sizeof(currentPosition[0]); i++) + { currentPosition[i] = 0.0; } //setAutolevelActive(false); // fixme delete me From 9a1a664024d6a402f2210db7da2da33a28adfd58 Mon Sep 17 00:00:00 2001 From: Dean Brestel Date: Sun, 23 Apr 2017 17:01:22 -0700 Subject: [PATCH 2/2] Improved ui_lang.h inclusion. - Added missing include guard. - Added include of Configuration.h to ensure that any file including ui_lang.h would get the correct language. --- Repetier Firmware/Repetier/uilang.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Repetier Firmware/Repetier/uilang.h b/Repetier Firmware/Repetier/uilang.h index fdac082..7d87ed1 100644 --- a/Repetier Firmware/Repetier/uilang.h +++ b/Repetier Firmware/Repetier/uilang.h @@ -16,6 +16,12 @@ */ +#ifndef UI_LANG_H +#define UI_LANG_H + +// Include Configuration.h in order to load the correct language. +#include "Configuration.h" + #if !defined(UI_DISPLAY_CHARSET) || UI_DISPLAY_CHARSET>3 #define UI_DISPLAY_CHARSET 1 #endif @@ -1798,3 +1804,5 @@ #define UI_TEXT_CALIBRATING_BED "Calibrating","Bed Level Matrix","","Please Wait" #endif + +#endif