melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,090 Commits 2 Branches 0 Tags
Commit Graph

15090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Lahteine
78308b1c0b New git helper scripts 'mfadd' and 'mfqp' 
- `mfadd` adds and fetches a user’s fork of Marlin
- `mfqp` invokes `git commit -m`, `mfrb`, `git push -f`
 2017-04-20 21:37:25 -05:00
Scott Lahteine
7b4c245de3 Improve existing git helper scripts 2017-04-20 21:37:25 -05:00
Scott Lahteine
06f4776be4 mfprune: fetch remotes, offer checkout option 2017-04-20 21:37:25 -05:00
Scott Lahteine
c73b62447c Merge pull request #6403 from thinkyhead/rc_flsun_clean 
FLSUN and trailing whitespace cleanup
 2017-04-20 20:48:41 -05:00
Scott Lahteine
e0e069c6d8 Clean up trailing whitespace 2017-04-20 17:52:07 -05:00
Scott Lahteine
9b94210394 Bring FLSUN config more up to date 2017-04-20 17:52:06 -05:00
Scott Lahteine
b0aa256bc0 Updates for all configs 2017-04-20 17:52:05 -05:00
Scott Lahteine
b6ed69571a Merge pull request #6400 from thinkyhead/rc_interrupt_macros 
Add and apply interrupt helper macros
 2017-04-20 17:17:21 -05:00
Scott Lahteine
ee46ce1743 Add and apply interrupt helper macros 2017-04-20 16:04:29 -05:00
Scott Lahteine
6131c62499 General cleanup 2017-04-20 16:04:29 -05:00
benlye
2c86dfd3b5 Fix compiler type conversion errors after LCD changes 2017-04-20 16:04:29 -05:00
Scott Lahteine
55f9e76610 Merge pull request #6367 from thinkyhead/rc_cleanup_followup 
Cleanup after some direct commits
 2017-04-20 15:13:24 -05:00
Scott Lahteine
d38a792a91 Merge pull request #6382 from MagoKimbra/fix_configuration_store 
Fix double definition in configuration_store
 2017-04-20 15:06:58 -05:00
Scott Lahteine
b98bc034ae Replace c_assert hack with static_assert 2017-04-19 13:07:35 -05:00
Scott Lahteine
5eb2b1a790 Clear up G29 compiler warnings 2017-04-19 13:07:35 -05:00
Scott Lahteine
4ce2a63db0 Apply const, spacing to Marlin_main.cpp 2017-04-19 13:07:34 -05:00
Scott Lahteine
e97f1284c1 Cleanup of pins testing code 2017-04-19 13:07:34 -05:00
Scott Lahteine
e9b53ae00c Cleanup after some direct commits 
https://github.com/MarlinFirmware/Marlin/commit/5e9726530ff21d3bc62beaa6
ac1b9437c276130a
 2017-04-19 13:07:34 -05:00
Scott Lahteine
e05d050a1e Add hex routine to print an address 2017-04-19 13:07:34 -05:00
Scott Lahteine
4542282f5e Fix broken TOGGLE macro in fastio.h 2017-04-19 12:38:13 -05:00
MagoKimbra
ed52275a14 Fix double definition in configuration_store 2017-04-18 17:57:40 +02:00
Scott Lahteine
de569e3d4e Merge pull request #6327 from Bob-the-Kuhn/M43-toggle-&-Z-probe-fixes 
M43 Toggle & Z servo test - fix bug & add another check
 2017-04-18 03:21:57 -05:00
Scott Lahteine
f33a650ecc Merge pull request #6368 from thinkyhead/rc_linear_advance_eeprom 
Add Linear Advance values to EEPROM and LCD
 2017-04-18 02:54:12 -05:00
Scott Lahteine
a00ae4790a Replace M905 with unique code M900 2017-04-17 16:39:37 -05:00
Scott Lahteine
1286d9603d Clean up and organize ultralcd.cpp 2017-04-17 16:39:36 -05:00
Scott Lahteine
3cdf78a79f MSG_VOLUMETRIC => MSG_FILAMENT 2017-04-17 16:39:36 -05:00
Thomas Moore
f8e77d6545 Add Linear Advance values to EEPROM and enable configuration of K via LCD 2017-04-17 16:39:36 -05:00
Scott Lahteine
eb2d073dae Add M905 R for setting the E/D ratio directly 2017-04-17 16:39:36 -05:00
Scott Lahteine
69dfa54a84 Use code_value_linear_units for known-linear axes 2017-04-17 16:39:36 -05:00
Scott Lahteine
b956f2642b Show M503 report with current linear units 2017-04-17 16:39:36 -05:00
Scott Lahteine
ba4a005ceb Merge pull request #6373 from mtowara/mt_makefile_fix 
Fix Makefile build
 2017-04-17 16:16:37 -05:00
