SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Apply const to mcp4728

Browse source
This commit is contained in:
Scott Lahteine 2019-05-26 03:02:23 -05:00
parent 3c179bbd47
commit b315157053
2 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Marlin/src/feature/dac/dac_mcp4728.cpp
View file

@ -58,7 +58,7 @@ void mcp4728_init() {
* Write input resister value to specified channel using fastwrite method. * Write input resister value to specified channel using fastwrite method.
* Channel : 0-3, Values : 0-4095 * Channel : 0-3, Values : 0-4095
*/ */
uint8_t mcp4728_analogWrite(uint8_t channel, uint16_t value) { uint8_t mcp4728_analogWrite(const uint8_t channel, const uint16_t value) {
mcp4728_values[channel] = value; mcp4728_values[channel] = value;
return mcp4728_fastWrite(); return mcp4728_fastWrite();
} }
@ -81,7 +81,7 @@ uint8_t mcp4728_eepromWrite() {
/** /**
* Write Voltage reference setting to all input regiters * Write Voltage reference setting to all input regiters
*/ */
uint8_t mcp4728_setVref_all(uint8_t value) { uint8_t mcp4728_setVref_all(const uint8_t value) {
Wire.beginTransmission(I2C_ADDRESS(DAC_DEV_ADDRESS)); Wire.beginTransmission(I2C_ADDRESS(DAC_DEV_ADDRESS));
Wire.write(VREFWRITE | (value ? 0x0F : 0x00)); Wire.write(VREFWRITE | (value ? 0x0F : 0x00));
return Wire.endTransmission(); return Wire.endTransmission();
@ -89,7 +89,7 @@ uint8_t mcp4728_setVref_all(uint8_t value) {
/** /**
* Write Gain setting to all input regiters * Write Gain setting to all input regiters
*/ */
uint8_t mcp4728_setGain_all(uint8_t value) { uint8_t mcp4728_setGain_all(const uint8_t value) {
Wire.beginTransmission(I2C_ADDRESS(DAC_DEV_ADDRESS)); Wire.beginTransmission(I2C_ADDRESS(DAC_DEV_ADDRESS));
Wire.write(GAINWRITE | (value ? 0x0F : 0x00)); Wire.write(GAINWRITE | (value ? 0x0F : 0x00));
return Wire.endTransmission(); return Wire.endTransmission();
@ -98,25 +98,24 @@ uint8_t mcp4728_setGain_all(uint8_t value) {
/** /**
* Return Input Register value * Return Input Register value
*/ */
uint16_t mcp4728_getValue(uint8_t channel) { return mcp4728_values[channel]; } uint16_t mcp4728_getValue(const uint8_t channel) { return mcp4728_values[channel]; }
#if 0 #if 0
/** /**
* Steph: Might be useful in the future * Steph: Might be useful in the future
* Return Vout * Return Vout
*/ */
uint16_t mcp4728_getVout(uint8_t channel) { uint16_t mcp4728_getVout(const uint8_t channel) {
uint32_t vref = 2048, const uint32_t vref = 2048,
vOut = (vref * mcp4728_values[channel] * (_DAC_STEPPER_GAIN + 1)) / 4096; vOut = (vref * mcp4728_values[channel] * (_DAC_STEPPER_GAIN + 1)) / 4096;
if (vOut > defaultVDD) vOut = defaultVDD; return MIN(vOut, defaultVDD);
return vOut;
} }
#endif #endif
/** /**
* Returns DAC values as a 0-100 percentage of drive strength * Returns DAC values as a 0-100 percentage of drive strength
*/ */
uint8_t mcp4728_getDrvPct(uint8_t channel) { return uint8_t(100.0 * mcp4728_values[channel] / (DAC_STEPPER_MAX) + 0.5); } uint8_t mcp4728_getDrvPct(const uint8_t channel) { return uint8_t(100.0 * mcp4728_values[channel] / (DAC_STEPPER_MAX) + 0.5); }
/** /**
* Receives all Drive strengths as 0-100 percent values, updates * Receives all Drive strengths as 0-100 percent values, updates
@ -144,7 +143,7 @@ uint8_t mcp4728_fastWrite() {
/** /**
* Common function for simple general commands * Common function for simple general commands
*/ */
uint8_t mcp4728_simpleCommand(byte simpleCommand) { uint8_t mcp4728_simpleCommand(const byte simpleCommand) {
Wire.beginTransmission(I2C_ADDRESS(GENERALCALL)); Wire.beginTransmission(I2C_ADDRESS(GENERALCALL));
Wire.write(simpleCommand); Wire.write(simpleCommand);
return Wire.endTransmission(); return Wire.endTransmission();

12
Marlin/src/feature/dac/dac_mcp4728.h
View file

@ -46,12 +46,12 @@
#define DAC_DEV_ADDRESS (BASE_ADDR | DAC_OR_ADDRESS) #define DAC_DEV_ADDRESS (BASE_ADDR | DAC_OR_ADDRESS)
void mcp4728_init(); void mcp4728_init();
uint8_t mcp4728_analogWrite(uint8_t channel, uint16_t value); uint8_t mcp4728_analogWrite(const uint8_t channel, const uint16_t value);
uint8_t mcp4728_eepromWrite(); uint8_t mcp4728_eepromWrite();
uint8_t mcp4728_setVref_all(uint8_t value); uint8_t mcp4728_setVref_all(const uint8_t value);
uint8_t mcp4728_setGain_all(uint8_t value); uint8_t mcp4728_setGain_all(const uint8_t value);
uint16_t mcp4728_getValue(uint8_t channel); uint16_t mcp4728_getValue(const uint8_t channel);
uint8_t mcp4728_fastWrite(); uint8_t mcp4728_fastWrite();
uint8_t mcp4728_simpleCommand(byte simpleCommand); uint8_t mcp4728_simpleCommand(const byte simpleCommand);
uint8_t mcp4728_getDrvPct(uint8_t channel); uint8_t mcp4728_getDrvPct(const uint8_t channel);
void mcp4728_setDrvPct(uint8_t pct[XYZE]); void mcp4728_setDrvPct(uint8_t pct[XYZE]);