MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Miscellaneous cleanup

Browse Source
This commit is contained in:
Scott Lahteine 2017-11-16 00:27:24 -06:00
parent 63257dc083
commit 50f09cc029
4 changed files with 24 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Marlin/src/feature/Max7219_Debug_LEDs.cpp
View File

@ -63,54 +63,41 @@
static uint8_t LEDs[8] = { 0 };
#ifdef CPU_32_BIT
#define MS_DELAY() delayMicroseconds(5) // 32-bit processors need a delay to stabilize the signal
#else
#define MS_DELAY() NOOP
#endif
void Max7219_PutByte(uint8_t data) {
CRITICAL_SECTION_START
for (uint8_t i = 8; i--;) {
#ifdef CPU_32_BIT // The 32-bit processors are so fast, a small delay in the code is needed
delayMicroseconds(5); // to let the signal wires stabilize.
MS_DELAY();
WRITE(MAX7219_CLK_PIN, LOW); // tick
delayMicroseconds(5);
MS_DELAY();
WRITE(MAX7219_DIN_PIN, (data & 0x80) ? HIGH : LOW); // send 1 or 0 based on data bit
delayMicroseconds(5);
MS_DELAY();
WRITE(MAX7219_CLK_PIN, HIGH); // tock
delayMicroseconds(5);
#else
WRITE(MAX7219_CLK_PIN, LOW); // tick
WRITE(MAX7219_DIN_PIN, (data & 0x80) ? HIGH : LOW); // send 1 or 0 based on data bit
WRITE(MAX7219_CLK_PIN, HIGH); // tock
#endif
MS_DELAY();
data <<= 1;
}
CRITICAL_SECTION_END
}
void Max7219(const uint8_t reg, const uint8_t data) {
#ifdef CPU_32_BIT
delayMicroseconds(5);
#endif
MS_DELAY();
CRITICAL_SECTION_START
WRITE(MAX7219_LOAD_PIN, LOW); // begin
#ifdef CPU_32_BIT // The 32-bit processors are so fast, a small delay in the code is needed
delayMicroseconds(5); // to let the signal wires stabilize.
#endif
MS_DELAY();
Max7219_PutByte(reg); // specify register
#ifdef CPU_32_BIT
delayMicroseconds(5);
#endif
MS_DELAY();
Max7219_PutByte(data); // put data
#ifdef CPU_32_BIT
delayMicroseconds(5);
#endif
MS_DELAY();
WRITE(MAX7219_LOAD_PIN, LOW); // and tell the chip to load the data
#ifdef CPU_32_BIT
delayMicroseconds(5);
#endif
MS_DELAY();
WRITE(MAX7219_LOAD_PIN, HIGH);
CRITICAL_SECTION_END
#ifdef CPU_32_BIT
delayMicroseconds(5);
#endif
MS_DELAY();
}
void Max7219_LED_Set(const uint8_t row, const uint8_t col, const bool on) {

4
Marlin/src/gcode/geometry/M206_M428.cpp
View File

@ -43,8 +43,8 @@ void GcodeSuite::M206() {
set_home_offset((AxisEnum)i, parser.value_linear_units());
#if ENABLED(MORGAN_SCARA)
if (parser.seen('T')) set_home_offset(A_AXIS, parser.value_linear_units()); // Theta
if (parser.seen('P')) set_home_offset(B_AXIS, parser.value_linear_units()); // Psi
if (parser.seen('T')) set_home_offset(A_AXIS, parser.value_float()); // Theta
if (parser.seen('P')) set_home_offset(B_AXIS, parser.value_float()); // Psi
#endif
report_current_position();

4
Marlin/src/gcode/motion/M290.cpp
View File

@ -36,14 +36,14 @@ void GcodeSuite::M290() {
#if ENABLED(BABYSTEP_XY)
for (uint8_t a = X_AXIS; a <= Z_AXIS; a++)
if (parser.seenval(axis_codes[a]) || (a == Z_AXIS && parser.seenval('S'))) {
const float offs = constrain(parser.value_axis_units(a), -2, 2);
const float offs = constrain(parser.value_axis_units((AxisEnum)a), -2, 2);
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
if (a == Z_AXIS) {
zprobe_zoffset += offs;
refresh_zprobe_zoffset(true); // 'true' to not babystep
}
#endif
thermalManager.babystep_axis(a, offs * planner.axis_steps_per_mm[a]);
thermalManager.babystep_axis((AxisEnum)a, offs * planner.axis_steps_per_mm[a]);
}
#else
if (parser.seenval('Z') || parser.seenval('S')) {

3
Marlin/src/module/planner.cpp
View File

@ -542,8 +542,7 @@ void Planner::check_axes_activity() {
}
inline float calculate_volumetric_multiplier(const float &diameter) {
if (!parser.volumetric_enabled || diameter == 0) return 1.0;
return 1.0 / CIRCLE_AREA(diameter * 0.5);
return (parser.volumetric_enabled && diameter) ? 1.0 / CIRCLE_AREA(diameter * 0.5) : 1.0;
}
void Planner::calculate_volumetric_multipliers() {