0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix MKS Base + Digipot compile error (#16636)

Browse source
This commit is contained in:
0r31 2020-01-26 08:08:40 +01:00 committed by Scott Lahteine
parent 95d5a0c480
commit e3611ad209
4 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.c
View file

@ -36,7 +36,6 @@
#endif #endif
#include "digipot_mcp4451_I2C_routines.h" #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 // 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. // to the lpc17xx_i2c.c routines so had to copy them into this file & rename them.

1
Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.h
View file

@ -33,6 +33,7 @@
#include <lpc17xx_i2c.h> #include <lpc17xx_i2c.h>
#include <lpc17xx_pinsel.h> #include <lpc17xx_pinsel.h>
#include <lpc17xx_libcfg_default.h> #include <lpc17xx_libcfg_default.h>
#include "i2c_util.h"
uint8_t digipot_mcp4451_start(uint8_t sla); uint8_t digipot_mcp4451_start(uint8_t sla);
uint8_t digipot_mcp4451_send_byte(uint8_t data); uint8_t digipot_mcp4451_send_byte(uint8_t data);

8
Marlin/src/HAL/HAL_LPC1768/include/i2c_util.h
View file

@ -45,4 +45,12 @@
#include <lpc17xx_pinsel.h> #include <lpc17xx_pinsel.h>
#include <lpc17xx_libcfg_default.h> #include <lpc17xx_libcfg_default.h>
#ifdef __cplusplus
extern "C" {
#endif
void configure_i2c(const uint8_t clock_option); void configure_i2c(const uint8_t clock_option);
#ifdef __cplusplus
}
#endif

2
Marlin/src/feature/digipot/digipot_mcp4451.cpp
View file

@ -77,7 +77,7 @@ void digipot_i2c_set_current(const uint8_t channel, const float current) {
void digipot_i2c_init() { void digipot_i2c_init() {
#if MB(MKS_SBASE) #if MB(MKS_SBASE)
configure_i2c(); configure_i2c(16); // Setting clock_option to 16 ensure the I2C bus is initialized at 400kHz
#else #else
Wire.begin(); Wire.begin();
#endif #endif