Browse Source

Make BARICUDA a feature

pull/1/head
Scott Lahteine 7 years ago
parent
commit
b464887ea1
  1. 16
      Marlin/src/Marlin.cpp
  2. 4
      Marlin/src/Marlin.h
  3. 14
      Marlin/src/feature/baricuda.cpp
  4. 11
      Marlin/src/feature/baricuda.h
  5. 36
      Marlin/src/gcode/feature/baricuda/M126-M129.cpp
  6. 30
      Marlin/src/gcode/feature/baricuda/M129.h
  7. 24
      Marlin/src/gcode/gcode.cpp
  8. 4
      Marlin/src/module/planner.cpp

16
Marlin/src/Marlin.cpp

@ -177,11 +177,6 @@ static millis_t stepper_inactive_time = (DEFAULT_STEPPER_DEACTIVE_TIME) * 1000UL
float z_endstop_adj; float z_endstop_adj;
#endif #endif
#if ENABLED(BARICUDA)
uint8_t baricuda_valve_pressure = 0,
baricuda_e_to_p_pressure = 0;
#endif
#if HAS_POWER_SWITCH #if HAS_POWER_SWITCH
bool powersupply_on = bool powersupply_on =
#if ENABLED(PS_DEFAULT_OFF) #if ENABLED(PS_DEFAULT_OFF)
@ -374,17 +369,6 @@ bool pin_is_protected(const int8_t pin) {
return false; return false;
} }
#if ENABLED(BARICUDA)
#if HAS_HEATER_1
#include "gcode/feature/baricuda/M126.h"
#include "gcode/feature/baricuda/M127.h"
#endif
#if HAS_HEATER_2
#include "gcode/feature/baricuda/M128.h"
#include "gcode/feature/baricuda/M129.h"
#endif
#endif
#if ENABLED(ULTIPANEL) #if ENABLED(ULTIPANEL)
#include "gcode/lcd/M145.h" #include "gcode/lcd/M145.h"
#endif #endif

4
Marlin/src/Marlin.h

@ -207,10 +207,6 @@ extern volatile bool wait_for_heatup;
#endif #endif
#endif #endif
#if ENABLED(BARICUDA)
extern uint8_t baricuda_valve_pressure, baricuda_e_to_p_pressure;
#endif
#if ENABLED(ADVANCED_PAUSE_FEATURE) #if ENABLED(ADVANCED_PAUSE_FEATURE)
extern AdvancedPauseMenuResponse advanced_pause_menu_response; extern AdvancedPauseMenuResponse advanced_pause_menu_response;
#endif #endif

14
Marlin/src/gcode/feature/baricuda/M127.h → Marlin/src/feature/baricuda.cpp

@ -20,11 +20,13 @@
* *
*/ */
/** #include "../inc/MarlinConfig.h"
* M127: Heater 1 valve close
*/ #if ENABLED(BARICUDA)
void gcode_M127() {
#include "baricuda.h"
baricuda_valve_pressure = 0; uint8_t baricuda_valve_pressure = 0,
baricuda_e_to_p_pressure = 0;
} #endif // BARICUDA

11
Marlin/src/gcode/feature/baricuda/M126.h → Marlin/src/feature/baricuda.h

@ -20,11 +20,10 @@
* *
*/ */
/** #ifndef __BARICUDA_H__
* M126: Heater 1 valve open #define __BARICUDA_H__
*/
void gcode_M126() {
baricuda_valve_pressure = parser.byteval('S', 255); extern uint8_t baricuda_valve_pressure,
baricuda_e_to_p_pressure;
} #endif // __BARICUDA_H__

36
Marlin/src/gcode/feature/baricuda/M128.h → Marlin/src/gcode/feature/baricuda/M126-M129.cpp

@ -20,11 +20,39 @@
* *
*/ */
/** #include "../../../inc/MarlinConfig.h"
#if ENABLED(BARICUDA)
#include "../../gcode.h"
#include "../../../feature/baricuda.h"
#if HAS_HEATER_1
/**
* M126: Heater 1 valve open
*/
void GcodeSuite::M126() { baricuda_valve_pressure = parser.byteval('S', 255); }
/**
* M127: Heater 1 valve close
*/
void GcodeSuite::M127() { baricuda_valve_pressure = 0; }
#endif // HAS_HEATER_1
#if HAS_HEATER_2
/**
* M128: Heater 2 valve open * M128: Heater 2 valve open
*/ */
void gcode_M128() { void GcodeSuite::M128() { baricuda_e_to_p_pressure = parser.byteval('S', 255); }
/**
* M129: Heater 2 valve close
*/
void GcodeSuite::M129() { baricuda_e_to_p_pressure = 0; }
baricuda_e_to_p_pressure = parser.byteval('S', 255); #endif // HAS_HEATER_2
} #endif // BARICUDA

30
Marlin/src/gcode/feature/baricuda/M129.h

@ -1,30 +0,0 @@
/**
* Marlin 3D Printer Firmware
* Copyright (C) 2016 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/>.
*
*/
/**
* M129: Heater 2 valve close
*/
void gcode_M129() {
baricuda_e_to_p_pressure = 0;
}

24
Marlin/src/gcode/gcode.cpp

@ -131,10 +131,6 @@ extern void gcode_M118();
extern void gcode_M119(); extern void gcode_M119();
extern void gcode_M120(); extern void gcode_M120();
extern void gcode_M121(); extern void gcode_M121();
extern void gcode_M126();
extern void gcode_M127();
extern void gcode_M128();
extern void gcode_M129();
extern void gcode_M145(); extern void gcode_M145();
extern void gcode_M149(); extern void gcode_M149();
extern void gcode_M150(); extern void gcode_M150();
@ -486,23 +482,15 @@ void GcodeSuite::process_next_command() {
#if ENABLED(BARICUDA) #if ENABLED(BARICUDA)
// PWM for HEATER_1_PIN // PWM for HEATER_1_PIN
#if HAS_HEATER_1 #if HAS_HEATER_1
case 126: // M126: valve open case 126: M126(); break; // M126: valve open
gcode_M126(); case 127: M127(); break; // M127: valve closed
break; #endif
case 127: // M127: valve closed
gcode_M127();
break;
#endif // HAS_HEATER_1
// PWM for HEATER_2_PIN // PWM for HEATER_2_PIN
#if HAS_HEATER_2 #if HAS_HEATER_2
case 128: // M128: valve open case 128: M128(); break; // M128: valve open
gcode_M128(); case 129: M129(); break; // M129: valve closed
break; #endif
case 129: // M129: valve closed
gcode_M129();
break;
#endif // HAS_HEATER_2
#endif // BARICUDA #endif // BARICUDA
#if HAS_POWER_SWITCH #if HAS_POWER_SWITCH

4
Marlin/src/module/planner.cpp

@ -76,6 +76,10 @@
#include "../feature/filwidth.h" #include "../feature/filwidth.h"
#endif #endif
#if ENABLED(BARICUDA)
#include "../feature/baricuda.h"
#endif
Planner planner; Planner planner;
// public: // public:

Loading…
Cancel
Save