Edward Patel
8067a985ce
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
...
Fixed conflicts:
Marlin/planner.h
2015-03-17 22:48:08 +01:00
wurstnase
05333f61b7
fix macro
2015-03-17 12:50:44 +01:00
AnHardt
1883e1bb60
Applied thinkyheads corrections from 2015-03-17
2015-03-17 11:23:44 +01:00
AnHardt
be79235ef2
Add new (cleaner) Marlin font
...
with sources in /fonts
2015-03-17 10:33:02 +01:00
Scott Lahteine
89fe77468d
Merge pull request #1586 from maverikou/delta_auto_bed_level
...
Delta auto bed level (Updated PR)
2015-03-16 18:17:11 -07:00
alexborro
cb676cdf39
Fix CoreXY homing bug introduced by PR #1606
...
The Check Endstop logic must be:
if (current_block->steps_x != current_block->steps_y || (TEST(out_bits,
X_AXIS) == TEST(out_bits, Y_AXIS)))
if (TEST(out_bits, X_HEAD))
not
if (TEST(out_bits, X_HEAD) && (current_block->steps_x !=
current_block->steps_y || (TEST(out_bits, X_AXIS) == TEST(out_bits,
Y_AXIS))))
Same applies for Y axis.
2015-03-16 16:31:25 -03:00
AnHardt
8a29dd4839
Cleaned typo in dogm_lcd_implementation.h
2015-03-16 20:18:48 +01:00
AnHardt
7e69f72db6
Moved font directory. Updated README.fonts
2015-03-16 17:27:27 +01:00
AnHardt
00b162a993
Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji
...
Conflicts:
Marlin/language.h
Conflict cleaned
2015-03-16 17:13:49 +01:00
AnHardt
e38dd5f030
Merge remote-tracking branch 'origin/utf' into utf-kanji
2015-03-16 17:00:54 +01:00
AnHardt
08e4651ece
Corrected cyrillic font again
...
Thank you @Nprod.
2015-03-16 16:59:14 +01:00
AnHardt
e6cb8ee188
Remove 6x9 font
...
in dogm_lcd_implementation.h
by using standard font and
shifting down temperature displays by one pixel
Saves 2300 bytes.
2015-03-16 11:18:27 +01:00
maverikou
e93eb3e8d3
Update test
2015-03-16 09:16:00 +02:00
maverikou
b8ae3feb9e
Update test
2015-03-16 09:03:15 +02:00
maverikou
3570447ded
Fix Z_RAISE_AFTER_PROBING
2015-03-16 08:35:49 +02:00
maverikou
8a739b6fba
Merge branch 'Development' into delta_auto_bed_level
...
Conflicts:
Marlin/Marlin_main.cpp
2015-03-16 08:24:26 +02:00
Scott Lahteine
7629c4f05c
Cleanup for menu optimization
...
- Compare pr_char to space
- Fewer calls to lcd_strlen
2015-03-15 22:54:54 -07:00
Scott Lahteine
3405f85a6a
Reduce size of menu code
...
- Get rid of _selected functions, passing selected state instead
2015-03-15 22:02:33 -07:00
Edward Patel
e983a5ab92
Disable option. Enable for use/test.
2015-03-16 02:50:11 +01:00
Edward Patel
f34b9c83d1
Added comment about MESH_NUM axis points.
2015-03-16 01:48:46 +01:00
Scott Lahteine
a686c9878f
Move TOPO_ORIGIN define to Configuration.h
...
- Addressing issue #1608
2015-03-15 15:49:36 -07:00
Edward Patel
8005d22c81
Added menu option for bed leveling.
2015-03-15 23:24:32 +01:00
Edward Patel
0e51e53813
WIP. Adding bed leveling code.
2015-03-15 23:24:32 +01:00
Scott Lahteine
d0d12962e0
Merge pull request #1615 from AnHardt/fix-1611
...
Fix #1611
2015-03-15 15:19:02 -07:00
AnHardt
f0dcea7e14
Fix #1611
...
Warning: suggest parentheses around comparison in operand of &
pretty much helped.
2015-03-15 22:52:50 +01:00
AnHardt
28b1c37dea
Fix for #1612
2015-03-15 21:35:33 +01:00
AnHardt
2f374f1465
Removed Kanji.
2015-03-15 16:44:37 +01:00
Scott Lahteine
5efc798642
Merge pull request #1546 from apollo-ng/pr-felix
...
Added support for Felix 2.0/3.0 printers
2015-03-15 07:52:22 -07:00
Scott Lahteine
b83e52e50f
Merge pull request #1467 from thinkyhead/marlin_configurator
...
Configurator utility
2015-03-15 07:49:19 -07:00
Scott Lahteine
7bc77dc134
Merge pull request #1583 from galexander1/m404fix
...
M404 should not use 'N' address as parameter because 'N' is reserved
2015-03-15 07:47:30 -07:00
Scott Lahteine
b80ed51fcc
Fix controllerFan() code
...
- Add support for 4th extruder
- Fix parentheses matching
- Apply coding standards
- Address issue mentioned at #1575
2015-03-15 06:55:31 -07:00
Scott Lahteine
4b50205f11
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
2015-03-15 06:37:32 -07:00
Scott Lahteine
bb4cb1b15a
Merge pull request #1606 from thinkyhead/cleanup_stepper
...
Cleanup of stepper.cpp
2015-03-15 06:05:08 -07:00
Scott Lahteine
63f41f56f8
Merge pull request #1607 from chris-bo/Development
...
Update ultralcd_st7920_u8glib_rrd.h
2015-03-15 01:04:40 -07:00
Scott Lahteine
4eabd80025
Fix babystep for extruder_duplication
2015-03-14 18:31:25 -07:00
alexborro
d3259d0dba
Merge pull request #1581 from msutas/Development
...
Filament Runout Sensor Feature
2015-03-14 18:35:20 -03:00
AnHardt
25c4f17e5d
Corrected Cyrillic fonts. Round II.
2015-03-14 15:10:45 +01:00
chris-bo
b73ba26b23
Update ultralcd_st7920_u8glib_rrd.h
2015-03-14 14:31:00 +01:00
Scott Lahteine
c37f7d15c9
- Rename WRITE_E_STEP for consistency
...
- Add BIT and TEST macros
- Add _APPLY_ macros to stepper.cpp to help with consolidation
- Consolidate code in stepper.cpp using macros
- Apply standards in stepper.cpp
- Use >= 0 instead of > -1 as a better semantic
- Replace DUAL_Y_CARRIAGE with Y_DUAL_STEPPER_DRIVERS
2015-03-14 04:28:22 -07:00
AnHardt
44a205d9d9
Corrected Cyrillic fonts.
...
Cleaned typo in language_test.h Cyrillic part.
2015-03-14 12:27:47 +01:00
chrono
4d878b9bac
Fixed path typos in README
2015-03-14 10:18:12 +00:00
chrono
12ec557a75
Added DEFAULT_TRAVEL_ACCELERATION
2015-03-14 10:14:13 +00:00
chrono
1d25d510bc
Upstream Merge Fixes
2015-03-14 09:48:30 +00:00
chrono
a89d690b77
Merge remote-tracking branch 'upstream/Development' into pr-felix
2015-03-14 09:25:43 +00:00
Scott Lahteine
cb57fc727d
Declare pid_output for PIDBEDTEMP
2015-03-13 20:19:51 -07:00
Scott Lahteine
3d6deb9bdf
Simplify manage_heater
...
- Make separate get_pid_output(e) and get_pid_output_bed() function
- Reduce size of manage_heater function
- Hopefully work around linker errors
2015-03-13 19:49:41 -07:00
AnHardt
730497aaa1
Make use of ligatures in language_kana_utf8.h
2015-03-13 19:47:40 +01:00
AnHardt
3240d89f7d
Logic cleanup in utf_mapper.
2015-03-13 19:45:10 +01:00
alexborro
2f3c77b751
Fix decimal places in G29 Bed Equation Coeficients
2015-03-13 14:39:41 -03:00
AnHardt
96f8d20f2f
Change selection logic another time
...
Automatic selection was to unflexible.
Updated documentation
Updated language files to new logic and documentation.
Updated bdf2u8g.exe
2015-03-13 14:26:58 +01:00
Scott Lahteine
352aa3f4c5
Merge branch 'Development' into marlin_configurator
...
Latest upstream
2015-03-12 17:12:51 -07:00
Scott Lahteine
e3ca9137b5
Fix missing temp_error declarations
...
- Fix for #1591 replacing #1595
2015-03-11 16:38:42 -07:00
Scott Lahteine
08694339eb
Merge branch 'Development' into marlin_configurator
...
Conflicts:
Marlin/Configuration.h
2015-03-11 15:47:32 -07:00
Scott Lahteine
e4d77a6313
Merge pull request #1554 from 2PrintBeta/Development
...
Macro indirection for stepper drivers + Support for TMC26X and L6470 Stepper Drivers
2015-03-11 15:31:57 -07:00
Mehmet Sutas
b373826428
Merge pull request #2 from MarlinFirmware/Development
...
update
2015-03-12 00:07:39 +02:00
AnHardt
5bafb1fe1f
Add user test to language_test.h and make it default.
...
Improve description in Configuration.h
2015-03-11 20:46:52 +01:00
alexborro
c0b6075f77
Fix max acceleration limits in planner
...
The max acceleration limiting was in wrong place.
2015-03-11 15:08:11 -03:00
alexborro
9157cbd8f3
Add Travel Acceleration and change the M204 options
...
Added option to set Travel Acceleration (non printing moves).
The M204 options was a non sense (S for printing moves and T for retract
moves).
It has been changed to:
P = Printing moves
R = Retract only (no X, Y, Z) moves
T = Travel (non
printing) moves
I will add this info o G-Code wiki in reprap.org. I also advise to put
this info in Marlin next version changelog.
2015-03-11 13:19:02 -03:00
alexborro
888cf161bd
fix travel speed option for G29
...
I forgot to enclousure the variable with #ifdef
2015-03-11 10:03:32 -03:00
alexborro
af63b54562
Add travel speed option to G29 command line
2015-03-11 09:51:56 -03:00
AnHardt
817751d4b9
Added new languages, the Cyrillic display and a test language to find out your hardware.
2015-03-11 11:10:35 +01:00
AnHardt
c4b0087f7a
Insert utf_mapper.h
...
Top -> down
- Decide what output function is to use.
- Precautions. If non of the DISPLAY_CHARSET_HD44780's is selected fall back to Japanese.
- When we are not on the dogms setup a mapping table depending on display type and mapper.
- If we are on dogm we use ONE To ONE mapping - except kanji.
- select and define one of the mapping functions.
2015-03-11 10:55:16 +01:00
AnHardt
b60761bcff
Removed some messages that shouldn't be translated in the Japanese files.
...
And made falback to kana work.
2015-03-11 10:30:38 +01:00
AnHardt
97ae3c5c6a
Corected some errors inrtoduced by a faild global replacement.
2015-03-11 10:26:36 +01:00
AnHardt
ae76b1e8a8
Changes in dogm_lcd_implementation.h in detail.
...
Top -> down
- We don't need the old Marlion_font package any more - we made new.
- But we need information about configured fonts and the mappers.
- We support Cyrillic now.
- LCD_CLASS is not used in this file. LiquidCrystalRus.h is deleted anyway.
- define some fonts
- BIG_EDIT_FONT works only together with western languages.
- Select a matching FONT for the MENUE depending on the defined language.
- Number the different font-types. Wanted to avoid to store complete font-structures when changing fonts back and forth.
- Marlin special symbols are now at the lower end - like in 'ultralcd_implementation_hitachi_HD44780.h'
- insert the new remembering setFont function.
- insert the new counting lcd_print functions.
- make use of the new setFont and lcd_print functions.
- On some places redefined one character long strings with chars to avoid overhead and reduce warnings.
2015-03-10 22:34:56 +01:00
alexborro
5bf42066fa
Fix typo in configuration.h
2015-03-10 15:06:34 -03:00
alexborro
8a4b62d081
Set more regular setup in configuration.h
2015-03-10 14:41:21 -03:00
AnHardt
255ca68123
Changes in ultralcd_implementation_hitachi_HD44780.h in detail
...
Top -> down:
We don't need LiquidCrystalRus.cpp and LiquidCrystalRus.h any more. Functionality is now in utf_mapper.h
Comment on LCD_STR_BEDTEMP about behaviour in strings.
Change LCD_STR_ARROW_RIGHT from "\x7E" to ">" because "\x7E" is only ARROW_RIGHT on displays with DISPLAY_CHARSET_HD44780_JAPAN.
Introduce the counting UTF8 enabled lcd_print functions.
Replace the old lcd.print functions and make use of them.
A bit of reformatting around the changes.
2015-03-10 18:30:09 +01:00
alexborro
60ceca1bc1
Add speed configuration for home-bumping movement
2015-03-10 14:08:32 -03:00
AnHardt
6fc2ccd568
Make use of new remenbering fontswitch.
2015-03-10 18:04:03 +01:00
AnHardt
0f26f3abf2
Add a test_language.
...
Will show the compleet utf8 or ASCII charset
To se the second half of ASCII click on "01234..."
2015-03-10 17:59:28 +01:00
AnHardt
901cf203fe
Add legal stuff to marlin_kanji.h
2015-03-10 17:49:16 +01:00
AnHardt
2d5134b0ed
Introduce - clean - prepae language files
2015-03-10 17:46:25 +01:00
domonoky
d813090d90
Merge remote-tracking branch 'remotes/upstream/Development' into Development
...
Conflicts:
Marlin/Marlin_main.cpp
Marlin/stepper.cpp
2015-03-10 10:46:37 +01:00
Scott Lahteine
c321c97f35
Merge pull request #1584 from galexander1/stringcleanup
...
fix a handful of cases where strtod() was cast to int, instead of just using strtol()
2015-03-10 01:48:30 -07:00
maverikou
53abc5e2f1
Merge branch 'Development' into delta_auto_bed_level
2015-03-09 22:28:57 +02:00
Mehmet Sutas
956fb2d278
Merge pull request #1 from MarlinFirmware/Development
...
update
2015-03-09 11:05:49 +02:00
Scott Lahteine
978dadf806
Base64 decode AJAX-fetched text properly
2015-03-08 21:54:17 -07:00
Scott Lahteine
0eae9c24bc
Merge pull request #1582 from galexander1/deltaconftypo
...
fix typo in delta example config introduced in commit 697ee2d
2015-03-08 21:13:14 -07:00
Scott Lahteine
624f23f550
Merge pull request #1575 from Wurstnase/fix-controllerFan
...
Fix controller fan
2015-03-08 20:36:38 -07:00
maverikou
424c747fb3
Enable M401 and M402 for deltas with allen key z-probes.
2015-03-08 09:57:38 +02:00
maverikou
0d593ab7c1
Fix debug message
2015-03-08 09:41:31 +02:00
Greg Alexander
ed7874b4e0
M404 should not use 'N' address as parameter because 'N' is reserved for the line number
2015-03-07 17:35:06 -05:00
Greg Alexander
b9dfa5cad4
use code_value_long() instead of (int)code_value()
2015-03-07 17:33:15 -05:00
Greg Alexander
901b03d020
use strtol() instead of strtod() when an integer value is desired
2015-03-07 17:24:26 -05:00
Greg Alexander
4fba7b084f
fix typo in delta example config introduced in
...
commit 697ee2dc50
2015-03-07 16:43:41 -05:00
Mehmet Sutas
cfc6a3a87a
Filament Runout Sensor Feature
...
With this change a mechanical or optical switch may be used to check the
availability of the filament and when the filament runs out an M600
(filament change) command is issued. This is only done while printing
with an SD card.
This feature was requested several times (issue #679 ), but the requests
were not accepted since it was believed that this situation should be
handled at host side. However during an SD print the control is totally
on firmware and I think that during an SD print it should be handled by
the firmware.
The original code was posted at reprap forum
(http://forums.reprap.org/read.php?1,297350 ) by Lazymonk. I have only
corrected some bugs of the code and improved it by adding definitions to
the configuration.h in order to make it more standardized.
2015-03-07 22:43:15 +02:00
maverikou
e6862700af
Add Z_RAISE_AFTER_PROBING to all config files
2015-03-07 20:55:30 +02:00
maverikou
39d255608d
Test an extra delta configuration with auto bed leveling code paths
2015-03-07 20:53:23 +02:00
maverikou
7c24b97958
Ported over Johann Rocholl's improvements for delta printers:
...
- Nonlinear auto bed leveling code (includes G29, G30, Z_RAISE_AFTER_PROBING). Cleaned it up to be a delta-specific AUTO_BED_LEVELING_GRID code path.
- Allen key z-probe deployment and retraction code. Cleaned it up and added safety checks.
2015-03-07 20:36:21 +02:00
Wurstnase
a5342c942e
Update Marlin_main.cpp
2015-03-07 16:47:53 +01:00
Scott Lahteine
0f3b7d5575
Update annotated configurations
...
- Also update base configs
2015-03-07 01:07:40 -08:00
Scott Lahteine
c5aa56bc4d
Merge branch 'Development' into marlin_configurator
...
Latest upstream commits
2015-03-06 23:00:03 -08:00
Scott Lahteine
d085725c86
More sanity-checking for ABL
...
- Moved sanity-checks to Marlin_main.cpp
- Applied to other configuration files
- Fixed formatting of ABL output
- Passing verbose level to probe_pt
- Miscellaneous cleanup
- Put CONFIG_STEPPERS_TOSHIBA into Configuration.h
2015-03-06 22:14:34 -08:00
Scott Lahteine
8b6766b37b
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
2015-03-06 16:32:57 -08:00
Scott Lahteine
9eed8c8cf0
Make sure a ROM is selected for ULTRA_LCD
2015-03-06 15:37:54 -08:00
AnHardt
7136268273
Added 'dogm_font_data_6x10_marlin_Kanji.h'
...
This is copied from http://www.thingiverse.com/thing:664397
// Japanese Original font
// Version 0.1 by ichibey
//
// 営利目的で利用する際は、かならず許可を得てください。非営利の場合は、CCライセンスに従い使用ください。
// http://creativecommons.org/licenses/by-nc/2.1/jp/legalcode
This font is very special. It uses a mixture of katakana an kanji symbols, uses multi character symbols and is only addressable by '\xxx' sequences.
2015-03-07 00:26:28 +01:00
AnHardt
16e173e167
Added 5 new font.h files to main directory.
...
The former place of 'dogm_font_data_6x9_marlin.h' was in 'dogm_font_data_m0arlin.h'.
Deleted 'dogm_font_data_marlin.h'.
2015-03-07 00:09:49 +01: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
AnHardt
b14270b029
Added font tools
2015-03-06 23:48:55 +01:00
AnHardt
fe2bd237d5
Add font sources.
...
Fonts have been created with fony.exe (http://hukka.ncn.fi/?fony )
The HD44760_? fonts simulate the fonts of the character based displays.
The ISO10646 fonts provide the right size of the standard fonts.
Marlin_symbols contains only the the special symbols of the original marlin font.
2015-03-06 23:36:56 +01: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
kieranc
8ccdac9898
Enable PID debugging for heated bed
2015-02-23 09:42:01 +01:00
kieranc
29097b0ab2
Enable PID debugging for heated bed
2015-02-23 09:41:25 +01:00
kieranc
21bd4fd6db
Enable PID debugging for heated bed
2015-02-23 09:40:53 +01:00
kieranc
fb56aad898
Enable PID debugging for heated bed
2015-02-23 09:40:29 +01:00
kieranc
08c543f8fb
Enable PID debugging for heated bed
2015-02-23 09:40:06 +01:00
kieranc
c89413db1e
Enable PID debugging for heated bed
2015-02-23 09:39:39 +01:00
kieranc
1c71e4751a
Enable PID debugging for heated bed
2015-02-23 09:39:07 +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