MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
326b925557
Firmware/Marlin
History
Scott Lahteine 326b925557 DOGLCD and LCD_PROGRESS_BAR to coexist 
Small changes (and formatting to confuse the diff’er) which first
allows DOGLCD and LCD_PROGRESS_BAR to be enabled in tandem, then a
#warning (rather than error) that the extra progress bar / message
options don’t apply to graphical displays at this time. This leaves
open perhaps combining the progress bar and message area in some future
(or forked custom) graphical LCD display arrangement (at which time the
relevant variables may be moved into ultralcd.cpp with externs in
ultralcd.h). I also added a conditional error that the progress bar and
the filament display may not work well together.
2015-01-09 18:16:56 -08:00
..
example_configurations Correct some mistakes 2015-01-06 21:55:08 +01:00
scripts rename stepper lookup table scipt to be consistent with termistor lookup table script 2015-01-06 10:30:20 +01:00
BlinkM.cpp Corrected LCD only error 2013-10-30 21:52:46 +01:00
BlinkM.h Corrected LCD only error 2013-10-30 21:52:46 +01:00
boards.h Defines for electronics boards 2014-12-18 13:59:31 -08:00
cardreader.cpp Merge branch 'Marlin_v1' into revert-1154-sd_sorting 2014-12-18 23:13:50 +01:00
cardreader.h Merge branch 'Marlin_v1' into revert-1154-sd_sorting 2014-12-18 23:13:50 +01:00
Configuration_adv.h DOGLCD and LCD_PROGRESS_BAR to coexist 2015-01-09 18:16:56 -08:00
Configuration.h Fix calculation of BAL grid fitting into the bed 2015-01-09 10:17:33 -02:00
ConfigurationStore.cpp Fix syntax error caused by previous changes. 2015-01-02 11:12:16 -05:00
ConfigurationStore.h Removed Delta from the default config file. 2013-09-14 13:50:09 +02:00
digipot_mcp4451.cpp Defines for electronics boards 2014-12-18 13:59:31 -08:00
dogm_font_data_marlin.h Removed STB custom font hack from u8glib library and moved to marlin project 2013-04-16 13:54:39 +02:00
dogm_lcd_implementation.h DOGLCD and LCD_PROGRESS_BAR to coexist 2015-01-09 18:16:56 -08:00
DOGMbitmaps.h changed boot logo a bit to test if fat wall goes away 2015-01-09 12:51:21 +01:00
fastio.h Various typo fixes - only in comments, no code changes. 2014-02-25 09:52:58 +00:00
language_an.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language_ca.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language_de.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language_en.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language_es.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language_eu.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language_fi.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language_fr.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language_it.h Correct some mistakes 2015-01-06 21:55:08 +01:00
language_nl.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language_pl.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language_pt.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language_ru.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language.h Update Marlin Firmware URL 2015-01-07 05:26:47 -06:00
LiquidCrystalRus.cpp Various typo fixes - only in comments, no code changes. 2014-02-17 10:58:36 +00:00
LiquidCrystalRus.h Enables support the Cyrillic alphabet for LCD 2012-10-12 19:06:43 +04:00
Makefile Support for Gen3 Monolithic electronics 2014-05-06 19:24:20 -05:00
Marlin_main.cpp Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Development 2015-01-09 21:33:29 +01:00
Marlin.h Fix CoreXY speed calculation 2015-01-06 16:39:48 -02:00
Marlin.ino Add Azteeg X3 Pro as motherboard 68 2014-02-05 01:47:12 -08:00
Marlin.pde Add Azteeg X3 Pro as motherboard 68 2014-02-05 01:47:12 -08:00
MarlinSerial.cpp Simple code cleanup. Rename "homeing" to homing. 2014-10-05 13:20:53 -07:00
MarlinSerial.h Initial SAV MkI (RepRap CloneWars board) integration. 2013-10-30 11:45:32 +01:00
motion_control.cpp Update motion_control.cpp 2014-10-04 09:24:09 +02:00
motion_control.h
pins.h Update pins.h 2014-12-31 13:04:16 +13:00
planner.cpp Fix CoreXY speed calculation 2015-01-06 16:39:48 -02:00
planner.h Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation" 2014-12-21 10:06:05 -02:00
qr_solve.cpp Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation" 2014-12-21 10:06:05 -02:00
qr_solve.h Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation" 2014-12-21 10:06:05 -02:00
Sd2Card.cpp Add feature to check&retry CRC read errors on SD. 2014-05-01 12:03:41 +02:00
Sd2Card.h Add feature to check&retry CRC read errors on SD. 2014-05-01 12:03:41 +02:00
Sd2PinMap.h Initial SAV MkI (RepRap CloneWars board) integration. 2013-10-30 11:45:32 +01:00
SdBaseFile.cpp Few simple fixes that save RAM, as static strings are stored in RAM by default. 2012-11-28 10:30:34 +01:00
SdBaseFile.h Added long filename support. 2012-08-22 14:49:57 +02:00
SdFatConfig.h Merge branch 'Marlin_v1' into revert-1154-sd_sorting 2014-12-18 23:13:50 +01:00
SdFatStructs.h Added long filename support. 2012-08-22 14:49:57 +02:00
SdFatUtil.cpp Fix regressions affecting compilation 2014-12-30 07:36:18 -08:00
SdFatUtil.h
SdFile.cpp First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions. 2012-11-06 12:06:41 +01:00
SdFile.h
SdInfo.h
SdVolume.cpp
SdVolume.h
Servo.cpp Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation" 2014-12-21 10:06:05 -02:00
Servo.h Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation" 2014-12-21 10:06:05 -02:00
speed_lookuptable.h Made the 2nd speed lookup table condition more explicit. 2012-11-11 12:02:48 +01:00
stepper.cpp Toshiba Stepper Driver support 2014-12-03 15:01:52 +01:00
stepper.h Various typo fixes - only in comments, no code changes. 2014-02-25 09:52:58 +00:00
temperature.cpp I have added some code in the "temperature.cpp" for have the possibility of control the time of the states with the heater drived by relays, with this feature now it is possible use PID function in conjunction with relay to control the temperature. I have made some tests and the temperature stay always in the range of +-1°C from the setted temp. 2015-01-06 18:32:17 +01:00
temperature.h Added "auto fan" checks to PID_autotune 2014-12-23 23:50:00 -05:00
thermistortables.h Update line 627 ,wrong number on thermistortables 2014-10-06 14:21:44 +02:00
ultralcd_implementation_hitachi_HD44780.h Add Filament menu and add Filament/Retract settings to config store. 2015-01-02 11:12:15 -05:00
ultralcd_st7920_u8glib_rrd.h Various typo fixes - only in comments, no code changes. 2014-02-17 10:58:36 +00:00
ultralcd.cpp DOGLCD and LCD_PROGRESS_BAR to coexist 2015-01-09 18:16:56 -08:00
ultralcd.h DOGLCD and LCD_PROGRESS_BAR to coexist 2015-01-09 18:16:56 -08:00
vector_3.cpp Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation" 2014-12-21 10:06:05 -02:00
vector_3.h Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation" 2014-12-21 10:06:05 -02:00
watchdog.cpp Fix compiling the watchdog error message when the manual reset watchdog is used. 2012-12-06 10:27:50 +01:00
watchdog.h Various typo fixes - only in comments, no code changes. 2014-02-17 10:58:36 +00:00