SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2397 commits 1 branch 0 tags 119 MiB
Commit graph

1918 commits

Author SHA1 Message Date
Scott Lahteine
9eed8c8cf0 Make sure a ROM is selected for ULTRA_LCD 2015-03-06 15:37:54 -08:00
Scott Lahteine
254970c92a Merge pull request #1570 from C-o-r-E/escape_fix 
Fixes gCode handling of comments and escaped characters
 2015-03-06 15:09:35 -08:00
Scott Lahteine
25dc79f124 Remove M48 credits also 2015-03-06 14:54:30 -08:00
Scott Lahteine
34e51f576f Fix compile error in gcode_G29 
- A redo of #1576, which missed topo_flag
- Always set verbose_level
 2015-03-06 14:52:05 -08:00
Scott Lahteine
344a12bd10 Merge pull request #1571 from AnHardt/Undubble 
Undubble MSG_MIN & MSG MAX
 2015-03-06 10:08:19 -08:00
Scott Lahteine
1149c24b86 More grouping, cleanup, start on overrides 2015-03-06 08:48:53 -08:00
Wurstnase
62bd734612 fix controllerFan() for inverted enable pins 
add ```^ !(n_ENABLE_ON)``` for each stepper
 2015-03-06 12:01:17 +01:00
AnHardt
3024f6c706 Undubble MSG_MIN &MSG MAX 2015-03-06 00:25:44 +01:00
Gina Häußge
63b62d8d4e Fixed in-line comments and escaping 
* "G1 X1 ; test" was not executing "G1 X1" due to never leaving comment mode.
  * "M117 Hello \;)" printed "Hello \" to the display due to not replacing serial_char properly.

Tested with the following commands:
    * M117 Hello ; test => displays "Hello" on display, ignores "test"
    * G1 X1 ; foo => moves 1mm in X, ignores "foo"
    * ; test => completely ignored, not even acknowledged
    * M117 Hello \;) => displays "Hello ;)" on display
    * M117 Hello \\;) => displays "Hello \" on display, ignores ")"
 2015-03-05 23:30:34 +01:00
C-o-r-E
99fb1bc3e8 Attempt to resolve #1568 and add basic escape character support 2015-03-05 15:22:37 -05:00
Scott Lahteine
fad14ae7eb Merge branch 'Development' into marlin_configurator 
Latest upstream changes
 2015-03-05 05:32:31 -08:00
Scott Lahteine
cdc38aa783 Move gcode handlers into inline functions 2015-03-05 04:27:24 -08:00
Scott Lahteine
6d9e9a6bef Merge branch 'Development' into enhanced_g29 
Latest upstream changes
 2015-03-05 02:49:18 -08:00
Scott Lahteine
4db2179f5c Include 4th extruder support 2015-03-05 02:37:36 -08:00
OhmEye
f90a947e65 Fix autoretract 
Autoretract was broken, looks like it was overlooked when the retracted flag was updated for multi extruders.
 2015-03-04 20:28:08 -10:00
Scott Lahteine
2ef6b3d57a Fix wrong defines, broken syntax 2015-03-04 22:24:44 -08:00
Scott Lahteine
08b722b635 Merge pull request #1555 from C-o-r-E/solenoids 
Add support for solenoid articulated extruders
 2015-03-04 21:36:29 -08:00
Scott Lahteine
32744d41a9 Do sanity checking on LRFB values 
- Setting boundaries based on configured limits, contrasting with G28
(which forgets these limits?)
 2015-03-04 21:32:11 -08:00
chrono
0a7d85c20e Minor fixes 2015-03-04 12:35:32 +00:00
chrono
48e3a97a18 Removed extra encoder definitions from pins_FELIX2.h 2015-03-04 12:21:18 +00:00
Scott Lahteine
d052a3c6aa Merge pull request #1551 from thinkyhead/redundant_encrot 
Cleanup rotary encoder encrot* defines
 2015-03-04 03:22:24 -08:00
