Browse Source

Fix PLR/M43 warnings (#14333)

pull/1/head
Tanguy Pruvot 6 years ago
committed by Scott Lahteine
parent
commit
be69ec5b32
  1. 4
      Marlin/src/HAL/HAL_STM32F1/HAL_Servo_STM32F1.cpp
  2. 2
      Marlin/src/feature/power_loss_recovery.cpp
  3. 2
      Marlin/src/gcode/config/M43.cpp

4
Marlin/src/HAL/HAL_STM32F1/HAL_Servo_STM32F1.cpp

@ -98,7 +98,7 @@ bool libServo::attach(const int32_t pin, const int32_t minAngle, const int32_t m
if (!PWM_PIN(pin)) return false; if (!PWM_PIN(pin)) return false;
timer_dev *tdev = PIN_MAP[pin].timer_device; timer_dev *tdev = PIN_MAP[pin].timer_device;
uint8_t tchan = PIN_MAP[pin].timer_channel; //uint8_t tchan = PIN_MAP[pin].timer_channel;
SET_PWM(pin); SET_PWM(pin);
servoWrite(pin, 0); servoWrite(pin, 0);
@ -221,7 +221,7 @@ void libServo::move(const int32_t value) {
#else #else
bool libServo::setupSoftPWM(const int32_t pin) {} bool libServo::setupSoftPWM(const int32_t pin) { return false; }
void libServo::pwmSetDuty(const uint16_t duty_cycle) {} void libServo::pwmSetDuty(const uint16_t duty_cycle) {}
void libServo::pauseSoftPWM() {} void libServo::pauseSoftPWM() {}

2
Marlin/src/feature/power_loss_recovery.cpp

@ -278,7 +278,7 @@ void PrintJobRecovery::resume() {
// Pretend that all axes are homed // Pretend that all axes are homed
axis_homed = axis_known_position = xyz_bits; axis_homed = axis_known_position = xyz_bits;
char cmd[50], str_1[16], str_2[16]; char cmd[MAX_CMD_SIZE+16], str_1[16], str_2[16];
// Select the previously active tool (with no_move) // Select the previously active tool (with no_move)
#if EXTRUDERS > 1 #if EXTRUDERS > 1

2
Marlin/src/gcode/config/M43.cpp

@ -114,7 +114,7 @@ inline void servo_probe_test() {
", stow angle: ", servo_angles[probe_index][1] ", stow angle: ", servo_angles[probe_index][1]
); );
bool deploy_state, stow_state; bool deploy_state = false, stow_state;
#if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)

Loading…
Cancel
Save