MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
8,068 Commits 1 Branch 0 Tags 129 MiB
062131554f
Commit Graph

6689 Commits

Author SHA1 Message Date
Scott Lahteine
761df686bd Minor cleanup in gcode.h 2017-06-09 16:59:26 -05:00
Thomas Moore
897bc2ac1f Updates for ensure_safe_temperature (#6963) 
* Updates for ensure_safe_temperature

* M600 fixes
 2017-06-09 15:19:08 -05:00
Bob-the-Kuhn
1c107b3949 delete problem line 2017-06-09 11:53:36 -05:00
Diederik van der Pant
5b270417ed added shift register pins for reprapworld keypad v1.1 
I recently upgraded my Marlin to V1.1.x and decided to publish my fix to make marlin compile properly when #define board megatronics 2 in combination with #define reprapworld keypad v1.1. It was previously described in the comments of a closed pull request. MarlinFirmware#472. All the buttons on the keypad are now operational.
 2017-06-09 14:17:47 +02:00
bgort
2f55870edb [New Feature] I2C position encoder support (#6946) 
* [New Feature] I2C position encoder support

I plan to continue improving/cleaning this up, as there areas that need work.

* let the cleanups begin.

* progress

* more progress

* comments, rename files, etc.

* clean

* Cleanups per thinkyhead

* a few more cleanups

* cleanups, bugfixes, etc.

* remove unnecessary passes_test(), additional cleanups/optimizations

* cleanups

* misc.

* Fix up I2CPEM.init() and a few other things.

* organize, fix, rename, etc.

* more optimization

* a few more tweaks
 2017-06-09 08:06:23 -04:00
Bob-the-Kuhn
28d72f48f1 change to DWORD 2017-06-08 16:15:02 -05:00
Bob-the-Kuhn
8d1d9040b6 add static 2017-06-08 14:59:21 -05:00
Bob-the-Kuhn
a17ffe1ece Merge pull request #6985 from Kaibob2/patch-1 
Fix for #6980 (case_light compile problem when EXTENDED_CAPABILITIES_REPORT is enabled)
 2017-06-08 11:18:56 -05:00
Tannoo
731c8e6372 Translatable Strings for ubl_G29 (#6990) 2017-06-08 10:09:39 -05:00
Kai
abb6b8ad54 update language_de.h (#6986) 
There was quite a lot to translate this time. I'm not absolutely confident with the whole UBL stuff and it's a PITA to translate. I don't use any kind of levelling myself as i just have a perfectly level cast aluminium plate as bed.
So maybe someone who really uses it might take a closer look at it after it's merged.
 2017-06-08 10:04:52 -05:00
Kai
c2eff60d3f Fix for #6980 
Line 7830 prevented successfull compilation when #define CASE_LIGHT_ENABLE is uncommented
 2017-06-08 09:19:04 +02:00
Scott Lahteine
1419126721 Merge pull request #6965 from thinkyhead/bf_save_more_sram 
Use createChar_P to save SRAM in bootscreen
 2017-06-07 17:34:19 -05:00
Scott Lahteine
a453be7357 Merge pull request #6973 from bgort/autoreportT 
Enable AUTO_REPORT_TEMPERATURES by default
 2017-06-07 17:33:40 -05:00
Scott Lahteine
1d615e0a67 Merge pull request #6976 from Tannoo/Leveling_in_About_Printer 
Leveling type in About Printer
 2017-06-07 17:26:21 -05:00
Scott Lahteine
707707d71a Fix LCD status message padding 2017-06-07 16:07:38 -05:00
Scott Lahteine
e556ab1dff Find three-point leveling points on Delta 2017-06-07 16:07:38 -05:00
Scott Lahteine
a27b08e6af Various code style tweaks 2017-06-07 16:07:38 -05:00
Scott Lahteine
dac29e0f75 Cleaner failure of UBL without EEPROM 2017-06-07 16:07:38 -05:00
Scott Lahteine
9128d9ab45 Improve sanity checks with static_assert, organize 2017-06-07 16:07:38 -05:00
Scott Lahteine
6bb05c4543 Save 20b in smart_fill_mesh with PROGMEM 2017-06-07 16:07:38 -05:00
Scott Lahteine
b7dc4d9973 Save 92b PROGMEM, 14b SRAM with extruder auto fan 2017-06-07 16:07:38 -05:00
Scott Lahteine
c9e3caf928 Save lots of PROGMEM, ~20b SRAM with DIGIPOT_I2C 2017-06-07 16:07:38 -05:00
Scott Lahteine
4134a6b526 Save 88b PROGMEM, 48 bytes SRAM in settings.reset 2017-06-07 16:07:38 -05:00
Scott Lahteine
36cc03a9b4 Save 224b PROGMEM, 48b SRAM in get_homing_bump_feedrate 2017-06-07 16:07:38 -05:00
Scott Lahteine
2a41f0ff84 Save 28b PROGMEM in ultralcd.cpp (line_to_current) 2017-06-07 16:07:38 -05:00
Scott Lahteine
e6d10f6ddd Spend 48b PROGMEM to save 16b SRAM 
...by moving `homing_feedrate_mm_s` to PROGMEM.
 2017-06-07 16:07:38 -05:00
Scott Lahteine
97e13a30ba Save over 100 bytes SRAM in pin_is_protected 2017-06-07 16:07:38 -05:00
Scott Lahteine
45c74406cf Recover 32 bytes of SRAM in Marlin bootscreen code 2017-06-07 16:07:38 -05:00
Scott Lahteine
e1c5a43247 Cleanup stepper current control config options 2017-06-07 16:07:38 -05:00
Scott Lahteine
efc198f952 Spacing, const, comments 2017-06-07 16:07:38 -05:00
Scott Lahteine
4406fba994 Fixes #6975 2017-06-07 11:14:30 -05:00
Scott Lahteine
d28f5d8a78 Fix: z_endstop_adj is never initialized 2017-06-07 10:29:56 -05:00
Scott Lahteine
5d5ff36446 Fix a compile error with _lcd_set_z_fade_height 2017-06-07 10:29:56 -05:00
Tannoo
b88957e0d4 Leveling type in About Printer 
Show the Leveling system in use on the About Printer screen.
 2017-06-07 06:28:33 -06:00
Brian
dd071a4a65 Enable AUTO_REPORT_TEMPERATURES by default 2017-06-07 02:52:35 -04:00
bgort
8db1197c9b Enable extended capabilities report by default (#6969) 
Ref #5139
 2017-06-07 02:36:34 -04:00
bgort
82e662fc69 Remove requirement for LCD when UBL is used. (#6971) 
* Remove requirement for LCD when UBL is used.

* fix previous oversights

* further refinement - error messages for P2 & P4

* require R on G26 when not using LCD; default to all points
 2017-06-07 02:24:36 -04:00
Tannoo
2c2b991b59 UBL Manual Build Menu Option (#6972) 
One click option to manually build UBL mesh.
 2017-06-06 22:14:18 -05:00
Roxy-3D
0dd0033b33 Save up to 94 bytes of RAM on 20x4 LCD Display machines (#6964) 
* Save up to 94 bytes of RAM on 20x4 LCD Display machines

Moved the custom screen characters out of RAM into Program Memory.  With
SD-Card support and the Progress Bar enabled, this saves 94 bytes of RAM
memory.

This was tested using the example_configurations/FolgerTech-i3-2020
files.  So a couple small changes to those files snuck into this Pull
Request.

Probably...  We can find similar savings in the Graphics LCD code it we
comb through it.   And if so...  That is the place we really need to
save RAM memory!

* Tidy up white space and indentation
 2017-06-05 17:02:00 -05:00
Bob-the-Kuhn
ba0bd33c38 Removed check for 2560 family 2017-06-04 22:16:27 -05:00
Scott Lahteine
04b07a6ecc Unused var in Stepper 2017-06-04 17:25:16 -05:00
Scott Lahteine
eb8af486d2 Ensure safe temperature for M600 2017-06-04 17:25:16 -05:00
Scott Lahteine
bfe7fbe5c0 Maintain message scroll rate 2017-06-04 17:25:15 -05:00
Scott Lahteine
6411d65c48 Fix Morgan SCARA S2 calculation 2017-06-04 12:24:09 -05:00
Scott Lahteine
46752588b9 Merge pull request #6948 from Bob-the-Kuhn/redundant_temperature 
fix redefinition errors for redundant_temperature
 2017-06-04 12:16:09 -05:00
Scott Lahteine
5938dae200 Merge pull request #6950 from MagoKimbra/fix_g29_3_point 
Fix G29 with 3 point
 2017-06-04 12:15:44 -05:00
Scott Lahteine
c5e0f08e35 Merge pull request #6951 from fixoid/patch-4 
Initializing extruder/nozzle servo when turning on the printer
 2017-06-04 12:13:05 -05:00
Scott Lahteine
e4937b0285 Cleanup of spacing and formatting 2017-06-04 11:31:43 -05:00
fixoid
1aab9906e6 Initializing extruder/nozzle servo when when turning on the printer 2017-06-04 16:57:24 +03:00
MagoKimbra
663ff7f92a Fix G29 with 3 point 2017-06-04 14:39:31 +02:00
oldmcg
9f295581f0 Ubl delta fixes and improvements (#6941) 
* Change all direct changes of ubl.state.active to
  set_bed_leveling_enabled() which handles apply/unapply
  leveling to maintain current_position consistency.

Fix invalidation of UBL mesh to invalid unreachable
  mesh points as well (delta corners).

Fix UBL_DELTA unapply_leveling logic and when
it gets applied, including fade_height changes.

Add optional M114 D for detailed position information,
disabled from compilation by default (M114_DETAIL).

* UBL_DELTA raw and inline kinematics

* UBL planner fall through fix

* consistent variable names

* Cleanup orphaned code and whitespace changes.
Use _O2.

* compile warnings cleanup

* Remove redundant #ifdef condition
 2017-06-03 17:11:43 -05:00
Bob-the-Kuhn
c34d7a29a6 fix redefinition errors for redundant_temperature 
Removing redundant_temperature from public section and leaving it in the
private section
 2017-06-03 16:40:14 -05:00
Bob-the-Kuhn
6a5d3b580d fix "hex_address not defined" when UBL is enabled 2017-06-03 13:19:55 -05:00
Scott Lahteine
789b2928a8 Tweak scrolling message code 2017-06-02 23:45:53 -05:00
Scott Lahteine
fc7d7f87b4 Init probe test pin with FastIO 2017-06-02 23:45:52 -05:00
Scott Lahteine
0282452cea Make Parser::seen volatile 2017-06-02 23:45:52 -05:00
Scott Lahteine
9a305a467b Patch LCD Contrast menu item 2017-06-02 23:45:52 -05:00
Scott Lahteine
90ccac4bcf Clean up after recent commits 2017-06-02 23:45:52 -05:00
Bob-the-Kuhn
2130f10de8 allow space between parameter and value 2017-06-02 19:57:22 -05:00
Bob-the-Kuhn
ebda4663c3 for discusion 2017-06-02 19:42:43 -05:00
FATALHERMIT
911079104e Support for ZRIB v2.0 Control Board 2017-06-02 12:05:46 -05:00
Scott Lahteine
65a0212866 Easier override of FILWIDTH_PIN 2017-06-02 12:05:46 -05:00
Scott Lahteine
147d9d76fc Merge pull request #6928 from Bob-the-Kuhn/Fix-case-light-logic-on-Azteeg-X3-boards 
Fix case light logic on Azteeg_X3 boards.
 2017-06-01 20:14:15 -05:00
guntherv73
4288c4fb4f Configurations for Malyan M150 2017-06-01 19:26:29 -05:00
Scott Lahteine
1919cb0d1e Config cleanups 2017-06-01 19:26:16 -05:00
Bob-the-Kuhn
9a9bbfc57c Fix case light logic on Azteeg_X3 boards. 2017-06-01 12:33:24 -05:00
Thomas Moore
a32f7b329c Fix heater status display for advanced pause 2017-06-01 12:29:47 -05:00
Scott Lahteine
445865ea03 REPRAPWORLD_KEYPAD is NEWPANEL but not ULTIPANEL 2017-05-31 23:48:03 -05:00
Scott Lahteine
4296a8b74e For status scrolling, pad a short message 2017-05-31 23:48:03 -05:00
Scott Lahteine
4a96433b7e Simplify counting of printable characters 2017-05-31 23:45:41 -05:00
Scott Lahteine
8d69394ae1 Fix LCD printing of progmem strings 2017-05-31 23:36:57 -05:00
Scott Lahteine
c74d4dede6 Prevent illegal leveling combinations 
Addressing issue #6901
 2017-05-31 23:36:57 -05:00
Scott Lahteine
155aa62fb0 Merge pull request #6912 from thinkyhead/bf_better_pulse_delay 
Account for dual XYZ in pulse delay cycles estimate
 2017-05-31 22:21:47 -05:00
Scott Lahteine
a5fa586642 Preferred patch to gcode.h 2017-05-31 21:18:16 -05:00
Bob-the-Kuhn
1b41e1f645 another compile error 
only seen if

#if ENABLED(TEMPERATURE_UNITS_SUPPORT)
      ...
    #if
ENABLED(ULTIPANEL) && DISABLED(DISABLE_M503)
 2017-05-31 13:59:49 -05:00
Bob-the-Kuhn
65bd4c8c94 Merge pull request #6797 from Bob-the-Kuhn/M355-case-lightimprovements-(1.1.x) 
M355 case light improvements (replaces PR #5685)
 2017-05-31 13:33:59 -05:00
Bob-the-Kuhn
9657e7d3ee copied file changes from PR #5685 
==============================

Configuration_adv.h changes

==============================

add "live" LCD update

==============================

P & S version

==============================

final (hopefully) tested version

==============================

update M115 capabilities print

==============================

Menu changes portion of the requested changes

==============================

changed USEABLE_HARDWARE_PWM from a function to a series of macros

==============================

changes per review
 2017-05-31 13:22:38 -05:00
Bob-the-Kuhn
8206bb9bb9 fix compile error 
invalid conversion from 'const char*' to 'char*' [-fpermissive]
 2017-05-31 13:17:01 -05:00
Scott Lahteine
df91346188 Account for dual XYZ in pulse delay cycles estimate 2017-05-31 12:23:28 -05:00
Scott Lahteine
7236109f2a Patch M24 / M125 for delta 2017-05-30 23:07:29 -05:00
Scott Lahteine
be17033762 Fix case light menu toggle 2017-05-30 14:03:45 -05:00
Scott Lahteine
89b93058e3 Merge pull request #6887 from christianh17/PR-sanitycheck 
enable DEACTIVATE_SERVOS_AFTER_MOVE with switching nozzle
 2017-05-30 13:43:39 -05:00
Scott Lahteine
05b66234ae Merge pull request #6895 from thinkyhead/bf_user_commands 
Custom user commands menu
 2017-05-30 13:40:50 -05:00
Scott Lahteine
84a0a77c59 Merge pull request #6852 from tcm0116/mixing_extruder_lin_advance 
Generate error if MIXING_EXTRUDER and LIN_ADVANCE are both enabled
 2017-05-30 13:37:51 -05:00
Scott Lahteine
266ae8912a Formatting in _draw_heater_status 2017-05-30 03:32:16 -05:00
Scott Lahteine
6b9ca16f36 Patch lcd_print edge limit code 2017-05-30 03:32:15 -05:00
Tannoo
74d6dee920 User Command (Script) Menu 
The menu (commands / scripts) is configurable in `Configuration_adv.h`.

- Added conditionals.
- Changed script handling.
- Slimmed and working!
- Added Status message.
- Returning to lcd status screen now!
- Example Configs Updated.
- Cleanups by @thinkyhead
 2017-05-30 02:33:57 -05:00
Scott Lahteine
d9c8072037 Edit PROPORTIONAL_FONT_RATIO comment 2017-05-30 01:29:39 -05:00
Scott Lahteine
46b32e4548 Cleanup LCD interface, add lcd_reset_status 2017-05-29 22:16:13 -05:00
Scott Lahteine
ca99d67ede Fix UBL "Info screen" menu items 2017-05-29 19:55:26 -05:00
Scott Lahteine
2c7a39bc0e Fix LCD print aborted message 2017-05-29 19:52:01 -05:00
Scott Lahteine
0f1e8c195d Draw on LCD after value has changed 2017-05-29 19:42:30 -05:00
Scott Lahteine
51587c4b43 Rename Feedrate to Velocity to match prior naming 2017-05-29 17:54:15 -05:00
Scott Lahteine
9677f3f2f5 Patch up LCD Bed Leveling menu 2017-05-29 17:51:11 -05:00
Scott Lahteine
fc2eaab7f3 Show home option in level bed menu 2017-05-29 17:51:10 -05:00
Scott Lahteine
c6a7adc293 Patch G29 A and Q arguments to bypass setup 2017-05-29 17:51:10 -05:00
Scott Lahteine
4cece2d72e Use NAN for G29 W omitted parameters 2017-05-29 17:51:10 -05:00
Scott Lahteine
2d71569138 Fix spacing in JSON output 2017-05-29 17:51:10 -05:00
Scott Lahteine
b2d3c8aedd Have G28 do a refresh of the display 2017-05-29 17:51:10 -05:00
Scott Lahteine
50ab9c2e04 General cleanup of spacing, comments 2017-05-29 15:34:14 -05:00