3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-23 20:18:52 +00:00
Code Issues Releases Wiki Activity
ea897654a4
MarlinFirmware/Marlin
History
AnHardt ea897654a4 Moved the definitions of the LCD_STR_* to Conditionals.h 
to avoid errors in Marlin_main.cpp. #1860

In the include tree of Marlin_main.cpp the decision between the display types is not made.
To include the right LCD_STR_* ether 'dogm_lcd_implementation.h' or 'ultralcd_implementation_hitachi_HD44780.h' with all their code.
A 'dogm_lcd_implementation.h.h' would be a curiosity.
So i moved both of the definition blocks to conditionals.h

On the long term it could make sense to use the same numbering for the u8glib and the hitachi symbols.
2015-04-08 21:53:58 +02:00
..
configurator Thermistor values for configurator 2015-04-08 03:12:21 -07:00
example_configurations Thermistor values for configurator 2015-04-08 03:12:21 -07:00
fonts Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 2015-03-19 12:35:43 +01:00
scripts Moved font directory. Updated README.fonts 2015-03-16 17:27:27 +01:00
BlinkM.cpp Cleanup of cardreader.* 2015-03-02 07:06:01 -08:00
BlinkM.h Cleanup of cardreader.* 2015-03-02 07:06:01 -08:00
boards.h Add KosselPro 2015-04-02 09:20:24 -05:00
cardreader.cpp Add code_value_short and SERIAL_CHAR 2015-04-03 21:43:30 -07:00
cardreader.h Cleanup of cardreader.* 2015-03-02 07:06:01 -08:00
Conditionals.h Moved the definitions of the LCD_STR_* to Conditionals.h 2015-04-08 21:53:58 +02:00
Configuration_adv.h Updates for the configurator 2015-04-06 23:16:01 -07:00
Configuration.h Thermistor values for configurator 2015-04-08 03:12:21 -07:00
ConfigurationStore.cpp Merge pull request #1796 from thinkyhead/pidbed_temp_eeprom 2015-04-03 20:03:38 -07:00
ConfigurationStore.h Cleanup of cardreader.* 2015-03-02 07:06:01 -08:00
digipot_mcp4451.cpp Cleanup of cardreader.* 2015-03-02 07:06:01 -08:00
dogm_font_data_6x9_marlin.h Added 5 new font.h files to main directory. 2015-03-07 00:09:49 +01:00
dogm_font_data_HD44780_C.h Corrected Cyrillic fonts. Round II. 2015-03-14 15:10:45 +01:00
dogm_font_data_HD44780_J.h Added 5 new font.h files to main directory. 2015-03-07 00:09:49 +01:00
dogm_font_data_HD44780_W.h Added 5 new font.h files to main directory. 2015-03-07 00:09:49 +01:00
dogm_font_data_ISO10646_1.h Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 2015-03-19 12:35:43 +01:00
dogm_font_data_ISO10646_5_Cyrillic.h Corrected cyrillic font again 2015-03-16 16:59:14 +01:00
dogm_font_data_ISO10646_Kana.h Added 5 new font.h files to main directory. 2015-03-07 00:09:49 +01:00
dogm_font_data_Marlin_symbols.h Added 5 new font.h files to main directory. 2015-03-07 00:09:49 +01:00
dogm_lcd_implementation.h Moved the definitions of the LCD_STR_* to Conditionals.h 2015-04-08 21:53:58 +02:00
DOGMbitmaps.h Replaced some literal constants with defines 2015-02-03 09:52:29 +01:00
fastio.h Spacing and spelling 2015-04-03 22:54:48 -07:00
language_an.h Added new trasnslatable labels. 2015-03-31 16:59:43 +02:00
language_ca.h Added new trasnslatable labels. 2015-03-31 16:59:43 +02:00
language_de.h Added new trasnslatable labels. 2015-03-31 16:59:43 +02:00
language_en.h Added new trasnslatable labels. 2015-03-31 16:59:43 +02:00
language_es.h Added new trasnslatable labels. 2015-03-31 16:59:43 +02:00
language_eu.h Added new trasnslatable labels. 2015-03-31 16:59:43 +02:00
language_fi.h Added new trasnslatable labels. 2015-03-31 16:59:43 +02:00
language_fr.h Added new trasnslatable labels. 2015-03-31 16:59:43 +02:00
language_it.h Added new trasnslatable labels. 2015-03-31 16:59:43 +02:00
language_kana_utf8.h Added new trasnslatable labels. 2015-03-31 16:59:43 +02:00
language_kana.h Added new trasnslatable labels. 2015-03-31 16:59:43 +02:00
language_nl.h Added new trasnslatable labels. 2015-03-31 16:59:43 +02:00
language_pl.h Added new trasnslatable labels. 2015-03-31 16:59:43 +02:00
language_pt-br.h Added new trasnslatable labels. 2015-03-31 16:59:43 +02:00
language_pt.h Added new trasnslatable labels. 2015-03-31 16:59:43 +02:00
language_ru.h Update language_ru.h 2015-04-08 13:18:45 +06:00
language_test.h Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
language.h Deferring default definition made #undef unnecessary 2015-04-04 05:48:07 -05:00
Makefile Remove hardcoded programmer option (-cwiring). Use variable AVRDUDE_PROGRAMMER. 2015-01-18 20:18:43 +03:00
Marlin_main.cpp current_position not static 2015-04-08 01:05:39 -07:00
Marlin.h IsStopped / IsRunning inline 2015-04-08 00:56:19 -07:00
Marlin.ino - Rename WRITE_E_STEP for consistency 2015-03-14 04:28:22 -07:00
Marlin.pde - Rename WRITE_E_STEP for consistency 2015-03-14 04:28:22 -07:00
MarlinSerial.cpp Spacing and spelling 2015-04-03 22:54:48 -07:00
MarlinSerial.h Spacing and spelling 2015-04-03 22:54:48 -07:00
mesh_bed_leveling.cpp Fix up bed leveling code 2015-03-25 20:36:24 -07:00
mesh_bed_leveling.h Additional pin tests, cleanup 2015-04-03 15:31:35 -07:00
motion_control.cpp
motion_control.h
pins_3DRAG.h Fix compiler warnings 2015-03-27 20:29:05 -07:00
pins_5DPRINT.h Fix compiler warnings 2015-03-27 20:29:05 -07:00
pins_99.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_AZTEEG_X1.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_AZTEEG_X3_PRO.h Azteeg X3 Pro Pin fix ups 2015-04-05 23:34:56 -06:00
pins_AZTEEG_X3.h Viki 2 Pins from Manual 2015-03-28 22:11:12 -06:00
pins_BAM_DICE_DUE.h Fix compiler warnings 2015-03-27 20:29:05 -07:00
pins_BRAINWAVE.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_CHEAPTRONIC.h Cleanup rotary encoder encrot* defines 2015-03-02 06:42:48 -08:00
pins_DUEMILANOVE_328P.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_ELEFU_3.h Cleanup rotary encoder encrot* defines 2015-03-02 06:42:48 -08:00
pins_FELIX2.h Fix compiler warnings 2015-03-27 20:29:05 -07:00
pins_GEN3_MONOLITHIC.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_GEN3_PLUS.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_GEN6_DELUXE.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_GEN6.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_GEN7_12.h cleanup 2015-01-27 15:32:34 -08:00
pins_GEN7_13.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_GEN7_14.h cleanup 2015-01-27 15:32:34 -08:00
pins_GEN7_CUSTOM.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_HEPHESTOS.h Fix compiler warnings 2015-03-27 20:29:05 -07:00
pins_K8200.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_LEAPFROG.h Max endstop pins disabled by configuration 2015-01-27 15:33:21 -08:00
pins_MEGATRONICS_1.h Cleanup rotary encoder encrot* defines 2015-03-02 06:42:48 -08:00
pins_MEGATRONICS_2.h Cleanup rotary encoder encrot* defines 2015-03-02 06:42:48 -08:00
pins_MEGATRONICS_3.h Cleanup rotary encoder encrot* defines 2015-03-02 06:42:48 -08:00
pins_MEGATRONICS.h Cleanup rotary encoder encrot* defines 2015-03-02 06:42:48 -08:00
pins_MELZI_1284.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_MELZI.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_OMCA_A.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_OMCA.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_PRINTRBOARD.h Viki 2 Pins from Manual 2015-03-28 22:11:12 -06:00
pins_RAMBO.h Update pins_RAMBO.h 2015-03-28 22:29:54 -06:00
pins_RAMPS_13.h Fix compile error with Z_DUAL_ENDSTOPS 2015-04-05 20:48:08 -07:00
pins_RAMPS_OLD.h Max endstop pins disabled by configuration 2015-01-27 15:33:21 -08:00
pins_RUMBA.h Cleanup of temperature code 2015-02-24 04:46:11 -08:00
pins_SANGUINOLOLU_11.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_SANGUINOLOLU_12.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_SAV_MKI.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_SETHI.h cleanup 2015-01-27 15:32:34 -08:00
pins_STB_11.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_TEENSY2.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_TEENSYLU.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_ULTIMAIN_2.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_ULTIMAKER_OLD.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_ULTIMAKER.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_WITBOX.h Fix compiler warnings 2015-03-27 20:29:05 -07:00
pins.h Fix missing backslash in macro 2015-04-04 03:35:16 -07:00
planner.cpp current_position not static 2015-04-08 01:05:39 -07:00
planner.h ARRAY_BY_EXTRUDERS, shorthand to sync planner 2015-03-28 20:33:21 -07:00
qr_solve.cpp Fix up the code to eliminate warnings 2015-03-27 00:32:58 -07:00
qr_solve.h
SanityCheck.h Moved checks into SanityCheck.h + removed previous added checks. 2015-04-07 22:58:08 +02:00
Sd2Card.cpp - Rename WRITE_E_STEP for consistency 2015-03-14 04:28:22 -07:00
Sd2Card.h
Sd2PinMap.h Added support for Atmega 1281 chip 2015-04-01 05:15:27 +02:00
SdBaseFile.cpp Rename lastnr to autostart_index and... 2015-01-24 04:57:44 -08:00
SdBaseFile.h Pass sel to lcd_implementation_mark_as_selected 2015-03-19 13:40:36 -07:00
SdFatConfig.h Rename lastnr to autostart_index and... 2015-01-24 04:57:44 -08:00
SdFatStructs.h
SdFatUtil.cpp
SdFatUtil.h
SdFile.cpp
SdFile.h
SdInfo.h
SdVolume.cpp - Rename WRITE_E_STEP for consistency 2015-03-14 04:28:22 -07:00
SdVolume.h
Servo.cpp Formatting cleanup of quiet sources 2015-01-23 22:26:52 -08:00
Servo.h Spacing and spelling 2015-04-03 22:54:48 -07:00
speed_lookuptable.h Revert "Reduce PROGMEM warnings" 2015-01-16 16:48:22 +01:00
stepper_indirection.cpp - Add support for L6470 Drivers. 2015-02-27 12:43:23 +01:00
stepper_indirection.h - Add support for L6470 Drivers. 2015-02-27 12:43:23 +01:00
stepper.cpp Fix compile error with Z_DUAL_ENDSTOPS 2015-04-05 20:48:08 -07:00
stepper.h New Feature: Z_DUAL_ENDSTOPS 2015-03-24 14:06:44 -03:00
temperature.cpp IsStopped / IsRunning inline 2015-04-08 00:56:19 -07:00
temperature.h Merge pull request #1787 from thinkyhead/fixup_tr 2015-04-03 20:06:56 -07:00
thermistortables.h Extend the idea of dummy temperature sensors. 2015-02-24 11:02:16 +01:00
ultralcd_implementation_hitachi_HD44780.h Moved the definitions of the LCD_STR_* to Conditionals.h 2015-04-08 21:53:58 +02:00
ultralcd_st7920_u8glib_rrd.h In ST7920_SWSPI_SND_8BIT(uint8_t val) parameter is unsigned 2015-03-30 01:40:58 +02:00
ultralcd.cpp Merge branch 'Development' into dev_version 2015-04-07 21:14:00 -07:00
ultralcd.h Additional pin tests, cleanup 2015-04-03 15:31:35 -07:00
utf_mapper.h Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
vector_3.cpp Add code_value_short and SERIAL_CHAR 2015-04-03 21:43:30 -07:00
vector_3.h Fix ECHOPAIR ambiguity 2015-03-27 00:46:39 -07:00
watchdog.cpp
watchdog.h