chrono
d8eeddfb93 Updated DUAL Extruder config, added README and enabled NEWPANEL by default 2015-03-04 09:59:58 +00:00
chrono
b423b90c77 Added Configuration_adv.h to examples for LCD/SD Support 2015-03-03 19:09:25 +01:00
domonoky
075507fb9a missed one X_ENABLE_PIN 2015-03-03 11:09:56 +01:00
Scott Lahteine
dfb38874f8 Some suggested changes for #1555 2015-03-03 00:48:20 -08:00
Scott Lahteine
7f8ea7105f Arrange ProbeAction values bitwise 2015-03-02 20:14:37 -08:00
Scott Lahteine
7684721977 Enhanced G29 
- Adapted “Enhanced G29” code referred to in #1499 and posted at
[3dprintboard.com](http://3dprintboard.com/showthread.php?3105-Auto_Bed_
Leveling-Enhanced-G29-command)
- Compatible with current G29 while adding some new arguments
  - `V` sets the verbose level for serial out
  - `T` (or `V` > 2) send a Topology report to serial out
  - `E` works the same way as before
  - `P` works as before (source used `n` or `U`/`u`)
  - `L`, `R`, `B`, `F` work as before
- Still needs sanity checking for `LRBF`
 2015-03-02 20:00:17 -08:00
C-o-r-E
874d3d3fc5 Add support for solenoid articulated extruders 2015-03-02 20:07:12 -05:00
chrono
7540a81106 Minor fixes 2015-03-02 22:55:00 +01:00
chrono
a375d648c7 Merge remote-tracking branch 'upstream/Development' into Development 2015-03-02 17:21:05 +00:00
domonoky
4a7aca2736 Merge remote-tracking branch 'remotes/upstream/Development' into Development 2015-03-02 17:52:12 +01:00
alexborro
715104e477 Fix Endstop check for CoreXY bots. 
The X_Axis could not home to min while Y_Max endstop was trigged.
 2015-03-02 13:36:58 -03:00
Scott Lahteine
e428e8da75 Merge pull request #1552 from thinkyhead/cleanup_cardreader 
Cleanup of cardreader.*
 2015-03-02 07:57:26 -08:00
Scott Lahteine
20e59dc61e Don't skip files starting with underscores 2015-03-02 07:56:11 -08:00
Scott Lahteine
f171656f8e Cleanup of cardreader.* 
- Apply standards to cardreader.*
- Fix minor issues with cardreader.cpp
- Apply standards to some other stale regions
 2015-03-02 07:06:01 -08:00
Scott Lahteine
f379edca78 Cleanup rotary encoder encrot* defines 
The encrot values are used in only one place, and don’t vary, so remove
redundant references.
 2015-03-02 06:42:48 -08:00
Scott Lahteine
c7cdb176c8 Merge branch 'Development' into marlin_configurator 
Latest upstream changes
 2015-03-02 06:13:10 -08:00
Scott Lahteine
49f471a5fc Merge pull request #1541 from thinkyhead/fixup_temperature 
Cleanup of temperature code
 2015-03-02 05:38:10 -08:00
Scott Lahteine
f2710e11d1 Optimize initial loading, code cleanup 2015-03-02 05:23:36 -08:00
chrono
558c6313f7 Merge branch 'pr-felix' into Marlix 2015-03-02 10:27:58 +00:00
chrono
08bc723a3c Enable PIDBED 2015-03-02 10:26:42 +00:00
chrono
e487bd642b Updated PR to streamline integration 2015-03-02 09:49:45 +00:00
Scott Lahteine
2eeb241b42 Find fields that group together 
- Do field grouping
- Tweak configurations for better grouping
 2015-03-02 01:45:53 -08:00
Scott Lahteine
e30bfedce4 Fix undefined *_PROBE_BED_POSITION error 2015-03-01 19:57:35 -08:00
chrono
3eafea840d Minor fixes in Configuration.h 2015-03-01 11:04:02 +01:00
chrono
c7fb1b70f2 Initial Configuration.h for Felix 2.0/3.0 2015-03-01 09:54:36 +00:00
chrono
2e172f38bd Added support for Felix 2.0/3.0 printers 2015-03-01 09:16:55 +00:00
Scott Lahteine
f994729999 Parse and use dependent groups 
- Parse #if, #ifdef, etc. for rules to enable fields
 2015-02-28 22:40:20 -08:00
