jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,839 Commits 58 Branches 59 Tags
c531ff3c60b2572ad536b40bb463f89f4231ff0a
Commit Graph

9839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
InsanityAutomation c531ff3c60 Add SSR support for factory kit 
Following pin 57 temp and 58 relay from photos provided by Justin Kennedy. Uses built in keenovo temp sensor.
 2018-05-11 22:21:06 -04:00
InsanityAutomation 243f32e5b8 Reimplement laser control 2018-05-09 19:53:46 -04:00
InsanityAutomation 8633601f59 Merge branch 'bugfix-1.1.x' into TM_TRex2+ 2018-05-09 15:55:52 -04:00
InsanityAutomation afd0b532ad Revert "Merge branch 'TM_CR10' into bugfix-1.1.x" 
This reverts commit 1cb2de37de, reversing
changes made to fd94570a0d.
 2018-05-09 11:01:53 -04:00
InsanityAutomation 1cb2de37de Merge branch 'TM_CR10' into bugfix-1.1.x 2018-05-09 10:55:26 -04:00
InsanityAutomation fd94570a0d Revert "Merge branch 'TM_CR10' into bugfix-1.1.x" 
This reverts commit 1cfe6d7478, reversing
changes made to a9b30acbe6.
 2018-05-09 10:44:35 -04:00
InsanityAutomation b120adf8df Bump version, disable power recovery by default 2018-05-09 10:37:26 -04:00
InsanityAutomation 1cfe6d7478 Merge branch 'TM_CR10' into bugfix-1.1.x 2018-05-09 10:31:43 -04:00
InsanityAutomation a9b30acbe6 Merge pull request #4 from MarlinFirmware/bugfix-1.1.x 
Bugfix 1.1.x 20180509 catchup
 2018-05-09 10:25:29 -04:00
Scott Lahteine b9e4ce3715 Fix compilation with UBL and Arc/Bézier 
Fix #10660
 2018-05-09 00:41:51 -05:00
