Commit Graph
100 Commits
Author SHA1 Message Date
Scott LahteineandGitHub ce65c13a97 Merge pull request #7398 from fiveangle/bf_lcd_bed_level_requirements
Clarify LCD_BED_LEVELING requirements
2017-08-01 17:46:07 -05:00
Scott LahteineandGitHub 6ef71c3d5f Merge pull request #7397 from Kaibob2/patch-4
Fix for #7395
2017-08-01 17:40:59 -05:00
Scott LahteineandGitHub 7ef0650504 Merge pull request #7386 from oysteinkrog/fix/DualX
Fix DUAL_X_CARRIAGE movement
2017-07-31 20:30:06 -05:00
Scott LahteineandGitHub 08b0456d91 Merge pull request #7379 from thinkyhead/bf_manual_bed_level_floor
Manual Bed Leveling: Goto previous Z height at each probe point
2017-07-30 05:41:12 -05:00
Scott LahteineandGitHub 850e404838 Merge pull request #7380 from thinkyhead/bf_touchy_probe_delay
Implement probing delay for piezo sensors
2017-07-30 05:39:45 -05:00
Scott LahteineandGitHub 29eef360d0 Merge pull request #7308 from thinkyhead/bf_cleanup_config_adv
Fixes for FWRETRACT
2017-07-29 21:20:19 -05:00
Scott LahteineandGitHub ff06e1a030 Merge pull request #7372 from tcm0116/delta_calib_menu
Move Delta Calibration menu to the Prepare menu
2017-07-29 21:05:03 -05:00
Scott LahteineandGitHub 8b0bd44b1e Merge pull request #7368 from thinkyhead/bf_fix_warnings
Patch to fix some compiler warnings
2017-07-28 02:53:13 -05:00
Scott LahteineandGitHub 48c5f3dddf Tweak kill action #ifdef 2017-07-27 23:42:01 -05:00
Scott LahteineandGitHub be7a9a07c5 Don't reset grid with G29 Q + PROBE_MANUALLY 2017-07-27 22:47:43 -05:00
Scott LahteineandGitHub dfe670247d Merge pull request #7363 from marcio-ao/bugfix-1.1.x
Makefile fixes and U8G support.
2017-07-27 21:31:56 -05:00
Scott LahteineandGitHub e52c1a0882 Merge pull request #7341 from thinkyhead/bf_bed_size
Add X_BED_SIZE, Y_BED_SIZE to configurations
2017-07-27 04:05:24 -05:00
Scott LahteineandGitHub 5b69d67da9 Merge pull request #7359 from fiveangle/pio_printrboard_revf
Add PIO entry for PRINTRBOARD_REVF
2017-07-26 23:09:06 -05:00
Scott LahteineandGitHub a972c060d7 Merge pull request #7347 from fiveangle/at90usb_usbcon_unification
Remove extraneous USBCON defines for AT90USB boards
2017-07-26 21:44:18 -05:00
Scott LahteineandGitHub 21591352d7 Merge pull request #7340 from thinkyhead/bf_neopixel_rgbw
Add support for Printrbot Neopixel RGBW strip.
2017-07-22 16:19:12 -05:00
Scott LahteineandGitHub d6d6043548 Merge pull request #7338 from thinkyhead/bf_mks_ps_on_pin
MKS 1.3+: Add pin mapping for PS_ON
2017-07-21 20:00:26 -05:00
Scott LahteineandGitHub 03989824fa Merge pull request #7339 from thinkyhead/bf_russian_part_1
Update Russian translation - Part 1
2017-07-21 19:57:18 -05:00
Scott LahteineandGitHub b7a16e4468 Merge pull request #7315 from fixoid/patch-1
Fixing SWITCHING_EXTRUDER feature to work with HOTENDS > 1
2017-07-21 19:10:54 -05:00
Scott LahteineandGitHub 60cb2bd4e7 Merge pull request #7332 from thinkyhead/bf_before_fwretract
Improve FWRETRACT comments
2017-07-21 00:20:56 -05:00
Scott LahteineandGitHub b9809ea86c Merge pull request #7281 from thinkyhead/bf_seen_not_volatile
Fixes for recent merges
2017-07-13 00:54:10 -05:00
Scott LahteineandGitHub e5904c4df8 Merge pull request #7275 from thinkyhead/bf_seen_not_volatile
Volatile keyword not needed for parser.seen
2017-07-10 16:11:08 -05:00
Scott LahteineandGitHub f63f1ff12c Merge pull request #7272 from thinkyhead/bf_user_menu_stay
Stay in User Menu after command. Add feedback.
2017-07-10 15:10:07 -05:00
Scott LahteineandGitHub 1066b17457 Merge pull request #7260 from thinkyhead/bf_G33_update_27
Updates to G33 and its LCD code
2017-07-10 13:39:36 -05:00
Scott LahteineandGitHub 68aea9c01d Merge pull request #7261 from thinkyhead/bf_configs_by_vendor
Arrange more example configs by vendor
2017-07-07 15:46:22 -05:00
Scott LahteineandGitHub 7fc31a7940 Merge pull request #7258 from thinkyhead/bf_cleanups_jbrazio
Add support for BQ heated bed kit with Hephestos 2
2017-07-07 04:11:07 -05:00
Scott LahteineandGitHub 11e376e920 Merge pull request #7256 from thinkyhead/bf_cleanup_july_6
Assign -1 to LCD_PINS_D4-7 if not defined
2017-07-07 03:22:47 -05:00
Scott LahteineandGitHub a3aa798f6d Merge pull request #7257 from thinkyhead/bf_Creality_CR10
Support for Creality CR-10
2017-07-07 03:22:27 -05:00
Scott LahteineandGitHub ce834bb78e Merge pull request #7255 from thinkyhead/bf_cleanup_july_6
Use FastIO for spindle, probe test, and case light
2017-07-06 22:03:27 -05:00
Scott LahteineandGitHub 2cb308fb53 Merge pull request #7253 from thinkyhead/bf_busy_protocol
"Keepalive" is now "Busy protocol"
2017-07-06 16:39:50 -05:00
Scott LahteineandGitHub 504d26341a Merge pull request #7251 from thinkyhead/bf_simplify3d_workaround
Patch M23 to work around Simplify3D bug
2017-07-06 14:45:04 -05:00
Scott LahteineandGitHub ef94ddf53c Merge pull request #7238 from thinkyhead/bf_probe_manual_G33
Add PROBE_MANUALLY support to G33
2017-07-04 18:18:32 -05:00
Scott LahteineandGitHub 28deff01b8 Fix a bug in mfup 2017-07-04 17:38:45 -05:00
Scott LahteineandGitHub cca1cca3a5 Merge pull request #7237 from thinkyhead/bf_cz_mapper
UTF-8 mapper for Czech
2017-07-04 16:45:13 -05:00
Scott LahteineandGitHub a2babb532d Merge pull request #7217 from benlye/add-kill-action
Add configurable action command to send when printer is killed
2017-07-04 16:44:08 -05:00
Scott LahteineandGitHub b8066fb36f Merge pull request #7232 from fiveangle/disable_xyz_compatibility_check
DISABLE_[XYZ] compatibility check
2017-07-04 13:26:56 -05:00
Scott LahteineandGitHub df87278fce Add "CAP:PRINT_JOB:1" (M75 / M76 / M77) to M115 output 2017-07-03 15:59:06 -05:00
Scott LahteineandGitHub 4be8d7720e Fix spelling of "Chinese" 2017-07-03 15:24:49 -05:00
Scott LahteineandGitHub 760bf49a00 Merge pull request #7221 from thinkyhead/bf_fix_reachable
Fix for issues #6997 and #7152
2017-07-03 03:40:42 -05:00
Scott LahteineandGitHub 57fff2e95e Merge pull request #7219 from thinkyhead/bf_update_git_scripts
Update Marlin+git helper scripts
2017-07-03 01:49:27 -05:00
Scott LahteineandGitHub 94c965fad6 Merge pull request #7220 from thinkyhead/bf_fix_eeprom_opts
Make all EEPROM optimization options available
2017-07-03 01:39:01 -05:00
Scott LahteineandGitHub 015839fc50 Merge pull request #7212 from thinkyhead/bf_m48_real_probe
M48 needs a real probe
2017-07-02 16:22:47 -05:00
Scott LahteineandGitHub 395a9f59ac Merge pull request #7211 from thinkyhead/bf_lcd_bootscreen
Use lcd_bootscreen for both
2017-07-02 02:11:07 -05:00
Scott LahteineandGitHub 14663efe0d Merge pull request #7210 from fiveangle/printrboard_revf_cleanup
Printrboard RevF cleanup
2017-07-02 01:02:26 -05:00
Scott LahteineandGitHub 41e0955c27 Merge pull request #7208 from thinkyhead/bf_lcd_for_melzi
LCD for Melzi support
2017-07-02 00:32:13 -05:00
Scott LahteineandGitHub 312f63dbe8 Merge pull request #7207 from thinkyhead/bf_update_ubl_lcd
Expose DISABLE_M503 option as a test option
2017-07-01 22:10:34 -05:00
Scott LahteineandGitHub 3e78a01262 Merge pull request #7204 from thinkyhead/bf_update_ubl_lcd
UBL radar map corrections
2017-07-01 20:59:03 -05:00
Scott LahteineandGitHub 2ff967f3e6 Merge pull request #7205 from thinkyhead/bf_infitary_m508
Add configuration for Infitary M508 (i3 clone)
2017-07-01 20:11:02 -05:00
Scott LahteineandGitHub 009a6104c5 Merge pull request #7201 from Bob-the-Kuhn/intermittent_Teensy2++_G26_compile_issue
intermittent AT90USB & G26 compile problem (proposal)
2017-07-01 18:54:36 -05:00
Scott LahteineandGitHub 457489d7ac Merge pull request #7187 from thinkyhead/bf_sanitycheck_G33
Add a sanity check for DELTA_AUTO_CALIBRATION
2017-06-30 11:39:09 -05:00
Scott LahteineandGitHub 814925d692 Merge pull request #7179 from thinkyhead/bf_anet_a6
Add ANET A6 example configuration
2017-06-28 17:06:04 -05:00
Scott LahteineandGitHub bb0508b6cf Fix comment in M115 code 2017-06-28 13:08:33 -05:00
Scott LahteineandGitHub 5c1888467f Merge pull request #7170 from thinkyhead/bf_M217_echo_to_serial
Add A (action) and E (echo) parameters to M118
2017-06-28 02:13:13 -05:00
Scott LahteineandGitHub d1e8d4cd9d Merge pull request #7167 from thinkyhead/bf_20x4_lcd_update
UBL Map Cleanup and LCD display
2017-06-28 01:20:22 -05:00
Scott LahteineandGitHub 797d6a97e7 Merge pull request #7168 from thinkyhead/bf_M217_echo_to_serial
M118 echo to serial
2017-06-28 01:12:09 -05:00
Scott LahteineandGitHub ada836db29 Merge pull request #7007 from thinkyhead/bf_followups_friday
Followups for I2C_POSITION_ENCODERS
2017-06-27 22:51:24 -05:00
Scott LahteineandGitHub f4246dc8ff Merge pull request #7165 from thinkyhead/bf_parser_shorthand
Use parser.seenval, add shorthand functions
2017-06-27 18:57:48 -05:00
Scott LahteineandGitHub 66faedb2b8 Merge pull request #6938 from thinkyhead/bf_prusa_multiplexer
Initial support for the Průša MK2 Multiplexer
2017-06-27 18:54:30 -05:00
Scott LahteineandGitHub c2c8aafda2 Merge pull request #7157 from thinkyhead/bf_g33_f_parameter
G33 F and Height bug fix
2017-06-27 04:36:22 -05:00
Scott LahteineandGitHub 627afb29df Merge pull request #7109 from tnw513/fix-italian
added missing italian translation
2017-06-27 04:12:30 -05:00
Scott LahteineandGitHub 61d00d8990 Merge pull request #7156 from benlye/benlye-fix-pinsdebug
Fix #ifdef AVR_AT90USB1286_FAMILY in pinsDebug
2017-06-27 04:11:46 -05:00
Scott LahteineandGitHub 134116b874 Merge pull request #7153 from thinkyhead/bf_czech_update
Updated Czech language
2017-06-26 17:34:15 -05:00
Scott LahteineandGitHub 89c6e92b66 Merge pull request #7144 from thinkyhead/bf_ubl_g26_p4_surface
Added option 'H' to G29 P4.
2017-06-26 16:34:48 -05:00
Scott LahteineandGitHub e687782875 Merge pull request #7134 from thinkyhead/bf_skynet_a3_ready
Add Skynet/ANET A10 support
2017-06-25 14:35:22 -05:00
Scott LahteineandGitHub efc6a9c1b8 Merge pull request #7136 from thinkyhead/bf_digipot_save
Edit digipot currents via LCD, save to EEPROM
2017-06-25 04:01:54 -05:00
Scott LahteineandGitHub ece89bcf7a Merge pull request #7119 from thinkyhead/bf_vref_MCP4018
Fix: set digipot mcp4018 Vrefmax to 1.666V
2017-06-24 13:27:17 -05:00
Scott LahteineandGitHub ebe6719e12 Merge pull request #7128 from thinkyhead/bf_enhanced_arcs
Enhance G2/G3 with 'P' and G17/G18/G19 Plane Select
2017-06-23 15:12:15 -05:00
Scott LahteineandScott Lahteine a18324bc8d Give a more detailed issue template 2017-06-22 18:17:02 -05:00
Scott LahteineandGitHub 254a11b083 Merge pull request #7120 from thinkyhead/bf_sainsmart_link
Add link to F. Malpartida LiquidCrystal library
2017-06-22 14:04:23 -05:00
Scott LahteineandGitHub aeb6d465a4 Merge pull request #7118 from thinkyhead/bf_french_update
French update
2017-06-22 13:10:07 -05:00
Scott LahteineandGitHub 424d0bae8b Merge pull request #7100 from thinkyhead/bf_HAL_prepare
Apply maths macros and type changes ahead of HAL
2017-06-20 01:15:23 -05:00
Scott LahteineandGitHub d5368461f9 Merge pull request #7098 from thinkyhead/bf_ubl_steps
Step-by-Step Menu addition
2017-06-19 23:12:52 -05:00
Scott LahteineandGitHub 0c616700f3 Merge pull request #7097 from thinkyhead/bf_dac_percents_fix
Convert DAC percent to uint8_t
2017-06-19 17:58:55 -05:00
Scott LahteineandGitHub 7b79f443ef Merge pull request #7096 from thinkyhead/redo_DSE
Support for two switching extruders
2017-06-19 17:32:24 -05:00
Scott LahteineandGitHub 17f69f8ca2 Merge pull request #7094 from thinkyhead/bf_fix_advance_rate
Fix #5699 - LIN_ADVANCE freeze when ADV_RATE returns 0
2017-06-19 16:38:41 -05:00
Scott LahteineandGitHub b8b7ef1902 Merge pull request #7090 from thinkyhead/bf_italian_refix
Fix Italian language mapper
2017-06-19 09:27:13 -05:00
Scott LahteineandGitHub 42f7f9e013 Merge pull request #7060 from bgort/i2cpefix
I2C Position Encoders Example Configs
2017-06-19 01:08:42 -05:00
Scott LahteineandGitHub 7e028ec429 Merge pull request #7089 from thinkyhead/bf_italian_update
Added missing Italian translations
2017-06-19 00:16:14 -05:00
Scott LahteineandGitHub 2e1b7d3a22 Merge pull request #7079 from thinkyhead/bf_m600_fixes
M600 fixes
2017-06-18 23:32:07 -05:00
Scott LahteineandGitHub 311f6aff72 Merge pull request #7078 from thinkyhead/bf_cleanups_fixes
Move lcd_refresh_zprobe_zoffset definition
2017-06-18 17:24:57 -05:00
Scott LahteineandGitHub 43a95ae5ad Merge pull request #7071 from thinkyhead/bf_cleanups_fixes
Fix status message, apply #7058
2017-06-16 17:29:28 -05:00
Scott LahteineandGitHub 43c96eb31f Merge pull request #7070 from thinkyhead/bf_cleanups_fixes
Thursday cleanup / bugfixes
2017-06-15 15:43:46 -05:00
Scott LahteineandGitHub 4414825e0d Merge pull request #7038 from thinkyhead/bf_PCA9632
PCA9632 PWM color LED support
2017-06-15 14:41:24 -05:00
Scott LahteineandGitHub 50c2702ba5 Merge pull request #7062 from Bob-the-Kuhn/AT90USB---UBL-compile-error
Fix two UBL compile errors (one is AT90USB only and one affects all)
2017-06-15 14:22:27 -05:00
Scott LahteineandGitHub 8326c1c279 Merge pull request #7005 from Diederikvanderpant/bugfix-1.1.x
added shift register pins for reprapworld keypad v1.1
2017-06-11 23:12:11 -05:00
Scott LahteineandGitHub 979a6a6459 Merge pull request #7037 from thinkyhead/bf_config_CL-260
CL-260 configs
2017-06-11 19:55:37 -05:00
Scott LahteineandGitHub dce665a083 Merge pull request #7025 from magnuspub/patch-1
Mod in language_it.h
2017-06-11 19:09:46 -05:00
Scott LahteineandGitHub 7b09ab6bda Merge pull request #7033 from Bob-the-Kuhn/pinsDebug-&-dac_mcp4728-fixes
Fix pinsDebug problem & add capability to display more than 70 pins
2017-06-11 19:09:09 -05:00
Scott LahteineandGitHub 5bdb4bbc5e Merge pull request #7030 from thinkyhead/bf_circular_scroll
Circular scrolling of the status message
2017-06-11 19:07:38 -05:00
Scott LahteineandGitHub 634b7fa7d4 Merge pull request #7031 from thinkyhead/bf_save_218_bytes
Reduce Marlin by ~218 bytes
2017-06-11 19:05:45 -05:00
Scott LahteineandGitHub 83263076dc Merge pull request #7014 from fiveangle/fix_get-set_DrvPct_declarations
fix get/setDrvPct declarations
2017-06-10 19:06:50 -05:00
Scott LahteineandGitHub ec61b07836 Merge pull request #7027 from thinkyhead/bf_water_is_wet
Followup to German language update
2017-06-10 19:04:19 -05:00
Scott LahteineandGitHub 6c9b5ab8e8 Merge pull request #6929 from p3p/pr_issue_template
Add template for github issues
2017-06-10 16:16:20 -05:00
Scott LahteineandGitHub 0b6b7c9c7e Merge pull request #7013 from thinkyhead/bf_german_update
Update language_de.h
2017-06-09 21:41:19 -05:00
Scott LahteineandGitHub f17a3c2474 Merge pull request #6889 from thinkyhead/bf_at90usb_mapping
Unify all AVR90USB pin mappings
2017-06-09 21:00:13 -05:00
Scott LahteineandGitHub 4cc5444144 Merge pull request #7008 from Bob-the-Kuhn/Z_MIN_PROBE_ENDSTOP-and-Z_MAX_PIN
Can't use "#define Z_MIN_PROBE_PIN Z_MAX_PIN" in configuration.h
2017-06-09 19:42:56 -05:00
Scott LahteineandGitHub f4b76b1ee7 Merge pull request #7011 from thinkyhead/bf_serial_macros
Tweak serial macros
2017-06-09 17:58:20 -05:00
Scott LahteineandGitHub 1419126721 Merge pull request #6965 from thinkyhead/bf_save_more_sram
Use createChar_P to save SRAM in bootscreen
2017-06-07 17:34:19 -05:00
Scott LahteineandGitHub a453be7357 Merge pull request #6973 from bgort/autoreportT
Enable AUTO_REPORT_TEMPERATURES by default
2017-06-07 17:33:40 -05:00
Scott LahteineandGitHub 1d615e0a67 Merge pull request #6976 from Tannoo/Leveling_in_About_Printer
Leveling type in About Printer
2017-06-07 17:26:21 -05:00
Scott LahteineandGitHub 7f0945d2b1 Merge pull request #6978 from thinkyhead/fix_z_endstop_adj
Fix z_endstop_adj initializer
2017-06-07 16:07:21 -05:00