3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-24 12:35:51 +00:00
Code Issues Releases Wiki Activity
9,091 Commits 20 Branches 80 Tags 1.8 GiB
c11665e92f
Commit Graph

9091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roxy-3D
c11665e92f
Regression fixes for UBL's G29 P1, G29 P2, G29 P4 and G26 (#9213) 
The changes to ultralcd.cpp for is_lcd_clicked() did not encompass the
full functionality of UBL's G29 P1, P2 and P4.   It also broke G26's
ability to abort in several of its phases.

This is the first pass at fixing the problem.   It has been tested for
correctness for several hours but more testing  needs to be done.
There may be a few follow up patches to finish covering all the corner
cases, but right now I need to merge this before any conflicts show up.

Some of these changes will need to be moved over to the bugfix-v2.0.0
branch.   That will happen a few days from now.
 2018-01-17 00:27:50 -06:00
Scott Lahteine
333bd8f394
Merge pull request #9203 from benlye/m73-bugfix-1.1.x 
[1.1.x] Fix progress bar duration when time is exactly 86400s
 2018-01-16 21:14:31 -06:00
Bob-the-Kuhn
e668e053c2
Merge pull request #9206 from MarlinFirmware/revert-9174-fix_missing_decel_steps 
Revert "[1.1.x] Fix missing deceleration steps"
 2018-01-16 11:33:39 -06:00
Bob-the-Kuhn
ba9aa47260
Revert "[1.1.x] Fix missing deceleration steps" 2018-01-16 11:31:27 -06:00
blye
deda3d3a3c Fix duration when time is exactly 86400s 2018-01-16 08:16:42 +00:00
Bob-the-Kuhn
ec028faa1b
Merge pull request #9174 from Sebastianv650/fix_missing_decel_steps 
[1.1.x] Fix missing deceleration steps
 2018-01-15 21:03:51 -06:00
Roxy-3D
06adef7343
Get FT-i3-2020 example files in compliance with ?_BED_SIZE 2018-01-15 15:32:19 -06:00
Scott Lahteine
69c993092b Followup to Ender config 2018-01-15 05:48:50 -06:00
Scott Lahteine
d25487dfb9
Merge pull request #9160 from tommie/ender/bugfix-1.1.x 
[1.1.x] Creality Ender support
 2018-01-15 03:48:47 -06:00
Tommie Gannert
f3f26f7cb3 Creality Ender support. 
Reverse engineered from the unpublished firmware from Creality,
inferring the base version and configuration they used. The basis is
the firmware version from "Jul 31 2017 10:16:30". Configurations were
found by seeing what code was compiled into the firmware, and
constants used there.

They used Marlin 1.0.1, because

* 1.0.0 had very different serial output in `setup()` and overall
  code structure.
* 1.0.2 changed the `VERSION_STRING` to include a leading space,
  and `lcd_init` uses `SET_INPUT` instead of `pinMode`.

For U8Glib, a version between 1.14 and 1.17 was used, because

* 1.12 didn't have the extra speed argument to u8g_InitCom.
* 1.13 didn't have the soft reset instruction for UC1701 initialization.
* 1.18 has a new directory structure.

Quirks

* The value of PID_dT hints that F_CPU is 20M, but MarlinSerial.begin
  suggests it's indeed 16M (and the board uses 16M). Left at 16M for now.

* The LED and DOGLCD_CS are on the same pin.
 2018-01-15 03:39:43 -06:00
Scott Lahteine
90125ab639
Merge pull request #9186 from thinkyhead/bf1_cooler_cr10s 
[1.1.x] More featureful CR-10S configuration
 2018-01-15 02:50:16 -06:00
Scott Lahteine
a16ae30a61 More featureful CR-10S configuration 2018-01-15 01:02:23 -06:00
Scott Lahteine
175207659a
Merge pull request #9183 from thinkyhead/bf1_new_flsun_config 
[1.1.x] Add FLSUN Kossel configuration
 2018-01-15 00:49:25 -06:00
Scott Lahteine
5129eb1d43 More reliable temperature serial output? 2018-01-15 00:44:55 -06:00
Scott Lahteine
8f08e029d8 More up-front option to show SD percentage 2018-01-14 23:30:59 -06:00
Scott Lahteine
5c6c12dc3a Patch EEPROM for 32-bit 2018-01-14 23:18:45 -06:00
Scott Lahteine
734fa91e63 Misc config updates 2018-01-14 23:18:45 -06:00
Scott Lahteine
1d5eba4470 Add FLSUN Kossel configuration 2018-01-14 23:18:45 -06:00
Scott Lahteine
758d9db964 Link to marlinfw.org bitmap tool 2018-01-14 22:39:57 -06:00
Scott Lahteine
1d8b03964f
Merge pull request #9164 from GMagician/1.1.x-SD-issues-fix 
[1.1.x] sd issue fix
 2018-01-14 20:47:04 -06:00
Sebastianv650
4fa0937a55 Fix missing deceleration steps 
Marlin never reached final_speed after deceleration.
 2018-01-14 17:09:47 +01:00
GMagician
82dc89bfd2 Save some program memory 
This will save some program memory with no speed lose
 2018-01-13 09:46:54 +01:00
