andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Optional `M42`/`M226`; Add more features filters (#19664)

vanilla_fb_2.0.x
Scott Lahteine 4 years ago
committed by Scott Lahteine
parent
59b6b32e6e
commit
454f9d6319
11 changed files with 111 additions and 78 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      Marlin/Configuration_adv.h
  2. 6
      Marlin/src/gcode/control/M226.cpp
  3. 7
      Marlin/src/gcode/control/M42.cpp
  4. 5
      Marlin/src/gcode/gcode.cpp
  5. 9
      Marlin/src/gcode/gcode.h
  6. 10
      Marlin/src/inc/MarlinConfig.h
  7. 8
      Marlin/src/inc/MarlinConfigPre.h
  8. 2
      Marlin/src/pins/pins.h
  9. 47
      buildroot/share/PlatformIO/scripts/common-dependencies.h
  10. 8
      buildroot/share/PlatformIO/scripts/common-dependencies.py
  11. 50
      platformio.ini

5
Marlin/Configuration_adv.h
View File

@ -3559,6 +3559,11 @@
// //
//#define M100_FREE_MEMORY_WATCHER //#define M100_FREE_MEMORY_WATCHER
//
// M42 - Set pin states
//
//#define DIRECT_PIN_CONTROL
// //
// M43 - display pin status, toggle pins, watch pins, watch endstops & toggle LED, test servo probe // M43 - display pin status, toggle pins, watch pins, watch endstops & toggle LED, test servo probe
// //

6
Marlin/src/gcode/control/M226.cpp
View File

@ -20,6 +20,10 @@
* *
*/ */
#include "../../inc/MarlinConfig.h"
#if ENABLED(DIRECT_PIN_CONTROL)
#include "../gcode.h" #include "../gcode.h"
#include "../../MarlinCore.h" // for pin_is_protected and idle() #include "../../MarlinCore.h" // for pin_is_protected and idle()
#include "../../module/stepper.h" #include "../../module/stepper.h"
@ -50,3 +54,5 @@ void GcodeSuite::M226() {
} // pin_state -1 0 1 && pin > -1 } // pin_state -1 0 1 && pin > -1
} // parser.seen('P') } // parser.seen('P')
} }
#endif // DIRECT_PIN_CONTROL

7
Marlin/src/gcode/control/M42.cpp
View File

@ -20,9 +20,12 @@
* *
*/ */
#include "../../inc/MarlinConfig.h"
#if ENABLED(DIRECT_PIN_CONTROL)
#include "../gcode.h" #include "../gcode.h"
#include "../../MarlinCore.h" // for pin_is_protected #include "../../MarlinCore.h" // for pin_is_protected
#include "../../inc/MarlinConfig.h"
#if HAS_FAN #if HAS_FAN
#include "../../module/temperature.h" #include "../../module/temperature.h"
@ -96,3 +99,5 @@ void GcodeSuite::M42() {
extDigitalWrite(pin, pin_status); extDigitalWrite(pin, pin_status);
analogWrite(pin, pin_status); analogWrite(pin, pin_status);
} }
#endif // DIRECT_PIN_CONTROL

5
Marlin/src/gcode/gcode.cpp
View File

@ -445,7 +445,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
#endif // SDSUPPORT #endif // SDSUPPORT
case 31: M31(); break; // M31: Report time since the start of SD print or last M109 case 31: M31(); break; // M31: Report time since the start of SD print or last M109
#if ENABLED(DIRECT_PIN_CONTROL)
case 42: M42(); break; // M42: Change pin state case 42: M42(); break; // M42: Change pin state
#endif
#if ENABLED(PINS_DEBUGGING) #if ENABLED(PINS_DEBUGGING)
case 43: M43(); break; // M43: Read pin state case 43: M43(); break; // M43: Read pin state
@ -620,7 +623,9 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
case 221: M221(); break; // M221: Set Flow Percentage case 221: M221(); break; // M221: Set Flow Percentage
#endif #endif
#if ENABLED(DIRECT_PIN_CONTROL)
case 226: M226(); break; // M226: Wait until a pin reaches a state case 226: M226(); break; // M226: Wait until a pin reaches a state
#endif
#if HAS_SERVOS #if HAS_SERVOS
case 280: M280(); break; // M280: Set servo position absolute case 280: M280(); break; // M280: Set servo position absolute

9
Marlin/src/gcode/gcode.h
View File