Scott Lahteine 78410b210b Add UBL support for G2/G3 and G5 (#10649) 2018-05-08 11:10:33 -05:00
Scott Lahteine de0b872a24 Merge pull request #10652 from thinkyhead/bf1_bezier_jerk_control_avr 
[1.1.x] Bézier Jerk Control
 2018-05-08 11:09:19 -05:00
Scott Lahteine ae24f4f930 Merge pull request #10650 from thinkyhead/bf1_junction_deviation 
[1.1.x] Junction Deviation
 2018-05-08 09:25:21 -05:00
Scott Lahteine f093ce35a0 Add BEZIER_JERK_CONTROL to example configs 2018-05-08 09:21:54 -05:00
Scott Lahteine 7ee1ab4fd3 Add Bézier Jerk Control option 2018-05-08 09:21:54 -05:00
Scott Lahteine bb352f9836 Add a 3-frame fan animation to bitmaps (#10653) 2018-05-08 08:18:51 -05:00
Scott Lahteine 5c120222a4 Show correct units in M503 2018-05-08 05:47:09 -05:00
Scott Lahteine b3af5a1ac0 Add JUNCTION_DEVIATION to example configs 2018-05-08 04:43:51 -05:00
Scott Lahteine 124cff0dbe Junction deviation jerk limiting option 2018-05-08 04:43:51 -05:00
Scott Lahteine 9076a9314f Fix abort of SD printing 2018-05-07 00:18:53 -05:00
Scott Lahteine 40ce9d0299 Fix some sanity checks 
Co-Authored-By: Giuliano <gmagician@users.noreply.github.com>
 2018-05-06 23:22:28 -05:00
Scott Lahteine 20f1688376 Try whole word over abbrev. for error 2018-05-06 20:50:12 -05:00
Scott Lahteine 59e8707a4f Remove some unused vars 2018-05-06 20:49:08 -05:00
Scott Lahteine 5735c8af5b [1.1.x] Arrange LCD options by type (#10631) 
* Bump configuration versions to 010109
* Arrange LCD options by type
 2018-05-06 19:17:29 -05:00
Scott Lahteine c97bf04166 Geeetech follow-up 2018-05-06 08:14:00 -05:00
Scott Lahteine 156bd28160 Fully init planner sync_block 2018-05-06 08:14:00 -05:00
Scott Lahteine 1f991f07be Merge pull request #10615 from thinkyhead/bf1_synced_planner_set_position 
[1.1.x] Improve sync of planner / stepper position, asynchronous G92
 2018-05-06 03:10:28 -05:00
Scott Lahteine 675be8db7c Bring some example configs up to date 2018-05-06 03:06:13 -05:00
Scott Lahteine fcb19823db Add Geeetech i3 Pro C / W examples 
Added base example configs for Geeetech's Pro C and Pro W machines.

Co-Authored-By: Phr3d13 <phr3d13@gmail.com>
 2018-05-06 01:37:41 -05:00
Scott Lahteine e8779e7fe2 Fix up fwretract handling 2018-05-06 01:22:30 -05:00
Scott Lahteine ac5ff1d802 Adjust usage of stepper.synchronize 2018-05-06 01:22:30 -05:00
Scott Lahteine 08e20dbbc6 Improve sync of stepper positions 2018-05-06 01:22:30 -05:00
Scott Lahteine 1682036533 Apply int32_t to stepper 2018-05-05 18:22:46 -05:00
Roxy-3D 42180e25a3 change Max7219 coordinates are in traditional (X,Y) format 2018-05-05 16:07:20 -05:00
Scott Lahteine c6e4fbe162 Additional patch for no heated bed 2018-05-04 00:11:19 -05:00
Bob-the-Kuhn 65adea6240 remove TMC version checks, move comment 2018-05-03 15:47:35 -05:00
Scott Lahteine 888da29b61 Enforce minimum TMC2130 / TMC2208 libs 2018-05-03 15:47:35 -05:00
TheMasterFX 50ff4cf157 Fix bed size and max z pos for Ender-2 (#10603) 2018-05-02 19:02:15 -05:00
Scott Lahteine 12b9bbaa50 Merge pull request #10602 from thinkyhead/bf1_AD8495_thermocouple 
[1.1.x] Add thermocouple with AD8495 support
 2018-05-02 09:05:11 -05:00
Scott Lahteine b50afa9897 Add thermocouple with AD8495 support 
Co-Authored-By: Dmitriy <demonx@demonx.ru>
 2018-05-02 08:41:31 -05:00
Scott Lahteine a556a8c506 Temp-related and conditional improvements 2018-05-02 08:41:30 -05:00
TerraBAS ee7b6a5e68 [1.1.x] Add Velleman RGB-LED Add-on support to K8400 configs (#10594) 2018-05-02 08:00:01 -05:00
Scott Lahteine da9f3868d5 Merge pull request #10587 from thinkyhead/bf1_lcd_bed_leveling_abl 
[1.1.x] Sub-menu for ABL with LCD_BED_LEVELING
 2018-05-01 06:49:32 -05:00
Scott Lahteine 04183da302 Add Ender-3 configs (#10588) 
Co-Authored-By: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com>
 2018-05-01 06:20:35 -05:00
Scott Lahteine 0b9f99f940 LCD_BED_LEVELING enables a sub-menu for ABL 2018-05-01 04:41:56 -05:00
Scott Lahteine 5aff43e65e Rename float32 => float52, etc. 2018-05-01 04:41:56 -05:00
Scott Lahteine 32b6a3ad12 Fewer includes of vector_3.h 2018-05-01 04:41:56 -05:00
Scott Lahteine 94857b59c9 General lcd code cleanup 2018-05-01 01:22:25 -05:00
Scott Lahteine 3c5f0ce858 Clean up autostart handling 2018-05-01 01:22:25 -05:00
Scott Lahteine 0d7c559139 Improve debug of homing move feedrate 2018-04-30 23:45:35 -05:00