GrantM11235
a0bd811093 [1.1.x] Fix support for Malyan M150 (#9146) 
Implements changes to LCD and encoder pins from
forums.reprap.org/read.php?110,716538,728278 and also sets
ST7920_DELAY_[1-3] to DELAY_2_NOP to be compatible with the slower LCD
 2018-01-12 01:14:07 -06:00
Scott Lahteine
c1d6d24b9d Cleanup spacing, commentary 2018-01-11 18:52:54 -06:00
Sebastianv650
e2871f0dcd [1.1.x] Ensure smooth printer movements (#9149) 
- Never execute a block without an up-to-date trapezoid
- Start blocks with MINIMUM_PLANNER_SPEED, except when coming from a full stop
 2018-01-11 18:50:18 -06:00
Bob-the-Kuhn
4393c3ef7f LCD_CONTRAST to uint16_t for 1.1.x parity (#9148) 2018-01-11 18:32:41 -06:00
Scott Lahteine
59d48b9b1f
Merge pull request #9143 from thinkyhead/bf1_Creality_CR-10S 
[1.1.x] Creality CR-10S configurations
 2018-01-11 01:24:44 -06:00
Scott Lahteine
e8b1bbac83 Creality CR-10S configurations 
Provided by printedsolid.com
 2018-01-11 01:03:34 -06:00
Scott Lahteine
885200f833 Bring other configs up-to-date 2018-01-11 01:03:34 -06:00
Scott Lahteine
044938bfd0
Merge pull request #9129 from thinkyhead/bf1_tmc_followup 
[1.1.x] TMC followup
 2018-01-10 23:07:15 -06:00
Scott Lahteine
ab7fb5b2e3 Use Arduino 1.8.5 for Travis CI 2018-01-10 05:23:06 -06:00
Scott Lahteine
3df0d62725 Updates to TMC support 2018-01-10 04:32:49 -06:00
Scott Lahteine
d1ce0bc071 M915 Z Axis Calibration 2018-01-09 18:55:08 -06:00
Scott Lahteine
9714c9aebe
Merge pull request #9128 from fiveangle/bf1-disable_serial_stats_on_usbcon 
[1.1.x] SERIAL_STATS_* features not supported on USBCON targets
 2018-01-09 18:42:26 -06:00
Dave Johnson
2fcef3e8e2 Enable USE_ZMIN_PLUG on SCARA example (#9125) 2018-01-09 18:41:02 -06:00
Scott Lahteine
d7651ea0d0
Merge pull request #9122 from thinkyhead/bf1_eeprom_debug 
[1.1.x] More EEPROM field debugging, 2.0.x parity
 2018-01-09 18:33:24 -06:00
Dave Johnson
dd55c98139 SERIAL_STATS_* features not supported on USBCON targets 2018-01-09 16:27:57 -08:00
Scott Lahteine
bb5ba482bc More EEPROM field debugging 2018-01-09 18:10:33 -06:00
GMagician
5903b002ac 1.1.x semitec 104NT-4 added (#9120) 
Table is very very similar to old 104-GT2 so I added only the name and recycled old ID
 2018-01-09 16:53:44 -06:00
Scott Lahteine
97b6eabe0c
Merge pull request #9103 from zarthcode/patch-2 
fix fwretract structure reference #9102
 2018-01-08 19:27:18 -06:00
Anthony
1326eb4ef7
fix fwretract structure reference #9102 
Marlin_main.cpp: In function 'void resume_print(const float&, const float&, int8_t)':

Marlin_main.cpp:6646: error: 'retract_length' was not declared in this scope
         do_pause_e_move(-retract_length, fwretract.retract_feedrate_mm_s);
                          ^
 2018-01-08 18:48:19 -06:00
Scott Lahteine
0eee55c0dd Patch TMC current read from EEPROM 2018-01-07 20:49:43 -06:00
Scott Lahteine
f8dee4e726
Merge pull request #9088 from thinkyhead/bf1_mbl_localize 
[1.1.x] MBL cleanup, has_mesh() method
 2018-01-07 20:10:10 -06:00
Tannoo
2c3bdfe2ea [1.1.x] UBL Mesh Storage Message (#9094) 2018-01-07 20:07:20 -06:00
Scott Lahteine
ffeb4495fe Make mbl.has_mesh() a method 2018-01-07 18:14:37 -06:00
Scott Lahteine
be555e3578 Move MBL functions into the class 2018-01-07 18:14:37 -06:00
Scott Lahteine
eec97a5cf1 Don't wrap mbl.h in conditionals 2018-01-07 00:24:46 -06:00
Scott Lahteine
fa3709451b
Set mbl.has_mesh on manual point entry 
Based on #9086
 2018-01-06 23:32:00 -06:00
Scott Lahteine
eaa6257baf
Fix M503 skew output 
Followup to 1761cacaa1
 2018-01-06 20:53:33 -06:00
Scott Lahteine
f2fd9ab1b0
Merge pull request #9081 from thinkyhead/bf1_patch_m5 
[1.1.x] Set laser/spindle PWM to lowest speed on M5
 2018-01-06 15:29:51 -06:00