@ -109,7 +109,7 @@
* The '#' is necessary when calling from within sd files, as it stops buffer prereading * The '#' is necessary when calling from within sd files, as it stops buffer prereading
* M33 - Get the longname version of a path. (Requires LONG_FILENAME_HOST_SUPPORT) * M33 - Get the longname version of a path. (Requires LONG_FILENAME_HOST_SUPPORT)
* M34 - Set SD Card sorting options. (Requires SDCARD_SORT_ALPHA) * M34 - Set SD Card sorting options. (Requires SDCARD_SORT_ALPHA)
* M42 - Change pin status via gcode: M42 P<pin> S<value>. LED pin assumed if P is omitted. * M42 - Change pin status via gcode: M42 P<pin> S<value>. LED pin assumed if P is omitted. (Requires DIRECT_PIN_CONTROL)
* M43 - Display pin status, watch pins for changes, watch endstops & toggle LED, Z servo probe test, toggle pins * M43 - Display pin status, watch pins for changes, watch endstops & toggle LED, Z servo probe test, toggle pins
* M48 - Measure Z Probe repeatability: M48 P<points> X<pos> Y<pos> V<level> E<engage> L<legs> S<chizoid>. (Requires Z_MIN_PROBE_REPEATABILITY_TEST) * M48 - Measure Z Probe repeatability: M48 P<points> X<pos> Y<pos> V<level> E<engage> L<legs> S<chizoid>. (Requires Z_MIN_PROBE_REPEATABILITY_TEST)
* M73 - Set the progress percentage. (Requires LCD_SET_PROGRESS_MANUALLY) * M73 - Set the progress percentage. (Requires LCD_SET_PROGRESS_MANUALLY)
@ -183,7 +183,7 @@
* M220 - Set Feedrate Percentage: "M220 S<percent>" (i.e., "FR" on the LCD) * M220 - Set Feedrate Percentage: "M220 S<percent>" (i.e., "FR" on the LCD)
* Use "M220 B" to back up the Feedrate Percentage and "M220 R" to restore it. (Requires PRUSA_MMU2) * Use "M220 B" to back up the Feedrate Percentage and "M220 R" to restore it. (Requires PRUSA_MMU2)
* M221 - Set Flow Percentage: "M221 S<percent>" * M221 - Set Flow Percentage: "M221 S<percent>"
* M226 - Wait until a pin is in a given state: "M226 P<pin> S<state>" * M226 - Wait until a pin is in a given state: "M226 P<pin> S<state>" (Requires DIRECT_PIN_CONTROL)
* M240 - Trigger a camera to take a photograph. (Requires PHOTO_GCODE) * M240 - Trigger a camera to take a photograph. (Requires PHOTO_GCODE)
* M250 - Set LCD contrast: "M250 C<contrast>" (0-63). (Requires LCD support) * M250 - Set LCD contrast: "M250 C<contrast>" (0-63). (Requires LCD support)
* M260 - i2c Send Data (Requires EXPERIMENTAL_I2CBUS) * M260 - i2c Send Data (Requires EXPERIMENTAL_I2CBUS)
@ -544,8 +544,7 @@ private:
#endif #endif
#endif #endif
static void M42(); TERN_(DIRECT_PIN_CONTROL, static void M42());
TERN_(PINS_DEBUGGING, static void M43()); TERN_(PINS_DEBUGGING, static void M43());
TERN_(Z_MIN_PROBE_REPEATABILITY_TEST, static void M48()); TERN_(Z_MIN_PROBE_REPEATABILITY_TEST, static void M48());
@ -673,7 +672,7 @@ private:
static void M221(); static void M221();
#endif #endif
static void M226(); TERN_(DIRECT_PIN_CONTROL, static void M226());
TERN_(PHOTO_GCODE, static void M240()); TERN_(PHOTO_GCODE, static void M240());

10
Marlin/src/inc/MarlinConfig.h
View File

@ -27,13 +27,21 @@
#include "MarlinConfigPre.h" #include "MarlinConfigPre.h"
#ifndef __MARLIN_DEPS__
#include "../HAL/HAL.h" #include "../HAL/HAL.h"
#endif
#include "../pins/pins.h" #include "../pins/pins.h"
#ifndef __MARLIN_DEPS__
#include HAL_PATH(../HAL, timers.h) #include HAL_PATH(../HAL, timers.h)
#include HAL_PATH(../HAL, spi_pins.h) #include HAL_PATH(../HAL, spi_pins.h)
#endif
#include "Conditionals_post.h" #include "Conditionals_post.h"
#ifndef __MARLIN_DEPS__
#include HAL_PATH(../HAL, inc/Conditionals_post.h) #include HAL_PATH(../HAL, inc/Conditionals_post.h)
#include "../core/types.h" // Ahead of sanity-checks #include "../core/types.h" // Ahead of sanity-checks
@ -45,3 +53,5 @@
#include "../core/language.h" #include "../core/language.h"
#include "../core/utility.h" #include "../core/utility.h"
#include "../core/serial.h" #include "../core/serial.h"
#endif

8
Marlin/src/inc/MarlinConfigPre.h
View File

@ -30,7 +30,9 @@
// //
#include <stdint.h> #include <stdint.h>
#ifndef __MARLIN_DEPS__
#include "../HAL/platforms.h" #include "../HAL/platforms.h"
#endif
#include "../core/boards.h" #include "../core/boards.h"
#include "../core/macros.h" #include "../core/macros.h"
@ -45,10 +47,16 @@
#include "Version.h" #include "Version.h"
#include "Conditionals_LCD.h" #include "Conditionals_LCD.h"
#ifndef __MARLIN_DEPS__
#include HAL_PATH(../HAL, inc/Conditionals_LCD.h) #include HAL_PATH(../HAL, inc/Conditionals_LCD.h)
#endif
#include "../core/drivers.h" #include "../core/drivers.h"
#include "../../Configuration_adv.h" #include "../../Configuration_adv.h"
#include "Conditionals_adv.h" #include "Conditionals_adv.h"
#ifndef __MARLIN_DEPS__
#include HAL_PATH(../HAL, inc/Conditionals_adv.h) #include HAL_PATH(../HAL, inc/Conditionals_adv.h)
#endif

