jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x

Browse Source
This commit is contained in:
InsanityAutomation
2021-08-08 14:31:40 -04:00
parent 5dc5d42e25 5756f8898e
commit e41ea19899
58 changed files with 1289 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/test-builds.yml
+5 -4
View File
@@ -58,15 +58,16 @@ jobs:
#- STM32F103RC_btt_maple
- STM32F103RC_btt_USB_maple
- STM32F103RC_fysetc
- STM32F103RC_fysetc_maple
- STM32F103RC_meeb
- jgaurora_a5s_a1
- jgaurora_a5s_a1_maple
- STM32F103VE_longer_maple
#- mks_robin_maple
- mks_robin_lite
- mks_robin_pro
- mks_robin_lite_maple
- mks_robin_pro_maple
#- mks_robin_nano35_maple
#- STM32F103RET6_creality_maple
- STM32F103VE_ZM3E4V2_USB_maple
# STM32 (ST) Environments
Marlin/Version.h
+1 -1
View File
@@ -41,7 +41,7 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
//#define STRING_DISTRIBUTION_DATE "2021-08-07"
//#define STRING_DISTRIBUTION_DATE "2021-08-08"
/**
* Defines a generic printer name to be output to the LCD after booting Marlin.
Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.h
+2 -2
View File
@@ -74,7 +74,7 @@
#define SD_MMC_REMOVING 2
//---- CONTROL FONCTIONS ----
//---- CONTROL FUNCTIONS ----
//!
//! @brief This function initializes the hw/sw resources required to drive the SD_MMC_SPI.
//!/
@@ -134,7 +134,7 @@ extern bool sd_mmc_spi_wr_protect(void);
extern bool sd_mmc_spi_removal(void);
//---- ACCESS DATA FONCTIONS ----
//---- ACCESS DATA FUNCTIONS ----
#if ACCESS_USB == true
// Standard functions for open in read/write mode the device
Marlin/src/HAL/DUE/usb/udd.h
+1 -1
View File
@@ -135,7 +135,7 @@ typedef void (*udd_callback_halt_cleared_t)(void);
* \param n number of data transferred
*/
typedef void (*udd_callback_trans_t) (udd_ep_status_t status,
iram_size_t nb_transfered, udd_ep_id_t ep);
iram_size_t nb_transferred, udd_ep_id_t ep);
/**
* \brief Authorizes the VBUS event
Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
+2 -2
View File
@@ -181,7 +181,7 @@ void LTDC_Config() {
hltdc_F.Init.AccumulatedVBP = (LTDC_LCD_VSYNC + LTDC_LCD_VBP - 1);
hltdc_F.Init.AccumulatedActiveH = (TFT_HEIGHT + LTDC_LCD_VSYNC + LTDC_LCD_VBP - 1);
hltdc_F.Init.AccumulatedActiveW = (TFT_WIDTH + LTDC_LCD_HSYNC + LTDC_LCD_HBP - 1);
hltdc_F.Init.TotalHeigh = (TFT_HEIGHT + LTDC_LCD_VSYNC + LTDC_LCD_VBP + LTDC_LCD_VFP - 1);
hltdc_F.Init.TotalHeight = (TFT_HEIGHT + LTDC_LCD_VSYNC + LTDC_LCD_VBP + LTDC_LCD_VFP - 1);
hltdc_F.Init.TotalWidth = (TFT_WIDTH + LTDC_LCD_HSYNC + LTDC_LCD_HBP + LTDC_LCD_HFP - 1);
/* Configure R,G,B component values for LCD background color : all black background */
@@ -203,7 +203,7 @@ void LTDC_Config() {
pLayerCfg.PixelFormat = LTDC_PIXEL_FORMAT_RGB565;
/* Start Address configuration : frame buffer is located at SDRAM memory */
pLayerCfg.FBStartAdress = (uint32_t)(FRAME_BUFFER_ADDRESS);
pLayerCfg.FBStartAddress = (uint32_t)(FRAME_BUFFER_ADDRESS);
/* Alpha constant (255 == totally opaque) */
pLayerCfg.Alpha = 255;
Marlin/src/core/boards.h
+3
View File
@@ -346,6 +346,9 @@
#define BOARD_BEAST 4048 // STM32F103RET6 Libmaple-based controller
#define BOARD_MINGDA_MPX_ARM_MINI 4049 // STM32F103ZET6 Mingda MD-16
#define BOARD_GTM32_PRO_VD 4050 // STM32F103VET6 controller
#define BOARD_ZONESTAR_ZM3E2 4051 // Zonestar ZM3E2 (STM32F103RCT6)
#define BOARD_ZONESTAR_ZM3E4 4052 // Zonestar ZM3E4 V1 (STM32F103VCT6)
#define BOARD_ZONESTAR_ZM3E4V2 4053 // Zonestar ZM3E4 V2 (STM32F103VCT6)
//
// ARM Cortex-M4F
Marlin/src/feature/binary_stream.h
+2 -2
View File
@@ -148,9 +148,9 @@ public:
case FileTransfer::QUERY:
SERIAL_ECHOPAIR("PFT:version:", VERSION_MAJOR, ".", VERSION_MINOR, ".", VERSION_PATCH);
#if ENABLED(BINARY_STREAM_COMPRESSION)
SERIAL_ECHOLNPAIR(":compresion:heatshrink,", HEATSHRINK_STATIC_WINDOW_BITS, ",", HEATSHRINK_STATIC_LOOKAHEAD_BITS);
SERIAL_ECHOLNPAIR(":compression:heatshrink,", HEATSHRINK_STATIC_WINDOW_BITS, ",", HEATSHRINK_STATIC_LOOKAHEAD_BITS);
#else
SERIAL_ECHOLNPGM(":compresion:none");
SERIAL_ECHOLNPGM(":compression:none");
#endif
break;
case FileTransfer::OPEN:
Marlin/src/gcode/lcd/M995.cpp
+2 -2
View File
@@ -26,7 +26,7 @@
#include "../gcode.h"
#if ENABLED(TFT_LVGL_UI)
#if HAS_TFT_LVGL_UI
#include "../../lcd/extui/mks_ui/draw_touch_calibration.h"
#else
#include "../../lcd/menu/menu.h"
@@ -37,7 +37,7 @@
*/
void GcodeSuite::M995() {
#if ENABLED(TFT_LVGL_UI)
#if HAS_TFT_LVGL_UI
lv_draw_touch_calibration_screen();
#else
ui.goto_screen(touch_screen_calibration);
Marlin/src/inc/Version.h
+1 -1
View File
@@ -42,7 +42,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2021-08-07"
#define STRING_DISTRIBUTION_DATE "2021-08-08"
#endif
/**
Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp
+1 -1
View File
@@ -42,7 +42,7 @@ namespace FTDI {
strcat_P(str, (const char*) units);
}
cmd.text(VAL_POS, str);
cmd.tag(0).text(VAL_POS, str);
}
void draw_adjuster(CommandProcessor& cmd, int16_t x, int16_t y, int16_t w, int16_t h, uint8_t tag, float value, progmem_str units, int8_t width, uint8_t precision, draw_mode_t what) {
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
+2 -1
View File
@@ -36,6 +36,7 @@ using namespace Theme;
constexpr static SpinnerDialogBoxData &mydata = screen_data.SpinnerDialogBox;
void SpinnerDialogBox::onEntry() {
UIScreen::onEntry();
mydata.auto_hide = true;
}
@@ -98,7 +99,7 @@ void SpinnerDialogBox::enqueueAndWait(progmem_str message, char *commands) {
}
void SpinnerDialogBox::onIdle() {
if (mydata.auto_hide && !commandsInQueue()) {
if (mydata.auto_hide && !commandsInQueue() && TERN1(HOST_KEEPALIVE_FEATURE, GcodeSuite::busy_state == GcodeSuite::NOT_BUSY)) {
mydata.auto_hide = false;
hide();
}
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
+1 -1
View File
@@ -29,7 +29,7 @@ struct SpinnerDialogBoxData {
bool auto_hide;
};
class SpinnerDialogBox : public BaseScreen {
class SpinnerDialogBox : public UIScreen {
public:
static void onEntry();
static void onExit();
Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h
+1 -1
View File
@@ -44,7 +44,7 @@ bool my_mousewheel_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data);
void LCD_Clear(uint16_t Color);
void tft_set_point(uint16_t x, uint16_t y, uint16_t point);
void LCD_setWindowArea(uint16_t StartX, uint16_t StartY, uint16_t width, uint16_t heigh);
void LCD_setWindowArea(uint16_t StartX, uint16_t StartY, uint16_t width, uint16_t height);
void LCD_WriteRAM_Prepare();
void lcd_draw_logo();
void lv_encoder_pin_init();
Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
+2 -2
View File
@@ -225,7 +225,7 @@ static bool longName2DosName(const char *longName, char *dosName) {
else if (status_bits & 0x2) {
// DMA transmit complete
if (esp_state == TRANSFER_IDLE)
esp_state = TRANSFERING;
esp_state = TRANSFERRING;
if (storeRcvData(WIFISERIAL.usart_device->rb->buf, UART_RX_BUFFER_SIZE)) {
esp_dma_pre();
@@ -1819,7 +1819,7 @@ void wifi_rcv_handle() {
#ifdef __STM32F1__
if (esp_state == TRANSFER_STORE) {
if (storeRcvData(WIFISERIAL.wifiRxBuf, UART_RX_BUFFER_SIZE)) {
esp_state = TRANSFERING;
esp_state = TRANSFERRING;
esp_dma_pre();
if (wifiTransError.flag != 0x1) WIFI_IO1_RESET();
}
Marlin/src/lcd/extui/mks_ui/wifi_module.h
+1 -1
View File
@@ -137,7 +137,7 @@ typedef enum {
typedef enum {
TRANSFER_IDLE,
TRANSFERING,
TRANSFERRING,
TRANSFER_STORE,
} TRANSFER_STATE;
extern volatile TRANSFER_STATE esp_state;
Marlin/src/lcd/tft_io/touch_calibration.cpp
+1 -1
View File
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
Marlin/src/lcd/tft_io/touch_calibration.h
+1 -1
View File
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
+1 -2
View File
@@ -126,11 +126,10 @@
#endif
#endif
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#if SD_CONNECTION_IS(LCD) && ENABLED(SKR_USE_LCD_SD_CARD_PINS_FOR_CS)
#error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_PINS_FOR_CS."
#error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_SD_CARD_PINS_FOR_CS."
#endif
#if SD_CONNECTION_IS(LCD)
Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+10 -2
View File
@@ -136,9 +136,17 @@
#endif
//
// Misc. Functions
// Power Supply Control
//
#define PS_ON_PIN P0_25 // TH3 Connector
#if ENABLED(PSU_CONTROL) // MKSPWC
#ifndef PS_ON_PIN
#define PS_ON_PIN P0_25 // SERVO
#endif
#ifndef KILL_PIN
#define KILL_PIN P1_29 // Z+
#define KILL_PIN_STATE HIGH
#endif
#endif
//
// Ethernet pins
Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+13
View File
@@ -215,6 +215,19 @@
#define FAN_PIN P2_04
#endif
//
// Power Supply Control
//
#if ENABLED(PSU_CONTROL) // MKSPWC
#ifndef PS_ON_PIN
#define PS_ON_PIN P2_00 // SERVO
#endif
#ifndef KILL_PIN
#define KILL_PIN P1_24 // Z+
#define KILL_PIN_STATE HIGH
#endif
#endif
//
// Misc. Functions
//
Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+1 -1
View File
@@ -212,7 +212,7 @@
* BEEPER | 5 6 ENT (BTN_ENC) (LCD_D4) P0_15 | 5 6 P0_20 (BTN_EN2)
* (SKR_RX1) TX | 7 8 | RX (SKR_TX1) Reset | 7 8 | P0_19 (BTN_EN1)
* NC | 9 10 | NC (BTN_ENC) P0_16 | 9 10 | P2_08 (BEEPER)
* ------ ------
* ------ ------
*/
#define BEEPER_PIN EXP1_10_PIN
Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
+13
View File
@@ -226,6 +226,19 @@
//
#define LED_PIN P1_18 // Used as a status indicator
//
// Power Supply Control
//
#if ENABLED(PSU_CONTROL) // MKSPWC
#ifndef PS_ON_PIN
#define PS_ON_PIN P2_00 // Suggestion (SERVO)
#endif
#ifndef KILL_PIN
#define KILL_PIN P1_24 // Suggestion (Z+)
#define KILL_PIN_STATE HIGH
#endif
#endif
//
// RGB LED
//
Marlin/src/pins/pins.h
+6
View File
@@ -561,6 +561,12 @@
#include "stm32f1/pins_BEAST.h" // STM32F103VE? env:STM32F103VE env:STM32F103RE_maple
#elif MB(MINGDA_MPX_ARM_MINI)
#include "stm32f1/pins_MINGDA_MPX_ARM_MINI.h" // STM32F1 env:mingda_mpx_arm_mini
#elif MB(ZONESTAR_ZM3E2)
#include "stm32f1/pins_ZM3E2_V1_0.h" // STM32F1 env:STM32F103RC_ZM3E2_USB env:STM32F103RC_ZM3E2_USB_maple
#elif MB(ZONESTAR_ZM3E4)
#include "stm32f1/pins_ZM3E4_V1_0.h" // STM32F1 env:STM32F103VC_ZM3E4_USB env:STM32F103VC_ZM3E4_USB_maple
#elif MB(ZONESTAR_ZM3E4V2)
#include "stm32f1/pins_ZM3E4_V2_0.h" // STM32F1 env:STM32F103VE_ZM3E4V2_USB env:STM32F103VE_ZM3E4V2_USB_maple
//
// ARM Cortex-M4F
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h
+1 -1
View File
@@ -23,7 +23,7 @@
#define SKR_MINI_E3_V2
#define BOARD_CUSTOM_BUILD_FLAGS -DTONE_CHANNEL=4 -DTONE_TIMER=4
#define BOARD_CUSTOM_BUILD_FLAGS -DTONE_CHANNEL=4 -DTONE_TIMER=4 -DTIMER_TONE=4
// Onboard I2C EEPROM
#if NO_EEPROM_SELECTED
Marlin/src/pins/stm32f1/pins_CHITU3D_common.h
+1 -1
View File
@@ -147,7 +147,7 @@
#define TFT_RS_PIN FSMC_RS_PIN
#endif
#if ENABLED(TFT_LVGL_UI)
#if HAS_TFT_LVGL_UI
// LVGL
#define HAS_SPI_FLASH_FONT 1
#define HAS_GCODE_PREVIEW 1
Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
+3 -2
View File
@@ -195,9 +195,10 @@
//
// Misc. Functions
//
//#define POWER_LOSS_PIN PA1 // PW_SO
#if ENABLED(BACKUP_POWER_SUPPLY)
#define POWER_LOSS_PIN PA2 // PW_DET (UPS) MKSPWC
#else
//#define POWER_LOSS_PIN PA1 // PW_SO
#endif
/**
@@ -217,7 +218,7 @@
//
#if ENABLED(PSU_CONTROL)
#define KILL_PIN PA2 // PW_DET
#define KILL_PIN_INVERTING true
#define KILL_PIN_STATE HIGH
//#define PS_ON_PIN PA3 // PW_CN /PW_OFF
#endif
Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
+11 -6
View File
@@ -45,14 +45,19 @@
#endif
//#define MCU_STM32F103ZE // not yet required
// Enable EEPROM Emulation for this board, so that we don't overwrite factory data
#if NO_EEPROM_SELECTED
//#define I2C_EEPROM // AT24C64
//#define FLASH_EEPROM_EMULATION
#endif
//#define I2C_EEPROM // AT24C64
//#define MARLIN_EEPROM_SIZE 0x8000UL // 64KB
//#define FLASH_EEPROM_EMULATION
//#define MARLIN_EEPROM_SIZE 0x1000UL // 4KB
//#define MARLIN_EEPROM_SIZE (EEPROM_START_ADDRESS + (EEPROM_PAGE_SIZE) * 2UL)
#if ENABLED(I2C_EEPROM)
//#define MARLIN_EEPROM_SIZE 0x8000UL // 32KB
#elif ENABLED(FLASH_EEPROM_EMULATION)
//#define MARLIN_EEPROM_SIZE 0x1000UL // 4KB
//#define MARLIN_EEPROM_SIZE (EEPROM_START_ADDRESS + (EEPROM_PAGE_SIZE) * 2UL)
#endif
//
// Limit Switches
Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once
/**
* MKS Robin mini (STM32F130VET6) board pin assignments
* MKS Robin mini (STM32F103VET6) board pin assignments
*/
#if NOT_TARGET(STM32F1, STM32F1xx)
Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once
/**
* MKS Robin (STM32F130ZET6) board pin assignments
* MKS Robin (STM32F103ZET6) board pin assignments
* https://github.com/makerbase-mks/MKS-Robin/tree/master/MKS%20Robin/Hardware
*/
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+6 -7
View File
@@ -22,7 +22,7 @@
#pragma once
/**
* MKS Robin nano (STM32F130VET6) board pin assignments
* MKS Robin nano (STM32F103VET6) board pin assignments
*/
#include "env_validate.h"
@@ -183,12 +183,11 @@
// Misc. Functions
//
#if HAS_TFT_LVGL_UI
//#define MKSPWC
#ifdef MKSPWC
#define SUICIDE_PIN PB2 // Enable MKSPWC SUICIDE PIN
#define SUICIDE_PIN_INVERTING false // Enable MKSPWC PIN STATE
#define KILL_PIN PA2 // Enable MKSPWC DET PIN
#define KILL_PIN_STATE true // Enable MKSPWC PIN STATE
#if ENABLED(PSU_CONTROL) // MKSPWC
#define SUICIDE_PIN PB2 // PW_OFF
#define SUICIDE_PIN_INVERTING false
#define KILL_PIN PA2 // PW_DET
#define KILL_PIN_STATE HIGH
#endif
#define MT_DET_1_PIN PA4 // LVGL UI FILAMENT RUNOUT1 PIN
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+16 -3
View File
@@ -126,6 +126,19 @@
#define FIL_RUNOUT_PIN PB10 // MT_DET
//
// Power Supply Control
//
#if ENABLED(PSU_CONTROL) // MKSPWC
#ifndef PS_ON_PIN
#define PS_ON_PIN PA14 // PW_OFF
#endif
#ifndef KILL_PIN
#define KILL_PIN PB10 // PW_DET
#define KILL_PIN_STATE HIGH
#endif
#endif
/**
* _____ _____ _____
* (BEEPER) PC1 | 1 2 | PC3 (BTN_ENC) (MISO) PB14 | 1 2 | PB13 (SD_SCK) 5V | 1 2 | GND
@@ -158,7 +171,7 @@
#elif ENABLED(MKS_MINI_12864_V3)
#define DOGLCD_CS PA4
#define DOGLCD_A0 PA5
#define LCD_PINS_DC DOGLCD_A0
#define LCD_PINS_DC DOGLCD_A0
#define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN PA6
#define NEOPIXEL_PIN PA7
@@ -189,8 +202,8 @@
//
// SD Card
//
#define SPI_DEVICE 2
#define ONBOARD_SPI_DEVICE 2
#define SPI_DEVICE 2
#define ONBOARD_SPI_DEVICE 2
#define SDSS SD_SS_PIN
#define SDCARD_CONNECTION ONBOARD
#define SD_DETECT_PIN PC10
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once
/**
* MKS Robin mini (STM32F130VET6) board pin assignments
* MKS Robin mini (STM32F103VET6) board pin assignments
*/
#include "env_validate.h"
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
+20 -9
View File
@@ -22,7 +22,7 @@
#pragma once
/**
* MKS Robin nano (STM32F130VET6) board pin assignments
* MKS Robin nano (STM32F103VET6) board pin assignments
* https://github.com/makerbase-mks/MKS-Robin-Nano-V1.X/tree/master/hardware
*/
@@ -127,18 +127,29 @@
//#define TEMP_0_CS_PIN PE5 // TC1 - CS1
//#define TEMP_0_CS_PIN PE6 // TC2 - CS2
//
// Power Supply Control
//
#if ENABLED(PSU_CONTROL) // MKSPWC
#if HAS_TFT_LVGL_UI
#error "PSU_CONTROL cannot be used with TFT_LVGL_UI. Disable PSU_CONTROL to continue."
#endif
#ifndef PS_ON_PIN
#define PS_ON_PIN PB2 // SUICIDE
#endif
#ifndef KILL_PIN
#define KILL_PIN PA2
#define KILL_PIN_STATE HIGH
#endif
#else
#define SUICIDE_PIN PB2
#define SUICIDE_PIN_INVERTING false
#endif
//
// Misc. Functions
//
#if HAS_TFT_LVGL_UI
//#define MKSPWC
#ifdef MKSPWC
#define SUICIDE_PIN PB2 // Enable MKSPWC SUICIDE PIN
#define SUICIDE_PIN_INVERTING false // Enable MKSPWC PIN STATE
#define KILL_PIN PA2 // Enable MKSPWC DET PIN
#define KILL_PIN_STATE true // Enable MKSPWC PIN STATE
#endif
#define MT_DET_1_PIN PA4 // LVGL UI FILAMENT RUNOUT1 PIN
#define MT_DET_2_PIN PE6 // LVGL UI FILAMENT RUNOUT2 PIN
#define MT_DET_PIN_INVERTING false // LVGL UI filament RUNOUT PIN STATE
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+20 -8
View File
@@ -22,7 +22,7 @@
#pragma once
/**
* MKS Robin nano (STM32F130VET6) board pin assignments
* MKS Robin nano (STM32F103VET6) board pin assignments
*/
#if NOT_TARGET(__STM32F1__, STM32F1)
@@ -191,17 +191,29 @@
//#define TEMP_0_CS_PIN PE5 // TC1 - CS1
//#define TEMP_0_CS_PIN PE6 // TC2 - CS2
//
// Power Supply Control
//
#if ENABLED(PSU_CONTROL) // MKSPWC
#if HAS_TFT_LVGL_UI
#error "PSU_CONTROL cannot be used with TFT_LVGL_UI. Disable PSU_CONTROL to continue."
#endif
#ifndef PS_ON_PIN
#define PS_ON_PIN PB2 // SUICIDE
#endif
#ifndef KILL_PIN
#define KILL_PIN PA2
#define KILL_PIN_STATE HIGH
#endif
#else
#define SUICIDE_PIN PB2
#define SUICIDE_PIN_INVERTING false
#endif
//
// Misc. Functions
//
#if HAS_TFT_LVGL_UI
//#define MKSPWC
#ifdef MKSPWC
#define SUICIDE_PIN PB2 // Enable MKSPWC SUICIDE PIN
#define SUICIDE_PIN_INVERTING false // Enable MKSPWC PIN STATE
#define KILL_PIN PA2 // Enable MKSPWC DET PIN
#define KILL_PIN_STATE true // Enable MKSPWC PIN STATE
#endif
#define MT_DET_1_PIN PA4 // LVGL UI FILAMENT RUNOUT1 PIN
#define MT_DET_2_PIN PE6 // LVGL UI FILAMENT RUNOUT2 PIN
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
+21 -3
View File
@@ -179,10 +179,28 @@
//#define TEMP_0_CS_PIN PF11 // TC2 - CS2
#define POWER_LOSS_PIN PA2 // PW_DET
#define PS_ON_PIN PG11 // PW_OFF
#define FIL_RUNOUT_PIN PA4 // MT_DET1
//#define FIL_RUNOUT_PIN PE6 // MT_DET2
//#define FIL_RUNOUT_PIN PG14 // MT_DET3
#define FIL_RUNOUT2_PIN PE6 // MT_DET2
#define FIL_RUNOUT3_PIN PG14 // MT_DET3
//
// Power Supply Control
//
#if ENABLED(PSU_CONTROL) // MKSPWC
#if HAS_TFT_LVGL_UI
#error "PSU_CONTROL cannot be used with TFT_LVGL_UI. Disable PSU_CONTROL to continue."
#endif
#ifndef PS_ON_PIN
#define PS_ON_PIN PG11 // SUICIDE
#endif
#ifndef KILL_PIN
#define KILL_PIN PA2
#define KILL_PIN_STATE HIGH
#endif
#else
#define SUICIDE_PIN PG11
#define SUICIDE_PIN_INVERTING false
#endif
//
// SD Card
Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once
/**
* ANYCUBIC Trigorilla Pro (STM32F130ZET6) board pin assignments.
* ANYCUBIC Trigorilla Pro (STM32F103ZET6) board pin assignments.
* It is the same used by the Tronxy X5SA thanks to ftoz1 for sharing it
* https://github.com/MarlinFirmware/Marlin/issues/14655
* https://github.com/MarlinFirmware/Marlin/files/3401484/x5sa-main_board-2.pdf
Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
+235
View File
@@ -0,0 +1,235 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2021 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/>.
*
*/
#pragma once
#include "env_validate.h"
#define BOARD_INFO_NAME "ZONESTAR ZM3E2 V1.0"
#define DISABLE_DEBUG
//#define DISABLE_JTAG
#if NO_EEPROM_SELECTED
#define FLASH_EEPROM_EMULATION
#define EEPROM_PAGE_SIZE (0x800) // 2KB
#define EEPROM_START_ADDRESS (0x08000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
#endif
//=============================================================================
// Zonestar ZM3E2 V1.0 (STM32F103RCT6) board pin assignments
//=============================================================================
// PA0 PWR_HOLD | PB0 BEEP | PC0 HEATER_0
// PA1 FAN_PIN | PB1 KILL | PC1 HEATER_BED
// PA2 TX2 | PB2 LCD_SDA | PC2 TEMP_BED
// PA3 RX2 | PB3 E1_EN | PC3 TEMP_E0
// PA4 SD_CS | PB4 Z_STOP | PC4 SD_DETECT
// PA5 SD_SCK | PB5 Z_DIR | PC5 BTN_EN2
// PA6 SD_MISO | PB6 Z_STEP | PC6 FAN1
// PA7 SD_MOSI | PB7 Z_EN | PC7 FIL_RUNOUT
// PA8 X_DIR | PB8 Y_STEP | PC8 X_EN
// PA9 LCD_RS | PB9 Y_DIR | PC9 X_STEP
// PA10 LCD_SCK | PB10 BTN_ENC | PC10 Z_MIN_PROBE_PIN
// PA11 USB_D- | PB11 BTN_EN1 | PC11 FIL_RUNOUT2
// PA12 USB_D+ | PB12 LED | PC12 E1_DIR
// PA13 MS1 | PB13 E0_EN | PC13 Y_STOP
// PA14 MS2 | PB14 E0_STEP | PC14 Y_EN
// PA15 PWM | PB15 E0_DIR | PC15 X_STOP
// PD0 NC
// PD1 NC
// PD2 E1_STEP
//=============================================================================
// EXP1 connector
// MARK I/O ZONESTAR_12864LCD ZONESTAR_12864OLED
// 10 MOSI PB1 KILL SDA
// 9 SCK PB0 BEEP SCK
// 8 TX1 PA9 DOGLCD_CS CS
// 7 RX1 PA10 DOGLCD_SCK DC
// 6 ENA PC5 BTN_EN2 KNOB_ENB
// 5 DAT PB2 DOGLCD_MOSI RESET
// 4 TX3 PB10 BTN_ENC KNOB_ENC
// 3 RX3 PB11 BTN_EN1 KNOB_ENA
// 2 +5V
// 1 GND
#define EXP1_03_PIN PB11
#define EXP1_04_PIN PB10
#define EXP1_05_PIN PB2
#define EXP1_06_PIN PC5
#define EXP1_07_PIN PA10
#define EXP1_08_PIN PA9
#define EXP1_09_PIN PB0
#define EXP1_10_PIN PB1
// AUX1 connector
// 1 +5V
// 2 TX2 PA2 UART2_TX
// 3 RX2 PA3 UART2_RX
// 4 GND
// AUX2 connector to BLTouch
// 1 +5V
// 2 SEN PC10
// 3 PWM PA15
// 4 GND
//=============================================================================
//
// Servos
//
#define SERVO0_PIN PA15
//
// Limit Switches
//
#define X_STOP_PIN PC15
#define Y_STOP_PIN PC13
#define Z_STOP_PIN PB4
#ifndef Z_MIN_PROBE_PIN
#define Z_MIN_PROBE_PIN PC10 // BLTouch (3DTouch)
#endif
//
// Filament Runout Sensor
//
#define FIL_RUNOUT_PIN PC7 // E0_SW
//#define FIL_RUNOUT2_PIN PC11 // E1_SW
//
// Steppers
//
#define MS1_PIN PA13
#define MS2_PIN PA14
#define X_STEP_PIN PC9
#define X_DIR_PIN PA8
#define X_ENABLE_PIN PC8
#define Y_STEP_PIN PB8
#define Y_DIR_PIN PB9
#define Y_ENABLE_PIN PC14
#define Z_STEP_PIN PB6
#define Z_DIR_PIN PB5
#define Z_ENABLE_PIN PB7
#define E0_STEP_PIN PB14
#define E0_DIR_PIN PB15
#define E0_ENABLE_PIN PB13
#define E1_STEP_PIN PD2
#define E1_DIR_PIN PC12
#define E1_ENABLE_PIN PB3
//
// Heaters / Fans
//
#define HEATER_0_PIN PC0 // EXTRUDER 1
#define HEATER_BED_PIN PC1 // BED
#define FAN1_PIN PC6
#define FAN_PIN PA1
//
// Temperature Sensors
//
#define TEMP_BED_PIN PC2 // Analog Input
#define TEMP_0_PIN PC3 // Analog Input
#define LED_PIN PB12
//#define KILL_PIN PB1 // @EXP1
#define SUICIDE_PIN PA0
//
// SD card
//
#define ENABLE_SPI1
#define SD_DETECT_PIN PC4
#define SD_SCK_PIN PA5
#define SD_MISO_PIN PA6
#define SD_MOSI_PIN PA7
#define SD_SS_PIN PA4
//
// LCD Pins
//
#if ENABLED(ZONESTAR_12864LCD)
//================================================================================
// LCD 128x64
//================================================================================
// EXP1 connector
// MARK I/O ZONESTAR_12864LCD
// 10 MOSI PB1 KILL
// 9 SCK PB0 BEEP
// 8 TX1 PA9 LCD_PINS_RS
// 7 RX1 PA10 LCD_PINS_D4
// 6 ENA PC5 BTN_EN2
// 5 DAT PB2 LCD_PINS_ENABLE
// 4 TX3 PB10 BTN_ENC
// 3 RX3 PB11 BTN_EN1
// 2 +5V
// 1 GND
#define LCDSCREEN_NAME "ZONESTAR LCD12864"
#define LCD_PINS_RS EXP1_08_PIN
#define LCD_PINS_ENABLE EXP1_05_PIN
#define LCD_PINS_D4 EXP1_07_PIN
//#define KILL_PIN EXP1_10_PIN
#define BEEPER_PIN EXP1_09_PIN
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_06_PIN
#define BTN_ENC EXP1_04_PIN
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
#define BOARD_ST7920_DELAY_2 DELAY_NS(200)
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
#elif EITHER(ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306)
//================================================================================
// OLED 128x64
//================================================================================
// 10 MOSI PB1 OLED_SDA
// 9 SCK PB0 OLED_SCK
// 8 TX1 PA9 OLED_CS
// 7 RX1 PA10 OLED_DC
// 6 ENA PC5 KNOB_ENA
// 5 DAT PB2 OLED_RESET
// 4 TX3 PB10 KNOB_ENC
// 3 RX3 PB11 KNOB_ENB
#define FORCE_SOFT_SPI
#define LCDSCREEN_NAME "ZONESTAR 12864OLED"
#define LCD_PINS_RS EXP1_05_PIN // = LCD_RESET_PIN
#define LCD_PINS_DC EXP1_07_PIN // DC
#define DOGLCD_CS EXP1_08_PIN // CS
#define DOGLCD_A0 LCD_PINS_DC // A0 = DC
#define DOGLCD_MOSI EXP1_10_PIN // SDA
#define DOGLCD_SCK EXP1_09_PIN // SCK
// Encoder
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_06_PIN
#define BTN_ENC EXP1_04_PIN
#endif
Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
+355
View File
@@ -0,0 +1,355 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2021 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/>.
*
*/
#pragma once
#include "env_validate.h"
#define BOARD_INFO_NAME "ZONESTAR ZM3E4 V1.0"
//#define DISABLE_DEBUG
#define DISABLE_JTAG
#if NO_EEPROM_SELECTED
#define FLASH_EEPROM_EMULATION
#define EEPROM_PAGE_SIZE (0x800) // 2KB
#define EEPROM_START_ADDRESS (0x08000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
#endif
//#define OPTION_DUALZ_DRIVE
//#define OPTION_Z2_ENDSTOP
//#define SWITCH_EXTRUDER_SEQUENCE
//=============================================================================
// Zonestar ZM3E4 V1.0 (STM32F103VCT6) board pin assignments
//=============================================================================
// PA0 | PB0 HEAT_1 | PC0 AXU_SDA
// PA1 | PB1 FAN1 | PC1 TEMP_E1
// PA2 HEAT_BED | PB2 BOOT1 | PC2 TEMP_E0
// PA3 PWR_HOLD | PB3 SPI3_SCK | PC3 TEMP_BED
// PA4 SD_CS | PB4 SPI3_MISO | PC4 SD_DETECT
// PA5 SD_SCK | PB5 SPI3_MOSI | PC5 HEAT_0
// PA6 SD_MISO | PB6 SERVO3 | PC6 E1_STEP
// PA7 SD_MOSI | PB7 SERVO2 | PC7 E1_EN
// PA8 X_DIR | PB8 FAN2/SERVO1 | PC8 FIL_RUNOUT_PIN
// PA9 UART1_RX | PB9 SERVO0 | PC9 E0_DIR
// PA10 UART1_TX | PB10 TX3 | PC10 E0_EN
// PA11 USB_D- | PB11 RX3 | PC11 Z2_EN
// PA12 USB_D+ | PB12 LED | PC12 Z2_STEP
// PA13 SWD_SDO | PB13 Z1_MAX | PC13 X_MIN
// PA14 SWD_SCK | PB14 Y_MAX | PC14 WIFI_RST
// PA15 SPI3_CS | PB15 PWR_DET | PC15 WIFI_CS
// PD0 Z2_DIR | PE0 Y_EN
// PD1 Z2_MIN | PE1 Y_STEP
// PD2 Z1_EN | PE2 Y_DIR
// PD3 Z1_STEP | PE3 Y_MIN
// PD4 Z1_DIR | PE4 X_DIR
// PD5 WIFI_RXD | PE5 X_STEP
// PD6 WIFI_TXD | PE6 X_EN
// PD7 Z1_MIN | PE7 AXU_SCL
// PD8 X_MAX | PE8 BTN_EN1
// PD9 E3_DIR | PE9 LCD_SCK
// PD10 E3_STEP | PE10 LCD_MOSI
// PD11 E3_EN | PE11 BEEPER
// PD12 E2_DIR | PE12 LCD_EN
// PD13 E2_STEP | PE13 KILL
// PD14 E2_EN | PE14 BTN_EN2
// PD15 E1_DIR | PE15 BTN_ENC
//=============================================================================
// EXP1 connector
// MARK I/O ZONESTAR_LCD12864 REPRAPDISCOUNT_LCD12864
// 10 RS PE13 KILL BTN_ENC
// 9 BP PE11 BEEP BEEP
// 8 EN PE12 DOGLCD_CS LCDRS
// 7 MOSI PE10 DOGLCD_SCK LCDE
// 6 EN1 PE8 BTN_EN1 NC
// 5 SCK PE9 DOGLCD_MOSI LCD4
// 4 ENC PE15 BTN_ENC NC
// 3 EN2 PE14 BTN_EN2 NC
// 2 +5V +5V
// 1 GND GND
#define EXP1_03_PIN PE14
#define EXP1_04_PIN PE15
#define EXP1_05_PIN PE9
#define EXP1_06_PIN PE8
#define EXP1_07_PIN PE10
#define EXP1_08_PIN PE12
#define EXP1_09_PIN PE11
#define EXP1_10_PIN PE13
// EXP2 connector
// MARK I/O ZONESTAR_LCD12864 REPRAPDISCOUNT_LCD12864
// 10
// 9
// 8 RX0 PA9 UART1_RX
// 7 TX0 PA10 UART1_TX BTN_EN2
// 6 CS3 PA15
// 5 MISO3 PB4 BTN_EN1
// 4 MOSI3 PB5 KILL
// 3 SCK3 PB3
// 2 +5V +5V
// 1 GND GND
#define EXP2_03_PIN PB3
#define EXP2_04_PIN PB5
#define EXP2_05_PIN PB4
#define EXP2_06_PIN PA15
#define EXP2_07_PIN PA10
#define EXP2_08_PIN PA9
// AUX1 connector
// 1 +5V
// 2 GND
// 3 RX3 PB11 UART3_RX
// 4 TX3 PB10 UART3_TX
// 5 SCL PE7
// 6 SDA PC0
// WiFi
// 1 +5V
// 2 GND
// 3 WIFI_TXD PD5 UART2_RX
// 4 WIFI_RXD PD6 UART2_TX
// 5 WIFI_RST PC14
// 6 WIFI_CS PC15
//=============================================================================
//
// Servos
//
#define SERVO0_PIN PB9
#define SERVO2_PIN PB7
#define SERVO3_PIN PB6
//
// Limit Switches
//
#define X_MIN_PIN PC13
#define X_MAX_PIN PD8
#define Y_MIN_PIN PE3
#define Y_MAX_PIN PB14
#define Z_MIN_PIN PD7
#define Z_MAX_PIN PB13
//
// Filament Runout Sensor
//
#ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN PC8
#endif
//
// Steppers
//
#if ENABLED(COREXY)
#define X_ENABLE_PIN PE0
#define X_STEP_PIN PE1
#define X_DIR_PIN PE2
#define Y_ENABLE_PIN PE6
#define Y_STEP_PIN PE5
#define Y_DIR_PIN PE4
#else
#define X_ENABLE_PIN PE6
#define X_STEP_PIN PE5
#define X_DIR_PIN PE4
#define Y_ENABLE_PIN PE0
#define Y_STEP_PIN PE1
#define Y_DIR_PIN PE2
#endif
#define Z_ENABLE_PIN PD2
#define Z_STEP_PIN PD3
#define Z_DIR_PIN PD4
#ifdef OPTION_DUALZ_DRIVE
#define Z2_ENABLE_PIN PC11
#define Z2_STEP_PIN PC12
#define Z2_DIR_PIN PD0
#endif
#ifdef OPTION_Z2_ENDSTOP
#define Z2_MIN_PIN PD1
#define Z2_MAX_PIN PB12
#endif
#ifdef SWITCH_EXTRUDER_SEQUENCE
#define E3_ENABLE_PIN PC10
#define E3_STEP_PIN PA8
#define E3_DIR_PIN PC9
#define E2_STEP_PIN PC6
#define E2_DIR_PIN PD15
#define E2_ENABLE_PIN PC7
#define E1_STEP_PIN PD13
#define E1_DIR_PIN PD12
#define E1_ENABLE_PIN PD14
#define E0_STEP_PIN PD10
#define E0_DIR_PIN PD9
#define E0_ENABLE_PIN PD11
#else
#define E0_ENABLE_PIN PC10
#define E0_STEP_PIN PA8
#define E0_DIR_PIN PC9
#define E1_STEP_PIN PC6
#define E1_DIR_PIN PD15
#define E1_ENABLE_PIN PC7
#define E2_STEP_PIN PD13
#define E2_DIR_PIN PD12
#define E2_ENABLE_PIN PD14
#define E3_STEP_PIN PD10
#define E3_DIR_PIN PD9
#define E3_ENABLE_PIN PD11
#endif
//
// Temperature Sensors
//
#define TEMP_0_PIN PC2 // TH0
#define TEMP_BED_PIN PC3 // TB1
//
// Heaters / Fans
//
#define HEATER_0_PIN PC5 // HEATER0
#define HEATER_BED_PIN PA2 // HOT BED
#if ENABLED(OPTION_CHAMBER)
#define TEMP_CHAMBER_PIN PC1
#define HEATER_CHAMBER_PIN PB0
#else
#define TEMP_1_PIN PC1 // TH1
#define HEATER_1_PIN PB0 // HEATER1
#endif
#define FAN_PIN PB1 // FAN1
#define FAN1_PIN PB8 // FAN2
//
// Misc. Functions
//
//#define POWER_LOSS_PIN PB15
#define LED_PIN PA0
#define SUICIDE_PIN PA3
//
// SD card
//
#define ENABLE_SPI1
#define SD_DETECT_PIN PC4
#define SD_SCK_PIN PA5
#define SD_MISO_PIN PA6
#define SD_MOSI_PIN PA7
#define SD_SS_PIN PA4
// WiFi Functions
#define WIFI_RST PC15
#define WIFI_EN PC14
//
// LCD / Controller
//
#if ENABLED(ZONESTAR_12864LCD)
#define LCDSCREEN_NAME "ZONESTAR LCD12864"
#define LCD_PINS_RS EXP1_08_PIN // 7 CS make sure for zonestar zm3e4!
#define LCD_PINS_ENABLE EXP1_05_PIN // 6 DATA make sure for zonestar zm3e4!
#define LCD_PINS_D4 EXP1_07_PIN // 8 SCK make sure for zonestar zm3e4!
#define BEEPER_PIN EXP1_09_PIN
#define KILL_PIN -1 // EXP1_10_PIN
#define BTN_EN1 EXP1_06_PIN
#define BTN_EN2 EXP1_03_PIN
#define BTN_ENC EXP1_04_PIN
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define LCDSCREEN_NAME "REPRAPDISCOUNT LCD12864"
#define LCD_PINS_RS EXP1_08_PIN // 7 CS make sure for zonestar zm3e4!
#define LCD_PINS_ENABLE EXP1_07_PIN // 6 DATA make sure for zonestar zm3e4!
#define LCD_PINS_D4 EXP1_05_PIN // 8 SCK make sure for zonestar zm3e4!
#define BEEPER_PIN EXP1_09_PIN
#define KILL_PIN EXP2_04_PIN
#define BTN_EN1 EXP2_05_PIN
#define BTN_EN2 EXP2_07_PIN
#define BTN_ENC EXP1_10_PIN
#elif ENABLED(ZONESTAR_DWIN_LCD)
// Connect to EXP2 connector
#define LCDSCREEN_NAME "ZONESTAR DWIN LCD"
#define BEEPER_PIN EXP2_06_PIN
#define KILL_PIN PC0
#define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 EXP2_04_PIN
#define BTN_ENC EXP2_05_PIN
#endif
#if ENABLED(ZONESTAR_LCD2004_KNOB)
#define LCDSCREEN_NAME "LCD2004 KNOB"
#define LCD_PINS_RS EXP1_08_PIN
#define LCD_PINS_ENABLE EXP1_07_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#define LCD_PINS_D5 EXP1_06_PIN
#define LCD_PINS_D6 EXP1_03_PIN
#define LCD_PINS_D7 EXP1_04_PIN
#define BTN_EN1 EXP2_07_PIN
#define BTN_EN2 EXP2_05_PIN
#define BTN_ENC EXP1_10_PIN
#define BEEPER_PIN EXP1_09_PIN
#define KILL_PIN EXP2_04_PIN
#elif ENABLED(ZONESTAR_LCD2004_ADCKEY)
#define LCDSCREEN_NAME "LCD2004 5KEY"
#define LCD_PINS_RS EXP1_08_PIN
#define LCD_PINS_ENABLE EXP1_07_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#define LCD_PINS_D5 EXP1_06_PIN
#define LCD_PINS_D6 EXP1_03_PIN
#define LCD_PINS_D7 EXP1_04_PIN
#define ADC_KEYPAD_PIN PC0 // PIN6 of AUX1
#endif
#if HAS_MARLINUI_U8GLIB
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
#define BOARD_ST7920_DELAY_2 DELAY_NS(250)
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
#endif
// Remap SERVO0 PIN for BLTouch
#if ENABLED(BLTOUCH_ON_EXP1)
// BLTouch connected to EXP1
#define BLTOUCH_PROBE_PIN EXP1_06_PIN
#define BLTOUCH_GND_PIN EXP1_04_PIN
#undef SERVO0_PIN
#define SERVO0_PIN EXP1_03_PIN
#elif ENABLED(BLTOUCH_ON_EXP2)
// BLTouch connected to EXP2
#define BLTOUCH_PROBE_PIN EXP2_03_PIN
#define BLTOUCH_GND_PIN EXP2_04_PIN
#undef SERVO0_PIN
#define SERVO0_PIN EXP2_06_PIN
#else
#define BLTOUCH_PROBE_PIN PB13
#endif
Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
+328
View File
@@ -0,0 +1,328 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2021 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/>.
*
*/
#pragma once
#include "env_validate.h"
#define BOARD_INFO_NAME "ZONESTAR ZM3E4 V2.0"
//#define DISABLE_DEBUG
#define DISABLE_JTAG
#if NO_EEPROM_SELECTED
#define FLASH_EEPROM_EMULATION
#define EEPROM_PAGE_SIZE (0x800) // 2KB
#define EEPROM_START_ADDRESS (0x08000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
#endif
//#define OPTION_DUALZ_DRIVE
//#define OPTION_Z2_ENDSTOP
//#define OPTION_REPEAT_PRINTING
//#define SWITCH_EXTRUDER_SEQUENCE
//=============================================================================
// Zonestar ZM3E4 V2.0 (STM32F103VET6) board pin assignments
//=============================================================================
// PA0 | PB0 HEAT_1 | PC0 AUX_SDA
// PA1 | PB1 FAN1 | PC1 TEMP_E1
// PA2 HEAT_BED | PB2 BOOT1 | PC2 TEMP_E0
// PA3 PWR_HOLD | PB3 SPI3_SCK | PC3 TEMP_BED
// PA4 SD_CS | PB4 SPI3_MISO | PC4 SD_DETECT
// PA5 SD_SCK | PB5 SPI3_MOSI | PC5 HEAT_0
// PA6 SD_MISO | PB6 SERVO3 | PC6 E1_STEP
// PA7 SD_MOSI | PB7 SERVO2 | PC7 E1_EN
// PA8 X_DIR | PB8 FAN2/SERVO1 | PC8 FIL_RUNOUT_PIN
// PA9 UART1_RX | PB9 SERVO0 | PC9 E0_DIR
// PA10 UART1_TX | PB10 TX3 | PC10 E0_EN
// PA11 USB_D- | PB11 RX3 | PC11 Z2_EN
// PA12 USB_D+ | PB12 LED | PC12 Z2_STEP
// PA13 SWD_SDO | PB13 Z1_MAX | PC13 X_MIN
// PA14 SWD_SCK | PB14 Y_MAX | PC14 WIFI_RST
// PA15 SPI3_CS | PB15 PWR_DET | PC15 WIFI_CS
// PD0 Z2_DIR | PE0 Y_EN
// PD1 Z2_MIN | PE1 Y_STEP
// PD2 Z1_EN | PE2 Y_DIR
// PD3 Z1_STEP | PE3 Y_MIN
// PD4 Z1_DIR | PE4 X_DIR
// PD5 WIFI_RXD | PE5 X_STEP
// PD6 WIFI_TXD | PE6 X_EN
// PD7 Z1_MIN | PE7 AUX_SCL
// PD8 X_MAX | PE8 BTN_EN1
// PD9 E3_DIR | PE9 LCD_SCK
// PD10 E3_STEP | PE10 LCD_MOSI
// PD11 E3_EN | PE11 BEEPER
// PD12 E2_DIR | PE12 LCD_EN
// PD13 E2_STEP | PE13 KILL
// PD14 E2_EN | PE14 BTN_EN2
// PD15 E1_DIR | PE15 BTN_ENC
//=============================================================================
// EXP1 connector
// MARK I/O ZONESTAR_LCD12864 REPRAPDISCOUNT_LCD12864
// 10 RS PE13 KILL BTN_ENC
// 9 BP PE11 BEEP BEEP
// 8 EN PE12 DOGLCD_CS LCDRS
// 7 MOSI PE10 DOGLCD_SCK LCDE
// 6 EN1 PE8 BTN_EN1 NC
// 5 SCK PE9 DOGLCD_MOSI LCD4
// 4 ENC PE15 BTN_ENC NC
// 3 EN2 PE14 BTN_EN2 NC
// 2 +5V
// 1 GND
#define EXP1_03_PIN PE14
#define EXP1_04_PIN PE15
#define EXP1_05_PIN PE9
#define EXP1_06_PIN PE8
#define EXP1_07_PIN PE10
#define EXP1_08_PIN PE12
#define EXP1_09_PIN PE11
#define EXP1_10_PIN PE13
// EXP2 connector
// MARK I/O ZONESTAR_LCD12864 REPRAPDISCOUNT_LCD12864
// 10 SDA PC0
// 9 SCL PE7
// 8 RX1 PA9 UART1_RX
// 7 TX1 PA10 UART1_TX BTN_EN2
// 6 CS3 PA15
// 5 MISO3 PB4 BTN_EN1
// 4 MOSI3 PB5 KILL
// 3 SCK3 PB3
// 2 +5V
// 1 GND
#define EXP2_03_PIN PB3
#define EXP2_04_PIN PB5
#define EXP2_05_PIN PB4
#define EXP2_06_PIN PA15
#define EXP2_07_PIN PA10
#define EXP2_08_PIN PA9
#define EXP2_09_PIN PE7
#define EXP2_10_PIN PC0
// AUX1 connector
// 1 +5V
// 2 GND
// 3 RX3 PB11 UART3_RX
// 4 TX3 PB10 UART3_TX
// 5 SCL PE7
// 6 SDA PC0
// WiFi
// 1 +5V
// 2 GND
// 3 WIFI_TXD PD5 UART2_RX
// 4 WIFI_RXD PD6 UART2_TX
// 5 WIFI_RST PC14
// 6 WIFI_CS PC15
//=============================================================================
//
// Servos
//
#define SERVO0_PIN PB9
//#define SERVO1_PIN PB8
#define SERVO2_PIN PB7
#define SERVO3_PIN PB6
//
// Limit Switches
//
#define X_MIN_PIN PC13
#define Y_MIN_PIN PE3
#define Z_MIN_PIN PD7
#define X_MAX_PIN PD8
#define Y_MAX_PIN PB14
#define Z_MAX_PIN PB13
#ifdef OPTION_Z2_ENDSTOP
#define Z2_MIN_PIN PD1
#define Z2_MAX_PIN PB12
#endif
//
// Steppers
//
#if ENABLED(COREXY)
#define X_ENABLE_PIN PE0
#define X_STEP_PIN PE1
#define X_DIR_PIN PE2
#define Y_ENABLE_PIN PE6
#define Y_STEP_PIN PE5
#define Y_DIR_PIN PE4
#else
#define X_ENABLE_PIN PE6
#define X_STEP_PIN PE5
#define X_DIR_PIN PE4
#define Y_ENABLE_PIN PE0
#define Y_STEP_PIN PE1
#define Y_DIR_PIN PE2
#endif
#define Z_ENABLE_PIN PD2
#define Z_STEP_PIN PD3
#define Z_DIR_PIN PD4
#ifdef OPTION_DUALZ_DRIVE
#define Z2_ENABLE_PIN PC11
#define Z2_STEP_PIN PC12
#define Z2_DIR_PIN PD0
#endif
#ifdef OPTION_REPEAT_PRINTING
#define REPRINT_STOP_PIN PD8 // X_MAX_PIN
#define FORWARD_PIN PA13
#define BACK_PIN PA14
#endif
#ifdef SWITCH_EXTRUDER_SEQUENCE
#define E3_ENABLE_PIN PC10
#define E3_STEP_PIN PA8
#define E3_DIR_PIN PC9
#define E2_STEP_PIN PC6
#define E2_DIR_PIN PD15
#define E2_ENABLE_PIN PC7
#define E1_STEP_PIN PD13
#define E1_DIR_PIN PD12
#define E1_ENABLE_PIN PD14
#define E0_STEP_PIN PD10
#define E0_DIR_PIN PD9
#define E0_ENABLE_PIN PD11
#else
#define E0_ENABLE_PIN PC10
#define E0_STEP_PIN PA8
#define E0_DIR_PIN PC9
#define E1_STEP_PIN PC6
#define E1_DIR_PIN PD15
#define E1_ENABLE_PIN PC7
#define E2_STEP_PIN PD13
#define E2_DIR_PIN PD12
#define E2_ENABLE_PIN PD14
#define E3_STEP_PIN PD10
#define E3_DIR_PIN PD9
#define E3_ENABLE_PIN PD11
#endif
//
// Temperature Sensors
//
#define TEMP_0_PIN PC2 // TH0
//#define TEMP_1_PIN PC1 // TH1
#define TEMP_BED_PIN PC3 // TB1
//
// Heaters
//
#define HEATER_0_PIN PC5 // HEATER0
//#define HEATER_1_PIN PB0 // HEATER1
#define HEATER_BED_PIN PA2 // HOT BED
//
// Fans
//
#define FAN_PIN PB1 // FAN1
#define FAN1_PIN PB8 // FAN2
//
// Misc. Functions
//
//#define POWER_LOSS_PIN PB15
#define LED_PIN PA0
#define SUICIDE_PIN PA3
#define FIL_RUNOUT_PIN PC8
//
// SD card
//
#define ENABLE_SPI1
#define SD_DETECT_PIN PC4
#define SD_SCK_PIN PA5
#define SD_MISO_PIN PA6
#define SD_MOSI_PIN PA7
#define SD_SS_PIN PA4
// WiFi Functions
#define WIFI_RST PC15
#define WIFI_EN PC14
#if ENABLED(ZONESTAR_12864LCD)
#define LCDSCREEN_NAME "ZONESTAR LCD12864"
#define LCD_PINS_RS EXP1_08_PIN // 7 CS make sure for zonestar zm3e4!
#define LCD_PINS_ENABLE EXP1_05_PIN // 6 DATA make sure for zonestar zm3e4!
#define LCD_PINS_D4 EXP1_07_PIN // 8 SCK make sure for zonestar zm3e4!
#define BEEPER_PIN EXP1_09_PIN
#define KILL_PIN -1 // EXP1_10_PIN
#define BTN_EN1 EXP1_06_PIN
#define BTN_EN2 EXP1_03_PIN
#define BTN_ENC EXP1_04_PIN
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define LCDSCREEN_NAME "REPRAPDISCOUNT LCD12864"
#define LCD_PINS_RS EXP2_08_PIN // 7 CS make sure for zonestar zm3e4!
#define LCD_PINS_ENABLE EXP2_05_PIN // 6 DATA make sure for zonestar zm3e4!
#define LCD_PINS_D4 EXP2_07_PIN // 8 SCK make sure for zonestar zm3e4!
#define BEEPER_PIN EXP2_10_PIN
#define KILL_PIN EXP2_09_PIN
#define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 EXP2_06_PIN
#define BTN_ENC EXP2_04_PIN
#elif ENABLED(ZONESTAR_DWIN_LCD)
// Connect to EXP2 connector
#define LCDSCREEN_NAME "ZONESTAR DWIN LCD"
#define BEEPER_PIN EXP2_06_PIN // PE11
#define KILL_PIN -1 // EXP1_10_PIN
#define BTN_EN2 EXP2_04_PIN // PE8
#define BTN_EN1 EXP2_03_PIN // PE14
#define BTN_ENC EXP2_05_PIN // PE15
#endif
#if HAS_MARLINUI_U8GLIB
#define BOARD_ST7920_DELAY_1 DELAY_NS(200) // Tclk_fall <200ns
#define BOARD_ST7920_DELAY_2 DELAY_NS(250) // Tdata_width >200ns
#define BOARD_ST7920_DELAY_3 DELAY_NS(200) // Tclk_rise <200ns
#endif
// Remap SERVO0 PIN for BLTouch
#if ENABLED(BLTOUCH_ON_EXP1)
// BLTouch connected to EXP1
#define BLTOUCH_PROBE_PIN EXP1_06_PIN
#define BLTOUCH_GND_PIN EXP1_04_PIN
#undef SERVO0_PIN
#define SERVO0_PIN EXP1_03_PIN
#elif ENABLED(BLTOUCH_ON_EXP2)
// BLTouch connected to EXP2
#define BLTOUCH_PROBE_PIN EXP2_03_PIN
#define BLTOUCH_GND_PIN EXP2_04_PIN
#undef SERVO0_PIN
#define SERVO0_PIN EXP2_06_PIN
#else
#define BLTOUCH_PROBE_PIN PB13 // Z1_MAX
#endif
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
+19 -6
View File
@@ -210,10 +210,8 @@
//
// Misc. Functions
//
#define MT_DET_1 Y_MAX_PIN
#define MT_DET_2 Z_MAX_PIN
#define PW_DET Y_MAX_PIN
#define PW_OFF Z_MAX_PIN
#define MT_DET_1 PC5 // Y+
#define MT_DET_2 PB12 // Z+
#ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN MT_DET_1
@@ -222,8 +220,23 @@
#define FIL_RUNOUT2_PIN MT_DET_2
#endif
#define POWER_LOSS_PIN PW_DET
#define PS_ON_PIN PW_OFF
//
// Power Supply Control
//
#if ENABLED(PSU_CONTROL) // MKSPWC
#ifndef PS_ON_PIN
#define PS_ON_PIN MT_DET_2 // Z+
#endif
#ifndef KILL_PIN
#define KILL_PIN MT_DET_1 // Y+
#define KILL_PIN_STATE HIGH
#endif
#else
#define PW_DET MT_DET_1
#define PW_OFF MT_DET_2
#define POWER_LOSS_PIN PW_DET
#define PS_ON_PIN PW_OFF
#endif
// Random Info
#define USB_SERIAL -1 // USB Serial
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+27 -10
View File
@@ -189,19 +189,36 @@
#define FIL_RUNOUT2_PIN MT_DET_2_PIN
#endif
#ifndef POWER_LOSS_PIN
#define POWER_LOSS_PIN PA13 // PW_DET
#endif
#define PS_ON_PIN PB2 // PW_OFF
//
// Enable MKSPWC support
//
//#define SUICIDE_PIN PB2
//#define KILL_PIN PA2
//#define KILL_PIN_INVERTING true
//#define LED_PIN PB2
//#define KILL_PIN PA2
//#define KILL_PIN_STATE HIGH
//
// Power Supply Control
//
#if ENABLED(PSU_CONTROL) // MKSPWC
#if HAS_TFT_LVGL_UI
#error "PSU_CONTROL cannot be used with TFT_LVGL_UI. Disable PSU_CONTROL to continue."
#endif
#ifndef PS_ON_PIN
#define PS_ON_PIN PB2 // SUICIDE
#endif
#ifndef KILL_PIN
#define KILL_PIN PA13 // PW_DET
#define KILL_PIN_STATE HIGH
#endif
#else
#define SUICIDE_PIN PB2
#define SUICIDE_PIN_INVERTING false
#endif
#ifndef POWER_LOSS_PIN
#define POWER_LOSS_PIN PA13 // PW_DET
#endif
// Random Info
#define USB_SERIAL -1 // USB Serial
@@ -222,8 +239,8 @@
// MKS TEST
#if ENABLED(MKS_TEST)
#define MKS_TEST_POWER_LOSS_PIN PA13 // PW_DET
#define MKS_TEST_PS_ON_PIN PB2 // PW_OFF
#define MKS_TEST_POWER_LOSS_PIN PA13 // PW_DET
#define MKS_TEST_PS_ON_PIN PB2 // PW_OFF
#endif
//
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
+12 -5
View File
@@ -195,12 +195,19 @@
//
// Misc. Functions
//
//#define POWER_LOSS_PIN PA2 // PW_DET
//#define PS_ON_PIN PA3 // PW_OFF
//#define SUICIDE_PIN PB2 // Enable MKSPWC support
//#define KILL_PIN PA2 // Enable MKSPWC support
//#define KILL_PIN_INVERTING true // Enable MKSPWC support
//#define LED_PIN PB2
//
// Power Supply Control
//
#if ENABLED(PSU_CONTROL) // MKSPWC
//#define SUICIDE_PIN PB2 // LED
//#define KILL_PIN PA2 // PW_DET
//#define KILL_PIN_STATE HIGH
#else
//#define POWER_LOSS_PIN PA2 // PW_DET
//#define LED_PIN PB2
#endif
#ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD
Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
+4 -1
View File
@@ -223,13 +223,16 @@
#define BTN_ENC PH8
#endif
//
// SD card
//
#ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD
#endif
#define SOFTWARE_SPI
#define SDSS PA15
#define SS_PIN SDSS
#define SD_SS_PIN SDSS
#define SD_SCK_PIN PC10
#define SD_MISO_PIN PC11
#define SD_MOSI_PIN PC12
Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_host_INLINE.h
+1 -1
View File
@@ -90,7 +90,7 @@ uint8_t UHS_USB_HOST_BASE::setEpInfoEntry(uint8_t addr, uint8_t iface, uint8_t e
}
/**
* sets all enpoint addresses to zero.
* sets all endpoint addresses to zero.
* Sets all max packet sizes to defaults
* Clears all endpoint attributes
* Sets bmNakPower to USB_NAK_DEFAULT
Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/macro_logic.h
+1 -1
View File
@@ -140,7 +140,7 @@ AJK_IIF(AJK_BITAND(AJK_IS_COMPARABLE(x))(AJK_IS_COMPARABLE(y)) ) \
#define AJK_MAKE_FUNS(AJK_v, AJK_args, AJK_count, AJK_body) AJK_EVAL(AJK_REPEAT(AJK_count, AJK_FUN, AJK_v, AJK_args, AJK_body))
#ifdef AJK_TEST_MACRO_LOGIC
#define BODY(AJKindex) some(C, statement); contaning(a, test[AJKindex]);
#define BODY(AJKindex) some(C, statement); containing(a, test[AJKindex]);
#define ZERO_TIMES_TEST 0
#define THREE_TIMES_TEST 3
blank > AJK_MAKE_LIST(VARIABLE_, ZERO_TIMES_TEST) < because zero repeats
buildroot/share/PlatformIO/ldscripts/ZONESTAR_ZM3E_256K.ld
+14
View File
@@ -0,0 +1,14 @@
MEMORY
{
ram (rwx) : ORIGIN = 0x20000000, LENGTH = 48K - 40
rom (rx) : ORIGIN = 0x08005000, LENGTH = 256K - 20K - 4K
}
/* Provide memory region aliases for common.inc */
REGION_ALIAS("REGION_TEXT", rom);
REGION_ALIAS("REGION_DATA", ram);
REGION_ALIAS("REGION_BSS", ram);
REGION_ALIAS("REGION_RODATA", rom);
/* Let common.inc handle the real work. */
INCLUDE common.inc
buildroot/share/PlatformIO/ldscripts/ZONESTAR_ZM3E_512K.ld
+14
View File
@@ -0,0 +1,14 @@
MEMORY
{
ram (rwx) : ORIGIN = 0x20000000, LENGTH = 48K - 40
rom (rx) : ORIGIN = 0x08005000, LENGTH = 512K - 20K - 4K
}
/* Provide memory region aliases for common.inc */
REGION_ALIAS("REGION_TEXT", rom);
REGION_ALIAS("REGION_DATA", ram);
REGION_ALIAS("REGION_BSS", ram);
REGION_ALIAS("REGION_RODATA", rom);
/* Let common.inc handle the real work. */
INCLUDE common.inc
buildroot/tests/STM32F103RC_fysetc → buildroot/tests/STM32F103RC_fysetc_maple
View File
buildroot/tests/STM32F103VE_ZM3E4V2_USB_maple
Executable
+14
View File
@@ -0,0 +1,14 @@
#!/usr/bin/env bash
#
# Build tests for STM32F103VE_ZM3E4V2_USB
#
# exit on first failure
set -e
restore_configs
opt_set MOTHERBOARD BOARD_ZONESTAR_ZM3E4V2 SERIAL_PORT 1
exec_test $1 $2 "Zonestar ZM3E4 V2.0" "$3"
# cleanup
restore_configs
buildroot/tests/jgaurora_a5s_a1 → buildroot/tests/jgaurora_a5s_a1_maple
View File
buildroot/tests/mega2560
+3 -2
View File
@@ -16,7 +16,7 @@ set -e
# Test a probeless build of AUTO_BED_LEVELING_UBL, with lots of extruders
#
use_example_configs AnimationExample
opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO LCD_LANGUAGE fr SAVED_POSITIONS 4 \
opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO LCD_LANGUAGE fr SAVED_POSITIONS 4 DEFAULT_EJERK 10 \
EXTRUDERS 5 TEMP_SENSOR_1 1 TEMP_SENSOR_2 5 TEMP_SENSOR_3 20 TEMP_SENSOR_4 1000 TEMP_SENSOR_BED 1
opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATURE G26_MESH_VALIDATION ENABLE_LEVELING_FADE_HEIGHT SKEW_CORRECTION \
REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LIGHTWEIGHT_UI STATUS_MESSAGE_SCROLLING SHOW_CUSTOM_BOOTSCREEN BOOT_MARLIN_LOGO_SMALL \
@@ -31,7 +31,7 @@ exec_test $1 $2 "Azteeg X3 Pro | EXTRUDERS 5 | RRDFGSC | UBL | LIN_ADVANCE ..."
# Add a Sled Z Probe, use UBL Cartesian moves, use Japanese language
#
use_example_configs AnimationExample
opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO LCD_LANGUAGE jp_kana \
opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO LCD_LANGUAGE jp_kana DEFAULT_EJERK 10 \
EXTRUDERS 5 TEMP_SENSOR_1 1 TEMP_SENSOR_2 5 TEMP_SENSOR_3 20 TEMP_SENSOR_4 1000 TEMP_SENSOR_BED 1
opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LIGHTWEIGHT_UI SHOW_CUSTOM_BOOTSCREEN BOOT_MARLIN_LOGO_SMALL \
LCD_SET_PROGRESS_MANUALLY PRINT_PROGRESS_SHOW_DECIMALS SHOW_REMAINING_TIME STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES \
@@ -73,6 +73,7 @@ opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO MIXING_STEPPERS 5 LCD_LANGUAGE ru \
opt_enable MIXING_EXTRUDER GRADIENT_MIX GRADIENT_VTOOL CR10_STOCKDISPLAY \
USE_CONTROLLER_FAN CONTROLLER_FAN_EDITABLE CONTROLLER_FAN_IGNORE_Z \
FILAMENT_RUNOUT_SENSOR ADVANCED_PAUSE_FEATURE NOZZLE_PARK_FEATURE
opt_disable DISABLE_INACTIVE_EXTRUDER
exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Greek" "$3"
#
buildroot/tests/mks_robin_lite → buildroot/tests/mks_robin_lite_maple
View File
buildroot/tests/mks_robin_pro → buildroot/tests/mks_robin_pro_maple
View File
buildroot/tests/rambo
+1
View File
@@ -123,6 +123,7 @@ opt_enable COREYX USE_XMAX_PLUG MIXING_EXTRUDER GRADIENT_MIX \
SD_ABORT_ON_ENDSTOP_HIT HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT HOST_PAUSE_M76 ADVANCED_OK M114_DETAIL \
VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS EXTRA_FAN_SPEED FWRETRACT \
USE_CONTROLLER_FAN CONTROLLER_FAN_EDITABLE CONTROLLER_FAN_USE_Z_ONLY
opt_disable DISABLE_INACTIVE_EXTRUDER
exec_test $1 $2 "Rambo | CoreXY, Gradient Mix | Endstop Int. | Home Y > X | FW Retract ..." "$3"
# clean up
buildroot/tests/teensy35
+1
View File
@@ -67,6 +67,7 @@ exec_test $1 $2 "PARKING_EXTRUDER with LCD" "$3"
restore_configs
opt_set MOTHERBOARD BOARD_TEENSY35_36 MIXING_STEPPERS 2
opt_enable MIXING_EXTRUDER DIRECT_MIXING_IN_G1 GRADIENT_MIX GRADIENT_VTOOL REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
opt_disable DISABLE_INACTIVE_EXTRUDER
exec_test $1 $2 "Mixing Extruder" "$3"
#
buildroot/tests/teensy41
+1
View File
@@ -70,6 +70,7 @@ exec_test $1 $2 "Ethernet, EEPROM, Magnetic Parking Extruder, No LCD" "$3"
restore_configs
opt_set MOTHERBOARD BOARD_TEENSY41 MIXING_STEPPERS 2
opt_enable MIXING_EXTRUDER DIRECT_MIXING_IN_G1 GRADIENT_MIX GRADIENT_VTOOL
opt_disable DISABLE_INACTIVE_EXTRUDER
exec_test $1 $2 "Mixing Extruder" "$3"
#
ini/stm32f1-maple.ini
+43
View File
@@ -357,3 +357,46 @@ extra_scripts = ${common_stm32f1.extra_scripts}
buildroot/share/PlatformIO/scripts/custom_board.py
build_flags = ${common_stm32f1.build_flags}
-DDEBUG_LEVEL=0 -DSS_TIMER=4
#
# Zonestar ZM3E2 V1.0 / ZM3E4 V1.0 / ZM3E4 V2.0
#
# STM32F103RC_ZM3E2_USB_maple ........... RCT6 with 256K
# STM32F103VC_ZM3E4_USB_maple ........... VCT6 with 256K
# STM32F103VE_ZM3E4V2_USB_maple ......... VET6 with 512K
#
[ZONESTAR_ZM3E_maple]
platform = ${common_stm32f1.platform}
extends = common_stm32f1
platform_packages = tool-stm32duino
board_build.address = 0x08005000
board_build.offset = 0x5000
board_upload.maximum_size = 237568
extra_scripts = ${common.extra_scripts}
buildroot/share/PlatformIO/scripts/custom_board.py
buildroot/share/PlatformIO/scripts/offset_and_rename.py
build_flags = ${common_stm32f1.build_flags}
-D__STM32F1__=1 -DDEBUG_LEVEL=0 -DSS_TIMER=4 -DSERIAL_USB
lib_deps = USBComposite for STM32F1@0.91
lib_ignore = Adafruit NeoPixel, SPI, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, TMCStepper
[env:STM32F103RC_ZM3E2_USB_maple]
platform = ${ZONESTAR_ZM3E_maple.platform}
extends = ZONESTAR_ZM3E_maple
board = genericSTM32F103RC
board_build.ldscript = ZONESTAR_ZM3E_256K.ld
[env:STM32F103VC_ZM3E4_USB_maple]
platform = ${ZONESTAR_ZM3E_maple.platform}
extends = ZONESTAR_ZM3E_maple
board = genericSTM32F103VC
board_build.ldscript = ZONESTAR_ZM3E_256K.ld
build_flags = ${ZONESTAR_ZM3E_maple.build_flags} -DTONE_TIMER=1 -DTONE_CHANNEL=2
[env:STM32F103VE_ZM3E4V2_USB_maple]
platform = ${ZONESTAR_ZM3E_maple.platform}
extends = ZONESTAR_ZM3E_maple
board = genericSTM32F103VE
board_build.ldscript = ZONESTAR_ZM3E_512K.ld
build_flags = ${ZONESTAR_ZM3E_maple.build_flags} -DTONE_TIMER=1 -DTONE_CHANNEL=2
board_upload.maximum_size = 499712
ini/stm32f1.ini
+40
View File
@@ -374,3 +374,43 @@ extra_scripts = ${stm32_variant.extra_scripts}
platform = ${common_stm32.platform}
extends = env:chitu_f103
build_flags = ${env:chitu_f103.build_flags} -DCHITU_V5_Z_MIN_BUGFIX
#
# Zonestar ZM3E2 V1.0 / ZM3E4 V1.0 / ZM3E4 V2.0
#
# STM32F103RC_ZM3E2_USB ........... RCT6 with 256K
# STM32F103VC_ZM3E4_USB ........... VCT6 with 256K
# STM32F103VE_ZM3E4V2_USB ......... VET6 with 512K
#
[ZONESTAR_ZM3E]
platform = ${common_stm32.platform}
extends = stm32_variant
platform_packages = ${stm_flash_drive.platform_packages}
board_upload.offset_address = 0x08005000
board_build.offset = 0x5000
board_upload.maximum_size = 237568
extra_scripts = ${stm32_variant.extra_scripts}
build_flags = ${common_stm32.build_flags}
-DSS_TIMER=4 -DTIMER_SERVO=TIM5 -DUSE_USB_FS -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6 -DUSBD_USE_CDC_MSC
build_unflags = ${stm32_variant.build_unflags} -DUSBD_USE_CDC
[env:STM32F103RC_ZM3E2_USB]
platform = ${ZONESTAR_ZM3E.platform}
extends = ZONESTAR_ZM3E
board = genericSTM32F103RC
board_build.variant = MARLIN_F103Rx
[env:STM32F103VC_ZM3E4_USB]
platform = ${ZONESTAR_ZM3E.platform}
extends = ZONESTAR_ZM3E
board = genericSTM32F103VC
board_build.variant = MARLIN_F103Vx
build_flags = ${ZONESTAR_ZM3E.build_flags} -DTIMER_TONE=1
[env:STM32F103VE_ZM3E4V2_USB]
platform = ${ZONESTAR_ZM3E.platform}
extends = ZONESTAR_ZM3E
board = genericSTM32F103VE
board_build.variant = MARLIN_F103Vx
build_flags = ${ZONESTAR_ZM3E.build_flags} -DTIMER_TONE=1
board_upload.maximum_size = 499712