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

Code style and comment tweaks

Browse Source
This commit is contained in:
Scott Lahteine 2020-01-08 20:00:06 -06:00
parent 95046c9047
commit 6e658a7c04
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/HAL/HAL_DUE/HAL_SPI.cpp
View File

@ -240,7 +240,7 @@
} }
// all the others // all the others
static uint32_t spiDelayCyclesX4 = (F_CPU) / 1000000; // 4uS => 125khz static uint32_t spiDelayCyclesX4 = (F_CPU) / 1000000; // 4µs => 125khz
static uint8_t spiTransferX(uint8_t b) { // using Mode 0 static uint8_t spiTransferX(uint8_t b) { // using Mode 0
int bits = 8; int bits = 8;

2
Marlin/src/HAL/HAL_DUE/usb/uotghs_device_due.c
View File

@ -1479,7 +1479,7 @@ static void udd_ctrl_in_sent(void)
// The IN data don't must be written in endpoint 0 DPRAM during // The IN data don't must be written in endpoint 0 DPRAM during
// a next setup reception in same endpoint 0 DPRAM. // a next setup reception in same endpoint 0 DPRAM.
// Thereby, an OUT ZLP reception must check before IN data write // Thereby, an OUT ZLP reception must check before IN data write
// and if no OUT ZLP is recevied the data must be written quickly (800us) // and if no OUT ZLP is received the data must be written quickly (800µs)
// before an eventually ZLP OUT and SETUP reception // before an eventually ZLP OUT and SETUP reception
flags = cpu_irq_save(); flags = cpu_irq_save();
if (Is_udd_out_received(0)) { if (Is_udd_out_received(0)) {

2
Marlin/src/HAL/HAL_ESP32/i2s.cpp
View File

@ -177,7 +177,7 @@ int i2s_init() {
* *
* fwclk = fbclk / 32 * fwclk = fbclk / 32
* *
* for fwclk = 250kHz (4uS pulse time) * for fwclk = 250kHz (4µS pulse time)
* N = 10 * N = 10
* M = 20 * M = 20
*/ */

2
Marlin/src/HAL/HAL_ESP32/timers.h
View File

@ -47,7 +47,7 @@ typedef uint64_t hal_timer_t;
#if ENABLED(I2S_STEPPER_STREAM) #if ENABLED(I2S_STEPPER_STREAM)
#define STEPPER_TIMER_PRESCALE 1 #define STEPPER_TIMER_PRESCALE 1
#define STEPPER_TIMER_RATE 250000 // 250khz, 4us pulses of i2s word clock #define STEPPER_TIMER_RATE 250000 // 250khz, 4µs pulses of i2s word clock
#define STEPPER_TIMER_TICKS_PER_US ((STEPPER_TIMER_RATE) / 1000000) // stepper timer ticks per µs // wrong would be 0.25 #define STEPPER_TIMER_TICKS_PER_US ((STEPPER_TIMER_RATE) / 1000000) // stepper timer ticks per µs // wrong would be 0.25
#else #else
#define STEPPER_TIMER_PRESCALE 40 #define STEPPER_TIMER_PRESCALE 40

4
Marlin/src/HAL/HAL_LPC1768/u8g/LCD_delay.h
View File

@ -26,8 +26,8 @@
* *
* These are based on the LPC1768 routines. * These are based on the LPC1768 routines.
* *
* Couldn't just call exact copies because the overhead resulted in the * Couldn't just call exact copies because the overhead
* one microsecond delay being about 4uS. * results in a one microsecond delay taking about 4µS.
*/ */
#ifdef __cplusplus #ifdef __cplusplus

2
Marlin/src/MarlinCore.cpp
View File

@ -618,7 +618,7 @@ void manage_inactivity(const bool ignore_stepper_queue/*=false*/) {
#if PIN_EXISTS(FET_SAFETY) #if PIN_EXISTS(FET_SAFETY)
static millis_t FET_next; static millis_t FET_next;
if (ELAPSED(ms, FET_next)) { if (ELAPSED(ms, FET_next)) {
FET_next = ms + FET_SAFETY_DELAY; // 2uS pulse every FET_SAFETY_DELAY mS FET_next = ms + FET_SAFETY_DELAY; // 2µs pulse every FET_SAFETY_DELAY mS
OUT_WRITE(FET_SAFETY_PIN, !FET_SAFETY_INVERTED); OUT_WRITE(FET_SAFETY_PIN, !FET_SAFETY_INVERTED);
DELAY_US(2); DELAY_US(2);
WRITE(FET_SAFETY_PIN, FET_SAFETY_INVERTED); WRITE(FET_SAFETY_PIN, FET_SAFETY_INVERTED);

2
Marlin/src/module/configuration_store.cpp
View File

@ -2352,7 +2352,7 @@ void MarlinSettings::reset() {
#endif #endif
#if HAS_BED_PROBE #if HAS_BED_PROBE
constexpr float dpo[XYZ] = NOZZLE_TO_PROBE_OFFSET; constexpr float dpo[] = NOZZLE_TO_PROBE_OFFSET;
static_assert(COUNT(dpo) == 3, "NOZZLE_TO_PROBE_OFFSET must contain offsets for X, Y, and Z."); static_assert(COUNT(dpo) == 3, "NOZZLE_TO_PROBE_OFFSET must contain offsets for X, Y, and Z.");
#if HAS_PROBE_XY_OFFSET #if HAS_PROBE_XY_OFFSET
LOOP_XYZ(a) probe_offset[a] = dpo[a]; LOOP_XYZ(a) probe_offset[a] = dpo[a];

4
Marlin/src/module/stepper.cpp
View File

@ -1492,7 +1492,7 @@ void Stepper::stepper_pulse_phase_isr() {
// Don't step E here - But remember the number of steps to perform // Don't step E here - But remember the number of steps to perform
motor_direction(E_AXIS) ? --LA_steps : ++LA_steps; motor_direction(E_AXIS) ? --LA_steps : ++LA_steps;
#else #else
step_needed[E_AXIS] = delta_error.e >= 0; step_needed.e = delta_error.e >= 0;
#endif #endif
} }
#elif HAS_E0_STEP #elif HAS_E0_STEP
@ -1519,7 +1519,7 @@ void Stepper::stepper_pulse_phase_isr() {
#if DISABLED(LIN_ADVANCE) #if DISABLED(LIN_ADVANCE)
#if ENABLED(MIXING_EXTRUDER) #if ENABLED(MIXING_EXTRUDER)
if (step_needed[E_AXIS]) E_STEP_WRITE(mixer.get_next_stepper(), !INVERT_E_STEP_PIN); if (step_needed.e) E_STEP_WRITE(mixer.get_next_stepper(), !INVERT_E_STEP_PIN);
#elif HAS_E0_STEP #elif HAS_E0_STEP
PULSE_START(E); PULSE_START(E);
#endif #endif