maverikou
9b50ec6512 Panel One encoder pins 2015-02-28 10:52:15 +02:00
Scott Lahteine
838a22de64 Fix switch value method, make app global 2015-02-27 21:08:09 -08:00
Scott Lahteine
8d5839151b Merge branch 'Development' into marlin_configurator 
Latest upstream changes
 2015-02-27 20:40:23 -08:00
domonoky
443e7edef4 - Add support for L6470 Drivers. 
- Both TMC, L6470 and pin-driven drivers work.
- All can be mixed and matched as needed.
 2015-02-27 12:43:23 +01:00
Scott Lahteine
1db02c2891 Merge branch 'Development' into fixup_temperature 
Merge upstream changes
 2015-02-26 17:25:28 -08:00
Scott Lahteine
a99470fbb0 Merge pull request #1527 from maverikou/panel_one 
Added support for PanelOne from T3P3.
 2015-02-26 16:01:13 -08:00
domonoky
5727cb3ed4 Cleanup TMC Stepper a bit. 2015-02-26 12:57:46 +01:00
Scott Lahteine
a5bbd402bf Merge pull request #1539 from AnHardt/dummysensor 
Extend the idea of dummy temperature sensors.
 2015-02-26 01:29:14 -08:00
Scott Lahteine
1a7b0d9a37 Redo HAS_* macros to fix define error 2015-02-26 01:14:59 -08:00
Scott Lahteine
864dddc878 Macros to the top, a few HAS_* macros 2015-02-26 00:33:30 -08:00
alexborro
227ab8c665 Merge pull request #1503 from MarcelMo/patch-2 
Support for simple customisable AutoZProbing area
 2015-02-25 13:22:42 -03:00
Scott Lahteine
fd1ea9d56f Move literal strings to language files 2015-02-24 23:03:08 -08:00
maverikou
8742b6bd56 Merge branch 'Development' into panel_one 2015-02-24 22:24:57 +02:00
Scott Lahteine
aa9c1f1bed Better name for ADC macro 2015-02-24 05:38:10 -08:00
Scott Lahteine
9c9726d469 Cleanup of temperature code 
- Reduce calls to millis()
- General cleanup of manage_heaters
- General cleanup of pid autotune
- Formatting here & there
- Macros to clean up and shrink ISR code (reduced by ~364 lines)
 2015-02-24 04:46:11 -08:00
AnHardt
c6d2ebe452 Extend the idea of dummy temperature sensors. 
Added a second sensor and made them configurable.
 2015-02-24 11:02:16 +01:00
Scott Lahteine
c9a3eb0c1a Spacing in calculate_volumetric_multiplier(s) 2015-02-23 20:35:18 -08:00
Scott Lahteine
2af559cca3 Shared function for menu_edit_* and menu_edit_callback_* 2015-02-23 20:31:28 -08:00
Scott Lahteine
df8c51528f Merge branch 'Development' into cleanup_ultralcd 
Latest upstream changes
 2015-02-23 20:13:08 -08:00
Scott Lahteine
517f411999 Spacing adjustment to menu_edit* macro 2015-02-23 20:11:52 -08:00
Scott Lahteine
4938ae5caf Add required backslash for macro expansion 2015-02-23 20:10:49 -08:00
Scott Lahteine
e182cdebf9 Add required backslash for macro expansion 2015-02-23 19:54:07 -08:00
Scott Lahteine
fa4c36df68 Fix menu callback issue wrt LCD_CLICKED 2015-02-23 19:40:57 -08:00
Scott Lahteine
0cf0c20532 Optimize calculate_volumetric_multiplier 2015-02-23 18:10:35 -08:00
domonoky
38500165ea First attempt at adding TMC Driver support. May need some cleanup. 2015-02-23 17:45:29 +01:00
domonoky
b55995aae8 Introduce a layer of macro indirection to all stepper pins. This allows other stepper drivers to redefine them, so they can use SPI/I2C instead of direct pin manipulation. 2015-02-23 16:12:35 +01:00
maverikou
a9e15aa503 Updated example configurations 2015-02-22 20:15:05 +02:00
Scott Lahteine
3ba47ea277 Remove test/demo multi=line code menu items 2015-02-22 10:10:37 -08:00
Scott Lahteine
c1240f23dd Merge branch 'Development' into marlin_configurator 
Latest upstream changes
 2015-02-22 10:02:25 -08:00