2
Marlin/src/pins/pins.h
View File

@ -52,7 +52,7 @@
#define HAS_FREE_AUX2_PINS !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD)) #define HAS_FREE_AUX2_PINS !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD))
// Test the target within the included pins file // Test the target within the included pins file
#ifdef __MARLIN_PREBUILD__ #ifdef __MARLIN_DEPS__
#define NOT_TARGET(V...) 0 #define NOT_TARGET(V...) 0
#else #else
#define NOT_TARGET(V...) NONE(V) #define NOT_TARGET(V...) NONE(V)

47
buildroot/share/PlatformIO/scripts/common-dependencies.h
View File

@ -19,7 +19,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
* *
*/ */
#pragma once
/** /**
* The purpose of this file is just include Marlin Configuration files, * The purpose of this file is just include Marlin Configuration files,
@ -27,44 +26,9 @@
* Used by common-dependencies.py * Used by common-dependencies.py
*/ */
#include <stdint.h> #define NUM_SERIAL 1 // Normally provided by HAL/HAL.h
// Include platform headers #include "../../../../Marlin/src/inc/MarlinConfig.h"
//#include "../../../../Marlin/src/HAL/platforms.h"
#include "../../../../Marlin/src/core/boards.h"
#include "../../../../Marlin/src/core/macros.h"
#include "../../../../Marlin/Configuration.h"
#include "../../../../Marlin/Version.h"
#include "../../../../Marlin/src/inc/Conditionals_LCD.h"
#ifdef HAL_PATH
#include HAL_PATH(../../../../Marlin/src/HAL, inc/Conditionals_LCD.h)
#endif
#include "../../../../Marlin/src/core/drivers.h"
#include "../../../../Marlin/Configuration_adv.h"
#include "../../../../Marlin/src/inc/Conditionals_adv.h"
#ifdef HAL_PATH
#include HAL_PATH(../../../../Marlin/src/HAL, inc/Conditionals_adv.h)
#endif
//#include "../../../../Marlin/src/pins/pins.h"
#ifdef HAL_PATH
#include HAL_PATH(../../../../Marlin/src/HAL, timers.h)
#include HAL_PATH(../../../../Marlin/src/HAL, spi_pins.h)
#endif
#include "../../../../Marlin/src/inc/Conditionals_post.h"
#ifdef HAL_PATH
#include HAL_PATH(../../../../Marlin/src/HAL, inc/Conditionals_post.h)
#endif
// //
// Conditionals only used for [features] // Conditionals only used for [features]
@ -89,6 +53,10 @@
#define HAS_EXTRUDERS #define HAS_EXTRUDERS
#endif #endif
#if ENABLED(DUET_SMART_EFFECTOR) && PIN_EXISTS(SMART_EFFECTOR_MOD)
#define HAS_SMART_EFF_MOD
#endif
#if HAS_LCD_MENU #if HAS_LCD_MENU
#if ENABLED(BACKLASH_GCODE) #if ENABLED(BACKLASH_GCODE)
#define HAS_MENU_BACKLASH #define HAS_MENU_BACKLASH
@ -145,6 +113,3 @@
#define HAS_MENU_UBL #define HAS_MENU_UBL
#endif #endif
#endif #endif
// Include pins for the current board. Platform tests will be skipped. No HAL-defined pins.
#include "../../../../Marlin/src/pins/pins.h"

8
buildroot/share/PlatformIO/scripts/common-dependencies.py
View File

@ -39,6 +39,12 @@ def parse_pkg_uri(spec):
FEATURE_CONFIG = {} FEATURE_CONFIG = {}
def add_to_feat_cnf(feature, flines): def add_to_feat_cnf(feature, flines):
try:
feat = FEATURE_CONFIG[feature]
except:
FEATURE_CONFIG[feature] = {}
feat = FEATURE_CONFIG[feature] feat = FEATURE_CONFIG[feature]
atoms = re.sub(',\\s*', '\n', flines).strip().split('\n') atoms = re.sub(',\\s*', '\n', flines).strip().split('\n')
for dep in atoms: for dep in atoms:
@ -238,7 +244,7 @@ def load_marlin_features():
else: else:
cmd += ['-D' + s] cmd += ['-D' + s]
cmd += ['-D__MARLIN_PREBUILD__ -w -dM -E -x c++ buildroot/share/PlatformIO/scripts/common-dependencies.h'] cmd += ['-D__MARLIN_DEPS__ -w -dM -E -x c++ buildroot/share/PlatformIO/scripts/common-dependencies.h']
cmd = ' '.join(cmd) cmd = ' '.join(cmd)
blab(cmd) blab(cmd)
define_list = subprocess.check_output(cmd, shell=True).splitlines() define_list = subprocess.check_output(cmd, shell=True).splitlines()

50
platformio.ini
View File

