forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes for Mini. M115 fixed.

Browse Source
master
Marcio Teixeira 7 years ago
parent 8d31c36bf0
commit d7f53214e3
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File

21
Marlin/Configuration_LulzBot.h
Unescape View File

@ -63,7 +63,7 @@
#error Angelfish_Aero // Titan AERO (Angelfish) #error Angelfish_Aero // Titan AERO (Angelfish)
#endif #endif
#define LULZBOT_FW_VERSION ".3" #define LULZBOT_FW_VERSION ".4"
// Select options based on printer model // Select options based on printer model
@ -523,8 +523,8 @@
#define LULZBOT_DEFAULT_ACCELERATION 2000 #define LULZBOT_DEFAULT_ACCELERATION 2000
#define LULZBOT_DEFAULT_TRAVEL_ACCELERATION 3000 #define LULZBOT_DEFAULT_TRAVEL_ACCELERATION 3000
#define LULZBOT_Z_MAX_POS 159 #define LULZBOT_Z_MAX_POS 160
#define LULZBOT_Z_MIN_POS -2 #define LULZBOT_Z_MIN_POS 0
#elif defined(LULZBOT_IS_TAZ) #elif defined(LULZBOT_IS_TAZ)
#define DIGIPOT_MOTOR_CURRENT_XY 175 #define DIGIPOT_MOTOR_CURRENT_XY 175
@ -644,8 +644,15 @@
u8g.drawStr(67,62,SHORT_BUILD_VERSION LULZBOT_FW_VERSION); \ u8g.drawStr(67,62,SHORT_BUILD_VERSION LULZBOT_FW_VERSION); \
} while( u8g.nextPage() ); } while( u8g.nextPage() );
// Z Probe w/ Rewipe // Customize version string
#define LULZBOT_DETAILED_BUILD_VERSION SHORT_BUILD_VERSION LULZBOT_FW_VERSION " (LulzBot " LULZBOT_CUSTOM_MACHINE_NAME " " LULZBOT_LCD_TOOLHEAD_NAME ")"
#define LULZBOT_STRING_DISTRIBUTION_DATE __DATE__ __TIME__
#define LULZBOT_SOURCE_CODE_URL "https://code.alephobjects.com/diffusion/MARLIN"
// Bed Probe w/ Rewipe
#define LULZBOT_NUM_REWIPES 1 #define LULZBOT_NUM_REWIPES 1
#define LULZBOT_BED_PROBE_MIN -2 // How far to push into bed before failing.
#if defined(LULZBOT_USE_LCD_DISPLAY) #if defined(LULZBOT_USE_LCD_DISPLAY)
#define LULZBOT_STOP_JOB_CMD card.stopSDPrint(); #define LULZBOT_STOP_JOB_CMD card.stopSDPrint();
@ -654,13 +661,13 @@
#endif #endif
#define LULZBOT_PROBE_Z_WITH_REWIPE(speed) \ #define LULZBOT_PROBE_Z_WITH_REWIPE(speed) \
do_probe_move(0, speed); /* probe; if we reach Z=0, the probe failed */ \ do_probe_move(LULZBOT_BED_PROBE_MIN, speed); /* probe; if we reach limit, the probe failed */ \
for(int rewipes = 1; current_position[Z_AXIS] == 0; rewipes++) { \ for(int rewipes = 1; current_position[Z_AXIS] == LULZBOT_BED_PROBE_MIN; rewipes++) { \
SERIAL_ERRORLNPGM(MSG_REWIPE); \ SERIAL_ERRORLNPGM(MSG_REWIPE); \
LCD_MESSAGEPGM(MSG_REWIPE); \ LCD_MESSAGEPGM(MSG_REWIPE); \
do_blocking_move_to_z(10, MMM_TO_MMS(speed)); /* raise nozzle */ \ do_blocking_move_to_z(10, MMM_TO_MMS(speed)); /* raise nozzle */ \
Nozzle::clean(0, 2, 0, 0); /* wipe nozzle */ \ Nozzle::clean(0, 2, 0, 0); /* wipe nozzle */ \
do_probe_move(0, speed); /* reprobe */ \ do_probe_move(LULZBOT_BED_PROBE_MIN, speed); /* reprobe */ \
if(rewipes >= LULZBOT_NUM_REWIPES) { /* max of tries */ \ if(rewipes >= LULZBOT_NUM_REWIPES) { /* max of tries */ \
SERIAL_ERRORLNPGM("PROBE FAIL CLEAN NOZZLE"); /* cura listens for this message specifically */ \ SERIAL_ERRORLNPGM("PROBE FAIL CLEAN NOZZLE"); /* cura listens for this message specifically */ \
LCD_MESSAGEPGM(MSG_LEVEL_FAIL); /* use a more friendly message on the LCD */ \ LCD_MESSAGEPGM(MSG_LEVEL_FAIL); /* use a more friendly message on the LCD */ \

6
Marlin/Version.h
Unescape View File

@ -41,14 +41,14 @@
* Verbose version identifier which should contain a reference to the location * Verbose version identifier which should contain a reference to the location
* from where the binary was downloaded or the source code was compiled. * from where the binary was downloaded or the source code was compiled.
*/ */
#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " (Github)" #define DETAILED_BUILD_VERSION LULZBOT_DETAILED_BUILD_VERSION
/** /**
* The STRING_DISTRIBUTION_DATE represents when the binary file was built, * The STRING_DISTRIBUTION_DATE represents when the binary file was built,
* here we define this default string as the date where the latest release * here we define this default string as the date where the latest release
* version was tagged. * version was tagged.
*/ */
#define STRING_DISTRIBUTION_DATE "2017-07-04 12:00" #define STRING_DISTRIBUTION_DATE LULZBOT_STRING_DISTRIBUTION_DATE
/** /**
* Required minimum Configuration.h and Configuration_adv.h file versions. * Required minimum Configuration.h and Configuration_adv.h file versions.
@ -78,7 +78,7 @@
* has a distinct Github fork— the Source Code URL should just be the main * has a distinct Github fork— the Source Code URL should just be the main
* Marlin repository. * Marlin repository.
*/ */
#define SOURCE_CODE_URL "https://github.com/MarlinFirmware/Marlin" #define SOURCE_CODE_URL LULZBOT_SOURCE_CODE_URL
/** /**
* Default generic printer UUID. * Default generic printer UUID.

3
README_LulzBot.md
Unescape View File

@ -17,5 +17,4 @@ To select what firmware to build, modify lines 6 and 7 of "Configuration_LulzBot
1. The Makefile does not work. Building must be done via the Arduino IDE (internal builds are being done with 1.8.3) 1. The Makefile does not work. Building must be done via the Arduino IDE (internal builds are being done with 1.8.3)
2. There is no way to tune the FlexyDually properly right now, as Marlin 1.1.4 does not support separate ESTEPs per extruder. 2. There is no way to tune the FlexyDually properly right now, as Marlin 1.1.4 does not support separate ESTEPs per extruder.
3. Printer needs to be power cycled to clear "clean nozzle" state. 3. Printer needs to be power cycled to clear "clean nozzle" state.
4. M114 not reporting complete version string. 4. LCD display will show "Heating" when cooling.
5. LCD display will show "Heating" when cooling.
Write Preview
Loading…
Cancel
Save