Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add SOFT_I2C_EEPROM and fix pin for Lerdge K #21812

Merged
merged 18 commits into from
May 8, 2021
Merged

add SOFT_I2C_EEPROM and fix pin for Lerdge K #21812

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
22232d1
add SOFT_I2C_EEPROM support and fix pins for Lerdge K
sanek88lbl May 5, 2021
761a562
add SOFT_I2C_EEPROM support and fix pins for Lerdge K
sanek88lbl May 5, 2021
a7ffd56
fix mistakes
sanek88lbl May 5, 2021
4677f18
Update eeprom_if_i2c.cpp
thinkyhead May 6, 2021
17ada98
wrap and format
thinkyhead May 6, 2021
5b5bc74
Best guess for "Extra" motor
thinkyhead May 6, 2021
154bba1
wrap and format
thinkyhead May 6, 2021
bccea2a
Best guess for "Extra" motor
thinkyhead May 6, 2021
bb0af51
Clean up features.ini
thinkyhead May 6, 2021
1e2e31c
Merge branch 'LerdgeK' of https://github.com/sanek88lbl/Marlin into L…
sanek88lbl May 6, 2021
bf33e4c
Use HAS_FSMC_TFT
thinkyhead May 7, 2021
054a156
Add a LERDGEK test
thinkyhead May 7, 2021
2403307
Skip spaces in opt_set
thinkyhead May 7, 2021
6616b63
Reformat features.ini
thinkyhead May 7, 2021
9aec3cb
Merge 'bugfix-2.0.x' into pr/21812
thinkyhead May 7, 2021
ae6589b
fix display
sanek88lbl May 8, 2021
ac9f12c
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/21812
thinkyhead May 8, 2021
2b24223
suggested tft driver
thinkyhead May 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions Marlin/src/pins/stm32f4/pins_LERDGE_K.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
// EEPROM
#if NO_EEPROM_SELECTED
#define I2C_EEPROM
#define SOFT_I2C_EEPROM //force the use of software i2c
#define SOFT_I2C_EEPROM // Force the use of Software I2C
#define I2C_SCL_PIN PG14
#define I2C_SDA_PIN PG13
#define MARLIN_EEPROM_SIZE 0x10000
Expand Down Expand Up @@ -233,21 +233,17 @@
// LCD / Controller
//

#if HAS_SPI_TFT
#define TFT_RESET_PIN PD6
#define TFT_BACKLIGHT_PIN PD3
#define TFT_RESET_PIN PD6
#define TFT_BACKLIGHT_PIN PD3

#define TFT_CS_PIN PD7
#define TFT_RS_PIN PD11
#define TFT_CS_PIN PD7
#define TFT_RS_PIN PD11

#define TOUCH_CS_PIN PG15
#define TOUCH_SCK_PIN PB3
#define TOUCH_MOSI_PIN PB5
#define TOUCH_MISO_PIN PB4
#endif
#define TOUCH_CS_PIN PG15
#define TOUCH_SCK_PIN PB3
#define TOUCH_MOSI_PIN PB5
#define TOUCH_MISO_PIN PB4

#if IS_ULTIPANEL
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved
#define BTN_EN1 PG10
#define BTN_EN2 PG11
#define BTN_ENC PG9
#endif
#define BTN_EN1 PG10
#define BTN_EN2 PG11
#define BTN_ENC PG9
4 changes: 2 additions & 2 deletions ini/features.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ HAS_TRINAMIC_CONFIG = TMCStepper@~0.7.1
src_filter=+<src/feature/tmc_util.cpp> +<src/module/stepper/trinamic.cpp> +<src/gcode/feature/trinamic/M122.cpp> +<src/gcode/feature/trinamic/M906.cpp> +<src/gcode/feature/trinamic/M911-M914.cpp>
HAS_STEALTHCHOP = src_filter=+<src/gcode/feature/trinamic/M569.cpp>
SR_LCD_3W_NL = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
(HAS_MOTOR_CURRENT_I2C|SOFT_I2C_EEPROM) = SlowSoftI2CMaster
HAS_MOTOR_CURRENT_I2C = SlowSoftI2CMaster
src_filter=+<src/feature/digipot>
HAS_TMC26X = TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
src_filter=+<src/module/TMC26X.cpp>
Expand All @@ -41,7 +41,7 @@ HAS_(FSMC|SPI|LTDC)_TFT = src_filter=+<src/HAL/STM32/tft> +<src/HAL/STM32F1/tft>
HAS_FSMC_TFT = src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp> +<src/HAL/STM32F1/tft/tft_fsmc.cpp>
HAS_SPI_TFT = src_filter=+<src/HAL/STM32/tft/tft_spi.cpp> +<src/HAL/STM32F1/tft/tft_spi.cpp>
I2C_EEPROM = src_filter=+<src/HAL/shared/eeprom_if_i2c.cpp>
SOFT_I2C_EEPROM = SlowSoftWire=https://github.com/felias-fogg/SlowSoftWire/archive/refs/heads/master.zip
SOFT_I2C_EEPROM = SlowSoftI2CMaster, SlowSoftWire=https://github.com/felias-fogg/SlowSoftWire/archive/master.zip
SPI_EEPROM = src_filter=+<src/HAL/shared/eeprom_if_spi.cpp>
HAS_GRAPHICAL_TFT = src_filter=+<src/lcd/tft>
DWIN_CREALITY_LCD = src_filter=+<src/lcd/dwin>
Expand Down