@ -27,6 +27,7 @@ include_dir = Marlin
[common] [common]
default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared> default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
-<src/lcd/HD44780> -<src/lcd/TFTGLCD> -<src/lcd/dwin> -<src/lcd/dogm> -<src/lcd/tft> -<src/lcd/HD44780> -<src/lcd/TFTGLCD> -<src/lcd/dwin> -<src/lcd/dogm> -<src/lcd/tft>
-<src/HAL/STM32/tft> -<src/HAL/STM32F1/tft>
-<src/lcd/menu> -<src/lcd/menu>
-<src/lcd/menu/game/game.cpp> -<src/lcd/menu/game/brickout.cpp> -<src/lcd/menu/game/invaders.cpp> -<src/lcd/menu/game/game.cpp> -<src/lcd/menu/game/brickout.cpp> -<src/lcd/menu/game/invaders.cpp>
-<src/lcd/menu/game/maze.cpp> -<src/lcd/menu/game/snake.cpp> -<src/lcd/menu/game/maze.cpp> -<src/lcd/menu/game/snake.cpp>
@ -53,10 +54,13 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
-<src/lcd/extui/example.cpp> -<src/lcd/extui/example.cpp>
-<src/lcd/extui/malyan_lcd.cpp> -<src/lcd/extui/malyan_lcd.cpp>
-<src/lcd/extui/lib/ftdi_eve_touch_ui> -<src/lcd/extui/lib/ftdi_eve_touch_ui>
-<src/lcd/extui/anycubic_chiron_lcd.cpp> -<src/lcd/extui/anycubic_chiron_lcd.cpp> -<src/lcd/extui/lib/anycubic_chiron>
-<src/lcd/extui/anycubic_i3mega_lcd.cpp> -<src/lcd/extui/lib/anycubic_i3mega> -<src/lcd/extui/anycubic_i3mega_lcd.cpp> -<src/lcd/extui/lib/anycubic_i3mega>
-<src/lcd/lcdprint.cpp> -<src/lcd/lcdprint.cpp>
-<src/lcd/touch/touch_buttons.cpp>
-<src/sd/usb_flashdrive> -<src/sd/usb_flashdrive>
-<src/HAL/shared/backtrace>
-<src/feature/babystep.cpp>
-<src/feature/backlash.cpp> -<src/feature/backlash.cpp>
-<src/feature/baricuda.cpp> -<src/gcode/feature/baricuda> -<src/feature/baricuda.cpp> -<src/gcode/feature/baricuda>
-<src/feature/bedlevel/abl> -<src/gcode/bedlevel/abl> -<src/feature/bedlevel/abl> -<src/gcode/bedlevel/abl>
@ -65,7 +69,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
-<src/feature/binary_stream.cpp> -<src/libs/heatshrink> -<src/feature/binary_stream.cpp> -<src/libs/heatshrink>
-<src/feature/bltouch.cpp> -<src/feature/bltouch.cpp>
-<src/feature/cancel_object.cpp> -<src/gcode/feature/cancel> -<src/feature/cancel_object.cpp> -<src/gcode/feature/cancel>
-<src/feature/caselight> -<src/gcode/feature/caselight> -<src/feature/caselight.cpp> -<src/gcode/feature/caselight>
-<src/feature/closedloop.cpp> -<src/feature/closedloop.cpp>
-<src/feature/controllerfan.cpp> -<src/gcode/feature/controllerfan> -<src/feature/controllerfan.cpp> -<src/gcode/feature/controllerfan>
-<src/feature/dac> -<src/feature/digipot> -<src/feature/dac> -<src/feature/digipot>
@ -80,6 +84,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
-<src/feature/joystick.cpp> -<src/feature/joystick.cpp>
-<src/feature/leds/blinkm.cpp> -<src/feature/leds/blinkm.cpp>
-<src/feature/leds/leds.cpp> -<src/feature/leds/leds.cpp>
-<src/feature/leds/neopixel.cpp>
-<src/feature/leds/pca9533.cpp> -<src/feature/leds/pca9533.cpp>
-<src/feature/leds/pca9632.cpp> -<src/feature/leds/pca9632.cpp>
-<src/feature/leds/printer_event_leds.cpp> -<src/feature/leds/printer_event_leds.cpp>
@ -95,7 +100,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
-<src/feature/probe_temp_comp.cpp> -<src/feature/probe_temp_comp.cpp>
-<src/feature/runout.cpp> -<src/gcode/feature/runout> -<src/feature/runout.cpp> -<src/gcode/feature/runout>
-<src/feature/snmm.cpp> -<src/feature/snmm.cpp>
-<src/feature/solenoid.cpp> -<src/feature/solenoid.cpp> -<src/gcode/control/M380_M381.cpp>
-<src/feature/spindle_laser.cpp> -<src/gcode/control/M3-M5.cpp> -<src/feature/spindle_laser.cpp> -<src/gcode/control/M3-M5.cpp>
-<src/feature/tmc_util.cpp> -<src/module/stepper/trinamic.cpp> -<src/feature/tmc_util.cpp> -<src/module/stepper/trinamic.cpp>
-<src/feature/twibus.cpp> -<src/feature/twibus.cpp>
@ -106,7 +111,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
-<src/gcode/bedlevel/M420.cpp> -<src/gcode/bedlevel/M420.cpp>
-<src/gcode/calibrate/G33.cpp> -<src/gcode/calibrate/G33.cpp>
-<src/gcode/calibrate/G34_M422.cpp> -<src/gcode/calibrate/G34_M422.cpp>
-<src/gcode/calibrate/G76_M871.cpp> -<src/gcode/calibrate/G76_M192_M871.cpp>
-<src/gcode/calibrate/G425.cpp> -<src/gcode/calibrate/G425.cpp>
-<src/gcode/calibrate/M12.cpp> -<src/gcode/calibrate/M12.cpp>
-<src/gcode/calibrate/M48.cpp> -<src/gcode/calibrate/M48.cpp>
@ -114,14 +119,19 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
-<src/gcode/calibrate/M425.cpp> -<src/gcode/calibrate/M425.cpp>
-<src/gcode/calibrate/M666.cpp> -<src/gcode/calibrate/M666.cpp>
-<src/gcode/calibrate/M852.cpp> -<src/gcode/calibrate/M852.cpp>
-<src/gcode/control/M42.cpp> -<src/gcode/control/M226.cpp>
-<src/gcode/config/M43.cpp> -<src/gcode/config/M43.cpp>
-<src/gcode/config/M217.cpp> -<src/gcode/config/M217.cpp>
-<src/gcode/config/M218.cpp> -<src/gcode/config/M218.cpp>
-<src/gcode/config/M221.cpp> -<src/gcode/config/M221.cpp>
-<src/gcode/config/M281.cpp> -<src/gcode/config/M281.cpp>
-<src/gcode/config/M301.cpp>
-<src/gcode/config/M302.cpp> -<src/gcode/config/M302.cpp>
-<src/gcode/config/M304.cpp>
-<src/gcode/config/M305.cpp> -<src/gcode/config/M305.cpp>
-<src/gcode/config/M540.cpp> -<src/gcode/config/M540.cpp>
-<src/gcode/config/M575.cpp>
-<src/gcode/config/M672.cpp>
-<src/gcode/control/M7-M9.cpp> -<src/gcode/control/M7-M9.cpp>
-<src/gcode/control/M211.cpp> -<src/gcode/control/M211.cpp>
-<src/gcode/control/M605.cpp> -<src/gcode/control/M605.cpp>
@ -169,8 +179,10 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
-<src/gcode/scara> -<src/gcode/scara>
-<src/gcode/sd> -<src/gcode/sd>
-<src/gcode/temp/M104_M109.cpp> -<src/gcode/temp/M104_M109.cpp>
-<src/gcode/temp/M155.cpp>
-<src/gcode/units/G20_G21.cpp> -<src/gcode/units/G20_G21.cpp>
-<src/gcode/units/M149.cpp> -<src/gcode/units/M149.cpp>
-<src/libs/BL24CXX.cpp> -<src/libs/W25Qxx.cpp>
-<src/libs/L64XX> -<src/module/stepper/L64xx.cpp> -<src/libs/L64XX> -<src/module/stepper/L64xx.cpp>
-<src/libs/hex_print.cpp> -<src/libs/hex_print.cpp>
-<src/libs/least_squares_fit.cpp> -<src/libs/least_squares_fit.cpp>
@ -214,9 +226,13 @@ HAS_WIRED_LCD = src_filter=+<src/lcd/lcdprint.cpp>
HAS_MARLINUI_HD44780 = src_filter=+<src/lcd/HD44780> HAS_MARLINUI_HD44780 = src_filter=+<src/lcd/HD44780>
HAS_MARLINUI_U8GLIB = U8glib-HAL@~0.4.1 HAS_MARLINUI_U8GLIB = U8glib-HAL@~0.4.1
src_filter=+<src/lcd/dogm> src_filter=+<src/lcd/dogm>
HAS_(FSMC|SPI)_TFT = src_filter=+<src/HAL/STM32/tft> +<src/HAL/STM32F1/tft>
HAS_FSMC_TFT = src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp> +<src/HAL/STM32F1/tft/tft_fsmc.cpp>
HAS_SPI_TFT = src_filter=+<src/HAL/STM32/tft/tft_spi.cpp> +<src/HAL/STM32F1/tft/tft_spi.cpp>
HAS_GRAPHICAL_TFT = src_filter=+<src/lcd/tft> HAS_GRAPHICAL_TFT = src_filter=+<src/lcd/tft>
DWIN_CREALITY_LCD = src_filter=+<src/lcd/dwin> DWIN_CREALITY_LCD = src_filter=+<src/lcd/dwin>
IS_TFTGLCD_PANEL = src_filter=+<src/lcd/TFTGLCD> IS_TFTGLCD_PANEL = src_filter=+<src/lcd/TFTGLCD>
HAS_TOUCH_XPT2046 = src_filter=+<src/lcd/touch/touch_buttons.cpp>
HAS_LCD_MENU = src_filter=+<src/lcd/menu> HAS_LCD_MENU = src_filter=+<src/lcd/menu>
HAS_GAMES = src_filter=+<src/lcd/menu/game/game.cpp> HAS_GAMES = src_filter=+<src/lcd/menu/game/game.cpp>
MARLIN_BRICKOUT = src_filter=+<src/lcd/menu/game/brickout.cpp> MARLIN_BRICKOUT = src_filter=+<src/lcd/menu/game/brickout.cpp>
@ -242,7 +258,7 @@ HAS_MENU_TEMPERATURE = src_filter=+<src/lcd/menu/menu_temperature.cpp>
HAS_MENU_TMC = src_filter=+<src/lcd/menu/menu_tmc.cpp> HAS_MENU_TMC = src_filter=+<src/lcd/menu/menu_tmc.cpp>
HAS_MENU_TOUCH_SCREEN = src_filter=+<src/lcd/menu/menu_touch_screen.cpp> HAS_MENU_TOUCH_SCREEN = src_filter=+<src/lcd/menu/menu_touch_screen.cpp>
HAS_MENU_UBL = src_filter=+<src/lcd/menu/menu_ubl.cpp> HAS_MENU_UBL = src_filter=+<src/lcd/menu/menu_ubl.cpp>
ANYCUBIC_LCD_CHIRON = src_filter=+<src/lcd/extui/anycubic_chiron_lcd.cpp> ANYCUBIC_LCD_CHIRON = src_filter=+<src/lcd/extui/anycubic_chiron_lcd.cpp> +<src/lcd/extui/lib/anycubic_chiron>
ANYCUBIC_LCD_I3MEGA = src_filter=+<src/lcd/extui/anycubic_i3mega_lcd.cpp> +<src/lcd/extui/lib/anycubic_i3mega> ANYCUBIC_LCD_I3MEGA = src_filter=+<src/lcd/extui/anycubic_i3mega_lcd.cpp> +<src/lcd/extui/lib/anycubic_i3mega>
HAS_DGUS_LCD = src_filter=+<src/lcd/extui/lib/dgus> +<src/lcd/extui/dgus_lcd.cpp> HAS_DGUS_LCD = src_filter=+<src/lcd/extui/lib/dgus> +<src/lcd/extui/dgus_lcd.cpp>
TOUCH_UI_FTDI_EVE = src_filter=+<src/lcd/extui/lib/ftdi_eve_touch_ui> TOUCH_UI_FTDI_EVE = src_filter=+<src/lcd/extui/lib/ftdi_eve_touch_ui>
@ -258,13 +274,15 @@ BARICUDA = src_filter=+<src/feature/baricuda.cpp> +<src/gcode/fea
BINARY_FILE_TRANSFER = src_filter=+<src/feature/binary_stream.cpp> +<src/libs/heatshrink> BINARY_FILE_TRANSFER = src_filter=+<src/feature/binary_stream.cpp> +<src/libs/heatshrink>
BLTOUCH = src_filter=+<src/feature/bltouch.cpp> BLTOUCH = src_filter=+<src/feature/bltouch.cpp>
CANCEL_OBJECTS = src_filter=+<src/feature/cancel_object.cpp> +<src/gcode/feature/cancel> CANCEL_OBJECTS = src_filter=+<src/feature/cancel_object.cpp> +<src/gcode/feature/cancel>
CASE_LIGHT_ENABLE = src_filter=+<src/feature/caselight> +<src/gcode/feature/caselight> CASE_LIGHT_ENABLE = src_filter=+<src/feature/caselight.cpp> +<src/gcode/feature/caselight>
EXTERNAL_CLOSED_LOOP_CONTROLLER = src_filter=+<src/feature/closedloop.cpp> +<src/gcode/calibrate/M12.cpp> EXTERNAL_CLOSED_LOOP_CONTROLLER = src_filter=+<src/feature/closedloop.cpp> +<src/gcode/calibrate/M12.cpp>
USE_CONTROLLER_FAN = src_filter=+<src/feature/controllerfan.cpp> USE_CONTROLLER_FAN = src_filter=+<src/feature/controllerfan.cpp>
DAC_STEPPER_CURRENT = src_filter=+<src/feature/dac> DAC_STEPPER_CURRENT = src_filter=+<src/feature/dac>
DIRECT_STEPPING = src_filter=+<src/feature/direct_stepping.cpp> +<src/gcode/motion/G6.cpp> DIRECT_STEPPING = src_filter=+<src/feature/direct_stepping.cpp> +<src/gcode/motion/G6.cpp>
EMERGENCY_PARSER = src_filter=+<src/feature/e_parser.cpp> -<src/gcode/control/M108_*.cpp> EMERGENCY_PARSER = src_filter=+<src/feature/e_parser.cpp> -<src/gcode/control/M108_*.cpp>
I2C_POSITION_ENCODERS = src_filter=+<src/feature/encoder_i2c.cpp> I2C_POSITION_ENCODERS = src_filter=+<src/feature/encoder_i2c.cpp>
IIC_BL24CXX_EEPROM = src_filter=+<src/libs/BL24CXX.cpp>
HAS_SPI_FLASH = src_filter=+<src/libs/W25Qxx.cpp>
HAS_FANMUX = src_filter=+<src/feature/fanmux.cpp> HAS_FANMUX = src_filter=+<src/feature/fanmux.cpp>
FILAMENT_WIDTH_SENSOR = src_filter=+<src/feature/filwidth.cpp> +<src/gcode/feature/filwidth> FILAMENT_WIDTH_SENSOR = src_filter=+<src/feature/filwidth.cpp> +<src/gcode/feature/filwidth>
FWRETRACT = src_filter=+<src/feature/fwretract.cpp> +<src/gcode/feature/fwretract> FWRETRACT = src_filter=+<src/feature/fwretract.cpp> +<src/gcode/feature/fwretract>
@ -285,10 +303,10 @@ ADVANCED_PAUSE_FEATURE = src_filter=+<src/feature/pause.cpp> +<src/gcode/featur
AUTO_POWER_CONTROL = src_filter=+<src/feature/power.cpp> AUTO_POWER_CONTROL = src_filter=+<src/feature/power.cpp>
HAS_POWER_MONITOR = src_filter=+<src/feature/power_monitor.cpp> +<src/gcode/feature/power_monitor> HAS_POWER_MONITOR = src_filter=+<src/feature/power_monitor.cpp> +<src/gcode/feature/power_monitor>
POWER_LOSS_RECOVERY = src_filter=+<src/feature/powerloss.cpp> +<src/gcode/feature/powerloss> POWER_LOSS_RECOVERY = src_filter=+<src/feature/powerloss.cpp> +<src/gcode/feature/powerloss>
PROBE_TEMP_COMPENSATION = src_filter=+<src/feature/probe_temp_comp.cpp> +<src/gcode/calibrate/G76_M871.cpp> PROBE_TEMP_COMPENSATION = src_filter=+<src/feature/probe_temp_comp.cpp> +<src/gcode/calibrate/G76_M192_M871.cpp>
HAS_FILAMENT_SENSOR = src_filter=+<src/feature/runout.cpp> +<src/gcode/feature/runout> HAS_FILAMENT_SENSOR = src_filter=+<src/feature/runout.cpp> +<src/gcode/feature/runout>
MK2_MULTIPLEXER = src_filter=+<src/feature/snmm.cpp> MK2_MULTIPLEXER = src_filter=+<src/feature/snmm.cpp>
EXT_SOLENOID|MANUAL_SOLENOID_CONTROL = src_filter=+<src/feature/solenoid.cpp> EXT_SOLENOID|MANUAL_SOLENOID_CONTROL = src_filter=+<src/feature/solenoid.cpp> +<src/gcode/control/M380_M381.cpp>
HAS_CUTTER = src_filter=+<src/feature/spindle_laser.cpp> +<src/gcode/control/M3-M5.cpp> HAS_CUTTER = src_filter=+<src/feature/spindle_laser.cpp> +<src/gcode/control/M3-M5.cpp>
EXPERIMENTAL_I2CBUS = src_filter=+<src/feature/twibus.cpp> +<src/gcode/feature/i2c> EXPERIMENTAL_I2CBUS = src_filter=+<src/feature/twibus.cpp> +<src/gcode/feature/i2c>
Z_STEPPER_AUTO_ALIGN = src_filter=+<src/feature/z_stepper_align.cpp> +<src/gcode/calibrate/G34_M422.cpp> Z_STEPPER_AUTO_ALIGN = src_filter=+<src/feature/z_stepper_align.cpp> +<src/gcode/calibrate/G34_M422.cpp>
@ -304,14 +322,19 @@ BACKLASH_GCODE = src_filter=+<src/gcode/calibrate/M425.cpp>
IS_KINEMATIC = src_filter=+<src/gcode/calibrate/M665.cpp> IS_KINEMATIC = src_filter=+<src/gcode/calibrate/M665.cpp>
HAS_EXTRA_ENDSTOPS = src_filter=+<src/gcode/calibrate/M666.cpp> HAS_EXTRA_ENDSTOPS = src_filter=+<src/gcode/calibrate/M666.cpp>
SKEW_CORRECTION_GCODE = src_filter=+<src/gcode/calibrate/M852.cpp> SKEW_CORRECTION_GCODE = src_filter=+<src/gcode/calibrate/M852.cpp>
PINS_DEBUGGING = src_filter=-<src/gcode/config/M43.cpp> DIRECT_PIN_CONTROL = src_filter=+<src/gcode/control/M42.cpp> +<src/gcode/control/M226.cpp>
PINS_DEBUGGING = src_filter=+<src/gcode/config/M43.cpp>
NO_VOLUMETRICS = src_filter=-<src/gcode/config/M200-M205.cpp> NO_VOLUMETRICS = src_filter=-<src/gcode/config/M200-M205.cpp>
HAS_MULTI_EXTRUDER = src_filter=+<src/gcode/config/M217.cpp> HAS_MULTI_EXTRUDER = src_filter=+<src/gcode/config/M217.cpp>
HAS_HOTEND_OFFSET = src_filter=+<src/gcode/config/M218.cpp> HAS_HOTEND_OFFSET = src_filter=+<src/gcode/config/M218.cpp>
EDITABLE_SERVO_ANGLES = src_filter=+<src/gcode/config/M281.cpp> EDITABLE_SERVO_ANGLES = src_filter=+<src/gcode/config/M281.cpp>
PIDTEMP = src_filter=+<src/gcode/config/M301.cpp>
PREVENT_COLD_EXTRUSION = src_filter=+<src/gcode/config/M302.cpp> PREVENT_COLD_EXTRUSION = src_filter=+<src/gcode/config/M302.cpp>
PIDTEMPBED = src_filter=+<src/gcode/config/M304.cpp>
HAS_USER_THERMISTORS = src_filter=+<src/gcode/config/M305.cpp> HAS_USER_THERMISTORS = src_filter=+<src/gcode/config/M305.cpp>
SD_ABORT_ON_ENDSTOP_HIT = src_filter=+<src/gcode/config/M540.cpp> SD_ABORT_ON_ENDSTOP_HIT = src_filter=+<src/gcode/config/M540.cpp>
BAUD_RATE_GCODE = src_filter=+<src/gcode/config/M575.cpp>
HAS_SMART_EFF_MOD = src_filter=+<src/gcode/config/M672.cpp>
COOLANT_CONTROL = src_filter=+<src/gcode/control/M7-M9.cpp> COOLANT_CONTROL = src_filter=+<src/gcode/control/M7-M9.cpp>
HAS_SOFTWARE_ENDSTOPS = src_filter=+<src/gcode/control/M211.cpp> HAS_SOFTWARE_ENDSTOPS = src_filter=+<src/gcode/control/M211.cpp>
HAS_DUPLICATION_MODE = src_filter=+<src/gcode/control/M605.cpp> HAS_DUPLICATION_MODE = src_filter=+<src/gcode/control/M605.cpp>
@ -336,12 +359,13 @@ LCD_SET_PROGRESS_MANUALLY = src_filter=+<src/gcode/lcd/M73.cpp>
TOUCH_SCREEN_CALIBRATION = src_filter=+<src/gcode/lcd/M995.cpp> TOUCH_SCREEN_CALIBRATION = src_filter=+<src/gcode/lcd/M995.cpp>
ARC_SUPPORT = src_filter=+<src/gcode/motion/G2_G3.cpp> ARC_SUPPORT = src_filter=+<src/gcode/motion/G2_G3.cpp>
GCODE_MOTION_MODES = src_filter=+<src/gcode/motion/G80.cpp> GCODE_MOTION_MODES = src_filter=+<src/gcode/motion/G80.cpp>
BABYSTEPPING = src_filter=+<src/gcode/motion/M290.cpp> BABYSTEPPING = src_filter=+<src/gcode/motion/M290.cpp> +<src/feature/babystep.cpp>
Z_PROBE_SLED = src_filter=+<src/gcode/probe/G31_G32.cpp> Z_PROBE_SLED = src_filter=+<src/gcode/probe/G31_G32.cpp>
G38_PROBE_TARGET = src_filter=+<src/gcode/probe/G38.cpp> G38_PROBE_TARGET = src_filter=+<src/gcode/probe/G38.cpp>
MAGNETIC_PARKING_EXTRUDER = src_filter=+<src/gcode/probe/M951.cpp> MAGNETIC_PARKING_EXTRUDER = src_filter=+<src/gcode/probe/M951.cpp>
SDSUPPORT = src_filter=+<src/gcode/sd> SDSUPPORT = src_filter=+<src/gcode/sd>
HAS_EXTRUDERS = src_filter=+<src/gcode/temp/M104_M109.cpp> +<src/gcode/config/M221.cpp> HAS_EXTRUDERS = src_filter=+<src/gcode/temp/M104_M109.cpp> +<src/gcode/config/M221.cpp>
AUTO_REPORT_TEMPERATURES = src_filter=+<src/gcode/temp/M155.cpp>
INCH_MODE_SUPPORT = src_filter=+<src/gcode/units/G20_G21.cpp> INCH_MODE_SUPPORT = src_filter=+<src/gcode/units/G20_G21.cpp>
TEMPERATURE_UNITS_SUPPORT = src_filter=+<src/gcode/units/M149.cpp> TEMPERATURE_UNITS_SUPPORT = src_filter=+<src/gcode/units/M149.cpp>
NEED_HEX_PRINT = src_filter=+<src/libs/hex_print.cpp> NEED_HEX_PRINT = src_filter=+<src/libs/hex_print.cpp>
@ -559,7 +583,7 @@ extends = env:at90usb1286_cdc
[env:DUE] [env:DUE]
platform = atmelsam platform = atmelsam
board = due board = due
src_filter = ${common.default_src_filter} +<src/HAL/DUE> src_filter = ${common.default_src_filter} +<src/HAL/DUE> +<src/HAL/shared/backtrace>
[env:DUE_USB] [env:DUE_USB]
platform = atmelsam platform = atmelsam
@ -635,7 +659,7 @@ lib_ldf_mode = off
lib_compat_mode = strict lib_compat_mode = strict
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
Marlin/src/HAL/LPC1768/upload_extra_script.py Marlin/src/HAL/LPC1768/upload_extra_script.py
src_filter = ${common.default_src_filter} +<src/HAL/LPC1768> src_filter = ${common.default_src_filter} +<src/HAL/LPC1768> +<src/HAL/shared/backtrace>
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
Servo Servo
custom_marlin.USES_LIQUIDCRYSTAL = LiquidCrystal@1.0.0 custom_marlin.USES_LIQUIDCRYSTAL = LiquidCrystal@1.0.0
@ -674,7 +698,7 @@ build_flags = ${common.build_flags}
-DUSBCON -DUSBD_USE_CDC -DUSBCON -DUSBD_USE_CDC
-DTIM_IRQ_PRIO=13 -DTIM_IRQ_PRIO=13
build_unflags = -std=gnu++11 build_unflags = -std=gnu++11
src_filter = ${common.default_src_filter} +<src/HAL/STM32> src_filter = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/backtrace>
# #
# HAL/STM32F1 Common Environment values # HAL/STM32F1 Common Environment values

Write Preview
Loading…
Cancel
Save