Singleton for cutting tools (#14429)
Scott Lahteine
5 years ago
committed by
GitHub
parent
2fde1475cb
commit
d7d80418ae
@ -0,0 +1,99 @@
|
|||||||
|
/**
|
||||||
|
* Marlin 3D Printer Firmware
|
||||||
|
* Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
|
*
|
||||||
|
* Based on Sprinter and grbl.
|
||||||
|
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* feature/spindle_laser.cpp
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "../inc/MarlinConfig.h"
|
||||||
|
|
||||||
|
#if HAS_CUTTER
|
||||||
|
|
||||||
|
#include "spindle_laser.h"
|
||||||
|
|
||||||
|
SpindleLaser cutter;
|
||||||
|
|
||||||
|
cutter_power_t SpindleLaser::power; // = 0
|
||||||
|
|
||||||
|
void SpindleLaser::init() {
|
||||||
|
OUT_WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ACTIVE_HIGH); // Init spindle to off
|
||||||
|
#if ENABLED(SPINDLE_CHANGE_DIR)
|
||||||
|
OUT_WRITE(SPINDLE_DIR_PIN, SPINDLE_INVERT_DIR ? 255 : 0); // Init rotation to clockwise (M3)
|
||||||
|
#endif
|
||||||
|
#if ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)
|
||||||
|
SET_PWM(SPINDLE_LASER_PWM_PIN);
|
||||||
|
analogWrite(SPINDLE_LASER_PWM_PIN, SPINDLE_LASER_PWM_INVERT ? 255 : 0); // set to lowest speed
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
#if ENABLED(SPINDLE_LASER_PWM)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ocr_val_mode() is used for debugging and to get the points needed to compute the RPM vs ocr_val line
|
||||||
|
*
|
||||||
|
* it accepts inputs of 0-255
|
||||||
|
*/
|
||||||
|
void SpindleLaser::set_ocr(const uint8_t ocr) {
|
||||||
|
WRITE(SPINDLE_LASER_ENA_PIN, SPINDLE_LASER_ACTIVE_HIGH); // turn spindle on (active low)
|
||||||
|
#if ENABLED(SPINDLE_LASER_PWM)
|
||||||
|
analogWrite(SPINDLE_LASER_PWM_PIN, (SPINDLE_LASER_PWM_INVERT) ? 255 - ocr : ocr);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void SpindleLaser::update_output() {
|
||||||
|
const bool ena = enabled();
|
||||||
|
#if ENABLED(SPINDLE_LASER_PWM)
|
||||||
|
if (ena) {
|
||||||
|
constexpr float inv_slope = RECIPROCAL(SPEED_POWER_SLOPE),
|
||||||
|
min_ocr = (SPEED_POWER_MIN - (SPEED_POWER_INTERCEPT)) * inv_slope, // Minimum allowed
|
||||||
|
max_ocr = (SPEED_POWER_MAX - (SPEED_POWER_INTERCEPT)) * inv_slope; // Maximum allowed
|
||||||
|
int16_t ocr_val;
|
||||||
|
if (power <= SPEED_POWER_MIN) ocr_val = min_ocr; // Use minimum if set below
|
||||||
|
else if (power >= SPEED_POWER_MAX) ocr_val = max_ocr; // Use maximum if set above
|
||||||
|
else ocr_val = (power - (SPEED_POWER_INTERCEPT)) * inv_slope; // Use calculated OCR value
|
||||||
|
set_ocr(ocr_val & 0xFF); // ...limited to Atmel PWM max
|
||||||
|
}
|
||||||
|
else { // Convert RPM to PWM duty cycle
|
||||||
|
WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ACTIVE_HIGH); // Turn spindle off (active low)
|
||||||
|
analogWrite(SPINDLE_LASER_PWM_PIN, SPINDLE_LASER_PWM_INVERT ? 255 : 0); // Only write low byte
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
WRITE(SPINDLE_LASER_ENA_PIN, ena ? SPINDLE_LASER_ACTIVE_HIGH : !SPINDLE_LASER_ACTIVE_HIGH);
|
||||||
|
#endif
|
||||||
|
power_delay(ena);
|
||||||
|
}
|
||||||
|
|
||||||
|
#if ENABLED(SPINDLE_CHANGE_DIR)
|
||||||
|
|
||||||
|
void SpindleLaser::set_direction(const bool reverse) {
|
||||||
|
const bool dir_state = (reverse == SPINDLE_INVERT_DIR); // Forward (M3) HIGH when not inverted
|
||||||
|
#if ENABLED(SPINDLE_STOP_ON_DIR_CHANGE)
|
||||||
|
if (enabled() && READ(SPINDLE_DIR_PIN) != dir_state) disable();
|
||||||
|
#endif
|
||||||
|
WRITE(SPINDLE_DIR_PIN, dir_state);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif // HAS_CUTTER
|
||||||
@ -0,0 +1,83 @@
|
|||||||
|
/**
|
||||||
|
* Marlin 3D Printer Firmware
|
||||||
|
* Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
|
*
|
||||||
|
* Based on Sprinter and grbl.
|
||||||
|
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
/**
|
||||||
|
* feature/spindle_laser.h
|
||||||
|
* Support for Laser Power or Spindle Power & Direction
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "../inc/MarlinConfig.h"
|
||||||
|
|
||||||
|
#if ENABLED(SPINDLE_FEATURE)
|
||||||
|
#define _MSG_CUTTER(M) MSG_SPINDLE_##M
|
||||||
|
#else
|
||||||
|
#define _MSG_CUTTER(M) MSG_LASER_##M
|
||||||
|
#endif
|
||||||
|
#define MSG_CUTTER(M) _MSG_CUTTER(M)
|
||||||
|
|
||||||
|
#if SPEED_POWER_MAX > 255
|
||||||
|
#define cutter_power_t uint16_t
|
||||||
|
#define CUTTER_MENU_TYPE uint16_5
|
||||||
|
#else
|
||||||
|
#define cutter_power_t uint8_t
|
||||||
|
#define CUTTER_MENU_TYPE uint8
|
||||||
|
#endif
|
||||||
|
|
||||||
|
class SpindleLaser {
|
||||||
|
public:
|
||||||
|
static cutter_power_t power;
|
||||||
|
|
||||||
|
static void init();
|
||||||
|
|
||||||
|
static inline bool enabled() { return !!power; }
|
||||||
|
|
||||||
|
static inline void set_power(const uint8_t pwr) { power = pwr; update_output(); }
|
||||||
|
|
||||||
|
static inline void set_enabled(const bool enable) { set_power(enable ? 255 : 0); }
|
||||||
|
|
||||||
|
//static bool active() { return READ(SPINDLE_LASER_ENA_PIN) == SPINDLE_LASER_ACTIVE_HIGH; }
|
||||||
|
|
||||||
|
#if ENABLED(SPINDLE_LASER_PWM)
|
||||||
|
static void update_output();
|
||||||
|
static void set_ocr(const uint8_t ocr);
|
||||||
|
static inline void set_ocr_power(const uint8_t pwr) { power = pwr; set_ocr(pwr); }
|
||||||
|
#else
|
||||||
|
static inline void update_output() { }
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Wait for spindle to spin up or spin down
|
||||||
|
static inline void power_delay(const bool on) { safe_delay(on ? SPINDLE_LASER_POWERUP_DELAY : SPINDLE_LASER_POWERDOWN_DELAY); }
|
||||||
|
|
||||||
|
#if ENABLED(SPINDLE_CHANGE_DIR)
|
||||||
|
static void set_direction(const bool reverse);
|
||||||
|
#else
|
||||||
|
static inline void set_direction(const bool reverse) { UNUSED(reverse); }
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static inline void disable() { set_enabled(false); }
|
||||||
|
static inline void enable_forward() { set_direction(false); set_enabled(true); }
|
||||||
|
static inline void enable_reverse() { set_direction(true); set_enabled(true); }
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
extern SpindleLaser cutter;
|
||||||
@ -0,0 +1,54 @@
|
|||||||
|
/**
|
||||||
|
* Marlin 3D Printer Firmware
|
||||||
|
* Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
|
*
|
||||||
|
* Based on Sprinter and grbl.
|
||||||
|
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
//
|
||||||
|
// Spindle / Laser Menu
|
||||||
|
//
|
||||||
|
|
||||||
|
#include "../../inc/MarlinConfig.h"
|
||||||
|
|
||||||
|
#if HAS_CUTTER
|
||||||
|
|
||||||
|
#include "menu.h"
|
||||||
|
|
||||||
|
#include "../../feature/spindle_laser.h"
|
||||||
|
|
||||||
|
void menu_spindle_laser() {
|
||||||
|
|
||||||
|
START_MENU();
|
||||||
|
MENU_BACK(MSG_MAIN);
|
||||||
|
if (cutter.enabled()) {
|
||||||
|
#if ENABLED(SPINDLE_LASER_PWM)
|
||||||
|
MENU_ITEM_EDIT_CALLBACK(CUTTER_MENU_TYPE, MSG_CUTTER(POWER), &cutter.power, SPEED_POWER_MIN, SPEED_POWER_MAX, cutter.update_output);
|
||||||
|
#endif
|
||||||
|
MENU_ITEM(function, MSG_CUTTER(OFF), cutter.disable);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
MENU_ITEM(function, MSG_CUTTER(ON), cutter.enable_forward);
|
||||||
|
#if ENABLED(SPINDLE_CHANGE_DIR)
|
||||||
|
MENU_ITEM(function, MSG_SPINDLE_REVERSE, cutter.enable_reverse);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
END_MENU();
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // HAS_CUTTER
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue