andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix DAC setDrvPct (#20205)

vanilla_fb_2.0.x
Orel 4 years ago
committed by Scott Lahteine
parent
afd3ee264b
commit
2abde8a068
3 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Marlin/src/feature/dac/dac_mcp4728.cpp
  2. 2
      Marlin/src/feature/dac/dac_mcp4728.h
  3. 6
      Marlin/src/feature/dac/stepper_dac.cpp

4
Marlin/src/feature/dac/dac_mcp4728.cpp
View File

@ -123,8 +123,8 @@ uint8_t MCP4728::getDrvPct(const uint8_t channel) { return uint8_t(100.0 * dac_v
* Receives all Drive strengths as 0-100 percent values, updates * Receives all Drive strengths as 0-100 percent values, updates
* DAC Values array and calls fastwrite to update the DAC. * DAC Values array and calls fastwrite to update the DAC.
*/ */
void MCP4728::setDrvPct(xyze_uint8_t &pct) { void MCP4728::setDrvPct(xyze_uint_t &pct) {
dac_values *= pct.asFloat() * 0.01f * (DAC_STEPPER_MAX); dac_values = pct * (DAC_STEPPER_MAX) * 0.01f;
fastWrite(); fastWrite();
} }

2
Marlin/src/feature/dac/dac_mcp4728.h
View File

@ -76,7 +76,7 @@ public:
static uint8_t fastWrite(); static uint8_t fastWrite();
static uint8_t simpleCommand(const byte simpleCommand); static uint8_t simpleCommand(const byte simpleCommand);
static uint8_t getDrvPct(const uint8_t channel); static uint8_t getDrvPct(const uint8_t channel);
static void setDrvPct(xyze_uint8_t &pct); static void setDrvPct(xyze_uint_t &pct);
}; };
extern MCP4728 mcp4728; extern MCP4728 mcp4728;

6
Marlin/src/feature/dac/stepper_dac.cpp
View File

@ -33,7 +33,7 @@
bool dac_present = false; bool dac_present = false;
constexpr xyze_uint8_t dac_order = DAC_STEPPER_ORDER; constexpr xyze_uint8_t dac_order = DAC_STEPPER_ORDER;
xyze_uint8_t dac_channel_pct = DAC_MOTOR_CURRENT_DEFAULT; xyze_uint_t dac_channel_pct = DAC_MOTOR_CURRENT_DEFAULT;
StepperDAC stepper_dac; StepperDAC stepper_dac;
@ -72,8 +72,8 @@ void StepperDAC::set_current_percent(const uint8_t channel, float val) {
set_current_value(channel, _MIN(val, 100.0f) * (DAC_STEPPER_MAX) / 100.0f); set_current_value(channel, _MIN(val, 100.0f) * (DAC_STEPPER_MAX) / 100.0f);
} }
static float dac_perc(int8_t n) { return 100.0 * mcp4728.getValue(dac_order[n]) * RECIPROCAL(DAC_STEPPER_MAX); } static float dac_perc(int8_t n) { return mcp4728.getDrvPct(dac_order[n]); }
static float dac_amps(int8_t n) { return mcp4728.getDrvPct(dac_order[n]) * (DAC_STEPPER_MAX) * 0.125 * RECIPROCAL(DAC_STEPPER_SENSE); } static float dac_amps(int8_t n) { return mcp4728.getValue(dac_order[n]) * 0.125 * RECIPROCAL(DAC_STEPPER_SENSE * 1000); }
uint8_t StepperDAC::get_current_percent(const AxisEnum axis) { return mcp4728.getDrvPct(dac_order[axis]); } uint8_t StepperDAC::get_current_percent(const AxisEnum axis) { return mcp4728.getDrvPct(dac_order[axis]); }
void StepperDAC::set_current_percents(xyze_uint8_t &pct) { void StepperDAC::set_current_percents(xyze_uint8_t &pct) {

Write Preview
Loading…
Cancel
Save