zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
8996 commits 1 branch 0 tags 156 MiB
Commit graph

8996 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine e6aba99f16 Fix M118 parameters, with strict guideline 2017-11-06 22:57:01 -06:00
Scott Lahteine 6718579ccf
Merge pull request #8294 from thinkyhead/bf2_fix_fallback_font 
[2.0] Patch non-extended font option
 2017-11-06 22:01:08 -06:00
Scott Lahteine e9b1944a67 Patch non-extended font option 2017-11-06 21:42:21 -06:00
Roxy-3D 6324b09934
Revert "Fix EEPROM crc (#8284)" (#8292) 
This reverts commit 172c36f517.
 2017-11-06 19:52:05 -06:00
Rowan Meara 172c36f517 Fix EEPROM crc (#8284) 2017-11-06 19:19:30 -06:00
Scott Lahteine cc4d28b73c
Update bilinear for native workspace 2017-11-06 17:04:41 -06:00
Scott Lahteine 94c7205d64
Merge pull request #8281 from thinkyhead/bf2_alligator_dac 
[2.0] Use fastio for Alligator dac084s085, etc.
 2017-11-06 12:16:18 -06:00
Scott Lahteine 2246316605 Fix name collision. timer_t => hal_timer_t 2017-11-05 19:31:07 -06:00
Jason Hitesman 4efaef7039 [2.0.x] Fix archim2 SSDS define (#8278) 
* Fix SSDS define

* Update pins_ARCHIM2.h
 2017-11-05 19:23:19 -06:00
Scott Lahteine c8dfa26bc8 Use fastio for STM32F1 endstop interrupts 2017-11-05 19:20:28 -06:00
Scott Lahteine 185dec800b Use fastio for HAL SPI EEPROM 2017-11-05 19:20:03 -06:00
Scott Lahteine 297666ea14 Use fastio for Alligator dac084s085 2017-11-05 19:14:42 -06:00
Scott Lahteine c5d95d318b
Merge pull request #8249 from thinkyhead/bf2_nozzle_cleanup 
[2.0] Cleanup Nozzle class, fix XY vs Z move order
 2017-11-05 18:51:11 -06:00
Scott Lahteine 7e2fee9d56
Merge pull request #8274 from tcm0116/2.0.x-re_arm_D8 
[2.0.x] Correct RAMPS_D8_PIN for Re-ARM
 2017-11-05 18:39:28 -06:00
Scott Lahteine 59c558d612
Merge pull request #8275 from GMagician/2.0.x-Typo-fix 
[2.0.x] typo fix (removed spaces)
 2017-11-05 18:39:04 -06:00
Scott Lahteine be73d5cc08 Cleanup Nozzle class, fix XY vs Z move order 2017-11-05 18:31:07 -06:00
Scott Lahteine 2e33c3bdc2
Merge pull request #8270 from studiodyne/studiodyne-fw 
fwretract bug/mistake + suggestion
 2017-11-05 18:21:22 -06:00
GMagician 9e93b7ccbd [2.0.x] removed spaces 
Removed spaces in array declaration
 2017-11-05 20:42:48 +01:00
Thomas Moore b91a822d7a Correct RAMPS_D8_PIN for Re-ARM 2017-11-05 13:03:42 -06:00
studiodyne d295f984e3
Update fwretract.cpp 2017-11-05 15:42:30 +01:00
Scott Lahteine 7de8a66780
Merge pull request #8256 from thinkyhead/bf2_cnc_coordinate_sys 
[2.0.x] CNC_COORDINATE_SYSTEMS
 2017-11-04 22:49:31 -05:00
Scott Lahteine 1b40e9c464 Implement CNC_COORDINATE_SYSTEMS 2017-11-04 22:28:46 -05:00
Scott Lahteine 1b42fba39b Add CNC_COORDINATE_SYSTEMS to configs 2017-11-04 22:28:46 -05:00
Scott Lahteine a22434508f Match tweaks to G33 from 1.1 2017-11-04 22:28:46 -05:00
Scott Lahteine c07bbd4154 Prettify some EEPROM code 2017-11-04 22:28:46 -05:00
Scott Lahteine d6aa127c76 Remove I2CPEM workspace offset 2017-11-04 22:28:46 -05:00
Scott Lahteine 79772219ae Fix Fan Multiplexer init 2017-11-04 22:28:46 -05:00
Scott Lahteine 47e0ee8eff
Merge pull request #8260 from thinkyhead/bf2_anet_keypad_ramps 
[2.0] RAMPS pins for ANET_KEYPAD_LCD
 2017-11-04 21:49:13 -05:00
Scott Lahteine ca7d36d9ed RAMPS pins for ANET_KEYPAD_LCD 2017-11-04 21:22:53 -05:00
Scott Lahteine 52aec32f3a
Merge pull request #8258 from thinkyhead/bf2_git_scripts 
[2.0] Update git helper scripts
 2017-11-04 21:03:17 -05:00
Scott Lahteine ca21367dde Update git helper scripts 2017-11-04 18:35:34 -05:00
Colten Edwards e0a6ee8da5 [2.0] Fix up G33, LPC1768 + SDCARD_SORT_ALPHA (#8250) 
* Update Conditionals_post.h

* Add a cast to round() to convert to a unsigned int

Add's a cast to round() so that it will compile properly. round() returns a float which must be cast to a integer for the following % operation. Use a unsigned int as a negative index to an array is wrong. Should never be more than 255 points allowing us to use a 8 bit cast.

* Update G33.cpp
 2017-11-04 18:04:18 -05:00
Scott Lahteine 46c0b73578
Merge pull request #8252 from PaoloP74/patch-1 
Update README.md
 2017-11-04 15:12:23 -05:00
Scott Lahteine dac1f6fe74 Tweaks to cubic_b_spline code style 2017-11-04 14:46:10 -05:00
Scott Lahteine 4df024d7b9
Merge pull request #8234 from thinkyhead/bf2_native_operation 
[2.0.x] Operate in Native Machine Space
 2017-11-04 14:31:44 -05:00
Scott Lahteine 601ccded89 Fix case-insensitive config issue 2017-11-04 14:10:13 -05:00
Paolo Paolucci 944b67b0b8
Update README.md 2017-11-04 16:23:12 +01:00
Scott Lahteine f8393a0908 Operate in Native Machine Space 2017-11-04 00:05:38 -05:00
Scott Lahteine d83a9a53e8
Merge pull request #8220 from thinkyhead/bf2_serial_port_-1 
[2.0] Add SERIAL_PORT -1 option for configurators
 2017-11-03 15:25:12 -05:00
Scott Lahteine 93ba72ea83 Add SERIAL_PORT -1, set on SBASE, STM32F103RET6 2017-11-03 15:22:45 -05:00
Scott Lahteine b561ee2738
Merge pull request #8244 from thinkyhead/bf2_probes_link 
[2.0] Fix probes configuration url
 2017-11-03 13:45:53 -05:00
Scott Lahteine 7e43dd1d23 Fix probes configuration url 
Based on #8241 by @machaj
 2017-11-03 13:35:40 -05:00
Scott Lahteine f606ebf8ee
Merge pull request #8238 from AnHardt/2.0_boot/kill_screen_cleanup 
[2.0] Some cleanup around 'lcd_bootscreen()' and 'lcd_kill_screen()'
 2017-11-03 13:31:49 -05:00
AnHardt ca0e4b4e96 Some cleanup around 'lcd_bootscreen()' and 'lcd_kill_screen()' 
Move 'lcd_bootscreen()' from `lcd_init()` to 'setup()' where it is cexecute exactly once. Saves 'bool show_bootscreen'.
Move the call of 'lcd_custom_bootscreen()' to the begin of 'lcd_bootscreen()'.
Move the delays into the related functions.
Move the picture loop around 'lcd_kill_screen()' into the function.
 2017-11-03 12:02:48 +01:00
Scott Lahteine 84b93d941f
Merge pull request #8178 from thinkyhead/bf2_config_tweak 
[2.0.x] Faster menu navigation for Anet A8
 2017-11-03 04:49:17 -05:00
teemuatlut 70be4d206e [2.0.x] UltiMachine Archim2 (#8190) 
* UltiMachine Archim2 support

* SPI gets included by the library

* Invert TMC2130 diag pin state

* Clean up Archim2 pins

* Update Archim2 config

* FAN2 -> FAN1

* Cleanup

* Add brief Archim installation instructions

* Bring pins into compliance

* Update 1.0 SD Detect pin for 1.1

* Update Configuration.h

* Update pins_ARCHIM2.h
 2017-11-03 04:48:15 -05:00
Scott Lahteine f3deb37bdf
Merge pull request #8236 from thinkyhead/bf2_protect_M303 
[2.0.x] M303 thermal runaway protection
 2017-11-03 04:42:14 -05:00
Scott Lahteine 31f112cf58 Cleanup trailing whitespace 2017-11-03 04:07:45 -05:00
Scott Lahteine 2f9e42feb9 M303 thermal runaway protection 2017-11-03 03:57:46 -05:00
Scott Lahteine e5ae545647 Remove ADCKey steps acceleration 2017-11-03 03:41:55 -05:00