Browse Source

✨ Classic UI BIQU BX (#24387)

Victor Oliveira 3 years ago
parent
commit
1a79537645
No account linked to committer's email address

+ 2
- 1
Marlin/src/inc/Conditionals_LCD.h View File

1463
 #elif ENABLED(TFT_RES_1024x600)
1463
 #elif ENABLED(TFT_RES_1024x600)
1464
   #define TFT_WIDTH  1024
1464
   #define TFT_WIDTH  1024
1465
   #define TFT_HEIGHT 600
1465
   #define TFT_HEIGHT 600
1466
-  #define GRAPHICAL_TFT_UPSCALE 4
1466
+  #define GRAPHICAL_TFT_UPSCALE 6
1467
+  #define TFT_PIXEL_OFFSET_X 120
1467
 #endif
1468
 #endif
1468
 
1469
 
1469
 // FSMC/SPI TFT Panels using standard HAL/tft/tft_(fsmc|spi|ltdc).h
1470
 // FSMC/SPI TFT Panels using standard HAL/tft/tft_(fsmc|spi|ltdc).h

+ 2
- 2
Marlin/src/inc/SanityCheck.h View File

2923
   #endif
2923
   #endif
2924
 #endif
2924
 #endif
2925
 
2925
 
2926
-#if defined(GRAPHICAL_TFT_UPSCALE) && !WITHIN(GRAPHICAL_TFT_UPSCALE, 2, 4)
2927
-  #error "GRAPHICAL_TFT_UPSCALE must be 2, 3, or 4."
2926
+#if defined(GRAPHICAL_TFT_UPSCALE) && !WITHIN(GRAPHICAL_TFT_UPSCALE, 2, 6)
2927
+  #error "GRAPHICAL_TFT_UPSCALE must be between 2 and 6."
2928
 #endif
2928
 #endif
2929
 
2929
 
2930
 #if BOTH(CHIRON_TFT_STANDARD, CHIRON_TFT_NEW)
2930
 #if BOTH(CHIRON_TFT_STANDARD, CHIRON_TFT_NEW)

+ 1
- 1
Marlin/src/lcd/dogm/HAL_LCD_com_defines.h View File

124
 #ifndef U8G_COM_SSD_I2C_HAL
124
 #ifndef U8G_COM_SSD_I2C_HAL
125
   #define U8G_COM_SSD_I2C_HAL       u8g_com_null_fn
125
   #define U8G_COM_SSD_I2C_HAL       u8g_com_null_fn
126
 #endif
126
 #endif
127
-#if HAS_FSMC_GRAPHICAL_TFT || HAS_SPI_GRAPHICAL_TFT
127
+#if HAS_FSMC_GRAPHICAL_TFT || HAS_SPI_GRAPHICAL_TFT || HAS_LTDC_GRAPHICAL_TFT
128
   uint8_t u8g_com_hal_tft_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
128
   uint8_t u8g_com_hal_tft_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
129
   #define U8G_COM_HAL_TFT_FN       u8g_com_hal_tft_fn
129
   #define U8G_COM_HAL_TFT_FN       u8g_com_hal_tft_fn
130
 #else
130
 #else

+ 25
- 20
Marlin/src/lcd/touch/touch_buttons.cpp View File

68
   #ifdef HAS_WIRED_LCD
68
   #ifdef HAS_WIRED_LCD
69
     int16_t x, y;
69
     int16_t x, y;
70
 
70
 
71
-    const bool is_touched = (TERN(TOUCH_SCREEN_CALIBRATION, touch_calibration.calibration.orientation, TOUCH_ORIENTATION) == TOUCH_PORTRAIT ? touchIO.getRawPoint(&y, &x) : touchIO.getRawPoint(&x, &y));
72
-    #if HAS_TOUCH_SLEEP
73
-      if (is_touched)
74
-        wakeUp();
75
-      else if (!isSleeping() && ELAPSED(millis(), next_sleep_ms) && ui.on_status_screen())
76
-        sleepTimeout();
77
-    #endif
78
-    if (!is_touched) return 0;
79
-
80
-    #if ENABLED(TOUCH_SCREEN_CALIBRATION)
81
-      const calibrationState state = touch_calibration.get_calibration_state();
82
-      if (WITHIN(state, CALIBRATION_TOP_LEFT, CALIBRATION_BOTTOM_RIGHT)) {
83
-        if (touch_calibration.handleTouch(x, y)) ui.refresh();
84
-        return 0;
85
-      }
86
-      x = int16_t((int32_t(x) * touch_calibration.calibration.x) >> 16) + touch_calibration.calibration.offset_x;
87
-      y = int16_t((int32_t(y) * touch_calibration.calibration.y) >> 16) + touch_calibration.calibration.offset_y;
88
-    #else
89
-      x = uint16_t((uint32_t(x) * TOUCH_CALIBRATION_X) >> 16) + TOUCH_OFFSET_X;
90
-      y = uint16_t((uint32_t(y) * TOUCH_CALIBRATION_Y) >> 16) + TOUCH_OFFSET_Y;
71
+    #if ENABLED(TFT_TOUCH_DEVICE_XPT2046)
72
+      const bool is_touched = (TERN(TOUCH_SCREEN_CALIBRATION, touch_calibration.calibration.orientation, TOUCH_ORIENTATION) == TOUCH_PORTRAIT ? touchIO.getRawPoint(&y, &x) : touchIO.getRawPoint(&x, &y));
73
+      #if HAS_TOUCH_SLEEP
74
+        if (is_touched)
75
+          wakeUp();
76
+        else if (!isSleeping() && ELAPSED(millis(), next_sleep_ms) && ui.on_status_screen())
77
+          sleepTimeout();
78
+      #endif
79
+      if (!is_touched) return 0;
80
+
81
+      #if ENABLED(TOUCH_SCREEN_CALIBRATION)
82
+        const calibrationState state = touch_calibration.get_calibration_state();
83
+        if (WITHIN(state, CALIBRATION_TOP_LEFT, CALIBRATION_BOTTOM_RIGHT)) {
84
+          if (touch_calibration.handleTouch(x, y)) ui.refresh();
85
+          return 0;
86
+        }
87
+        x = int16_t((int32_t(x) * touch_calibration.calibration.x) >> 16) + touch_calibration.calibration.offset_x;
88
+        y = int16_t((int32_t(y) * touch_calibration.calibration.y) >> 16) + touch_calibration.calibration.offset_y;
89
+      #else
90
+        x = uint16_t((uint32_t(x) * TOUCH_CALIBRATION_X) >> 16) + TOUCH_OFFSET_X;
91
+        y = uint16_t((uint32_t(y) * TOUCH_CALIBRATION_Y) >> 16) + TOUCH_OFFSET_Y;
92
+      #endif
93
+    #elif ENABLED(TFT_TOUCH_DEVICE_GT911)
94
+      bool is_touched = (TOUCH_ORIENTATION == TOUCH_PORTRAIT ? touchIO.getPoint(&y, &x) : touchIO.getPoint(&x, &y));
95
+      if (!is_touched) return 0;
91
     #endif
96
     #endif
92
 
97
 
93
     // Touch within the button area simulates an encoder button
98
     // Touch within the button area simulates an encoder button

+ 5
- 2
Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h View File

33
 #define MARLIN_EEPROM_SIZE                0x1000  // 4K (24C32)
33
 #define MARLIN_EEPROM_SIZE                0x1000  // 4K (24C32)
34
 
34
 
35
 #define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
35
 #define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
36
+//#define SWD_DEBUG                               // Use pins PA13 and PA14 on STM32H7 for the SWD debugger
36
 
37
 
37
 //
38
 //
38
 // Limit Switches
39
 // Limit Switches
47
 #define FIL_RUNOUT_PIN                      PD13
48
 #define FIL_RUNOUT_PIN                      PD13
48
 #define FIL_RUNOUT2_PIN                     PB13
49
 #define FIL_RUNOUT2_PIN                     PB13
49
 
50
 
50
-#define LED_PIN                             PA13
51
-#define BEEPER_PIN                          PA14
51
+#ifndef SWD_DEBUG
52
+  #define LED_PIN                           PA13
53
+  #define BEEPER_PIN                        PA14
54
+#endif
52
 
55
 
53
 #define POWER_MONITOR_PIN                   PB0
56
 #define POWER_MONITOR_PIN                   PB0
54
 #define RPI_POWER_PIN                       PE5
57
 #define RPI_POWER_PIN                       PE5

Loading…
Cancel
Save