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

Store servo angles in EEPROM

Browse Source
This commit is contained in:
Jan
2018-08-07 17:04:46 +02:00
committed by Scott Lahteine
parent 9953213513
commit aa80e448e2
10 changed files with 141 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@
*/
// Change EEPROM version if the structure changes
#define EEPROM_VERSION "V55"
#define EEPROM_VERSION "V56"
#define EEPROM_OFFSET 100
// Check the integrity of data offsets.
@ -70,6 +70,10 @@
#include "../feature/bedlevel/bedlevel.h"
#endif
#if HAS_SERVOS
#include "servo.h"
#endif
#if HAS_BED_PROBE
#include "../module/probe.h"
#endif
@ -174,6 +178,13 @@ typedef struct SettingsDataStruct {
bool planner_leveling_active; // M420 S planner.leveling_active
int8_t ubl_storage_slot; // ubl.storage_slot
//
// SERVO_ANGLES
//
#if HAS_SERVOS
uint8_t servo_angles[NUM_SERVOS][2];
#endif
//
// DELTA / [XYZ]_DUAL_ENDSTOPS
//
@ -532,6 +543,10 @@ void MarlinSettings::postprocess() {
EEPROM_WRITE(storage_slot);
#endif // AUTO_BED_LEVELING_UBL
#if HAS_SERVOS
EEPROM_WRITE(servo_angles);
#endif
// 11 floats for DELTA / [XYZ]_DUAL_ENDSTOPS
#if ENABLED(DELTA)
@ -1135,6 +1150,14 @@ void MarlinSettings::postprocess() {
EEPROM_READ(dummyui8);
#endif // AUTO_BED_LEVELING_UBL
//
// SERVO_ANGLES
//
#if HAS_SERVOS
EEPROM_READ(servo_angles);
#endif
//
// DELTA Geometry or Dual Endstops offsets
//
@ -1774,6 +1797,37 @@ void MarlinSettings::reset(PORTARG_SOLO) {
zprobe_zoffset = Z_PROBE_OFFSET_FROM_EXTRUDER;
#endif
//
// Servo Angles
//
#if HAS_SERVOS
#if ENABLED(SWITCHING_EXTRUDER)
#if EXTRUDERS > 3
#define REQ_ANGLES 4
#else
#define REQ_ANGLES 2
#endif
const uint8_t extruder_angles[2] = SWITCHING_EXTRUDER_SERVO_ANGLES;
static_assert(COUNT(extruder_angles) == REQ_ANGLES, "SWITCHING_EXTRUDER_SERVO_ANGLES needs " STRINGIFY(REQ_ANGLES) " angles.");
servo_angles[SWITCHING_EXTRUDER_SERVO_NR][0] = extruder_angles[0];
servo_angles[SWITCHING_EXTRUDER_SERVO_NR][1] = extruder_angles[1];
#endif
#if ENABLED(SWITCHING_NOZZLE)
const uint8_t nozzel_angles[2] = SWITCHING_NOZZLE_SERVO_ANGLES;
servo_angles[SWITCHING_NOZZLE_SERVO_NR][0] = nozzel_angles[0];
servo_angles[SWITCHING_NOZZLE_SERVO_NR][1] = nozzel_angles[1];
#endif
#if defined(Z_SERVO_ANGLES) && defined(Z_PROBE_SERVO_NR)
const uint8_t z_probe_angles[2] = Z_SERVO_ANGLES;
servo_angles[Z_PROBE_SERVO_NR][0] = z_probe_angles[0];
servo_angles[Z_PROBE_SERVO_NR][1] = z_probe_angles[1];
#endif
#endif
#if ENABLED(DELTA)
const float adj[ABC] = DELTA_ENDSTOP_ADJ,
dta[ABC] = DELTA_TOWER_ANGLE_TRIM;
@ -2252,6 +2306,20 @@ void MarlinSettings::reset(PORTARG_SOLO) {
#endif // HAS_LEVELING
#if HAS_SERVOS
if (!forReplay) {
CONFIG_ECHO_START;
SERIAL_ECHOLNPGM_P(port, "Servo Angles:");
}
for (uint8_t i = 0; i < NUM_SERVOS; i++) {
CONFIG_ECHO_START;
SERIAL_ECHOPAIR_P(port, " M281 P", i);
SERIAL_ECHOPAIR_P(port, " L",servo_angles[i][0]);
SERIAL_ECHOPAIR_P(port, " U",servo_angles[i][1]);
SERIAL_EOL_P(port);
}
#endif
#if ENABLED(DELTA)
if (!forReplay) {

3
Marlin/src/module/probe.cpp
View File

@ -54,7 +54,6 @@ float zprobe_zoffset; // Initialized by settings.load()
#if HAS_Z_SERVO_PROBE
#include "../module/servo.h"
const int z_servo_angle[2] = Z_SERVO_ANGLES;
#endif
#if ENABLED(Z_PROBE_SLED)
@ -435,7 +434,7 @@ bool set_probe_deployed(const bool deploy) {
#elif HAS_Z_SERVO_PROBE && DISABLED(BLTOUCH)
MOVE_SERVO(Z_PROBE_SERVO_NR, z_servo_angle[deploy ? 0 : 1]);
MOVE_SERVO(Z_PROBE_SERVO_NR, servo_angles[Z_PROBE_SERVO_NR][(deploy ? 0 : 1)]);
#elif ENABLED(Z_PROBE_ALLEN_KEY)

1
Marlin/src/module/probe.h
View File

@ -53,7 +53,6 @@
#endif
#if HAS_Z_SERVO_PROBE
extern const int z_servo_angle[2];
void servo_probe_init();
#endif

1
Marlin/src/module/servo.cpp
View File

@ -31,6 +31,7 @@
#include "servo.h"
HAL_SERVO_LIB servo[NUM_SERVOS];
uint8_t servo_angles[NUM_SERVOS][2];
void servo_init() {
#if NUM_SERVOS >= 1 && HAS_SERVO_0

5
Marlin/src/module/servo.h
View File

@ -30,6 +30,7 @@
#include "../HAL/shared/servo.h"
extern HAL_SERVO_LIB servo[NUM_SERVOS];
extern uint8_t servo_angles[NUM_SERVOS][2];
extern void servo_init();
#define MOVE_SERVO(I, P) servo[I].move(P)
@ -37,8 +38,8 @@ extern void servo_init();
#include "../inc/MarlinConfig.h"
#if HAS_Z_SERVO_PROBE
#define DEPLOY_Z_SERVO() MOVE_SERVO(Z_PROBE_SERVO_NR, z_servo_angle[0])
#define STOW_Z_SERVO() MOVE_SERVO(Z_PROBE_SERVO_NR, z_servo_angle[1])
#define DEPLOY_Z_SERVO() MOVE_SERVO(Z_PROBE_SERVO_NR, servo_angles[Z_PROBE_SERVO_NR][0])
#define STOW_Z_SERVO() MOVE_SERVO(Z_PROBE_SERVO_NR, servo_angles[Z_PROBE_SERVO_NR][1])
#endif
#endif // _SERVO_H_

9
Marlin/src/module/tool_change.cpp
View File

@ -60,22 +60,18 @@
#if DO_SWITCH_EXTRUDER
#if EXTRUDERS > 3
#define REQ_ANGLES 4
#define _SERVO_NR (e < 2 ? SWITCHING_EXTRUDER_SERVO_NR : SWITCHING_EXTRUDER_E23_SERVO_NR)
#else
#define REQ_ANGLES 2
#define _SERVO_NR SWITCHING_EXTRUDER_SERVO_NR
#endif
void move_extruder_servo(const uint8_t e) {
constexpr int16_t angles[] = SWITCHING_EXTRUDER_SERVO_ANGLES;
static_assert(COUNT(angles) == REQ_ANGLES, "SWITCHING_EXTRUDER_SERVO_ANGLES needs " STRINGIFY(REQ_ANGLES) " angles.");
planner.synchronize();
#if EXTRUDERS & 1
if (e < EXTRUDERS - 1)
#endif
{
MOVE_SERVO(_SERVO_NR, angles[e]);
MOVE_SERVO(_SERVO_NR, servo_angles[_SERVO_NR][e]);
safe_delay(500);
}
}
@ -85,9 +81,8 @@
#if ENABLED(SWITCHING_NOZZLE)
void move_nozzle_servo(const uint8_t e) {
const int16_t angles[2] = SWITCHING_NOZZLE_SERVO_ANGLES;
planner.synchronize();
MOVE_SERVO(SWITCHING_NOZZLE_SERVO_NR, angles[e]);
MOVE_SERVO(SWITCHING_NOZZLE_SERVO_NR, servo_angles[SWITCHING_EXTRUDER_SERVO_NR][e]);
safe_delay(500);
}