Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
c2553f9
2.0.x - Idex match119 (#11556)
InsanityAutomation Aug 15, 2018
9de730b
Update tool_change.cpp (#11559)
InsanityAutomation Aug 16, 2018
aae4c67
Max7219 Clean Up (#11563)
Roxy-3D Aug 16, 2018
db30650
Fix UBL/Homing (#11566)
smoki3 Aug 16, 2018
a98f21e
Marlin assumes signed chars
thinkyhead Aug 15, 2018
0b2d686
Fix "SD init fail" problem for STM32F1 (#11579)
jmz52 Aug 18, 2018
56f1e17
[2.0.x] Max7219 cleanup, simplify, and extend (#11575)
thinkyhead Aug 18, 2018
00d24a8
Don't call __delay_4cycles for 0 cycle delay - takes a really long ti…
ghent360 Aug 19, 2018
a82be36
Create pins_FORMBOT.h
Roxy-3D Aug 20, 2018
62ce937
Update pins.h to include the Formbot board
Roxy-3D Aug 20, 2018
b0a8ce5
Update Boards.h to include Formbot support
Roxy-3D Aug 20, 2018
dfe18ac
Fix compilation error for STM32F1 with U8GLIB_SSD1306 or U8GLIB_SH110…
jmz52 Aug 21, 2018
0456caf
Consolidate shared HALs and isolate HAL compile (#11552)
Aug 21, 2018
a77f8c6
Implement servo support for STM32F1 (#11580)
jmz52 Aug 21, 2018
d05b239
Tweak env build test scripts
thinkyhead Aug 21, 2018
8f0bbdc
Fix up Max7219 orientations (#11596)
thinkyhead Aug 21, 2018
b5537dd
need to add E2END to pins_RAMPS_FD_V2.h (#11564)
salfter Aug 21, 2018
ad12b9b
Fix indentation, whitespace, spelling, formbot pins...
thinkyhead Aug 21, 2018
0e25f66
Fix Ultimaker servo pin
thinkyhead Aug 21, 2018
97f6396
Fix RE_ARM LCD pins to avoid #undef
thinkyhead Aug 21, 2018
cd9868f
Make position_is_reachable() smarter about IDEX machines`
Roxy-3D Aug 22, 2018
2d3317a
Prettify Dual X Carriage description
thinkyhead Aug 22, 2018
f0dbe61
Tweaks to motion.h reachable tests
thinkyhead Aug 22, 2018
593d537
Fix G28 resetting DUAL_NOZZLE_DUPLICATION_MODE (#11605)
hexane360 Aug 22, 2018
3671c63
Einsy Full Graphic LCD Fix (#11604)
jneilliii Aug 22, 2018
f8c52c9
Azteeg X5 Mini WiFi support (#11601)
ModMike Aug 22, 2018
6483285
HOTEND_OFFSET_Z always available (#11603)
smoki3 Aug 22, 2018
0987ed2
Use American English
thinkyhead Aug 22, 2018
ba1919c
HAL tweaks to LPC1768 main
thinkyhead Aug 22, 2018
acf5ae3
!ENABLED => DISABLED
thinkyhead Aug 24, 2018
a317bb4
Remove stray tab
thinkyhead Aug 24, 2018
b71c2b8
[2.0.x] Update LPC176x tests, fix clean script (#11617)
p3p Aug 24, 2018
e2b8fc4
Reduce some debug strings
thinkyhead Aug 25, 2018
d1c9517
Followup to hotend_offset[Z] patch
thinkyhead Aug 25, 2018
933d833
Tweak some Anet A6 comments
thinkyhead Aug 25, 2018
66966db
Tweak comments for newer multiplexer
thinkyhead Aug 25, 2018
a15e570
Fix SD progress with Lite Status Screen
thinkyhead Aug 26, 2018
6dc9553
Fix SWITCHING_NOZZLE compile error (#11657)
scott0122 Aug 28, 2018
0f14977
LIGHTWEIGHT_UI: Allow feedrate % to exceed 255% (#11656)
marcio-ao Aug 28, 2018
409a063
[2.0.x] Add Morpheus Board support (#11651)
pscrespo Aug 28, 2018
7ecb8b4
[2.0.x] Teensy 3.1 and 3.2 support (#11460)
MstrVLT Aug 28, 2018
2a2e8c3
Suppress emergency parser G-code errors
thinkyhead Aug 29, 2018
59cf217
Fix 5 mixing steppers
neorex Aug 27, 2018
32e38fe
Update Controller Fan for Y2,Z2
thinkyhead Aug 29, 2018
199613a
Merge pull request #11653 from neorex/add_support_E4
thinkyhead Aug 29, 2018
e40a3ee
Support for Anet A2 Plus
thinkyhead Aug 29, 2018
0966bdc
Reorganized ultralcd menu (10317) (#10360)
marcio-ao Aug 29, 2018
9953213
Add EDITABLE_SERVO_ANGLES to example configs
thinkyhead Aug 25, 2018
aa80e44
Store servo angles in EEPROM
Aug 7, 2018
3e81745
Fix issues, make optional
thinkyhead Aug 25, 2018
607c1e5
Improve HOTEND OFFSET Z display precision to 3 (#11685)
scott0122 Aug 31, 2018
ada85d5
Improve HOTEND OFFSET Z display precision to 3 (#11686)
scott0122 Aug 31, 2018
66de50f
Updated slovak translation (#11684)
rmoravcik Aug 31, 2018
136860e
Sanity-check SERVO pin for servo probes
thinkyhead Aug 31, 2018
e3fc9aa
Update some config comments
thinkyhead Aug 31, 2018
77efcad
Use TMC2208Stepper version 0.2.2
thinkyhead Aug 31, 2018
6a32073
Remove obsolete HAL_timer_restrain
thinkyhead Aug 31, 2018
d55f44e
Printcounter improvements (#11689)
thinkyhead Aug 31, 2018
e3debc7
Revert "Use TMC2208Stepper version 0.2.2"
thinkyhead Aug 31, 2018
509e1cf
Add *_DRIVER_TYPE to remaining configs
thinkyhead Sep 1, 2018
74a04ae
Fix compile error with NO_LCD_MENUS
thinkyhead Sep 1, 2018
18f1af2
Fix up Teensy tests, servo sanity
thinkyhead Sep 1, 2018
05dc79e
Update platform tests to use '.test' folder
thinkyhead Sep 1, 2018
92069f1
Merge pull request #11692 from thinkyhead/bf2_teensy_and_servos
thinkyhead Sep 1, 2018
49e107c
Restrict SW serial to AVR (#11696)
teemuatlut Sep 1, 2018
d0c96ee
Use TMC2208Stepper 0.2.1 for LPC1768
thinkyhead Sep 1, 2018
8c11220
[2.0.x] Debug Travis tests and scripts (#11704)
thinkyhead Sep 2, 2018
7680b64
IDEX clean up (#11690)
Roxy-3D Sep 2, 2018
f8abe12
Boot and status file should not have been added to main directory!
Roxy-3D Sep 2, 2018
509ee44
Boot and status file should not have been added to main directory!
Roxy-3D Sep 2, 2018
59e76e5
[2.0.x] Fix planner computation (#11708)
GMagician Sep 3, 2018
4668c71
Revert circleci oopsie
thinkyhead Sep 3, 2018
8e18e48
Merge pull request #11610 from Freeviv/bugfix-2.0.x
thinkyhead Sep 3, 2018
fa772c3
Provide more options for Max7219 connection on Formbot
Roxy-3D Sep 3, 2018
d62f4df
Disable LCD Pins used by new Max7219 hook up if in that mode
Roxy-3D Sep 3, 2018
d1ceaf5
[2.0.x] Followup to IDEX changes (#11707)
thinkyhead Sep 4, 2018
8b837dc
No need for last \n in G-code items
thinkyhead Sep 4, 2018
72fdb6b
Fix SWITCHING_NOZZLE zdiff (#11683)
scott0122 Sep 4, 2018
aefc2f7
Add Anet A2 and A2 Plus Configurations (#11677)
ModMike Sep 4, 2018
12fded4
Correct some FR strings
thinkyhead Sep 4, 2018
530a13a
[2.0.x] SECURITYFIX missing max temp error when PID is used (#11717)
AnHardt Sep 5, 2018
650d431
Bring some configs up to date
thinkyhead Sep 5, 2018
ae1271b
RADDS: Update Full Graphic Display Pins (#11731)
smoki3 Sep 5, 2018
86ee747
Comment for RADDS + RRDFGSC
thinkyhead Sep 5, 2018
b213a89
Sanity-check NOZZLE_PARK_POINT
thinkyhead Sep 5, 2018
9651ceb
Correct spelling of #endif
Roxy-3D Sep 5, 2018
8d5bea0
Assume one Max7219 unit if not specified
Roxy-3D Sep 5, 2018
d5379ee
Fix search for white space in enqueued commands
Roxy-3D Sep 5, 2018
dcfde23
Pass segment length in prepare_kinematic_move_to (#11737)
thinkyhead Sep 6, 2018
d10f29a
Pass segment length in G2-G3
thinkyhead Sep 6, 2018
beb51c2
Show manual extrusion moves as relative in LCD
marcio-ao Sep 5, 2018
679e460
Add MANUAL_E_MOVES_RELATIVE to examples
thinkyhead Sep 6, 2018
3b2690a
Merge pull request #11733 from marcio-ao/pr-relative-manual-extrusion…
thinkyhead Sep 6, 2018
b3efbc6
Add MANUAL_E_MOVES_RELATIVE to more configs
thinkyhead Sep 6, 2018
2a61c9a
Various fixups to configs, spacing, etc.
thinkyhead Sep 6, 2018
fe4fc28
Add support for Formbot T-Rex3
Roxy-3D Sep 6, 2018
0738576
seperate the T-Rex2 and T-Rex3 support
Roxy-3D Sep 6, 2018
f580247
Create pins_FORMBOT_TREX2.h
Roxy-3D Sep 6, 2018
e3aac59
Create pins_FORMBOT_TREX3.h
Roxy-3D Sep 6, 2018
9c8d9d2
Break out support for Formbot T-Rex3 from previous versions
Roxy-3D Sep 6, 2018
67996c2
Break out support for the T-Rex 3
Roxy-3D Sep 6, 2018
e2e7b1d
Break out support of the T-Rex 3
Roxy-3D Sep 6, 2018
9f85d3a
Create _statusscreen.h
Roxy-3D Sep 6, 2018
a9c98a0
Create _Bootscreen.h
Roxy-3D Sep 6, 2018
3d7f2c1
Fix directory name to be consistent (#11745)
Roxy-3D Sep 6, 2018
f417408
[STM32F1] Fix HAL for new PlatformIO (#11749)
AlexanderAmelkin Sep 7, 2018
e25d2ae
[2.0.x] SWITCHING_TOOLHEAD (#11623)
smoki3 Sep 8, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,16 @@ jobs:
export PATH=`pwd`/buildroot/bin/:${PATH}

# Generate custom version include
generate_version_header_for_marlin ./Marlin/src/inc
generate_version ./Marlin/src/inc
cat ./Marlin/src/inc/_Version.h
#
# Backup pins_RAMPS.h
#
cp Marlin/src/pins/pins_RAMPS.h Marlin/src/pins/pins_RAMPS.h.backup
#

env_backup

#################################
# Build all sample configurations
#################################
Expand Down Expand Up @@ -279,11 +281,13 @@ jobs:
# Remove temp files from dependencies tree prior to caching
rm -rf ~/Marlin/.piolibdeps/_tmp_*


#
# Restore the environment
#
env_restore

- save_cache:
paths:
- ~/.platformio
- ~/Marlin/.piolibdeps
key: v1-dependencies-{{ checksum "~/Marlin/platformio.ini" }}

2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ before_script:
- cd ${TRAVIS_BUILD_DIR}
#
# Generate custom version include
- generate_version_header_for_marlin ${TRAVIS_BUILD_DIR}/Marlin/src/inc
- generate_version ${TRAVIS_BUILD_DIR}/Marlin/src/inc
- cat ${TRAVIS_BUILD_DIR}/Marlin/src/inc/_Version.h
#
script:
Expand Down
39 changes: 28 additions & 11 deletions Marlin/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@
// Override the default DIO selector pins here, if needed.
// Some pins files may provide defaults for these pins.
//#define E_MUX0_PIN 40 // Always Required
//#define E_MUX1_PIN 42 // Needed for 3 to 8 steppers
//#define E_MUX2_PIN 44 // Needed for 5 to 8 steppers
//#define E_MUX1_PIN 42 // Needed for 3 to 8 inputs
//#define E_MUX2_PIN 44 // Needed for 5 to 8 inputs
#endif

// A dual extruder that uses a single stepper motor
Expand All @@ -190,7 +190,6 @@
#if ENABLED(SWITCHING_NOZZLE)
#define SWITCHING_NOZZLE_SERVO_NR 0
#define SWITCHING_NOZZLE_SERVO_ANGLES { 0, 90 } // Angles for E0, E1
//#define HOTEND_OFFSET_Z { 0.0, 0.0 }
#endif

/**
Expand All @@ -205,7 +204,23 @@
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking
#define HOTEND_OFFSET_Z { 0.0, 1.3 } // Z-offsets of the two hotends. The first must be 0.
#endif

/**
* Switching Toolhead
*
* Support for swappable and dockable toolheads, such as
* the E3D Tool Changer. Toolheads are locked with a servo.
*/
//#define SWITCHING_TOOLHEAD
#if ENABLED(SWITCHING_TOOLHEAD)
#define SWITCHING_TOOLHEAD_SERVO_NR 2 // Index of the servo connector
#define SWITCHING_TOOLHEAD_SERVO_ANGLES { 0, 180 } // (degrees) Angles for Lock, Unlock
#define SWITCHING_TOOLHEAD_Y_POS 235 // (mm) Y position of the toolhead dock
#define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis
#define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis
#define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders
#define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking
#endif

/**
Expand All @@ -226,8 +241,9 @@
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.
//#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
//#define HOTEND_OFFSET_Y {0.0, 5.00} // (in mm) for each extruder, offset of the hotend on the Y axis
//#define HOTEND_OFFSET_X {0.0, 20.00} // (mm) relative X-offset for each nozzle
//#define HOTEND_OFFSET_Y {0.0, 5.00} // (mm) relative Y-offset for each nozzle
//#define HOTEND_OFFSET_Z {0.0, 0.00} // (mm) relative Z-offset for each nozzle

// @section machine

Expand Down Expand Up @@ -1041,9 +1057,9 @@

// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))

// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
Expand Down Expand Up @@ -1947,9 +1963,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }

// Servo deactivation
//
// With this option servos are powered only during movement, then turned off to prevent jitter.
// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE

// Allow servo angle to be edited and saved to EEPROM
//#define EDITABLE_SERVO_ANGLES

#endif // CONFIGURATION_H
29 changes: 17 additions & 12 deletions Marlin/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -331,15 +331,18 @@
#endif
#endif

// Enable this for dual x-carriage printers.
// A dual x-carriage design has the advantage that the inactive extruder can be parked which
// prevents hot-end ooze contaminating the print. It also reduces the weight of each x-carriage
// allowing faster printing speeds. Connect your X2 stepper to the first unused E plug.
/**
* Dual X Carriage
*
* This setup has two X carriages that can move independently, each with its own hotend.
* The carriages can be used to print an object with two colors or materials, or in
* "duplication mode" it can print two identical or X-mirrored objects simultaneously.
* The inactive carriage is parked automatically to prevent oozing.
* X1 is the left carriage, X2 the right. They park and home at opposite ends of the X axis.
* By default the X2 stepper is assigned to the first unused E plug on the board.
*/
//#define DUAL_X_CARRIAGE
#if ENABLED(DUAL_X_CARRIAGE)
// Configuration for second X-carriage
// Note: the first x-carriage is defined as the x-carriage which homes to the minimum endstop;
// the second x-carriage always homes to the maximum endstop.
#define X1_MIN_POS X_MIN_POS // set minimum to ensure first x-carriage doesn't hit the parked second X-carriage
#define X1_MAX_POS X_BED_SIZE // set maximum to ensure first x-carriage doesn't hit the parked second X-carriage
#define X2_MIN_POS 80 // set minimum to ensure second x-carriage doesn't hit the parked first X-carriage
Expand Down Expand Up @@ -422,6 +425,7 @@

#if ENABLED(ULTIPANEL)
#define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
#define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
#define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
#endif

Expand Down Expand Up @@ -474,7 +478,7 @@
* known compatible chips: AD5206
* DAC_MOTOR_CURRENT_DEFAULT - used by PRINTRBOARD_REVF & RIGIDBOARD_V2
* known compatible chips: MCP4728
* DIGIPOT_I2C_MOTOR_CURRENTS - used by 5DPRINT, AZTEEG_X3_PRO, MIGHTYBOARD_REVE
* DIGIPOT_I2C_MOTOR_CURRENTS - used by 5DPRINT, AZTEEG_X3_PRO, AZTEEG_X5_MINI_WIFI, MIGHTYBOARD_REVE
* known compatible chips: MCP4451, MCP4018
*
* Motor currents can also be set by M907 - M910 and by the LCD.
Expand All @@ -492,10 +496,11 @@
/**
* Common slave addresses:
*
* A (A shifted) B (B shifted) IC
* Smoothie 0x2C (0x58) 0x2D (0x5A) MCP4451
* AZTEEG_X3_PRO 0x2C (0x58) 0x2E (0x5C) MCP4451
* MIGHTYBOARD_REVE 0x2F (0x5E) MCP4018
* A (A shifted) B (B shifted) IC
* Smoothie 0x2C (0x58) 0x2D (0x5A) MCP4451
* AZTEEG_X3_PRO 0x2C (0x58) 0x2E (0x5C) MCP4451
* AZTEEG_X5_MINI_WIFI 0x58 0x5C MCP4451
* MIGHTYBOARD_REVE 0x2F (0x5E) MCP4018
*/
#define DIGIPOT_I2C_ADDRESS_A 0x2C // unshifted slave address for first DIGIPOT
#define DIGIPOT_I2C_ADDRESS_B 0x2D // unshifted slave address for second DIGIPOT
Expand Down
5 changes: 2 additions & 3 deletions Marlin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -574,9 +574,8 @@ CSTANDARD = -std=gnu99
CXXSTANDARD = -std=gnu++11
CDEBUG = -g$(DEBUG)
CWARN = -Wall -Wstrict-prototypes
CTUNING = -funsigned-char -funsigned-bitfields -fpack-struct \
-fshort-enums -w -ffunction-sections -fdata-sections \
-flto \
CTUNING = -w -fsigned-char -funsigned-bitfields -fpack-struct \
-fshort-enums -ffunction-sections -fdata-sections -flto \
-DARDUINO=$(ARDUINO_VERSION)
ifneq ($(HARDWARE_MOTHERBOARD),)
CTUNING += -DMOTHERBOARD=${HARDWARE_MOTHERBOARD}
Expand Down
2 changes: 0 additions & 2 deletions Marlin/src/HAL/HAL_AVR/HAL.h
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,6 @@ FORCE_INLINE void HAL_timer_start(const uint8_t timer_num, const uint32_t freque

#define _CAT(a, ...) a ## __VA_ARGS__
#define HAL_timer_set_compare(timer, compare) (_CAT(TIMER_OCR_, timer) = compare)
#define HAL_timer_restrain(timer, interval_ticks) NOLESS(_CAT(TIMER_OCR_, timer), _CAT(TIMER_COUNTER_, timer) + interval_ticks)

#define HAL_timer_get_compare(timer) _CAT(TIMER_OCR_, timer)
#define HAL_timer_get_count(timer) _CAT(TIMER_COUNTER_, timer)

Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/HAL/HAL_DUE/DebugMonitor_Due.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
#include "../../core/serial.h"
#include <stdarg.h>

#include "../backtrace/unwinder.h"
#include "../backtrace/unwmemaccess.h"
#include "../shared/backtrace/unwinder.h"
#include "../shared/backtrace/unwmemaccess.h"

// Debug monitor that dumps to the Programming port all status when
// an exception or WDT timeout happens - And then resets the board
Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/HAL/HAL_DUE/EepromEmulation_Due.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -310,9 +310,9 @@ static bool ee_PageErase(uint16_t page) {

#ifdef EE_EMU_DEBUG
SERIAL_ECHO_START();
SERIAL_ECHOLNPAIR("EEPROM PageErase ",page);
SERIAL_ECHOLNPAIR(" in FLASH address ",(uint32_t)addrflash);
SERIAL_ECHOLNPAIR(" base address ",(uint32_t)getFlashStorage(0));
SERIAL_ECHOLNPAIR("EEPROM PageErase ", page);
SERIAL_ECHOLNPAIR(" in FLASH address ", (uint32_t)addrflash);
SERIAL_ECHOLNPAIR(" base address ", (uint32_t)getFlashStorage(0));
SERIAL_FLUSH();
#endif

Expand Down
6 changes: 0 additions & 6 deletions Marlin/src/HAL/HAL_DUE/HAL_timers_Due.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,6 @@ FORCE_INLINE static hal_timer_t HAL_timer_get_count(const uint8_t timer_num) {
return pConfig->pTimerRegs->TC_CHANNEL[pConfig->channel].TC_CV;
}

// if counter too high then bump up compare
FORCE_INLINE static void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_ticks) {
const hal_timer_t mincmp = HAL_timer_get_count(timer_num) + interval_ticks;
if (HAL_timer_get_compare(timer_num) < mincmp) HAL_timer_set_compare(timer_num, mincmp);
}

void HAL_timer_enable_interrupt(const uint8_t timer_num);
void HAL_timer_disable_interrupt(const uint8_t timer_num);
bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
Expand Down
6 changes: 0 additions & 6 deletions Marlin/src/HAL/HAL_ESP32/HAL_timers_ESP32.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,6 @@ void HAL_timer_set_compare(const uint8_t timer_num, const hal_timer_t count);
hal_timer_t HAL_timer_get_compare(const uint8_t timer_num);
hal_timer_t HAL_timer_get_count(const uint8_t timer_num);

// if counter too high then bump up compare
FORCE_INLINE static void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_ticks) {
const hal_timer_t mincmp = HAL_timer_get_count(timer_num) + interval_ticks;
if (HAL_timer_get_compare(timer_num) < mincmp) HAL_timer_set_compare(timer_num, mincmp);
}

void HAL_timer_enable_interrupt(const uint8_t timer_num);
void HAL_timer_disable_interrupt(const uint8_t timer_num);
bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
Expand Down
5 changes: 0 additions & 5 deletions Marlin/src/HAL/HAL_LPC1768/HAL_timers.h
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,6 @@ FORCE_INLINE static hal_timer_t HAL_timer_get_count(const uint8_t timer_num) {
return 0;
}

FORCE_INLINE static void HAL_timer_restrain(const uint8_t timer_num, const uint16_t interval_ticks) {
const hal_timer_t mincmp = HAL_timer_get_count(timer_num) + interval_ticks;
if (HAL_timer_get_compare(timer_num) < mincmp) HAL_timer_set_compare(timer_num, mincmp);
}

FORCE_INLINE static void HAL_timer_enable_interrupt(const uint8_t timer_num) {
switch (timer_num) {
case 0: NVIC_EnableIRQ(TIMER0_IRQn); // Enable interrupt handler
Expand Down
20 changes: 10 additions & 10 deletions Marlin/src/HAL/HAL_LPC1768/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ extern void setup();
extern void loop();

extern "C" {
#include <lpc17xx_gpio.h>
#include <lpc17xx_gpio.h>
}

#include <usb/usb.h>
Expand All @@ -19,9 +19,9 @@ extern "C" {
#include <usb/mscuser.h>

extern "C" {
#include <debug_frmwrk.h>
#include <chanfs/diskio.h>
#include <chanfs/ff.h>
#include <debug_frmwrk.h>
#include <chanfs/diskio.h>
#include <chanfs/ff.h>
}

#include "../../inc/MarlinConfig.h"
Expand Down Expand Up @@ -59,23 +59,23 @@ extern "C" {

// Runs after clock init and before global static constructors
void SystemPostInit() {
_millis = 0; // Initialise the millisecond counter value;
_millis = 0; // Initialize the millisecond counter value
SysTick_Config(SystemCoreClock / 1000); // Start millisecond global counter

// Runs before setup() need to configure LED_PIN and use to indicate succsessful bootloader execution
// Runs before setup() to configure LED_PIN and used to indicate successful bootloader execution
#if PIN_EXISTS(LED)
SET_DIR_OUTPUT(LED_PIN);
WRITE_PIN_CLR(LED_PIN);

//MKS-SBASE has 3 other LEDS the bootloader uses during flashing, clear them
// MKS_SBASE has 3 other LEDs the bootloader uses during flashing. Clear them.
SET_DIR_OUTPUT(P1_19);
WRITE_PIN_CLR(P1_19);
SET_DIR_OUTPUT(P1_20);
WRITE_PIN_CLR(P1_20);
SET_DIR_OUTPUT(P1_21);
WRITE_PIN_CLR(P1_21);

for (int i = 0; i < 6; ++i) {
for (uint8_t i = 6; i--;) {
TOGGLE(LED_PIN);
delay(100);
}
Expand All @@ -96,7 +96,7 @@ int main(void) {
while (!USB_Configuration && PENDING(millis(), usb_timeout)) {
delay(50);
#if PIN_EXISTS(LED)
TOGGLE(LED_PIN); // Flash fast while USB initialisation completes
TOGGLE(LED_PIN); // Flash quickly during USB initialization
#endif
}

Expand All @@ -105,7 +105,7 @@ int main(void) {
#if NUM_SERIAL > 1
MYSERIAL1.begin(BAUDRATE);
#endif
SERIAL_PRINTF("\n\necho:%s (%dMhz) Initialised\n", isLPC1769() ? "LPC1769" : "LPC1768", SystemCoreClock / 1000000);
SERIAL_PRINTF("\n\necho:%s (%dMhz) Initialized\n", isLPC1769() ? "LPC1769" : "LPC1768", SystemCoreClock / 1000000);
SERIAL_FLUSHTX();
#endif

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ extern "C" {
#include "lpc17xx_iap.h"
}

#define SECTOR_START(sector) ((sector < 16) ? (sector * 0x1000) : ((sector - 14) * 0x8000))
#define SECTOR_START(sector) ((sector < 16) ? (sector * 0x1000) : ((sector - 14) * 0x8000))
#define EEPROM_SECTOR 29
#define EEPROM_SIZE (4096)
#define SECTOR_SIZE (32768)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_STM32F1/HAL.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
// --------------------------------------------------------------------------

#include <stdint.h>
#include <libmaple/atomic.h>
#include <util/atomic.h>
#include <Arduino.h>

// --------------------------------------------------------------------------
Expand Down
Loading