Skip to content

Commit

Permalink
apply pinsformat.js
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed May 9, 2023
1 parent fc3e719 commit 28cf88f
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 35 deletions.
12 changes: 6 additions & 6 deletions Marlin/src/pins/esp32/pins_GODI_CONTROLLER_V1_0.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
Expand Down Expand Up @@ -33,7 +33,7 @@
#if EXTRUDERS > 1 || E_STEPPERS > 1
#error "Godi Controller only supports 1 E stepper."
#elif HAS_MULTI_HOTEND
#error "Godi Controller only supports 1 hotend / E stepper."
#error "Godi Controller only supports 1 hotend."
#endif

#define BOARD_INFO_NAME "Godi Controller 32-Bit V1.0"
Expand Down Expand Up @@ -131,11 +131,11 @@

#if EITHER(EDUTRONICS_12864OLED_SH1106, EDUTRONICS_12864OLED_SSD1306)
#define LCDSCREEN_NAME "EDUTRONICS 12864 OLED"
#define BTN_EN2 1
#define BTN_EN1 3
#define BTN_ENC 0
#define BTN_EN2 1
#define BTN_EN1 3
#define BTN_ENC 0
#define BEEPER_PIN -1
#define KILL_PIN -1
#define DOGLCD_SDA 21 // SDA
#define DOGLCD_SCL 22 // SCL
#endif // OLED 128x64
#endif
2 changes: 1 addition & 1 deletion Marlin/src/pins/pins.h
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@
#elif MB(TRIGORILLA_V006)
#include "gd32f1/pins_TRIGORILLA_V006.h" // GD32F103 env:trigorilla_v006
#elif MB(KEDI_CONTROLLER_V1_2)
#include "stm32f1/pins_KEDI_CONTROLLER_V1_2.h"// STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
#include "stm32f1/pins_KEDI_CONTROLLER_V1_2.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple

//
// ARM Cortex-M4F
Expand Down
48 changes: 22 additions & 26 deletions Marlin/src/pins/stm32f1/pins_KEDI_CONTROLLER_V1_2.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
Expand Down Expand Up @@ -68,15 +68,14 @@
#define E0_DIR_PIN PB0
#define E0_ENABLE_PIN PC4


// Special Drivers

// L6470 or L6474 on SPI
#if HAS_DRIVER(L6470) || HAS_DRIVER(L6474) // Shared with SPI on EXP2
#define L6470_CHAIN_SCK_PIN PB3
#define L6470_CHAIN_MISO_PIN PB4
#define L6470_CHAIN_MOSI_PIN PB5
#define L6470_CHAIN_SS_PIN PA15
#if HAS_DRIVER(L6470) || HAS_DRIVER(L6474) // Shared with SPI on EXP2
#define L6470_CHAIN_SCK_PIN PB3
#define L6470_CHAIN_MISO_PIN PB4
#define L6470_CHAIN_MOSI_PIN PB5
#define L6470_CHAIN_SS_PIN PA15
#define ENABLE_RESET_L64XX_CHIPS
#endif

Expand All @@ -97,49 +96,47 @@
// CS Pins (One pin for each driver)
#if HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2160) || HAS_DRIVER(TMC2660) || HAS_DRIVER(TMC5130) || HAS_DRIVER(TMC5160)
#ifndef X_CS_PIN
#define X_CS_PIN PC10
#define X_CS_PIN PC10
#endif
#ifndef Y_CS_PIN
#define Y_CS_PIN PC11
#define Y_CS_PIN PC11
#endif
#ifndef Z_CS_PIN
#define Z_CS_PIN PC12
#define Z_CS_PIN PC12
#endif
#ifndef E0_CS_PIN
#define E0_CS_PIN PC14
#define E0_CS_PIN PC14
#endif
#endif


// TMC2208 or TMC2209 on UART
#if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)

// UART Pins (Single pin for both RX & TX)
#ifndef X_PIN_UART
#define X_PIN_UART PC10
#define X_PIN_UART PC10
#endif
#ifndef Y_PIN_UART
#define Y_PIN_UART PC11
#define Y_PIN_UART PC11
#endif
#ifndef Z_PIN_UART
#define Z_PIN_UART PC12
#define Z_PIN_UART PC12
#endif
#ifndef E0_PIN_UART
#define E0_PIN_UART PC14
#define E0_PIN_UART PC14
#endif

// Configurating Pins
#define X_SERIAL_TX_PIN X_PIN_UART
#define X_SERIAL_RX_PIN X_PIN_UART
#define Y_SERIAL_TX_PIN Y_PIN_UART
#define Y_SERIAL_RX_PIN Y_PIN_UART
#define Z_SERIAL_TX_PIN Z_PIN_UART
#define Z_SERIAL_RX_PIN Z_PIN_UART
#define E0_SERIAL_TX_PIN E0_PIN_UART
#define E0_SERIAL_RX_PIN E0_PIN_UART
#define X_SERIAL_TX_PIN X_PIN_UART
#define X_SERIAL_RX_PIN X_PIN_UART
#define Y_SERIAL_TX_PIN Y_PIN_UART
#define Y_SERIAL_RX_PIN Y_PIN_UART
#define Z_SERIAL_TX_PIN Z_PIN_UART
#define Z_SERIAL_RX_PIN Z_PIN_UART
#define E0_SERIAL_TX_PIN E0_PIN_UART
#define E0_SERIAL_RX_PIN E0_PIN_UART
#endif


//
// Heaters / Fans
//
Expand Down Expand Up @@ -298,4 +295,3 @@
#endif
#define ONBOARD_SPI_DEVICE 1 // SPI1
#define ONBOARD_SD_CS_PIN PA4 // Chip select for "System" SD card

4 changes: 2 additions & 2 deletions ini/esp32.ini
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ board_build.partitions = default_8MB.csv
[env:godi_esp32]
extends = env:esp32
board_build.partitions = Marlin/src/HAL/ESP32/esp32.csv
upload_speed = 115200
monitor_speed = 115200
upload_speed = 115200
monitor_speed = 115200

0 comments on commit 28cf88f

Please sign in to comment.