towara
150b15c311 fix compiler errors generated by more stringent flags in Makefile: 
- use volatile for registers
- avoid implicit casts
 2017-04-17 11:59:47 +02:00
towara
f6095c9325 fix missing serial.cpp in Makefile 2017-04-17 11:59:03 +02:00
Scott Lahteine
871f92378c Tweak headings in EEPROM structure 2017-04-16 18:42:33 -05:00
Scott Lahteine
bf2548be4a Merge pull request #6362 from tcm0116/babystepping 
Only queue babysteps if axis is in a known position
 2017-04-16 17:46:06 -05:00
Scott Lahteine
bddd75aa5c Merge pull request #6363 from dot-bob/display_reset 
Identifed a display initialization issue.
 2017-04-16 17:44:44 -05:00
dot-bob
9c410ddf68 Fixed an issue where a display with a hardware reset pin (LCD_RESET) may not get initialized properly. 2017-04-15 22:45:15 -06:00
Thomas Moore
72a7fac461 Only queue babysteps if axis is in a known position 2017-04-15 23:19:43 -05:00
Roxy-3D
5e9726530f Setup to find data corruption and general clean up 
This data corruption problem is very difficult.  Just changing the code
a little bit changes whether the problem even happens and what is
affected.  I need these changes in the main branch so I can operate with
the extra debug code always available and turned on.

Everything is setup such that if M100 is turned off or DEBUG(ECHO) is
turned off, the code is not affected.   M100 has been made a little bit
more inteligent so it can display the serial command buffers in a more
meaningful way (because the data corruption seems to often times end up
in that area).
 2017-04-15 19:26:43 -05:00
Scott Lahteine
e519e95953 Merge pull request #6358 from thinkyhead/rc_doubleclick_fix 
Show Cancel/Continue screen for ABL "Level Bed"
 2017-04-15 17:25:37 -05:00
Scott Lahteine
a81606c680 Show Cancel/Continue screen for ABL "Level Bed" 2017-04-15 16:51:03 -05:00
Scott Lahteine
51021bc7b8 Merge pull request #6353 from thinkyhead/rc_endstop_coolness 
Clean up endstop triggering code
 2017-04-15 16:49:54 -05:00
Scott Lahteine
857dec0990 Merge pull request #6342 from benlye/benlye-fix-softspi 
Fix softspi variant conditional for 1284p
 2017-04-15 16:33:50 -05:00
Scott Lahteine
4e04383d18 Merge pull request #6354 from thinkyhead/rc_doubleclick_fix 
Fix undefined symbol if DOUBLECLICK_FOR_Z_BABYSTEPPING and HAS_BED_PROBE defined
 2017-04-15 16:06:29 -05:00
Thomas Moore
8dd0492e68 Show lcd_babystep_zoffset screen if DOUBLECLICK_FOR_Z_BABYSTEPPING is enabled and HAS_BED_PROBE is defined 2017-04-15 14:44:50 -05:00
benlye
0a2f60fab4 Make spi.h inclusion conditional 
spi.h is only needed if HEATER_0_USES_MAX6675 is defined, so making its inclusion conditional on HEATER_0_USES_MAX6675 being defined.
 2017-04-15 16:22:42 +01:00
Bob-the-Kuhn
60471b7592 minor improvements 
Configuration_store.cpp - changed a couple of print statements so the
values were printed.  The old method resulted in the formula being
printed.

ubl_G29
1) added support for R option to P4.  Now probes all points unless R is
present and the number is greater than 0.

2) P2 - moved map print statement so it showed the point that was
currently being probed,  The old location did this only for the first
point.

3) P4 - Moved the map print for the same reason.

ultralcd.cpp - changed "Mesh Editor :" to "Mesh Editor" because the LCD
draw routine puts a ":" in automatically so you end up with an extra ":"
using the old message.
 2017-04-15 09:31:55 -05:00
Scott Lahteine
25a61e9061 Improve motion-based endstop triggering code 2017-04-15 06:16:50 -05:00
Scott Lahteine
5a97a7be97 Merge pull request #6352 from thinkyhead/rc_patch_menu_bug 
Fix compiler warning about z-offset callback
 2017-04-15 03:35:16 -05:00
Scott Lahteine
a2356c2825 Fix compiler warning about z-offset callback 2017-04-15 02:50:27 -05:00