Skip to content

Commit 2b2750a

Browse files
p3pernisv
authored andcommitted
🔨 MarlinSimUI updates (MarlinFirmware#25589)
1 parent 5e4e797 commit 2b2750a

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

Marlin/src/core/boards.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@
494494
// Simulations
495495
//
496496

497-
#define BOARD_LINUX_RAMPS 9999
497+
#define BOARD_SIMULATED 9999
498498

499499
#define _MB_1(B) (defined(BOARD_##B) && MOTHERBOARD==BOARD_##B)
500500
#define MB(V...) DO(MB,||,V)

Marlin/src/inc/SanityCheck.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -4160,7 +4160,7 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
41604160
/**
41614161
* Touch Screen Calibration
41624162
*/
4163-
#if !MB(LINUX_RAMPS) && ENABLED(TFT_TOUCH_DEVICE_XPT2046) && DISABLED(TOUCH_SCREEN_CALIBRATION) \
4163+
#if !MB(SIMULATED) && ENABLED(TFT_TOUCH_DEVICE_XPT2046) && DISABLED(TOUCH_SCREEN_CALIBRATION) \
41644164
&& !(defined(TOUCH_CALIBRATION_X) && defined(TOUCH_CALIBRATION_Y) && defined(TOUCH_OFFSET_X) && defined(TOUCH_OFFSET_Y))
41654165
#error "TOUCH_CALIBRATION_[XY] and TOUCH_OFFSET_[XY] are required for resistive touch screens with TOUCH_SCREEN_CALIBRATION disabled."
41664166
#endif

Marlin/src/pins/pins.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@
807807
// Linux Native Debug board
808808
//
809809

810-
#elif MB(LINUX_RAMPS)
810+
#elif MB(SIMULATED)
811811
#include "linux/pins_RAMPS_LINUX.h" // Native or Simulation lin:linux_native mac:simulator_macos_debug mac:simulator_macos_release win:simulator_windows lin:simulator_linux_debug lin:simulator_linux_release
812812

813813
#else
@@ -843,6 +843,7 @@
843843
#define BOARD_TH3D_EZBOARD_LITE_V2 99923
844844
#define BOARD_BTT_SKR_SE_BX 99924
845845
#define BOARD_MKS_MONSTER8 99925
846+
#define BOARD_LINUX_RAMPS 99926
846847

847848
#if MB(MKS_13)
848849
#error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."
@@ -898,6 +899,8 @@
898899
#error "BOARD_BTT_SKR_SE_BX is now BOARD_BTT_SKR_SE_BX_V2 or BOARD_BTT_SKR_SE_BX_V3. Please update your configuration."
899900
#elif MB(MKS_MONSTER8)
900901
#error "BOARD_MKS_MONSTER8 is now BOARD_MKS_MONSTER8_V1 or BOARD_MKS_MONSTER8_V2. Please update your configuration."
902+
#elif MB(LINUX_RAMPS)
903+
#error "BOARD_LINUX_RAMPS is now BOARD_SIMULATED. Please update your configuration."
901904
#elif defined(MOTHERBOARD)
902905
#error "Unknown MOTHERBOARD value set in Configuration.h."
903906
#else
@@ -931,6 +934,7 @@
931934
#undef BOARD_TH3D_EZBOARD_LITE_V2
932935
#undef BOARD_BTT_SKR_SE_BX
933936
#undef BOARD_MKS_MONSTER8
937+
#undef BOARD_LINUX_RAMPS
934938

935939
#endif
936940

buildroot/tests/linux_native

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set -e
1010
# Build with the default configurations
1111
#
1212
restore_configs
13-
opt_set MOTHERBOARD BOARD_LINUX_RAMPS TEMP_SENSOR_BED 1
13+
opt_set MOTHERBOARD BOARD_SIMULATED TEMP_SENSOR_BED 1
1414
opt_enable PIDTEMPBED EEPROM_SETTINGS BAUD_RATE_GCODE
1515
exec_test $1 $2 "Linux with EEPROM" "$3"
1616

ini/native.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ debug_build_flags = -fstack-protector-strong -g -g3 -ggdb
4343
lib_compat_mode = off
4444
build_src_filter = ${common.default_src_filter} +<src/HAL/NATIVE_SIM>
4545
lib_deps = ${common.lib_deps}
46-
MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/refs/heads/bugfix-2.0.x.zip
46+
MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/refs/heads/bugfix-2.1.x.zip
4747
Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/marlin_sim_native.zip
4848
LiquidCrystal=https://github.com/p3p/LiquidCrystal/archive/master.zip
4949
extra_scripts = ${common.extra_scripts}

0 commit comments

Comments
 (0)