bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

BLTouch V3.1 changes (#14104)

Browse Source
This commit is contained in:
InsanityAutomation
2019-05-25 22:56:47 -04:00
committed by Scott Lahteine
parent 14fe41f6b2
commit 49e83dd7c8
103 changed files with 6059 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Marlin/src/module/configuration_store.cpp
View File

@ -37,7 +37,7 @@
*/
// Change EEPROM version if the structure changes
#define EEPROM_VERSION "V66"
#define EEPROM_VERSION "V67"
#define EEPROM_OFFSET 100
// Check the integrity of data offsets.
@ -109,6 +109,10 @@ extern float saved_extruder_advance_K[EXTRUDERS];
void M217_report(const bool eeprom);
#endif
#if ENABLED(BLTOUCH)
#include "../feature/bltouch.h"
#endif
#if HAS_TRINAMIC
#include "stepper_indirection.h"
#include "../feature/tmc_util.h"
@ -206,6 +210,11 @@ typedef struct SettingsDataStruct {
//
uint16_t servo_angles[EEPROM_NUM_SERVOS][2]; // M281 P L U
//
// BLTOUCH
//
bool bltouch_last_written_mode;
//
// DELTA / [XYZ]_DUAL_ENDSTOPS
//
@ -700,6 +709,19 @@ void MarlinSettings::postprocess() {
EEPROM_WRITE(servo_angles);
}
//
// BLTOUCH
//
{
_FIELD_TEST(bltouch_last_written_mode);
#if ENABLED(BLTOUCH)
const bool &bltouch_last_written_mode = bltouch.last_written_mode;
#else
constexpr bool bltouch_last_written_mode = false;
#endif
EEPROM_WRITE(bltouch_last_written_mode);
}
//
// DELTA Geometry or Dual Endstops offsets
//
@ -1488,6 +1510,19 @@ void MarlinSettings::postprocess() {
EEPROM_READ(servo_angles_arr);
}
//
// BLTOUCH
//
{
_FIELD_TEST(bltouch_last_written_mode);
#if ENABLED(BLTOUCH)
bool &bltouch_last_written_mode = bltouch.last_written_mode;
#else
bool bltouch_last_written_mode;
#endif
EEPROM_READ(bltouch_last_written_mode);
}
//
// DELTA Geometry or Dual Endstops offsets
//
@ -2313,6 +2348,13 @@ void MarlinSettings::reset() {
COPY(servo_angles, base_servo_angles);
#endif
//
// BLTOUCH
//
//#if ENABLED(BLTOUCH)
// bltouch.last_written_mode;
//#endif
//
// Endstop Adjustments
//