Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit b9d7e6f
Author: adequator <ggoodd@gmail.com>
Date:   Wed Nov 16 01:06:23 2022 +0300

    distribution date update

commit e55db2c
Author: adequator <ggoodd@gmail.com>
Date:   Wed Nov 16 01:05:16 2022 +0300

    Squashed commit of the following:

    commit 8298a47
    Author: thinkyhead <thinkyhead@users.noreply.github.com>
    Date:   Tue Nov 15 00:24:38 2022 +0000

        [cron] Bump distribution date (2022-11-15)

    commit 00156a3
    Author: ellensp <530024+ellensp@users.noreply.github.com>
    Date:   Mon Nov 14 21:35:24 2022 +1300

        🩹 Fix 2 thermocouples (MarlinFirmware#24982)

        Followup to MarlinFirmware#24898

    commit d62fbfb
    Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
    Date:   Mon Nov 14 02:26:31 2022 -0600

        🐛 Fix M808 starting count

        Reported by adcurtin on Discord

    commit 14966c0
    Author: thinkyhead <thinkyhead@users.noreply.github.com>
    Date:   Mon Nov 14 06:23:44 2022 +0000

        [cron] Bump distribution date (2022-11-14)

    commit e283f15
    Author: Justin Hartmann <zadarimm@gmail.com>
    Date:   Mon Nov 14 00:50:02 2022 -0500

        🩹 Fix Overlord compile (MarlinFirmware#24947)

    commit 16faa29
    Author: Pascal de Bruijn <pmjdebruijn@pcode.nl>
    Date:   Mon Nov 14 05:59:25 2022 +0100

        🚸 M306: Indicate MPC Autotune (MarlinFirmware#24949)

    commit abc9316
    Author: ellensp <530024+ellensp@users.noreply.github.com>
    Date:   Mon Nov 14 17:45:28 2022 +1300

        🩹 Allow max endstops MKS Monster 8 V2 (MarlinFirmware#24944)

    commit dbd5dc4
    Author: thinkyhead <thinkyhead@users.noreply.github.com>
    Date:   Sun Nov 13 00:23:31 2022 +0000

        [cron] Bump distribution date (2022-11-13)

    commit 7395569
    Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
    Date:   Fri Nov 11 20:35:07 2022 -0600

        🐛 Fix Anycubic / Trigorilla pins, etc. (MarlinFirmware#24971)

    commit e1423a8
    Author: thinkyhead <thinkyhead@users.noreply.github.com>
    Date:   Sat Nov 12 00:40:15 2022 +0000

        [cron] Bump distribution date (2022-11-12)

    commit d123ea7
    Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
    Date:   Fri Nov 11 16:09:26 2022 -0600

        🎨 Prefer axis element over index

    commit 4d913fb
    Author: thinkyhead <thinkyhead@users.noreply.github.com>
    Date:   Thu Nov 10 06:06:37 2022 +0000

        [cron] Bump distribution date (2022-11-10)

    commit 3985d26
    Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
    Date:   Wed Nov 9 20:54:17 2022 -0600

        🐛 Fix recalculate_max_e_jerk

commit c47971d
Author: adequator <ggoodd@gmail.com>
Date:   Sun Nov 13 04:41:39 2022 +0300

    Sync with Zr 1.3.1

commit fbcc2fb
Author: adequator <ggoodd@gmail.com>
Date:   Sun Nov 13 03:40:14 2022 +0300

    Squashed commit of the following:

    commit dbd5dc4
    Author: thinkyhead <thinkyhead@users.noreply.github.com>
    Date:   Sun Nov 13 00:23:31 2022 +0000

        [cron] Bump distribution date (2022-11-13)

    commit 7395569
    Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
    Date:   Fri Nov 11 20:35:07 2022 -0600

        🐛 Fix Anycubic / Trigorilla pins, etc. (MarlinFirmware#24971)

    commit e1423a8
    Author: thinkyhead <thinkyhead@users.noreply.github.com>
    Date:   Sat Nov 12 00:40:15 2022 +0000

        [cron] Bump distribution date (2022-11-12)

    commit d123ea7
    Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
    Date:   Fri Nov 11 16:09:26 2022 -0600

        🎨 Prefer axis element over index

    commit 4d913fb
    Author: thinkyhead <thinkyhead@users.noreply.github.com>
    Date:   Thu Nov 10 06:06:37 2022 +0000

        [cron] Bump distribution date (2022-11-10)

    commit 3985d26
    Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
    Date:   Wed Nov 9 20:54:17 2022 -0600

        🐛 Fix recalculate_max_e_jerk

commit 9cf5658
Author: adequator <ggoodd@gmail.com>
Date:   Sun Nov 13 03:29:42 2022 +0300

    touch fix + ui improvements

commit 4ebac68
Author: adequator <ggoodd@gmail.com>
Date:   Wed Nov 9 11:19:34 2022 +0300

    FB logo bootscreen

commit 9b4a407
Author: adequator <ggoodd@gmail.com>
Date:   Tue Nov 8 20:09:25 2022 +0300

    Zr v1.2
  • Loading branch information
@adequator
adequator committed Nov 16, 2022
1 parent 8298a47 commit d6edcd8
Show file tree
Hide file tree
Showing 21 changed files with 2,544 additions and 161 deletions.
153 changes: 92 additions & 61 deletions Marlin/Configuration.h
View file

Large diffs are not rendered by default.

68 changes: 40 additions & 28 deletions Marlin/Configuration_adv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,11 @@
* Multiple extruders can be assigned to the same pin in which case
* the fan will turn on when any selected extruder is above the threshold.
*/
#define E0_AUTO_FAN_PIN -1

#if MOTHERBOARD == BOARD_MKS_ROBIN_NANO_V3
#define E0_AUTO_FAN_PIN PC14
#endif

#define E1_AUTO_FAN_PIN -1
#define E2_AUTO_FAN_PIN -1
#define E3_AUTO_FAN_PIN -1
Expand All @@ -649,9 +653,9 @@
#define CHAMBER_AUTO_FAN_PIN -1
#define COOLER_AUTO_FAN_PIN -1

#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_TEMPERATURE 40
#define EXTRUDER_AUTO_FAN_SPEED 255 // 255 == full speed
#define CHAMBER_AUTO_FAN_TEMPERATURE 30
#define CHAMBER_AUTO_FAN_TEMPERATURE 40
#define CHAMBER_AUTO_FAN_SPEED 255
#define COOLER_AUTO_FAN_TEMPERATURE 18
#define COOLER_AUTO_FAN_SPEED 255
Expand Down Expand Up @@ -704,15 +708,19 @@
/**
* M355 Case Light on-off / brightness
*/
//#define CASE_LIGHT_ENABLE
#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE)
//#define CASE_LIGHT_PIN 4 // Override the default pin if needed
#define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW

#if MOTHERBOARD == BOARD_MKS_ROBIN_NANO_V3
#define CASE_LIGHT_PIN PE6 // Override the default pin if needed
#endif

#define INVERT_CASE_LIGHT true // Set true if Case Light is ON when pin is LOW
#define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 255 // Set default power-up brightness (0-255, requires PWM pin)
//#define CASE_LIGHT_NO_BRIGHTNESS // Disable brightness control. Enable for non-PWM lighting.
//#define CASE_LIGHT_MAX_PWM 128 // Limit PWM duty cycle (0-255)
//#define CASE_LIGHT_MENU // Add Case Light options to the LCD menu
#define CASE_LIGHT_MENU // Add Case Light options to the LCD menu
#if ENABLED(NEOPIXEL_LED)
//#define CASE_LIGHT_USE_NEOPIXEL // Use NeoPixel LED as case light
#endif
Expand Down Expand Up @@ -1187,7 +1195,7 @@
#endif

/**
* Automatic backlash, position, and hotend offset calibration
* Automatic backlash, position and hotend offset calibration
*
* Enable G425 to run automatic calibration using an electrically-
* conductive cube, bolt, or washer mounted on the bed.
Expand Down Expand Up @@ -1414,8 +1422,8 @@
#endif // HAS_MARLINUI_MENU

#if ANY(HAS_DISPLAY, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
//#define SOUND_MENU_ITEM // Add a mute option to the LCD menu
#define SOUND_ON_DEFAULT // Buzzer/speaker default enabled state
#define SOUND_MENU_ITEM // Add a mute option to the LCD menu
//#define SOUND_ON_DEFAULT // Buzzer/speaker default enabled state
#endif

#if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI)
Expand Down Expand Up @@ -2047,7 +2055,7 @@
*
* Warning: Does not respect endstops!
*/
//#define BABYSTEPPING
#define BABYSTEPPING
#if ENABLED(BABYSTEPPING)
//#define INTEGRATED_BABYSTEPPING // EXPERIMENTAL integration of babystepping into the Stepper ISR
//#define BABYSTEP_WITHOUT_HOMING
Expand All @@ -2068,7 +2076,7 @@
#endif
#endif

//#define BABYSTEP_DISPLAY_TOTAL // Display total babysteps since last G28
#define BABYSTEP_DISPLAY_TOTAL // Display total babysteps since last G28
//#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
Expand All @@ -2094,17 +2102,17 @@
*
* See https://marlinfw.org/docs/features/lin_advance.html for full instructions.
*/
//#define LIN_ADVANCE
#define LIN_ADVANCE
#if ENABLED(LIN_ADVANCE)
#if ENABLED(DISTINCT_E_FACTORS)
#define ADVANCE_K { 0.22 } // (mm) Compression length per 1mm/s extruder speed, per extruder
#define ADVANCE_K { 0 } // (mm) Compression length per 1mm/s extruder speed, per extruder
#else
#define ADVANCE_K 0.22 // (mm) Compression length applying to all extruders
#define ADVANCE_K 0 // (mm) Compression length applying to all extruders
#endif
//#define ADVANCE_K_EXTRA // Add a second linear advance constant, configurable with M900 L.
//#define LA_DEBUG // Print debug information to serial during operation. Disable for production use.
//#define EXPERIMENTAL_SCURVE // Allow S-Curve Acceleration to be used with LA.
//#define ALLOW_LOW_EJERK // Allow a DEFAULT_EJERK value of <10. Recommended for direct drive hotends.
#define ALLOW_LOW_EJERK // Allow a DEFAULT_EJERK value of <10. Recommended for direct drive hotends.
//#define EXPERIMENTAL_I2S_LA // Allow I2S_STEPPER_STREAM to be used with LA. Performance degrades as the LA step rate reaches ~20kHz.
#endif

Expand Down Expand Up @@ -2429,7 +2437,7 @@
* Currently handles M108, M112, M410, M876
* NOTE: Not yet implemented for all platforms.
*/
//#define EMERGENCY_PARSER
#define EMERGENCY_PARSER

/**
* Realtime Reporting (requires EMERGENCY_PARSER)
Expand Down Expand Up @@ -2501,14 +2509,14 @@
*
* Note that M207 / M208 / M209 settings are saved to EEPROM.
*/
//#define FWRETRACT
#define FWRETRACT
#if ENABLED(FWRETRACT)
#define FWRETRACT_AUTORETRACT // Override slicer retractions
//#define FWRETRACT_AUTORETRACT // Override slicer retractions
#if ENABLED(FWRETRACT_AUTORETRACT)
#define MIN_AUTORETRACT 0.1 // (mm) Don't convert E moves under this length
#define MAX_AUTORETRACT 10.0 // (mm) Don't convert E moves over this length
#endif
#define RETRACT_LENGTH 3 // (mm) Default retract length (positive value)
#define RETRACT_LENGTH 1.5 // (mm) Default retract length (positive value)
#define RETRACT_LENGTH_SWAP 13 // (mm) Default swap retract length (positive value)
#define RETRACT_FEEDRATE 45 // (mm/s) Default feedrate for retracting
#define RETRACT_ZRAISE 0 // (mm) Default retract Z-raise
Expand Down Expand Up @@ -2622,7 +2630,11 @@
*
* Enable PARK_HEAD_ON_PAUSE to add the G-code M125 Pause and Park.
*/
//#define ADVANCED_PAUSE_FEATURE

#if MOTHERBOARD == BOARD_MKS_ROBIN_NANO_V3
#define ADVANCED_PAUSE_FEATURE
#endif

#if ENABLED(ADVANCED_PAUSE_FEATURE)
#define PAUSE_PARK_RETRACT_FEEDRATE 60 // (mm/s) Initial retract feedrate.
#define PAUSE_PARK_RETRACT_LENGTH 2 // (mm) Initial retract.
Expand All @@ -2634,16 +2646,16 @@
// For direct drive, the full length of the nozzle.
// Set to 0 for manual unloading.
#define FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE 6 // (mm/s) Slow move when starting load.
#define FILAMENT_CHANGE_SLOW_LOAD_LENGTH 0 // (mm) Slow length, to allow time to insert material.
#define FILAMENT_CHANGE_SLOW_LOAD_LENGTH 10 // (mm) Slow length, to allow time to insert material.
// 0 to disable start loading and skip to fast load only
#define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE 6 // (mm/s) Load filament feedrate. This can be pretty fast.
#define FILAMENT_CHANGE_FAST_LOAD_ACCEL 25 // (mm/s^2) Lower acceleration may allow a faster feedrate.
#define FILAMENT_CHANGE_FAST_LOAD_ACCEL 50 // (mm/s^2) Lower acceleration may allow a faster feedrate.
#define FILAMENT_CHANGE_FAST_LOAD_LENGTH 0 // (mm) Load length of filament, from extruder gear to nozzle.
// For Bowden, the full length of the tube and nozzle.
// For direct drive, the full length of the nozzle.
//#define ADVANCED_PAUSE_CONTINUOUS_PURGE // Purge continuously up to the purge length until interrupted.
#define ADVANCED_PAUSE_PURGE_FEEDRATE 3 // (mm/s) Extrude feedrate (after loading). Should be slower than load feedrate.
#define ADVANCED_PAUSE_PURGE_LENGTH 50 // (mm) Length to extrude after loading.
#define ADVANCED_PAUSE_PURGE_LENGTH 80 // (mm) Length to extrude after loading.
// Set to 0 for manual extrusion.
// Filament can be extruded repeatedly from the Filament Change menu
// until extrusion is consistent, and to purge old filament.
Expand Down Expand Up @@ -4189,9 +4201,9 @@
//#define ESP3D_WIFISUPPORT // ESP3D Library WiFi management (https://github.com/luc-github/ESP3DLib)

#if EITHER(WIFISUPPORT, ESP3D_WIFISUPPORT)
//#define WEBSUPPORT // Start a webserver (which may include auto-discovery)
//#define OTASUPPORT // Support over-the-air firmware updates
//#define WIFI_CUSTOM_COMMAND // Accept feature config commands (e.g., WiFi ESP3D) from the host
#define WEBSUPPORT // Start a webserver (which may include auto-discovery)
#define OTASUPPORT // Support over-the-air firmware updates
#define WIFI_CUSTOM_COMMAND // Accept feature config commands (e.g., WiFi ESP3D) from the host
/**
* To set a default WiFi SSID / Password, create a file called Configuration_Secure.h with
Expand Down
6 changes: 3 additions & 3 deletions Marlin/Version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/**
* Marlin release version identifier
*/
//#define SHORT_BUILD_VERSION "bugfix-2.1.x"
#define SHORT_BUILD_VERSION "FBG6-2.1.1"

/**
* Verbose version identifier which should contain a reference to the location
Expand All @@ -46,15 +46,15 @@
/**
* Defines a generic printer name to be output to the LCD after booting Marlin.
*/
//#define MACHINE_NAME "3D Printer"
#define MACHINE_NAME "Flying Bear Ghost 6"

/**
* The SOURCE_CODE_URL is the location where users will find the Marlin Source
* Code which is installed on the device. In most cases —unless the manufacturer
* has a distinct Github fork— the Source Code URL should just be the main
* Marlin repository.
*/
//#define SOURCE_CODE_URL "github.com/MarlinFirmware/Marlin"
#define SOURCE_CODE_URL "github.com/FB-G6/Marlin"

/**
* Default generic printer UUID.
Expand Down
14 changes: 10 additions & 4 deletions Marlin/src/MarlinCore.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ void startOrResumeJob() {
TERN_(GCODE_REPEAT_MARKERS, repeat.reset());
TERN_(CANCEL_OBJECTS, cancelable.reset());
TERN_(LCD_SHOW_E_TOTAL, e_move_accumulator = 0);
#if ENABLED(SET_REMAINING_TIME)
#if BOTH(LCD_SET_PROGRESS_MANUALLY, USE_M73_REMAINING_TIME)
ui.reset_remaining_time();
#endif
}
Expand Down Expand Up @@ -385,6 +385,11 @@ void startOrResumeJob() {
marlin_state = MF_RUNNING; // Signal to stop trying
TERN_(PASSWORD_AFTER_SD_PRINT_END, password.lock_machine());
TERN_(DGUS_LCD_UI_MKS, ScreenHandler.SDPrintingFinished());
buzzer.tick();
delay(200);
buzzer.tick();
delay(200);
buzzer.tick();
}
}

Expand Down Expand Up @@ -488,7 +493,7 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
}
#endif

#if ENABLED(FREEZE_FEATURE)
#if HAS_FREEZE_PIN
stepper.frozen = READ(FREEZE_PIN) == FREEZE_STATE;
#endif

Expand Down Expand Up @@ -837,8 +842,9 @@ void idle(bool no_stepper_sleep/*=false*/) {
TERN_(PRINTCOUNTER, print_job_timer.tick());

// Update the Beeper queue
TERN_(HAS_BEEPER, buzzer.tick());

if (MarlinUI::sound_on) {
TERN_(HAS_BEEPER, buzzer.tick());
}
// Handle UI input / draw events
TERN(DWIN_CREALITY_LCD, DWIN_Update(), ui.update());

Expand Down
42 changes: 36 additions & 6 deletions Marlin/src/inc/Conditionals_LCD.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,20 +309,20 @@
#endif

// TFT Compatibility
#if ANY(FSMC_GRAPHICAL_TFT, SPI_GRAPHICAL_TFT, TFT_320x240, TFT_480x320, TFT_320x240_SPI, TFT_480x320_SPI, TFT_LVGL_UI_FSMC, TFT_LVGL_UI_SPI)
#if ANY(FSMC_GRAPHICAL_TFT, SPI_GRAPHICAL_TFT, TFT_320x240, TFT_480x320, TFT_320x240_SPI, TFT_480x320_SPI, TFT_LVGL_UI_FSMC, TFT_LVGL_UI_SPI, TFT_320x480, TFT_320x480_SPI)
#define IS_LEGACY_TFT 1
#define TFT_GENERIC
#endif

#if ANY(FSMC_GRAPHICAL_TFT, TFT_320x240, TFT_480x320, TFT_LVGL_UI_FSMC)
#if ANY(FSMC_GRAPHICAL_TFT, TFT_320x240, TFT_480x320, TFT_LVGL_UI_FSMC, TFT_320x480)
#define TFT_INTERFACE_FSMC
#elif ANY(SPI_GRAPHICAL_TFT, TFT_320x240_SPI, TFT_480x320_SPI, TFT_LVGL_UI_SPI)
#elif ANY(SPI_GRAPHICAL_TFT, TFT_320x240_SPI, TFT_480x320_SPI, TFT_LVGL_UI_SPI, TFT_320x480_SPI)
#define TFT_INTERFACE_SPI
#endif

#if EITHER(FSMC_GRAPHICAL_TFT, SPI_GRAPHICAL_TFT)
#define TFT_CLASSIC_UI
#elif ANY(TFT_320x240, TFT_480x320, TFT_320x240_SPI, TFT_480x320_SPI)
#elif ANY(TFT_320x240, TFT_480x320, TFT_320x240_SPI, TFT_480x320_SPI, TFT_320x480, TFT_320x480_SPI)
#define TFT_COLOR_UI
#elif EITHER(TFT_LVGL_UI_FSMC, TFT_LVGL_UI_SPI)
#define TFT_LVGL_UI
Expand Down Expand Up @@ -529,6 +529,10 @@
#define HAS_MANUAL_MOVE_MENU 1
#endif

#if ANY(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI, HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL, IS_DWIN_MARLINUI, DWIN_CREALITY_LCD_JYERSUI)
#define CAN_SHOW_REMAINING_TIME 1
#endif

#if HAS_MARLINUI_U8GLIB
#ifndef LCD_PIXEL_WIDTH
#define LCD_PIXEL_WIDTH 128
Expand Down Expand Up @@ -1484,6 +1488,16 @@
#define TFT_DEFAULT_ORIENTATION TFT_EXCHANGE_XY
#define TFT_RES_480x320
#define TFT_INTERFACE_SPI
#elif ENABLED(MKS_TS35_V2_0_VERTICAL)
#define TFT_DEFAULT_DRIVER ST7796
#define TFT_DEFAULT_ORIENTATION TFT_INVERT_Y
#define TOUCH_ORIENTATION TOUCH_PORTRAIT
#define TOUCH_CALIBRATION_X 11579
#define TOUCH_CALIBRATION_Y 17253
#define TOUCH_OFFSET_X -24
#define TOUCH_OFFSET_Y -42
#define TFT_RES_320x480
#define TFT_INTERFACE_SPI
#elif EITHER(LERDGE_TFT35, ANET_ET5_TFT35) // ST7796
#define TFT_DEFAULT_ORIENTATION TFT_EXCHANGE_XY
#define TFT_RES_480x320
Expand Down Expand Up @@ -1514,8 +1528,10 @@
#define TFT_TOUCH_DEVICE_GT911
#endif
#elif ENABLED(TFT_GENERIC)
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
#if NONE(TFT_RES_320x240, TFT_RES_480x272, TFT_RES_480x320, TFT_RES_1024x600)
#ifndef TFT_DEFAULT_ORIENTATION
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
#endif
#if NONE(TFT_RES_320x240, TFT_RES_480x272, TFT_RES_480x320, TFT_RES_320x480, TFT_RES_1024x600)
#define TFT_RES_320x240
#endif
#if NONE(TFT_INTERFACE_FSMC, TFT_INTERFACE_SPI)
Expand All @@ -1535,6 +1551,10 @@
#define TFT_WIDTH 480
#define TFT_HEIGHT 320
#define GRAPHICAL_TFT_UPSCALE 3
#elif ENABLED(TFT_RES_320x480)
#define TFT_WIDTH 320
#define TFT_HEIGHT 480
#define GRAPHICAL_TFT_UPSCALE 3
#elif ENABLED(TFT_RES_1024x600)
#define TFT_WIDTH 1024
#define TFT_HEIGHT 600
Expand Down Expand Up @@ -1584,6 +1604,12 @@
#elif ENABLED(TFT_INTERFACE_FSMC)
#define TFT_480x320
#endif
#elif TFT_HEIGHT == 480 //TEST
#if ENABLED(TFT_INTERFACE_SPI) //TEST
#define TFT_320x480_SPI //TEST
#elif ENABLED(TFT_INTERFACE_FSMC) //TEST
#define TFT_320x480 //TEST
#endif //TEST
#elif TFT_HEIGHT == 272
#if ENABLED(TFT_INTERFACE_SPI)
#define TFT_480x272_SPI
Expand All @@ -1605,13 +1631,17 @@
#define HAS_UI_480x320 1
#elif EITHER(TFT_480x272, TFT_480x272_SPI)
#define HAS_UI_480x272 1
#elif EITHER(TFT_320x480_SPI, TFT_320x480) //TEST !!!!!!!!!!!!!!!!
#define HAS_UI_320x480 1 //TEST !!!!!!!!!!!!!!!!
#elif EITHER(TFT_1024x600_LTDC, TFT_1024x600_SIM)
#define HAS_UI_1024x600 1
#endif
#if ANY(HAS_UI_320x240, HAS_UI_480x320, HAS_UI_480x272)
#define LCD_HEIGHT TERN(TOUCH_SCREEN, 6, 7) // Fewer lines with touch buttons onscreen
#elif HAS_UI_1024x600
#define LCD_HEIGHT TERN(TOUCH_SCREEN, 12, 13) // Fewer lines with touch buttons onscreen
#elif HAS_UI_320x480
#define LCD_HEIGHT TERN(TOUCH_SCREEN, 7, 6) //TEST !!!!!!!!!!!!!!!!
#endif

// This emulated DOGM has 'touch/xpt2046', not 'tft/xpt2046'
Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/inc/SanityCheck.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2966,7 +2966,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
+ COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_GENERIC_12864_1_1) \
+ COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \
+ COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \
+ COUNT_ENABLED(MKS_TS35_V2_0, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32, MKS_ROBIN_TFT35, MKS_ROBIN_TFT43, MKS_ROBIN_TFT_V1_1R, ANET_ET4_TFT28, ANET_ET5_TFT35, BIQU_BX_TFT70, BTT_TFT35_SPI_V1_0) \
+ COUNT_ENABLED(MKS_TS35_V2_0, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32, MKS_ROBIN_TFT35, MKS_ROBIN_TFT43, MKS_ROBIN_TFT_V1_1R, ANET_ET4_TFT28, ANET_ET5_TFT35, BIQU_BX_TFT70, BTT_TFT35_SPI_V1_0, MKS_TS35_V2_0_VERTICAL) \
+ COUNT_ENABLED(TFTGLCD_PANEL_SPI, TFTGLCD_PANEL_I2C) \
+ COUNT_ENABLED(VIKI2, miniVIKI) \
+ ENABLED(WYH_L12864) \
Expand Down Expand Up @@ -3017,7 +3017,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#undef IS_U8GLIB_SSD1306
#undef IS_EXTUI

#if ANY(TFT_GENERIC, MKS_TS35_V2_0, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32, MKS_ROBIN_TFT35, MKS_ROBIN_TFT43, MKS_ROBIN_TFT_V1_1R, TFT_TRONXY_X5SA, ANYCUBIC_TFT35, ANYCUBIC_TFT35, LONGER_LK_TFT28, ANET_ET4_TFT28, ANET_ET5_TFT35, BIQU_BX_TFT70, BTT_TFT35_SPI_V1_0)
#if ANY(TFT_GENERIC, MKS_TS35_V2_0, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32, MKS_ROBIN_TFT35, MKS_ROBIN_TFT43, MKS_ROBIN_TFT_V1_1R, TFT_TRONXY_X5SA, ANYCUBIC_TFT35, ANYCUBIC_TFT35, LONGER_LK_TFT28, ANET_ET4_TFT28, ANET_ET5_TFT35, BIQU_BX_TFT70, BTT_TFT35_SPI_V1_0, MKS_TS35_V2_0_VERTICAL)
#if NONE(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI)
#error "TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI is required for your TFT. Please enable one."
#elif MANY(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI)
Expand Down Expand Up @@ -3073,7 +3073,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#endif
#endif

#if EITHER(MKS_TS35_V2_0, BTT_TFT35_SPI_V1_0) && SD_CONNECTION_IS(LCD)
#if ANY(MKS_TS35_V2_0, BTT_TFT35_SPI_V1_0, MKS_TS35_V2_0_VERTICAL) && SD_CONNECTION_IS(LCD)
#error "SDCARD_CONNECTION cannot be set to LCD for the enabled TFT. No available SD card reader."
#endif

Expand Down
Loading

0 comments on commit d6edcd8

Please sign in to comment.