Clean up whitespace, GTM32 pins
This commit is contained in:
		| @@ -39,7 +39,7 @@ | ||||
|  | ||||
| // | ||||
| // EEPROM Emulation | ||||
| //  | ||||
| // | ||||
| #define FLASH_EEPROM_EMULATION | ||||
| //#define SRAM_EEPROM_EMULATION | ||||
|  | ||||
| @@ -202,7 +202,7 @@ | ||||
|     #define DOGLCD_CS      PC12 | ||||
|     #define DOGLCD_A0      PD0 | ||||
|   #endif | ||||
|    | ||||
|  | ||||
| #endif | ||||
|  | ||||
| #if ENABLED(NEWPANEL) | ||||
|   | ||||
| @@ -1,232 +1,232 @@ | ||||
| /** | ||||
|  * Marlin 3D Printer Firmware | ||||
|  * Copyright (c) 2019 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 | ||||
|  | ||||
| /** | ||||
|  * 24 May 2018 - @chepo for STM32F103VET6 | ||||
|  * Schematic: https://github.com/chepo92/Smartto/blob/master/circuit_diagram/Rostock301/Hardware_GTM32_PRO_VB.pdf | ||||
|  */ | ||||
|  | ||||
| #ifndef __STM32F1__ | ||||
|   #error "Oops! Select an STM32F1 board in 'Tools > Board.'" | ||||
| #endif | ||||
|  | ||||
| #define BOARD_NAME           "GTM32 Pro VB" | ||||
| #define DEFAULT_MACHINE_NAME "M201" | ||||
|  | ||||
| //#define DISABLE_DEBUG | ||||
|  | ||||
| // | ||||
| // It is required to disable JTAG function because its pins are | ||||
| // used as GPIO to drive the Y axis stepper. | ||||
| // DO NOT ENABLE! | ||||
| // | ||||
| #define DISABLE_JTAG | ||||
|  | ||||
| // | ||||
| // If you don't need the SWDIO functionality (any more), you may | ||||
| // disable SWD here to regain PA13/PA14 pins for other use. | ||||
| // | ||||
| //#define DISABLE_JTAGSWD | ||||
|  | ||||
| // Ignore temp readings during development. | ||||
| //#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000 | ||||
|  | ||||
| // Enable EEPROM Emulation for this board as it doesn't have EEPROM | ||||
| #define FLASH_EEPROM_EMULATION | ||||
| #define E2END 0xFFF // 4KB | ||||
|  | ||||
| // | ||||
| // Limit Switches | ||||
| // | ||||
| #define X_MIN_PIN          PE5   // ENDSTOPS 15,17 | ||||
| #define X_MAX_PIN          PE4   // ENDSTOPS 16,18 | ||||
| #define Y_MIN_PIN          PE3   // ENDSTOPS 9,11 | ||||
| #define Y_MAX_PIN          PE2   // ENDSTOPS 10,12 | ||||
| #define Z_MIN_PIN          PE1   // ENDSTOPS 3,5 | ||||
| #define Z_MAX_PIN          PE0   // ENDSTOPS 4,6 | ||||
|  | ||||
| // | ||||
| // Steppers | ||||
| // | ||||
| #define X_STEP_PIN         PC6 | ||||
| #define X_DIR_PIN          PD13 | ||||
| #define X_ENABLE_PIN       PA8 | ||||
|  | ||||
| #define Y_STEP_PIN         PA12 | ||||
| #define Y_DIR_PIN          PA11 | ||||
| #define Y_ENABLE_PIN       PA15 | ||||
|  | ||||
| #define Z_STEP_PIN         PD6 | ||||
| #define Z_DIR_PIN          PD3 | ||||
| #define Z_ENABLE_PIN       PB3 | ||||
|  | ||||
| // Extruder stepper pins | ||||
| // NOTE: Numbering here is made according to EXT connector numbers, | ||||
| //       the FANx_PWM line numbering in the schematics is reverse. | ||||
| //       That is, E0_*_PIN are the E2_* lines connected to E2_A1 step | ||||
| //       stick that drives the EXT0 output on the board. | ||||
| // | ||||
| #define E0_STEP_PIN        PC14 | ||||
| #define E0_DIR_PIN         PC13 | ||||
| #define E0_ENABLE_PIN      PC15 | ||||
|  | ||||
| #define E1_STEP_PIN        PA0 | ||||
| #define E1_DIR_PIN         PB6 | ||||
| #define E1_ENABLE_PIN      PA1 | ||||
|  | ||||
| #define E2_STEP_PIN        PB2 | ||||
| #define E2_DIR_PIN         PB11 | ||||
| #define E2_ENABLE_PIN      PC4 | ||||
|  | ||||
| // | ||||
| // Heaters / Fans - INFO: Extruders ports are in reverse order. Pin numbers here differ from schematic. Original firmware assumes heater, fan and temp sensor on port EXT0 PB0, PB9, PC2.  | ||||
| // | ||||
| #define HEATER_0_PIN       PB0   // EXT0 port.  | ||||
| #define HEATER_1_PIN       PB5   // EXT1 port | ||||
| #define HEATER_2_PIN       PB4   // EXT2 port | ||||
| #define HEATER_BED_PIN     PB1   // CON2X3 hotbed port | ||||
|  | ||||
| // | ||||
| // These are FAN PWM pins on EXT0..EXT2 connectors. | ||||
| // | ||||
| //#define FAN_PIN            PB9   // EXT0 port | ||||
| #define FAN1_PIN           PB8   // EXT1 port | ||||
| #define FAN2_PIN           PB7   // EXT2 port | ||||
| #define ORIG_E0_AUTO_FAN_PIN  PB9  // EXT0 port, used as main extruder fan | ||||
|  | ||||
| // | ||||
| // Temperature Sensors | ||||
| // | ||||
| #define TEMP_0_PIN         PC2   // EXT0 port | ||||
| #define TEMP_1_PIN         PC1   // EXT1 port | ||||
| #define TEMP_2_PIN         PC0   // EXT2 port | ||||
| #define TEMP_BED_PIN       PC3   // CON2X3 hotbed port | ||||
|  | ||||
| // | ||||
| // Misc. Functions | ||||
| // | ||||
| #define LED_PWM            PD12   // External LED, pin 2 on LED labeled connector | ||||
|  | ||||
| // | ||||
| // LCD / Controller | ||||
| // | ||||
| #if HAS_SPI_LCD | ||||
|  | ||||
|  #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) | ||||
|  | ||||
|     // | ||||
|     // LCD display on J2 FFC40 | ||||
|     // Geeetech's LCD2004A Control Panel is very much like | ||||
|     // RepRapDiscount Smart Controller, but adds an FFC40 connector | ||||
|     // connected with a flat wire to J2 connector on the board. | ||||
|     // | ||||
|     #define LCD_PINS_RS    PE6   // CS chip select /SS chip slave select | ||||
|     #define LCD_PINS_ENABLE PE14 // SID (MOSI) | ||||
|     #define LCD_PINS_D4    PD8   // SCK (CLK) clock | ||||
|     #define LCD_PINS_D5    PD9 | ||||
|     #define LCD_PINS_D6    PD10 | ||||
|     #define LCD_PINS_D7    PE15 | ||||
|  | ||||
|     #define BTN_EN1        PE8 | ||||
|     #define BTN_EN2        PE9 | ||||
|     #define BTN_ENC        PE13 | ||||
|  | ||||
|     //#define GTM32_PRO_VB_USE_LCD_BEEPER | ||||
|     #define GTM32_PRO_VB_USE_EXT_SDCARD | ||||
|  | ||||
|   #else | ||||
|     // | ||||
|     // Serial LCDs can be implemented in ExtUI | ||||
|     // | ||||
|     //#define LCD_UART_TX    PD8 | ||||
|     //#define LCD_UART_RX    PD9 | ||||
|   #endif | ||||
|  | ||||
|   #if HAS_GRAPHICAL_LCD | ||||
|     #ifndef ST7920_DELAY_1 | ||||
|       #define ST7920_DELAY_1 DELAY_NS(96) | ||||
|     #endif | ||||
|     #ifndef ST7920_DELAY_2 | ||||
|       #define ST7920_DELAY_2 DELAY_NS(48) | ||||
|     #endif | ||||
|     #ifndef ST7920_DELAY_3 | ||||
|       #define ST7920_DELAY_3 DELAY_NS(715) | ||||
|     #endif | ||||
|   #endif | ||||
|  | ||||
| #endif // HAS_SPI_LCD | ||||
|  | ||||
| // | ||||
| // Beeper | ||||
| // | ||||
| #ifdef GTM32_PRO_VB_USE_LCD_BEEPER | ||||
|   // This is pin 32 on J2 FFC40 and pin, goes to the beeper | ||||
|   // on Geeetech's version of RepRapDiscount Smart Controller | ||||
|   // (e.g. on Rostock 301) | ||||
|   #define BEEPER_PIN       PE12 | ||||
| #else | ||||
|   // This is the beeper on the board itself | ||||
|   #define BEEPER_PIN       PB10 | ||||
| #endif | ||||
|  | ||||
| /** | ||||
|  * The on-board TF_CARD_SOCKET microSD card socket has no SD Detect pin wired. | ||||
|  * | ||||
|  * The FFC10 (SD_CARD) connector has the same pins as those routed to the FFC40 (J2) | ||||
|  * connector, which usually go to the SD Card slot on the Geeetech version of the | ||||
|  * RepRapDiscount Smart Controller. Both connectors have the card detect signal. | ||||
|  * | ||||
|  * The on-board SD card and the external card (on either SD_CARD or J2) are two | ||||
|  * separate devices and can work simultaneously. Unfortunately, Marlin only supports | ||||
|  * a single SPI Flash device (as of 2019-07-05) so only one is enabled here. | ||||
|  */ | ||||
| #if ENABLED(GTM32_PRO_VB_USE_EXT_SDCARD) | ||||
|   // | ||||
|   // SD Card on RepRapDiscount Smart Controller (J2) or on SD_CARD connector | ||||
|   // | ||||
|   #define SS_PIN         PB12 / PC11  | ||||
|   #define SCK_PIN          PB13 // PC12 // PC1 | ||||
|   #define MOSI_PIN         PB15 // PD2  // PD2 | ||||
|   #define MISO_PIN         PB14 // PC8 | ||||
|   #define SD_DETECT_PIN    PC7 | ||||
|  | ||||
| #else | ||||
|   // | ||||
|   // Use the on-board card socket labeled TF_CARD_SOCKET | ||||
|   // | ||||
|   #define SS_PIN           PA4 | ||||
|   #define SCK_PIN          PA5 | ||||
|   #define MOSI_PIN         PA7   | ||||
|   #define MISO_PIN         PA6 // PA6 | ||||
|   #define SD_DETECT_PIN    -1  // Card detect is not connected | ||||
| #endif | ||||
|  | ||||
| #define SDSS               SS_PIN | ||||
|  | ||||
| // | ||||
| // ESP WiFi can be soldered to J9 connector which is wired to USART2. | ||||
| // Must define WIFISUPPORT in Configuration.h for the printer. | ||||
| // | ||||
| #define ESP_WIFI_MODULE_COM       2 | ||||
| #define ESP_WIFI_MODULE_BAUDRATE  115200 | ||||
| #define ESP_WIFI_MODULE_RESET_PIN -1 | ||||
| /** | ||||
|  * Marlin 3D Printer Firmware | ||||
|  * Copyright (c) 2019 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 | ||||
|  | ||||
| /** | ||||
|  * 24 May 2018 - @chepo for STM32F103VET6 | ||||
|  * Schematic: https://github.com/chepo92/Smartto/blob/master/circuit_diagram/Rostock301/Hardware_GTM32_PRO_VB.pdf | ||||
|  */ | ||||
|  | ||||
| #ifndef __STM32F1__ | ||||
|   #error "Oops! Select an STM32F1 board in 'Tools > Board.'" | ||||
| #endif | ||||
|  | ||||
| #define BOARD_NAME           "GTM32 Pro VB" | ||||
| #define DEFAULT_MACHINE_NAME "M201" | ||||
|  | ||||
| //#define DISABLE_DEBUG | ||||
|  | ||||
| // | ||||
| // It is required to disable JTAG function because its pins are | ||||
| // used as GPIO to drive the Y axis stepper. | ||||
| // DO NOT ENABLE! | ||||
| // | ||||
| #define DISABLE_JTAG | ||||
|  | ||||
| // | ||||
| // If you don't need the SWDIO functionality (any more), you may | ||||
| // disable SWD here to regain PA13/PA14 pins for other use. | ||||
| // | ||||
| //#define DISABLE_JTAGSWD | ||||
|  | ||||
| // Ignore temp readings during development. | ||||
| //#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000 | ||||
|  | ||||
| // Enable EEPROM Emulation for this board as it doesn't have EEPROM | ||||
| #define FLASH_EEPROM_EMULATION | ||||
| #define E2END 0xFFF // 4KB | ||||
|  | ||||
| // | ||||
| // Limit Switches | ||||
| // | ||||
| #define X_MIN_PIN          PE5   // ENDSTOPS 15,17 | ||||
| #define X_MAX_PIN          PE4   // ENDSTOPS 16,18 | ||||
| #define Y_MIN_PIN          PE3   // ENDSTOPS 9,11 | ||||
| #define Y_MAX_PIN          PE2   // ENDSTOPS 10,12 | ||||
| #define Z_MIN_PIN          PE1   // ENDSTOPS 3,5 | ||||
| #define Z_MAX_PIN          PE0   // ENDSTOPS 4,6 | ||||
|  | ||||
| // | ||||
| // Steppers | ||||
| // | ||||
| #define X_STEP_PIN         PC6 | ||||
| #define X_DIR_PIN          PD13 | ||||
| #define X_ENABLE_PIN       PA8 | ||||
|  | ||||
| #define Y_STEP_PIN         PA12 | ||||
| #define Y_DIR_PIN          PA11 | ||||
| #define Y_ENABLE_PIN       PA15 | ||||
|  | ||||
| #define Z_STEP_PIN         PD6 | ||||
| #define Z_DIR_PIN          PD3 | ||||
| #define Z_ENABLE_PIN       PB3 | ||||
|  | ||||
| // Extruder stepper pins | ||||
| // NOTE: Numbering here is made according to EXT connector numbers, | ||||
| //       the FANx_PWM line numbering in the schematics is reverse. | ||||
| //       That is, E0_*_PIN are the E2_* lines connected to E2_A1 step | ||||
| //       stick that drives the EXT0 output on the board. | ||||
| // | ||||
| #define E0_STEP_PIN        PC14 | ||||
| #define E0_DIR_PIN         PC13 | ||||
| #define E0_ENABLE_PIN      PC15 | ||||
|  | ||||
| #define E1_STEP_PIN        PA0 | ||||
| #define E1_DIR_PIN         PB6 | ||||
| #define E1_ENABLE_PIN      PA1 | ||||
|  | ||||
| #define E2_STEP_PIN        PB2 | ||||
| #define E2_DIR_PIN         PB11 | ||||
| #define E2_ENABLE_PIN      PC4 | ||||
|  | ||||
| // | ||||
| // Heaters / Fans - INFO: Extruders ports are in reverse order. Pin numbers here differ from schematic. Original firmware assumes heater, fan and temp sensor on port EXT0 PB0, PB9, PC2. | ||||
| // | ||||
| #define HEATER_0_PIN       PB0   // EXT0 port. | ||||
| #define HEATER_1_PIN       PB5   // EXT1 port | ||||
| #define HEATER_2_PIN       PB4   // EXT2 port | ||||
| #define HEATER_BED_PIN     PB1   // CON2X3 hotbed port | ||||
|  | ||||
| // | ||||
| // These are FAN PWM pins on EXT0..EXT2 connectors. | ||||
| // | ||||
| //#define FAN_PIN            PB9   // EXT0 port | ||||
| #define FAN1_PIN           PB8   // EXT1 port | ||||
| #define FAN2_PIN           PB7   // EXT2 port | ||||
| #define ORIG_E0_AUTO_FAN_PIN  PB9  // EXT0 port, used as main extruder fan | ||||
|  | ||||
| // | ||||
| // Temperature Sensors | ||||
| // | ||||
| #define TEMP_0_PIN         PC2   // EXT0 port | ||||
| #define TEMP_1_PIN         PC1   // EXT1 port | ||||
| #define TEMP_2_PIN         PC0   // EXT2 port | ||||
| #define TEMP_BED_PIN       PC3   // CON2X3 hotbed port | ||||
|  | ||||
| // | ||||
| // Misc. Functions | ||||
| // | ||||
| #define LED_PWM            PD12   // External LED, pin 2 on LED labeled connector | ||||
|  | ||||
| // | ||||
| // LCD / Controller | ||||
| // | ||||
| #if HAS_SPI_LCD | ||||
|  | ||||
|  #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) | ||||
|  | ||||
|     // | ||||
|     // LCD display on J2 FFC40 | ||||
|     // Geeetech's LCD2004A Control Panel is very much like | ||||
|     // RepRapDiscount Smart Controller, but adds an FFC40 connector | ||||
|     // connected with a flat wire to J2 connector on the board. | ||||
|     // | ||||
|     #define LCD_PINS_RS    PE6   // CS chip select /SS chip slave select | ||||
|     #define LCD_PINS_ENABLE PE14 // SID (MOSI) | ||||
|     #define LCD_PINS_D4    PD8   // SCK (CLK) clock | ||||
|     #define LCD_PINS_D5    PD9 | ||||
|     #define LCD_PINS_D6    PD10 | ||||
|     #define LCD_PINS_D7    PE15 | ||||
|  | ||||
|     #define BTN_EN1        PE8 | ||||
|     #define BTN_EN2        PE9 | ||||
|     #define BTN_ENC        PE13 | ||||
|  | ||||
|     //#define GTM32_PRO_VB_USE_LCD_BEEPER | ||||
|     #define GTM32_PRO_VB_USE_EXT_SDCARD | ||||
|  | ||||
|   #else | ||||
|     // | ||||
|     // Serial LCDs can be implemented in ExtUI | ||||
|     // | ||||
|     //#define LCD_UART_TX    PD8 | ||||
|     //#define LCD_UART_RX    PD9 | ||||
|   #endif | ||||
|  | ||||
|   #if HAS_GRAPHICAL_LCD | ||||
|     #ifndef ST7920_DELAY_1 | ||||
|       #define ST7920_DELAY_1 DELAY_NS(96) | ||||
|     #endif | ||||
|     #ifndef ST7920_DELAY_2 | ||||
|       #define ST7920_DELAY_2 DELAY_NS(48) | ||||
|     #endif | ||||
|     #ifndef ST7920_DELAY_3 | ||||
|       #define ST7920_DELAY_3 DELAY_NS(715) | ||||
|     #endif | ||||
|   #endif | ||||
|  | ||||
| #endif // HAS_SPI_LCD | ||||
|  | ||||
| // | ||||
| // Beeper | ||||
| // | ||||
| #ifdef GTM32_PRO_VB_USE_LCD_BEEPER | ||||
|   // This is pin 32 on J2 FFC40 and pin, goes to the beeper | ||||
|   // on Geeetech's version of RepRapDiscount Smart Controller | ||||
|   // (e.g. on Rostock 301) | ||||
|   #define BEEPER_PIN       PE12 | ||||
| #else | ||||
|   // This is the beeper on the board itself | ||||
|   #define BEEPER_PIN       PB10 | ||||
| #endif | ||||
|  | ||||
| /** | ||||
|  * The on-board TF_CARD_SOCKET microSD card socket has no SD Detect pin wired. | ||||
|  * | ||||
|  * The FFC10 (SD_CARD) connector has the same pins as those routed to the FFC40 (J2) | ||||
|  * connector, which usually go to the SD Card slot on the Geeetech version of the | ||||
|  * RepRapDiscount Smart Controller. Both connectors have the card detect signal. | ||||
|  * | ||||
|  * The on-board SD card and the external card (on either SD_CARD or J2) are two | ||||
|  * separate devices and can work simultaneously. Unfortunately, Marlin only supports | ||||
|  * a single SPI Flash device (as of 2019-07-05) so only one is enabled here. | ||||
|  */ | ||||
| #if ENABLED(GTM32_PRO_VB_USE_EXT_SDCARD) | ||||
|   // | ||||
|   // SD Card on RepRapDiscount Smart Controller (J2) or on SD_CARD connector | ||||
|   // | ||||
|   #define SS_PIN           PB12   // PC11 | ||||
|   #define SCK_PIN          PB13   // PC12 // PC1 | ||||
|   #define MOSI_PIN         PB15   // PD2  // PD2 | ||||
|   #define MISO_PIN         PB14   // PC8 | ||||
|   #define SD_DETECT_PIN    PC7 | ||||
|  | ||||
| #else | ||||
|   // | ||||
|   // Use the on-board card socket labeled TF_CARD_SOCKET | ||||
|   // | ||||
|   #define SS_PIN           PA4 | ||||
|   #define SCK_PIN          PA5 | ||||
|   #define MOSI_PIN         PA7 | ||||
|   #define MISO_PIN         PA6 // PA6 | ||||
|   #define SD_DETECT_PIN    -1  // Card detect is not connected | ||||
| #endif | ||||
|  | ||||
| #define SDSS               SS_PIN | ||||
|  | ||||
| // | ||||
| // ESP WiFi can be soldered to J9 connector which is wired to USART2. | ||||
| // Must define WIFISUPPORT in Configuration.h for the printer. | ||||
| // | ||||
| #define ESP_WIFI_MODULE_COM       2 | ||||
| #define ESP_WIFI_MODULE_BAUDRATE  115200 | ||||
| #define ESP_WIFI_MODULE_RESET_PIN -1 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user