MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,147 Commits 1 Branch 0 Tags 96 MiB
bf6539f13d
Commit Graph

10147 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Basler
bf6539f13d Merge remote-tracking branch 'upstream/1.1.x' into 1.1.x 2018-08-10 18:24:21 +02:00
Scott Lahteine
f6ef58f3a7 Merge remote-tracking branch 'upstream/bugfix-1.1.x' into release_119 2018-08-06 23:41:53 -05:00
lsellens
614a944504 auto power control without heated bed (#11467) 
`AUTO_POWER_CONTROL` will not work if printer has no heated bed due to `degTargetBed()` not being defined
 2018-08-06 23:18:13 -05:00
Giuliano
33364c17b9 [1.1.x] Better timing handling (#11462) 2018-08-06 23:14:11 -05:00
Scott Lahteine
b8d4c4216f
Easier to disable homing validation (#11457) 2018-08-06 23:11:28 -05:00
Thomas Basler
e3398b2203 Merge branch '1.1.x' of https://github.com/MarlinFirmware/Marlin into 1.1.x 2018-08-04 11:09:44 +02:00
Scott Lahteine
86d9af1108
Fix drivers.h dependency, defer macro evaluation (#11449) 2018-08-03 21:48:57 -05:00
silentninja1
4c4fffc503 [1.1.x] Fix Dual X Carriage tool change crash (#11425) 2018-08-03 20:47:19 -05:00
Marcio Teixeira
fae96a6a13 Fix jumping progress bar. (#11438) 
- When `LCD_SET_PROGRESS_MANUALLY` was disabled and an SD print was not active (i.e. the printer was idle), progress_bar_percent would read uninitialized memory from stack and cause progress bar to jump wildly.
- Also updated conditions in `#ifdef` to match `ultralcd.cpp`
 2018-08-03 17:16:14 -05:00
Scott Lahteine
f816d6f70f Merge remote-tracking branch 'upstream/bugfix-1.1.x' into release_119 2018-08-02 18:46:23 -05:00
Roxy-3D
7d491aa015 Tiny improvement to M7219 
The registers within the Max7219 can get corrupted a number of ways.  This allows the Max7219 to be reset and fully initialized.
And...  it also allows the user to see the initialization pattern.
 2018-08-02 18:43:36 -05:00
Scott Lahteine
888d319145 Align some config options 2018-08-02 18:42:20 -05:00
Thomas Basler
4b0b506a35 Set right motor drivers and enable inch mode support 2018-08-01 21:27:06 +02:00
Thomas Basler
2080439d7f Update configuration to match new board name 2018-08-01 21:18:56 +02:00
Thomas Basler
c95b0482fd Merge remote-tracking branch 'upstream/1.1.x' into 1.1.x 2018-08-01 21:11:00 +02:00
Scott Lahteine
ed86550061 Version 1.1.9 2018-07-31 02:30:48 -05:00
Scott Lahteine
2ef02eafc0 Merge bugfix-1.1.x for 1.1.9 update 2018-07-31 02:16:18 -05:00
MikeLud
a2ac7e1407 Add M915 to Prepare Menu (#11383) 2018-07-31 02:03:49 -05:00
Shen Yiming
8db91f0bd1 Clean up 12864 OLED code (#11388) 2018-07-30 23:02:12 -05:00
Scott Lahteine
c4f4c255b4
Fix initial safe_speed in jerk code (#11396) 2018-07-30 22:49:20 -05:00
Roxy-3D
33c37d587d
Revert "[1.1.x] idex and bl touch fix" (#11406) 
* Revert "[1.1.x] bltouch home refinements (#11398)"

This reverts commit 30839a6ba6.

* Revert "[1.1.x] idex and bl touch fix (#11392)"

This reverts commit e1bef0ea79.
 2018-07-28 23:14:41 -05:00
Giuliano
30839a6ba6 [1.1.x] bltouch home refinements (#11398) 
Just create a better functions call logic flow
 2018-07-28 19:29:26 -05:00
silentninja1
e1bef0ea79 [1.1.x] idex and bl touch fix (#11392) 
* [1.1.x] IDEX and BLTouch Fixes

Fix bltouch not deploying during fast home, fix dual x carriage setting opposing side park position as destination on tool change

* Update Marlin_main.cpp

* Update Marlin_main.cpp

* Change brackets to be more in conformance with Marlin coding standards
 2018-07-28 10:33:35 -05:00
Giuliano
7284488da3 [1.1.x] fix bltouch homing (#11380) 
Partially revert. Seems to solve the issue, but one report says G29 still fails.
 2018-07-27 18:29:26 -05:00
Scott Lahteine
cab2e0877e Update DELAY_10US 2018-07-26 20:21:50 -05:00
bleughb
b6f24992ee [1.1.x] Update fastio_1280.h pin mapping comments (#11374) 2018-07-26 05:19:05 -05:00
Scott Lahteine
c30f636d22
Improve drivers.h macros (#11372) 2018-07-26 05:10:11 -05:00
Giuliano
2f76ec5c6a [1.1.x]-different-bltouch-init (#11358) 2018-07-26 05:03:39 -05:00
Scott Lahteine
56fbe3361b
Ensure ADC conversion is complete before reading (#11370) 
Co-Authored-By: gloomyandy <andy-git@gloomy-place.com>
 2018-07-26 03:58:33 -05:00
vitekn
b5ed4a1a8c Fix thermistor type in Anet A6 config (#11346) 
I have Anet a6 and my thermistor is NTC 3950. If the default is 5 (ATC Semitec 104GT-2) it gives overheat upto 330 degrees (real) instead of 250 (displayed). I don't know for sure if all the A6 have such thermistor but I think it's safer to have underheat than overheat. And 3950 looks more spread among A6 searching on Internet. The same is true for the bed though it has small difference at the beginning of scale, actually +-2 degrees.
 2018-07-26 02:03:30 -05:00
Scott Lahteine
5061c3a016
Merge pull request #11368 from thinkyhead/bf1_pwm_adjustments 
[1.1.x] Tweak some SoftPWM code
 2018-07-25 19:02:10 -05:00
Scott Lahteine
2af06b82b4 Specify some extra CR-10S pins 2018-07-25 18:18:33 -05:00
Scott Lahteine
637489ae17 Tweak some SoftPWM code 2018-07-25 18:16:33 -05:00
Scott Lahteine
349cf3ee5a Sync enqueue_and_echo_command with 2.0.x 2018-07-25 18:06:31 -05:00
Giuliano
e5b928f574 [1.1.x] Typo fix (#11366) 
Typo fix
 2018-07-25 18:00:28 -05:00
Scott Lahteine
2b860ab8a2
Merge pull request #11361 from thinkyhead/bf1_define_drivers_th 
[1.1.x] Configure stepper drivers per axis
 2018-07-25 04:05:13 -05:00
Scott Lahteine
7bad507d70 Simplify stepper driver config 2018-07-25 03:02:12 -05:00
Scott Lahteine
6d6bdc6517 Add *_DRIVER_TYPE to example configs 2018-07-25 02:39:16 -05:00
silentninja1
57ce81f067 [1.1.x] Fix LCD axis move E index (#11328) 2018-07-25 02:21:05 -05:00
Scott Lahteine
ed0e72bf44 Fix spelling in configs 2018-07-24 21:02:22 -05:00
silentninja1
060e7a3565 Silentninja1 idex crash fix (#11329) 
* Move home all axis prototype to allow access from UBL.h

* Remove home all axis command as it exists in marlin.h now

* Reverse order of tool change and home

Race condition causes E0 carriage to move on E1 commands and crash into parked head if order is reversed. Needs more research into permanent fix, but this will prevent damage to machines in the meantime.
 2018-07-24 14:44:50 -05:00
Scott Lahteine
3bbb121e7d Tweak some Max7219 code 2018-07-19 18:51:35 -05:00
Scott Lahteine
d1590fec3e
Merge pull request #11308 from thinkyhead/bf1_manual_probe_start_z 
[1.1.x] Manual Z Start Height
 2018-07-19 18:26:51 -05:00
Roxy-3D
6c62b0e263
Change Max7219_idle_task() to use columns if Y-Axis has 16 LED's (#11317) 2018-07-19 16:59:38 -05:00
Thomas Basler
bb7ab11f65 Remove not required menu entries 2018-07-19 13:15:01 +02:00
Thomas Basler
b99e8862d8 Change commit behavior of custom command 2018-07-19 13:13:28 +02:00
Thomas Basler
f91fa66f48 Disable custom bootscreen to increase startup time 2018-07-19 13:12:36 +02:00
Scott Lahteine
221e8bbb05 Add MANUAL_PROBE_START_Z to example configs 2018-07-18 21:50:18 -05:00
Scott Lahteine
888774cbc3 Add MANUAL_PROBE_START_Z for manual probing 2018-07-18 21:50:18 -05:00
Scott Lahteine
db057eb453 Fix tool_change call in UBL G29 
Fix #11279, #11252
 2018-07-18 20:35:14 -05:00