1
0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-23 20:18:52 +00:00
MarlinFirmware/Marlin
Diederik van der Pant 5b270417ed added shift register pins for reprapworld keypad v1.1
I recently upgraded my Marlin to V1.1.x and decided to publish my fix to make marlin compile properly when #define board megatronics 2 in combination with #define reprapworld keypad v1.1. It was previously described in the comments of a closed pull request. MarlinFirmware#472. All the buttons on the keypad are now operational.
2017-06-09 14:17:47 +02:00
..
example_configurations Merge pull request #6965 from thinkyhead/bf_save_more_sram 2017-06-07 17:34:19 -05:00
blinkm.cpp Patch #else / #endif comments 2017-05-09 12:37:23 -05:00
blinkm.h
boards.h Clean up after recent commits 2017-06-02 23:45:52 -05:00
buzzer.h Spacing, const, comments 2017-06-07 16:07:38 -05:00
cardreader.cpp Patch #else / #endif comments 2017-05-09 12:37:23 -05:00
cardreader.h Patch #else / #endif comments 2017-05-09 12:37:23 -05:00
circularqueue.h
Conditionals_LCD.h Spacing, const, comments 2017-06-07 16:07:38 -05:00
Conditionals_post.h Prevent illegal leveling combinations 2017-05-31 23:36:57 -05:00
Conditionals.h
Configuration_adv.h Merge pull request #6965 from thinkyhead/bf_save_more_sram 2017-06-07 17:34:19 -05:00
configuration_store.cpp change to DWORD 2017-06-08 16:15:02 -05:00
configuration_store.h Fix broken EEPROM save/load 2017-05-17 12:41:27 -04:00
Configuration.h Find three-point leveling points on Delta 2017-06-07 16:07:38 -05:00
dac_mcp4728.cpp
dac_mcp4728.h
digipot_mcp4018.cpp Save lots of PROGMEM, ~20b SRAM with DIGIPOT_I2C 2017-06-07 16:07:38 -05:00
digipot_mcp4451.cpp Save lots of PROGMEM, ~20b SRAM with DIGIPOT_I2C 2017-06-07 16:07:38 -05:00
dogm_bitmaps.h
dogm_font_data_6x9_marlin.h
dogm_font_data_HD44780_C.h
dogm_font_data_HD44780_J.h
dogm_font_data_HD44780_W.h
dogm_font_data_ISO10646_1_PL.h Polish font 2017-04-21 21:42:41 -05:00
dogm_font_data_ISO10646_1_tr.h
dogm_font_data_ISO10646_1.h
dogm_font_data_ISO10646_5_Cyrillic.h
dogm_font_data_ISO10646_CN.h
dogm_font_data_ISO10646_Greek.h
dogm_font_data_ISO10646_Kana.h
dogm_font_data_Marlin_symbols.h
duration_t.h
endstop_interrupts.h Patch #else / #endif comments 2017-05-09 12:37:23 -05:00
endstops.cpp Towards supporting Z2 in Endstops::report_state 2017-05-02 15:39:32 -05:00
endstops.h
enum.h Unify M600 and M125 pause features (#6407) 2017-05-26 13:01:02 -05:00
fastio_168.h Split up fastio.h, document pin mappings 2017-05-21 10:33:27 -05:00
fastio_644.h Split up fastio.h, document pin mappings 2017-05-21 10:33:27 -05:00
fastio_1280.h Split up fastio.h, document pin mappings 2017-05-21 10:33:27 -05:00
fastio_1281.h Split up fastio.h, document pin mappings 2017-05-21 10:33:27 -05:00
fastio_AT90USB-Marlin.h Split up fastio.h, document pin mappings 2017-05-21 10:33:27 -05:00
fastio_AT90USB-Teensy.h Cleanup some fastio code 2017-05-22 17:38:36 -05:00
fastio.h copied file changes from PR #5685 2017-05-31 13:22:38 -05:00
G26_Mesh_Validation_Tool.cpp Various code style tweaks 2017-06-07 16:07:38 -05:00
gcode.cpp Clean up after recent commits 2017-06-02 23:45:52 -05:00
gcode.h Make Parser::seen volatile 2017-06-02 23:45:52 -05:00
hex_print_routines.cpp New GCode Parser - Implementation 2017-05-23 14:15:10 -05:00
hex_print_routines.h New GCode Parser - Implementation 2017-05-23 14:15:10 -05:00
language_an.h Case light as a toggle menu item 2017-05-28 14:32:07 -05:00
language_bg.h Case light as a toggle menu item 2017-05-28 14:32:07 -05:00
language_ca.h Case light as a toggle menu item 2017-05-28 14:32:07 -05:00
language_cn.h Add more options to the Bed Leveling menu 2017-05-28 14:04:28 -05:00
language_cz.h Case light as a toggle menu item 2017-05-28 14:32:07 -05:00
language_da.h Add more options to the Bed Leveling menu 2017-05-28 14:04:28 -05:00
language_de.h update language_de.h (#6986) 2017-06-08 10:04:52 -05:00
language_el-gr.h Add more options to the Bed Leveling menu 2017-05-28 14:04:28 -05:00
language_el.h Add more options to the Bed Leveling menu 2017-05-28 14:04:28 -05:00
language_en.h Translatable Strings for ubl_G29 (#6990) 2017-06-08 10:09:39 -05:00
language_es.h Case light as a toggle menu item 2017-05-28 14:32:07 -05:00
language_eu.h Case light as a toggle menu item 2017-05-28 14:32:07 -05:00
language_fi.h Add more options to the Bed Leveling menu 2017-05-28 14:04:28 -05:00
language_fr.h Case light as a toggle menu item 2017-05-28 14:32:07 -05:00
language_gl.h Case light as a toggle menu item 2017-05-28 14:32:07 -05:00
language_hr.h Case light as a toggle menu item 2017-05-28 14:32:07 -05:00
language_it.h Case light as a toggle menu item 2017-05-28 14:32:07 -05:00
language_kana_utf8.h Case light as a toggle menu item 2017-05-28 14:32:07 -05:00
language_kana.h Case light as a toggle menu item 2017-05-28 14:32:07 -05:00
language_nl.h Case light as a toggle menu item 2017-05-28 14:32:07 -05:00
language_pl-DOGM.h Case light as a toggle menu item 2017-05-28 14:32:07 -05:00
language_pl-HD44780.h Case light as a toggle menu item 2017-05-28 14:32:07 -05:00
language_pl.h Case light as a toggle menu item 2017-05-28 14:32:07 -05:00
language_pt_utf8.h Add more options to the Bed Leveling menu 2017-05-28 14:04:28 -05:00
language_pt-br_utf8.h Add more options to the Bed Leveling menu 2017-05-28 14:04:28 -05:00
language_pt-br.h Add more options to the Bed Leveling menu 2017-05-28 14:04:28 -05:00
language_pt.h Add more options to the Bed Leveling menu 2017-05-28 14:04:28 -05:00
language_ru.h Add more options to the Bed Leveling menu 2017-05-28 14:04:28 -05:00
language_test.h MSG_VOLUMETRIC => MSG_FILAMENT 2017-04-17 16:39:36 -05:00
language_tr.h Case light as a toggle menu item 2017-05-28 14:32:07 -05:00
language_uk.h Case light as a toggle menu item 2017-05-28 14:32:07 -05:00
language_zh_CN.h Add more options to the Bed Leveling menu 2017-05-28 14:04:28 -05:00
language_zh_TW.h Add more options to the Bed Leveling menu 2017-05-28 14:04:28 -05:00
language.h M421 Mesh Point Offset and misc. UBL clean up (#6685) 2017-05-10 18:54:10 -05:00
least_squares_fit.cpp UBL G29 -P3.1 smart fill (#6823) 2017-05-22 12:33:50 -05:00
least_squares_fit.h Apply const float & more 2017-05-22 17:38:36 -05:00
M100_Free_Mem_Chk.cpp New GCode Parser - Implementation 2017-05-23 14:15:10 -05:00
macros.h Simplify counting of printable characters 2017-05-31 23:45:41 -05:00
Makefile fix missing serial.cpp in Makefile 2017-04-17 11:59:03 +02:00
Marlin_main.cpp add static 2017-06-08 14:59:21 -05:00
Marlin.h fix "hex_address not defined" when UBL is enabled 2017-06-03 13:19:55 -05:00
Marlin.ino
MarlinConfig.h
MarlinSerial.cpp Patch MarlinSerial to match up with 32-bit version 2017-04-02 04:39:18 -05:00
MarlinSerial.h Patch MarlinSerial to match up with 32-bit version 2017-04-02 04:39:18 -05:00
mesh_bed_leveling.cpp Patch #else / #endif comments 2017-05-09 12:37:23 -05:00
mesh_bed_leveling.h Patch #else / #endif comments 2017-05-09 12:37:23 -05:00
nozzle.cpp Use new attribute macros in more places 2017-05-22 17:38:58 -05:00
nozzle.h Use new attribute macros in more places 2017-05-22 17:38:58 -05:00
pins_3DRAG.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_5DPRINT.h
pins_AZTEEG_X1.h
pins_AZTEEG_X3_PRO.h Cleanup of spacing and formatting 2017-06-04 11:31:43 -05:00
pins_AZTEEG_X3.h Cleanup of spacing and formatting 2017-06-04 11:31:43 -05:00
pins_BAM_DICE_DUE.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_BQ_ZUM_MEGA_3D.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_BRAINWAVE_PRO.h Pins-related cleanup, formatting 2017-05-21 07:18:03 -05:00
pins_BRAINWAVE.h Pins-related cleanup, formatting 2017-05-21 07:18:03 -05:00
pins_CHEAPTRONIC.h
pins_CHEAPTRONICv2.h Easier override of FILWIDTH_PIN 2017-06-02 12:05:46 -05:00
pins_CNCONTROLS_11.h
pins_CNCONTROLS_12.h
pins_ELEFU_3.h
pins_FELIX2.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_GEN3_MONOLITHIC.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_GEN3_PLUS.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_GEN6_DELUXE.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_GEN6.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_GEN7_12.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_GEN7_13.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_GEN7_14.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_GEN7_CUSTOM.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_K8200.h
pins_K8400.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_LEAPFROG.h
pins_MEGACONTROLLER.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_MEGATRONICS_2.h added shift register pins for reprapworld keypad v1.1 2017-06-09 14:17:47 +02:00
pins_MEGATRONICS_3.h Neater Megatronics 3 pins 2017-05-24 17:49:23 -05:00
pins_MEGATRONICS.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_MELZI_MAKR3D.h #if defined => #ifdef / PIN_EXISTS 2017-03-22 20:51:11 -05:00
pins_MELZI.h #if defined => #ifdef / PIN_EXISTS 2017-03-22 20:51:11 -05:00
pins_MIGHTYBOARD_REVE.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_MINIRAMBO.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_MINITRONICS.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_MKS_13.h Patch pins files hotends/e-steppers sanity check 2017-04-07 10:46:33 -05:00
pins_MKS_BASE.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_OMCA_A.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_OMCA.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_PRINTRBOARD_REVF.h Easier override of FILWIDTH_PIN 2017-06-02 12:05:46 -05:00
pins_PRINTRBOARD.h Easier override of FILWIDTH_PIN 2017-06-02 12:05:46 -05:00
pins_RAMBO.h Easier override of FILWIDTH_PIN 2017-06-02 12:05:46 -05:00
pins_RAMPS_13.h
pins_RAMPS_OLD.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_RAMPS.h Support for ZRIB v2.0 Control Board 2017-06-02 12:05:46 -05:00
pins_RIGIDBOARD_V2.h Need to define this for Rigidboard V2 2017-04-30 19:04:27 -05:00
pins_RIGIDBOARD.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_RUMBA.h Pins-related cleanup, formatting 2017-05-21 07:18:03 -05:00
pins_SAINSMART_2IN1.h Patch pins files hotends/e-steppers sanity check 2017-04-07 10:46:33 -05:00
pins_SANGUINOLOLU_11.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_SANGUINOLOLU_12.h #if defined => #ifdef / PIN_EXISTS 2017-03-22 20:51:11 -05:00
pins_SAV_MKI.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_SCOOVO_X9H.h Easier override of FILWIDTH_PIN 2017-06-02 12:05:46 -05:00
pins_SETHI.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_STB_11.h #if defined => #ifdef / PIN_EXISTS 2017-03-22 20:51:11 -05:00
pins_TEENSY2.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_TEENSYLU.h Pins-related cleanup, formatting 2017-05-21 07:18:03 -05:00
pins_ULTIMAIN_2.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_ULTIMAKER_OLD.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_ULTIMAKER.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pins_ZRIB_V20.h Support for ZRIB v2.0 Control Board 2017-06-02 12:05:46 -05:00
pins.h Cleanup stepper current control config options 2017-06-07 16:07:38 -05:00
pinsDebug_list.h SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
pinsDebug_Teensyduino.h Remove extraneous whitespace 2017-03-18 03:17:39 -05:00
pinsDebug.h Pins-related cleanup, formatting 2017-05-21 07:18:03 -05:00
planner_bezier.cpp
planner_bezier.h
planner.cpp Ubl delta fixes and improvements (#6941) 2017-06-03 17:11:43 -05:00
planner.h G33 evolutionary changes 2017-05-20 19:23:39 -05:00
point_t.h
printcounter.cpp Cosmetic patches 2017-04-26 06:24:23 -05:00
printcounter.h Cosmetic patches 2017-04-26 06:24:23 -05:00
qr_solve.cpp
qr_solve.h
SanityCheck.h Improve sanity checks with static_assert, organize 2017-06-07 16:07:38 -05:00
Sd2Card.cpp Format hex values as uppercase 2017-04-21 21:42:41 -05:00
Sd2Card.h
SdBaseFile.cpp Reference op with variable name 2017-05-28 11:33:22 -05:00
SdBaseFile.h Reference op with variable name 2017-05-28 11:33:22 -05:00
SdFatConfig.h
SdFatStructs.h
SdFatUtil.cpp
SdFatUtil.h
SdFile.cpp
SdFile.h
SdInfo.h
SdVolume.cpp
SdVolume.h
serial.cpp Add proportional font adjustment ratio 2017-05-10 17:19:03 -04:00
serial.h Ensure Arduino.h and configs are included for serial.cpp 2017-05-17 05:07:35 -05:00
servo.cpp Patch #else / #endif comments 2017-05-09 12:37:23 -05:00
servo.h Add macros for delays by machine cycle 2017-04-11 09:18:32 -05:00
softspi.h Clean up excess whitespace, comment formatting 2017-04-28 18:32:38 -05:00
speed_lookuptable.h
spi.h Use new attribute macros in more places 2017-05-22 17:38:58 -05:00
stepper_dac.cpp # This is a combination of 2 commits. 2017-04-06 16:16:27 -05:00
stepper_dac.h
stepper_indirection.cpp Cleanup, extend TMC2130 implementation 2017-04-14 23:00:00 -05:00
stepper_indirection.h Updates to support 5 extruders 2017-04-09 03:49:16 -05:00
stepper.cpp Unused var in Stepper 2017-06-04 17:25:16 -05:00
stepper.h Format hex values as uppercase 2017-04-21 21:42:41 -05:00
stopwatch.cpp General comment cleanup 2017-04-08 18:58:33 -05:00
stopwatch.h Patch #else / #endif comments 2017-05-09 12:37:23 -05:00
temperature.cpp Save 92b PROGMEM, 14b SRAM with extruder auto fan 2017-06-07 16:07:38 -05:00
temperature.h fix redefinition errors for redundant_temperature 2017-06-03 16:40:14 -05:00
thermistornames.h Add Thermistor 75: MGB18 silicon pad 2017-03-18 11:35:20 -05:00
thermistortable_1.h
thermistortable_2.h
thermistortable_3.h
thermistortable_4.h
thermistortable_5.h
thermistortable_6.h
thermistortable_7.h
thermistortable_8.h
thermistortable_9.h
thermistortable_10.h
thermistortable_11.h
thermistortable_12.h
thermistortable_13.h
thermistortable_20.h Header and pins changes to support 5 extruders 2017-04-07 10:46:36 -05:00
thermistortable_51.h
thermistortable_52.h
thermistortable_55.h
thermistortable_60.h
thermistortable_66.h
thermistortable_70.h
thermistortable_71.h
thermistortable_75.h Add Thermistor 75: MGB18 silicon pad 2017-03-18 11:35:20 -05:00
thermistortable_110.h
thermistortable_147.h
thermistortable_998.h
thermistortable_999.h
thermistortable_1010.h
thermistortable_1047.h
thermistortables.h Misc. Clean Up (#6822) 2017-05-21 22:09:51 -05:00
twibus.cpp Patch #else / #endif comments 2017-05-09 12:37:23 -05:00
twibus.h Patch #else / #endif comments 2017-05-09 12:37:23 -05:00
types.h
ubl_G29.cpp Translatable Strings for ubl_G29 (#6990) 2017-06-08 10:09:39 -05:00
ubl_motion.cpp Various code style tweaks 2017-06-07 16:07:38 -05:00
ubl.cpp Ubl delta fixes and improvements (#6941) 2017-06-03 17:11:43 -05:00
ubl.h Various code style tweaks 2017-06-07 16:07:38 -05:00
ultralcd_impl_DOGM.h Maintain message scroll rate 2017-06-04 17:25:15 -05:00
ultralcd_impl_HD44780.h Recover 32 bytes of SRAM in Marlin bootscreen code 2017-06-07 16:07:38 -05:00
ultralcd_st7920_u8glib_rrd.h Patch #else / #endif comments 2017-05-09 12:37:23 -05:00
ultralcd.cpp Merge pull request #6965 from thinkyhead/bf_save_more_sram 2017-06-07 17:34:19 -05:00
ultralcd.h copied file changes from PR #5685 2017-05-31 13:22:38 -05:00
utf_mapper.h Simplify counting of printable characters 2017-05-31 23:45:41 -05:00
utility.cpp Reference op with variable name 2017-05-28 11:33:22 -05:00
utility.h Reference op with variable name 2017-05-28 11:33:22 -05:00
vector_3.cpp Use 'sq' macro where possible 2017-05-02 22:22:23 -05:00
vector_3.h Reference op with variable name 2017-05-28 11:33:22 -05:00
Version.h bugfix-1.1.x ReadMe, Version, helper scripts 2017-05-04 07:17:10 -05:00
watchdog.cpp Patch #else / #endif comments 2017-05-09 12:37:23 -05:00
watchdog.h