alexborro
a57869ba49 Dummy Thermistor Table for testing purposes 
Am I the only one who always need to change the thermistortable.h to add
a dummy table??
Ok, it is done. Just set the thermistor to 999 and it will always read
25C. Great for Testing or Development purposes.
 2015-02-22 11:02:04 -03:00
Maverikou
2e166f5337 Added support for PanelOne from T3P3. 2015-02-22 09:14:43 +02:00
Scott Lahteine
40ef472a25 Merge in encoder multiplier 2015-02-21 20:18:49 -08:00
Scott Lahteine
1c13cd604b Formatting in babysteps defines 2015-02-21 18:45:10 -08:00
Scott Lahteine
3a26804d80 Adapt to latest PID code and fix typos 2015-02-21 18:41:04 -08:00
Scott Lahteine
422582da71 Prep formatting for upcoming PR 2015-02-21 18:24:16 -08:00
Scott Lahteine
27ac3e985d Add options to example_configurations 2015-02-21 18:17:37 -08:00
Scott Lahteine
0d6a7a2df0 Merge with latest upstream changes 2015-02-21 18:13:31 -08:00
Scott Lahteine
c7a97e18b7 Merge branch 'Development' into cleanup_ultralcd 
Latest upstream changes
 2015-02-21 18:04:08 -08:00
Scott Lahteine
6d5c13df74 Merge pull request #1520 from thinkyhead/fixup_temperature 
Fix typos in checkExtruderAutoFans
 2015-02-21 17:53:26 -08:00
Scott Lahteine
5b9e341222 Merge pull request #1516 from thinkyhead/fixup_ramps 
Cleanup ramps boards
 2015-02-21 17:51:57 -08:00
Scott Lahteine
57bc28b42c Cleanup and fix ultralcd.cpp 
- Fix bug in lcd_control_temperature_menu
- Remove test menu-item left in from multi-line command feature
- Replace literals with translatable strings
- Reduce lcd_preheat code redundancy
- Reduce menu macro redundancy
- Clean up formatting
 2015-02-21 17:38:56 -08:00
Scott Lahteine
4fcd4b444e Merge pull request #1519 from thinkyhead/fix_recent_issues 
Fix implementation of PID menu items
 2015-02-21 16:43:11 -08:00
Scott Lahteine
9c35ed149d Merge pull request #1508 from AnHardt/iss1492 
Fix iss#1492
 2015-02-21 16:26:37 -08:00
Scott Lahteine
430c4b6538 Replace missing backslash 2015-02-20 02:17:16 -08:00
Scott Lahteine
3aa5f98b64 Download all as ZIP, adjust layout on resize 2015-02-20 02:12:00 -08:00
Scott Lahteine
a8939eec28 Readability of MENU_MULTIPLIER_ITEM 
Last commit before bed.
 2015-02-20 02:08:41 -08:00
Scott Lahteine
09e09b308e Tweaky spacing adjustments 2015-02-20 01:22:56 -08:00
Scott Lahteine
e3fd3e8fa4 Fix typos in checkExtruderAutoFans 2015-02-20 00:08:59 -08:00
Scott Lahteine
c610471b0c Add PID_PARAMS_PER_EXTRUDER conditional 2015-02-20 00:00:19 -08:00
Scott Lahteine
2d6fa9ce80 Proper implementation of PID menu items 
- Make this work per #1344
 2015-02-19 23:54:06 -08:00
wgm4321
b8e79dce89 Fix compilation errors when encoder multiplier is disabled 2015-02-19 21:51:23 -05:00
wgm4321
65e1fc71be Add encoder rate multiplier 2015-02-19 21:42:57 -05:00