Skip to content

Fix MKS Base + Digipot compile error #16636

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

Merged
thinkyhead merged 6 commits into from
Jan 26, 2020
Merged

Fix MKS Base + Digipot compile error #16636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
70b1417
Mks base + digipot config fails to compile.
Jan 21, 2020
47cf848
Fix compilation failure when enabling U8GLIB_SSD1306
Jan 23, 2020
ca81339
i2c for mcp4451 was originally initialized with 400kHz bit rate
Jan 23, 2020
a10dd04
Merge branch 'bugfix-2.0.x' into mkssbase_digipot
Jan 23, 2020
09af30a
Missing newline at the end of file...
Jan 23, 2020
3c25e11
Explain why clock_option is set to 16 in digitpot i2c initialization.
Jan 24, 2020
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
1 change: 0 additions & 1 deletion Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
#endif

#include "digipot_mcp4451_I2C_routines.h"
#include "i2c_util.h"

// These two routines are exact copies of the lpc17xx_i2c.c routines. Couldn't link to
// to the lpc17xx_i2c.c routines so had to copy them into this file & rename them.
Expand Down
1 change: 1 addition & 0 deletions Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include <lpc17xx_i2c.h>
#include <lpc17xx_pinsel.h>
#include <lpc17xx_libcfg_default.h>
#include "i2c_util.h"

uint8_t digipot_mcp4451_start(uint8_t sla);
uint8_t digipot_mcp4451_send_byte(uint8_t data);
Expand Down
8 changes: 8 additions & 0 deletions Marlin/src/HAL/HAL_LPC1768/include/i2c_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,12 @@
#include <lpc17xx_pinsel.h>
#include <lpc17xx_libcfg_default.h>

#ifdef __cplusplus
extern "C" {
#endif

void configure_i2c(const uint8_t clock_option);

#ifdef __cplusplus
}
#endif
2 changes: 1 addition & 1 deletion Marlin/src/feature/digipot/digipot_mcp4451.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void digipot_i2c_set_current(const uint8_t channel, const float current) {

void digipot_i2c_init() {
#if MB(MKS_SBASE)
configure_i2c();
configure_i2c(16); // Setting clock_option to 16 ensure the I2C bus is initialized at 400kHz
#else
Wire.begin();
#endif
Expand Down