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

1963 commits

Author SHA1 Message Date
domonoky
15b73386b5 Add pin definitions for the Boards BAM&DICE + BAM&DICE Due 2015-02-19 11:53:31 +01:00
Scott Lahteine
08c236059e Merge pull request #1505 from thinkyhead/issue_1499 
Bed leveling probe behavior issue?
 2015-02-19 01:24:17 -08:00
Scott Lahteine
f238c7428d Merge branch 'Development' into marlin_configurator 
Latest upstream changes
 2015-02-18 21:56:17 -08:00
Scott Lahteine
da275c72ab Cleanup Github reply.data.content before atob() 2015-02-18 21:45:38 -08:00
MagoKimbra
159196d1e9 Reset Alert message when finish M600 command 2015-02-18 21:33:38 +01:00
daid
266ff227cf Merge pull request #1510 from docdawning/Development 
Trivial spelling correction
 2015-02-17 20:59:32 +01:00
DocDawning
dfd4e74a5c Trivial spelling correction 2015-02-17 12:37:05 -07:00
AnHardt
6cdcd6c6d1 Fix iss#1492 
Introduced lcd_strlen() and lcd_strlen_P().
Replaced the old functions where necessary.
Reworked language_ru.h.

Speeded up test for zero length string in cardreader.cpp
 2015-02-16 13:53:58 +01:00
Scott Lahteine
c033904693 Updated config file section markers 2015-02-15 23:25:57 -08:00
Scott Lahteine
84a87a5b1c Fix up configs a little 2015-02-15 23:19:22 -08:00
Scott Lahteine
63a5ff7ab9 Merge pull request #1489 from tommil/Development 
Updated Finnish language file
 2015-02-15 23:02:11 -08:00
Scott Lahteine
efb0491d40 Merge branch 'Development' into issue_1499 
Merging latest upstream changes
 2015-02-15 22:59:07 -08:00
Scott Lahteine
8309b4f408 Merge branch 'Development' into marlin_configurator 
Merging latest upstream changes
 2015-02-15 22:58:04 -08:00
Scott Lahteine
961998cf91 Merge pull request #1496 from thinkyhead/issue_1493 
Megatronics 3 servo pins
 2015-02-15 22:00:14 -08:00
Scott Lahteine
b71322e793 Issue #1504 – K8200 Z_ENABLE_PIN 
- K8200 uses a non-standard RAMPS with Z_ENABLE=63 ??
- Assuming from previous input that 3DRAG is the same.
 2015-02-15 21:56:23 -08:00
Scott Lahteine
978d114c73 Bed leveling probe behavior issue? 
The `float` keyword should not be on these vars because they conceal
the outer vars, preventing them from obtaining known values before
being passed in `set_bed_level_equation_3pts`. Possibly related to
`Z_RAISE_BETWEEN_PROBING` not functioning.
 2015-02-15 20:51:27 -08:00
Scott Lahteine
7c6236761a Merge branch 'Development' into issue_1493 
Merging latest upstream changes
 2015-02-15 20:45:35 -08:00
Scott Lahteine
9875352dd8 Merge branch 'Development' into marlin_configurator 
Merging latest upstream changes
 2015-02-15 20:44:21 -08:00
MarcelMo
d28f5b9e82 Support for simple customisable AutoZProbing area 
When probing PCB´s I had the problem that i needed auto-leveling for specific areas (it´s never the same size).
Not much code, but very useful.
Now I use simply G29 L5 R55 F5 B35 P3 to probe a 4x6cm PCB before milling.
I used int for values... might be wrong...
I hope this time I got the right development tree. (tried first with https://github.com/MarlinFirmware/Marlin/pull/1130/commits)
 2015-02-15 15:58:29 +01:00
Tommi Lamberg
513ff94b89 Merge remote-tracking branch 'upstream/Development' into Development 2015-02-15 12:21:45 +02:00
Scott Lahteine
83cb702e72 Config sections, multi-field values, toggles, etc 
- Auto-detect “switchable” items where possible
- Handle switchable multi-value fields
- Add standard sections to config form
- Add section markers to configurations
- Add value options to configurations
- Remove and re-add fields for loaded configs
- Preserve sections across configs
- Preserve non-added fields
- Style added fields wider & newline by default
 2015-02-14 23:44:01 -08:00
alexborro
afc737ca0c Fix CoreXY Homing Routine. 
Fixed how stepper ISR figure it out when the head (extruder) is going to
Min or Max direction.
Added Homing to Max Endstops.
 2015-02-13 14:38:05 -02:00
Scott Lahteine
ec53c6309a More fields, options in config, fix tooltips 2015-02-13 03:02:56 -08:00
Scott Lahteine
68184af57b Merge branch 'Development' into marlin_configurator 
Latest upstream commits
 2015-02-12 21:59:26 -08:00
Scott Lahteine
7866fa161f Merge pull request #1476 from Natealus/Development 
Compiling errors with 4 Extruders defined and Viki 2 Implementation
 2015-02-12 16:56:55 -08:00
Natealus
ea9e49b20d ARRAY_BY_EXTRUDERS 4th hotend PID parameters 2015-02-12 00:56:47 -07:00
Scott Lahteine
d0ad8a978c Megatronics 3 servo pins 
- Naive implementation, assuming the data sheet pin numbers correspond
to Arduino pin numbers.
 2015-02-11 23:46:27 -08:00
Scott Lahteine
e74138b2be More robust fetch code, download buttons 
- Fetch code now handles github, local, or http: access
- Download button creates a time-stamped inline download
- More complete error messages
- Show warnings when approaching the hourly fetch quota (limit
reloading!)
- Added my test domain (where the _htaccess is deployed)
- `_htaccess` file added to set Access-Control-Allow-Origin “*”
- Marlin logo with css
- Limit selectable areas to avoid annoying selections
- Messages now persist until dismissed
- Default repo for files set to thinkyhead, ‘marlin_configurator’ branch
- Cosmetic changes
 2015-02-11 04:59:07 -08:00
Tommi Lamberg
622a531d9c Fixed error in translation 2015-02-11 08:50:48 +02:00
Tommi Lamberg
290ab42d22 Updated Finnish translations 2015-02-11 08:37:07 +02:00
Jérémie FRANCOIS
22a7985445 reverted to upstream 2015-02-11 07:12:55 +01:00
Jérémie FRANCOIS
b3bda57ca2 reverted to upstream 2015-02-11 07:12:02 +01:00
Jérémie FRANCOIS
9d75a56b56 Merge remote-tracking branch 'upstream/Development' into Development 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
 2015-02-11 06:38:36 +01:00
Tommi Lamberg
0a59fee763 Merge remote-tracking branch 'upstream/Development' into Development 2015-02-11 06:53:43 +02:00
Scott Lahteine
eb5889b3da Merge pull request #1479 from AnHardt/en_first 
#include "language_en.h" before the national language in language.h
 2015-02-10 15:33:45 -08:00
Tommi Lamberg
a4f939cc27 Updated Finnish language file 2015-02-10 10:48:33 +02:00
Scott Lahteine
32d4dd073f Merge pull request #1487 from AnHardt/iss1485 
Fix for #1485
 2015-02-09 21:41:07 -08:00
AnHardt
c246026bda Sorry. 2015-02-10 00:23:39 +01:00
AnHardt
07e488cfae Fix for #1485 2015-02-10 00:13:46 +01:00
Souko
e7ecf14d0c Update ultralcd_st7920_u8glib_rrd.h 
Fixed delay-times during Init. REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER won't get initialized on some Boards because delay was to short.
 2015-02-09 21:46:06 +01:00
Scott Lahteine
52c3cf6d34 Fix a logging error 2015-02-09 05:07:05 -08:00
Scott Lahteine
ba24a09f24 Use api.github to get Configurations 
- Make api.github the default source for configurations
- Remove configurations from the configurator
- Continuation and enhancements
 2015-02-09 04:34:57 -08:00
Natealus
f4b0a40abb Additional fixes to temperature.cpp and found another missing line 
Looks like INVERT_E3_DIR was missing in the configuration.h also as I
did a test compile with 4 extruders and Azteeg X3 Pro defined. So I also
added those lines too. Additional formatting to make the comments line
up better in that section.
 2015-02-08 15:43:58 -07:00
AnHardt
3aac2df057 Now the oter way around. 
Include of language_en.h now behind national language.

All "#define MSG_STR_*" now surrounded by #ifndef and #endif.
 2015-02-08 20:41:20 +01:00
AnHardt
488633bf44 #include "language_en.h" before the national language in language.h 
+ May decrease the workload for feature developers. They may omit to
update all the language files but "language_en.h". When loading _en
first, all new features give some display, but the new in English.

- May throw some additional warnings about redefinition during compile.
 2015-02-08 14:26:24 +01:00
AnHardt
8e92729141 Make display language configurable in Configuration.h 2015-02-08 13:45:22 +01:00
Natealus
38a500d05c Viki 2 Implementation 
I've insert the define and pointer entries for the Viki 2 and miniViki
from Panucatt in all of the example configs and main config. With these
additions and with pins done in the old single pin.h style...I was able
to get the display working fine save for needing to turn Delta Segments
per Second down. But that's a common graphics lcd issue being looked
into right now.

I need assistance in understanding how the new divided pins files fit
together because my previous attempts at trying to get it to work
appropriately didn't seem successful. This originally came from trying
to find out how to swap the XYZ Min and Max Endstop pins in the Azteeg
X3 Pro. It only comes with one set of connectors and they're Min
Endstops. My previous experience didn't turn out well trying to tell the
firmware to home to the Min Endstops so the best solution I found was to
swap the pins in the firmware. If I'm missing a conflict with a setup
other than delta please let me know, but it makes sense in my setup.
 2015-02-08 03:14:59 -07:00
Natealus
697ee2dc50 Compiling errors with 4 Extruders defined 
Here were a few changes that I had to make/add lines for the 4th hotend.
A compiling problem in the Temperature.cpp and missing lines in
configuration.h and configuration_adv.h. I added these lines in all of
the example configs too.
 2015-02-08 01:05:05 -07:00
Jérémie FRANCOIS
85e5aa4011 Generalized enqueue_commands_P, and moved them to Marlin_main as they should 2015-02-07 23:24:20 +01:00
Scott Lahteine
4228758f1d Clean up and improve tooltips, show the name 2015-02-07 11:58:19 -08:00
Scott Lahteine
0116320d2c Strip slashes off the front of tooltips 2015-02-07 11:04:10 -08:00
Scott Lahteine
69240d41b0 Offset the timing of the pulsing animation 2015-02-07 10:45:56 -08:00
Scott Lahteine
78b9428f4e Avoid capturing disabled items in comments 2015-02-07 10:34:16 -08:00
Scott Lahteine
5d159851e5 Fix positioning of tooltip 2015-02-07 09:03:00 -08:00
Scott Lahteine
c99f1de9f3 Fix tooltips blocking clicks 2015-02-07 07:39:10 -08:00
Scott Lahteine
1a548c1bc1 Find nearby comments and make them into tooltips 2015-02-07 06:20:04 -08:00
Scott Lahteine
90fa1345b0 Fix purge + refresh of define info 2015-02-07 03:02:26 -08:00
Scott Lahteine
aa67b38a44 Fan speed and 4th extruder on graphical LCD 
- Display fan speed 0-1 as “—“ and 254-255 as “100%”.
- Display 4th extruder instead of the heated bed
 2015-02-07 02:44:35 -08:00
Scott Lahteine
7850ae2f4f Merge branch 'Development' into marlin_configurator 
Merge latest Development
 2015-02-07 02:20:25 -08:00
Scott Lahteine
2647402095 Use info.repl in updateDefineFromField, fix regex 2015-02-07 02:04:44 -08:00
Scott Lahteine
12a3975341 Close section tag, add String.prototype.lineCount 2015-02-07 00:46:14 -08:00
Scott Lahteine
4bb72f9480 Highlight the edited line 
- Add a span to the edited text line to provide a highlight
- Scroll and highlight for switch checkboxes also
- Clean up initialization
- More API documentation
- Smarter handling of asynchronous file loading during init
 2015-02-06 23:46:16 -08:00
Scott Lahteine
37c43a7ab3 Scroll to reveal on switches as well 2015-02-06 18:09:14 -08:00
Scott Lahteine
9c0adae3cd Scroll to setting position in file when edited 
- Animate scrolling to the edited item’s position
- Sanity check file drops and show warnings
- Fix form init / refresh on new configuration drop
- Document the API methods that get/set defines
 2015-02-06 17:57:31 -08:00
Scott Lahteine
4d341bb758 Copy configs into subfolder 
Browsers may not want to load files outside the folder, but they may be
okay with these relative references within the folder.
 2015-02-06 14:58:47 -08:00
Scott Lahteine
72856166a9 Fix bad typo in ConfigurationStore.cpp 2015-02-06 14:43:58 -08:00
Scott Lahteine
b51204cc1c Add fieldsets and make them into tabs 2015-02-05 20:28:39 -08:00
Scott Lahteine
56769ba4f8 Make comment/uncomment a little neater 2015-02-05 19:39:42 -08:00
Scott Lahteine
94bebf31ac Pre-collect info about options on field init 
- When initializing fields use the configuration to determine the format
- Cache the line for each option for fastest string compare / replace
- Add logging levels for debugging
 2015-02-05 19:30:11 -08:00
Scott Lahteine
32aaadc301 Include minimized jQuery 2.1.3 2015-02-05 11:50:42 -08:00
Scott Lahteine
53f6bbdfe0 Try a stepper for the serial port 2015-02-05 11:44:43 -08:00
Scott Lahteine
ac7a4358d6 Add a responsive file uploader 
- Specify HTML5
- Allow drag and drop for loading configurations
 2015-02-05 11:14:31 -08:00
Scott Lahteine
09a385d9b0 Add "use strict" to the top. 2015-02-05 08:22:51 -08:00
Scott Lahteine
b2627200ea Get thermistors from config, add temp sensors 2015-02-05 08:19:09 -08:00
Scott Lahteine
ef18bfdd3f An in-place browser-based configurator utility 
- A web form with fields for configuration values
- Reads and parses standard config files
- Modifies configurations dynamically in-place
 2015-02-05 07:05:29 -08:00
Scott Lahteine
3490a19103 Merge pull request #1466 from CONSULitAS/Development_K8200_de 
K8200: Example Configuration.h fixed
 2015-02-04 17:28:04 -08:00
CONSULitAS
cfbb94a2a8 K8200: Example Configuration.h fixed 
Example Configuration.h: fixed strange white characters preventing
compilation in lines 1 and 3 - oops
 2015-02-04 10:35:10 +01:00
Scott Lahteine
b65c5d8ec6 Merge pull request #1464 from AnHardt/iss1448-Menu 
Unified menu selection - by hilighting - made first column avilable
 2015-02-03 22:43:29 -08:00
CONSULitAS
0de5083aff K8200: Example Configurations readme.md updated 
Example Configurations for K8200 readme.md updated
* readme.md: added description for german umlaut support on LCD
 2015-02-04 00:24:51 +01:00
CONSULitAS
c421ffd520 K8200: Example Configuration_adv.h back in sync 
Example Configuration_adv.h for K8200 back in sync
* Configuration_adv.h: rebased and added missing changes for 4th
extruder
 2015-02-04 00:19:18 +01:00
CONSULitAS
0575dd10de K8200: Example Configuration.h back in sync 
Example Configuration.h for K8200 back in sync
* Configuration.h: rebased and added missing changes
* Configuration.h: updated comments for K8200
 2015-02-04 00:15:50 +01:00
AnHardt
f708884808 Introduced new function lcd_implementation_mark_as_selected() 
New function now drops the prechar (select character) and makes the first
column usable for text.
Marking the line is now constantly made by highlighting (reverse).

Replaced selection code in:
lcd_implementation_drawmenu_generic()
_drawmenu_setting_edit_generic()
_drawmenu_sd()

with new function.
 2015-02-03 23:35:33 +01:00
Scott Lahteine
b6ca50a2cc Merge pull request #1463 from thinkyhead/cleanup_recent_merge 
Apply some cleanup for recent merge
 2015-02-03 12:06:47 -08:00
Scott Lahteine
cc56f36870 Merge pull request #1461 from thinkyhead/issue_1453_redo 
Apply fix for M600 filament change
 2015-02-03 11:52:09 -08:00
Scott Lahteine
8663f4bbaf Apply some cleanup for recent merge 
Combine 1/(rows+1) with u8g.getHeight() to get rowHeight and just use
that.
 2015-02-03 11:48:49 -08:00
Scott Lahteine
0cb1029311 remove extra plan_buffer_line 2015-02-03 11:26:36 -08:00
AnHardt
9381bfe7f9 Fixes issue #1447 - Overlapping of long descriptions with values. 2015-02-03 20:15:16 +01:00
Scott Lahteine
b97a950f53 Apply fix for M600 filament change 
- Patch from #1453 for delta movement plan
- Fix: Set X with code X instead of adding to X
 2015-02-03 09:57:16 -08:00
AnHardt
2abf1ad940 Distribute recent changes in Configuration.h to the examples. 2015-02-03 17:59:04 +01:00
AnHardt
33f8580255 Merge branch 'lcd-width' into b- 2015-02-03 14:45:58 +01:00
AnHardt
0c24bb6cfc Adjust LCD_WIDTH to make better use of DOGM LCDs 2015-02-03 14:21:43 +01:00
AnHardt
b1dbd765c6 Centralise definition of fonts for DOGM displays 
Prework for issue #1448 and #1447

Will merge in when pull request #1457 is in.
 2015-02-03 13:10:09 +01:00
AnHardt
65642592ee Added dualline version. 2015-02-03 12:25:36 +01:00
AnHardt
f9cc1df00b Droped URL from bootsplash. 2015-02-03 11:14:27 +01:00
AnHardt
c20606b8d7 Replaced some literal constants with defines 
Replaced calculation to centre bitmap with fixed values.
Saved 20 bytes.
 2015-02-03 09:52:29 +01:00
AnHardt
3602474c25 Replace solitaire use of u8g_font_5x8 font and replace with u8g_font_6x10_marlin 
and win another 1694 bytes.
 2015-02-03 09:07:57 +01:00
AnHardt
f5fd94d62a Kick suspicious loop an win 72 bytes. 
No visible impact.
 2015-02-03 08:56:00 +01:00
Scott Lahteine
b3973ed224 Fix HD44780 misspelled as HD44870 2015-02-02 22:33:58 -08:00
Scott Lahteine
d8b7f29fa2 Merge pull request #1452 from thinkyhead/fix_M200_bug 
M200 cleanup, normalization of EXTRUDER loops
 2015-02-02 21:58:15 -08:00
Scott Lahteine
6d81968db5 Merge pull request #1450 from docdawning/Development 
Normalized section headers, added some headers, added help URLs for newb...
 2015-02-02 21:17:06 -08:00
DocDawning
5bb3933b21 Fixed n00bsauce 2015-02-02 14:18:53 -07:00
DocDawning
d109cd940b Normalized all configuration files to include my new section headers and the like. 2015-02-02 14:11:21 -07:00
DocDawning
055c4beaf9 Normalized section headers, added some headers, added help URLs for newbies 2015-02-02 14:11:09 -07:00
Scott Lahteine
9dc5de6166 Hide code that makes veteran geeks go "aha!" 2015-02-02 05:55:55 -08:00
Scott Lahteine
bd387068bb Apply loops for extruders elsewhere also 2015-02-02 05:27:27 -08:00
Scott Lahteine
4a146d584b Loop, since the pending feature can use an array 2015-02-02 05:16:17 -08:00
Scott Lahteine
bca884bf72 Realized it's not a bug, but cleanup code anyway 2015-02-02 04:41:31 -08:00
AnHardt
2dd43a82b1 Ups. #else added 2015-02-01 14:16:35 +01:00
AnHardt
26e55471f8 Update example configurations. 2015-02-01 13:46:32 +01:00
AnHardt
85385be132 Removed now automatic define of DISPLAY_CHARSET_DOGM + improved description. 2015-02-01 13:33:25 +01:00
AnHardt
0e40408ee5 Make exemplaric use of new display charsets in language_en.h and languag_de.h 2015-02-01 13:20:58 +01:00
AnHardt
8dce5a6644 Improve new charset featur. 
Select DOGM-displays automaticly.
Give hint where to find charsets.
Add '²' and '³' characters.
 2015-02-01 13:09:59 +01:00
Scott Lahteine
c009c81e65 make marlin-main the default 2015-01-31 23:11:28 -08:00
Scott Lahteine
f4ebc02555 marlin url 2015-01-31 23:09:12 -08:00
Scott Lahteine
0af9a0bf57 url to firmware downloads 2015-01-31 22:19:45 -08:00
Scott Lahteine
5f8dd92905 toss in a fix for .ru 2015-01-31 21:58:38 -08:00
Scott Lahteine
3f3ad9b3ad typo 2015-01-31 21:42:53 -08:00
Scott Lahteine
07639053fb Add support for BQ Prusa i3 "Hephestos" 2015-01-31 21:38:30 -08:00
Philip Schell
fb7c636ecf Avoid compiling error 
Only a missing ","... now it will compile again
 2015-02-01 01:33:04 +01:00
alexborro
787d6fb61a Update RUMBA pins file 
Add FAN1_PIN and SERVO0_PIN
 2015-01-31 18:03:28 -02:00
Scott Lahteine
5fd5105d44 Merge pull request #1439 from clefranc/Development 
Fix nozzle in temperature menu
 2015-01-30 19:05:45 -08:00
AnHardt
76bf93efcb Revert "get STR_THERMOMETER from ultralcd_implementation_hitachi_HD44780.h" 
This reverts commit 4d5b0e2037.
 2015-01-30 22:42:44 +01:00
AnHardt
4d5b0e2037 get STR_THERMOMETER from ultralcd_implementation_hitachi_HD44780.h 2015-01-30 22:20:10 +01:00
Christian Lefrançois
33408a4dfc Update ultralcd.cpp 
Fix number of nozzle displayed in temperature menu.
 2015-01-30 11:16:13 -05:00
AnHardt
6e6e3cf443 merged https://github.com/MarlinFirmware/Marlin.git 2015-01-30 11:05:29 +01:00
AnHardt
b3ca430a20 Inducted the defined placeholders in the translation table. 2015-01-30 10:35:14 +01:00
AnHardt
e045034c3f Included Configuration.h to read the defined charsets. 
Defined the charsets plus a default.
 2015-01-30 10:31:58 +01:00
AnHardt
27c638803e Defined three charsets. 2015-01-30 10:28:22 +01:00
Scott Lahteine
073c59c50a Clean up some formatting 
- Also partial cleanup of Marlin_main.cpp with a smidgen of Doxygen.
 2015-01-29 18:52:21 -08:00
AnHardt
9a4d4b3a2f translated Deltamenu 2015-01-29 13:19:32 +01:00
AnHardt
8aa6487b4b MSG_ENDSTOP_ABORT = 'Endstop abort' > 'Endstop Abbr. Ein' 2015-01-29 13:12:55 +01:00
AnHardt
666ad7106b Translated redundand: define MSG_INIT_SDCARD and MSG_CNG_SDCARD 2015-01-29 13:09:12 +01:00
AnHardt
e5c45fbe8c Infoscreen messages end with a '.' if not to long. 
MSG_NO_MOVE = 'Kein Zug.' > 'Motoren Eingesch.' hat mich grau Haare gekostet.
Die englisch Meldung will sagen - Du kannst jetz am Extruder arbeiten, die
Achsen sind bockiert, die Motoren sperren die Achsen weil sie unter Strom
stehen, weil sie eingeschaltet sind.
 2015-01-29 13:02:21 +01:00
AnHardt
1e22137e27 MSG_STOP_PRINT = 'Druck stoppen' > 'SD-Druck Abbruch' 
to work out that this can't be resumed.
 2015-01-29 12:41:46 +01:00
AnHardt
05d2ebd118 MSG_WATCH > 'Beobachten' > 'Info' 2015-01-29 12:29:31 +01:00
AnHardt
06cba91c39 eye candy 2 2015-01-29 12:26:21 +01:00
AnHardt
9352c9547f MSG_SPEED = 'Geschw' > 'Geschw.' 2015-01-29 12:13:44 +01:00
AnHardt
0dfb0162f3 eye candy. 2015-01-29 12:07:01 +01:00
AnHardt
7222b27501 MSG_MOVE_AXIS = 'Achsen bewegen' > 'Bewegen'. Is Extruder an axis? 2015-01-29 12:02:58 +01:00
AnHardt
a6f808c9b1 remove unused #define MSG_RETRACT 2015-01-29 11:58:50 +01:00
AnHardt
152fa579f5 MSG_SWITCH_PS_OFF = 'Switch Power Off' -> 'Netzteil Aus' 2015-01-29 11:55:36 +01:00
AnHardt
7a32b742f3 MSG_SWITCH_PS_ON = 'Switch Power On' ->'Netzteil Ein' 2015-01-29 11:50:51 +01:00
AnHardt
4e176d2ce8 MSG_SET_ORIGIN = 'Setze Nullpunkt' ->'Setze Null hier' 2015-01-29 11:45:18 +01:00
AnHardt
1f8c8ad3ed MSG_SET_HOME_OFFSETS = 'Set home offsets' ->'Setze Home hier' 2015-01-29 11:39:35 +01:00
AnHardt
0e8836ce5e MSG_AUTO_HOME = 'Auto Nullpunkt' ->'Home' 2015-01-29 11:36:07 +01:00
AnHardt
56d3e6615d MSG_DISABLE_STEPPERS = 'Stepper abschalt.' -> 'Motoren Aus'# 2015-01-29 11:19:10 +01:00
Scott Lahteine
1258980832 Merge pull request #1429 from bq/Development 
Add bq Witbox 3D printer
 2015-01-29 01:14:18 -08:00
Victor Andueza
766762a4dc Change url link 2015-01-29 09:28:50 +01:00
Scott Lahteine
7df9ca051c Merge pull request #1428 from thinkyhead/issue_1388_eeprom 
Make EEPROM storage consistent
 2015-01-28 22:58:04 -08:00
Scott Lahteine
fe3810f073 yeah, what he said 2015-01-28 22:27:15 -08:00
Scott Lahteine
6137bbd484 use eeprom read correctly 2015-01-28 22:10:31 -08:00
Scott Lahteine
9bc9051405 Flag EEPROM write errors on serial output 
- Also adds a language string for the error.
- Also adds SERIAL_EOL as an alias for SERIAL_ECHOLN(“”)
 2015-01-28 21:19:51 -08:00
Scott Lahteine
ff99ca3040 Fix alignment of Restore following PIDTEMP 
Should be reading 4 x 4 PID values instead of 4 x 3
 2015-01-28 20:48:32 -08:00
Philip Schell
6c285930cb Fixing wrong pin to heater extruder 2 <-> 3 
Extruder 2 and 3 was swapped
 2015-01-28 23:57:22 +01:00
Victor Andueza
0d4ce27b79 Add pins_WITBOX file 2015-01-28 17:26:50 +01:00
Victor Andueza
13118cde33 Add bq Witbox 3D printer 2015-01-28 16:52:36 +01:00
Scott Lahteine
093fedfde8 Make EEPROM storage consistent 
Update ConfigurationStore to always write dummy values for disabled
options, including FWRETRACT, DELTA, and SCARA. Update the EEPROM
version to “V15.” Also fixes a buffer overrun with axis_scaling in
Config_ResetDefault.
 2015-01-28 01:08:48 -08:00
Scott Lahteine
34377ee512 Merge pull request #1427 from thinkyhead/fewer_preheat_strings 
Remove language strings that only add a number
 2015-01-27 22:10:08 -08:00
Scott Lahteine
7378a7fef4 Merge pull request #1408 from thinkyhead/cleanup_servo 
Formatting cleanup of quiet sources
 2015-01-27 22:09:04 -08:00
Scott Lahteine
5fbef6bed2 Merge pull request #1409 from thinkyhead/rename_lastnr 
Rename lastnr to autostart_index and...
 2015-01-27 22:07:23 -08:00
Scott Lahteine
53eea611b8 Fix MSG_NOZZLE 2015-01-27 22:00:32 -08:00
Scott Lahteine
d7211a5324 Changes for Portuguese too 2015-01-27 21:53:08 -08:00
Scott Lahteine
0a21727c0a Portuguese (pt) and Brazilian Portuguese (pt-br) 2015-01-27 21:45:21 -08:00
Scott Lahteine
c90f2e77d8 Remove language strings that only add a number 
This won’t reduce the string storage in the end, but it makes the
language files smaller. Also removed remaining unused strings.
 2015-01-27 21:36:58 -08:00
Scott Lahteine
2ce4a102ee Add support for Megatronics 3 a la #1426 2015-01-27 15:54:46 -08:00
Scott Lahteine
ae4b348d77 Make sure _Ex_PINS is defined 
Also fix analogInputToDigitalPin so it uses proper C hex notation
 2015-01-27 15:36:47 -08:00
Scott Lahteine
80be6f3f91 tweak tweak 2015-01-27 15:36:47 -08:00
Scott Lahteine
ebe78cb36f tweak 2015-01-27 15:36:47 -08:00
Scott Lahteine
82474fef8a Max endstop pins disabled by configuration 
There’s no need to ask users to uncomment Max Endstop pins when they
have them. These will be set to -1 later if the endstop option is
disabled.
 2015-01-27 15:33:21 -08:00
Scott Lahteine
8045e4d60d Add support for 4th extruder 
#1405 includes some changes to pins.h for a 4th extruder. This commit
applies those changes. It also deals with a possible problem with
SENSITIVE_PINS.
 2015-01-27 15:33:21 -08:00
Scott Lahteine
df4f3e7712 cleanup 2015-01-27 15:32:34 -08:00
Scott Lahteine
b6ecbd8cc4 cleanup 2015-01-27 15:32:34 -08:00
Scott Lahteine
4e573134de Cleanup heading 2015-01-27 15:32:34 -08:00
Scott Lahteine
574a5ab72a Split up pins to make it more manageable 
Hopefully this is helpful to organization and future expansion….
 2015-01-27 15:32:34 -08:00
clefranc
d55c62bf9f Update ConfigurationStore.cpp 
Moved #endif to allow filament settings to print.
 2015-01-27 13:28:37 -05:00
clefranc
e779641c73 Update ConfigurationStore.cpp 
Added PIDTEMP dummy write to align EEPROM read/write operation.
 2015-01-27 13:25:47 -05:00
Scott Lahteine
baac6e242d Merge pull request #1419 from AnHardt/bootsplash 
repair Bootsplash
 2015-01-27 00:30:29 -08:00
AnHardt
75cf302da3 example configurations changed to meet Configuration.h 2015-01-27 00:01:33 +01:00
Philip Schell
61fd45a0c2 Add 4th extruder 2015-01-26 21:22:00 +01:00
Philip Schell
2650be4921 Add 4th extruder 2015-01-26 21:21:31 +01:00
Philip Schell
a9763d894e Add 4th extruder 2015-01-26 21:20:56 +01:00
Philip Schell
4949088302 Add 4th extruder 2015-01-26 21:20:04 +01:00
Philip Schell
fc5204bd42 Add 4th extruder 2015-01-26 21:17:35 +01:00
Philip Schell
9834818ef7 Add 4th extruder 2015-01-26 21:16:23 +01:00
Philip Schell
8696963154 Add 4th extruder 2015-01-26 21:15:24 +01:00
Philip Schell
ee8a7419f4 Add 4th extruder 2015-01-26 21:14:18 +01:00
Philip Schell
e18403235d Add 4th extruder 2015-01-26 21:12:55 +01:00
Philip Schell
7baee555f4 Add 4th extruder 2015-01-26 21:11:49 +01:00
Philip Schell
cebc7daf2a Add 4th extruder 2015-01-26 21:10:42 +01:00
Philip Schell
ef4c7abb21 Update language_es.h 
Add 4th extruder
 2015-01-26 21:09:24 +01:00
Philip Schell
22e591518a Update language_de.h 
Add 4th extruder
 2015-01-26 21:08:13 +01:00
Philip Schell
a20c35bb38 Update language_ca.h 
Add 4th extruder
 2015-01-26 21:04:31 +01:00
Jérémie FRANCOIS
dd301be52d Added suport for multiline G-code commands in the LCD menus 2015-01-26 18:50:29 +01:00
AnHardt
aa48056c03 Made centering of bootlogo work and removed contraproductiv setScale2x2() in dogm_lcd_implementation.h 2015-01-26 17:26:22 +01:00
AnHardt
0d219b3e14 Make centering of STRING_SPLASH work 2015-01-26 16:00:10 +01:00
AnHardt
59315330dd Remove definition of VERSION_STRING and replace where usend with STRING_VERSION 2015-01-26 15:52:01 +01:00
AnHardt
8c792c7b22 Make STRING_VERSION and VERSION_STRING the same 2015-01-26 15:40:44 +01:00
Scott Lahteine
865ca0ef04 Merge pull request #1405 from MagoKimbra/4th-extruders 
All the additions look proper. I can't think of any other extruder-count-related items that you might have missed. So, with some optimism, I will merge this for testing.
 2015-01-25 19:30:51 -08:00
MagoKimbra
3021f7f743 Fix PID_dT 
Add PID_dT in temeprature.cpp
 2015-01-25 17:56:14 +01:00
Scott Lahteine
a7b02975b7 No TEMP1 or TEMP2 pins for TEENSYLU || PRINTRBOARD 
Pins 2 and 3 are probably general-use pins, since the filament sensor
uses pin 2.
 2015-01-24 05:10:48 -08:00
Scott Lahteine
6723388f7f Proposed fix to #1379. Printrboard I2C LCD support 2015-01-24 05:01:02 -08:00
Scott Lahteine
03c9cb60e8 Rename lastnr to autostart_index and... 
Replace instances of the number 13 with FILENAME_LENGTH where
appropriate.
 2015-01-24 04:57:44 -08:00
MagoKimbra
ef5959a705 Fix Temperature 
Githun insert this line when i merge with actual Branch development...
 2015-01-24 13:49:29 +01:00
MagoKimbra
3d4ee6c868 Merge branch '4th-extruders' of https://github.com/MagoKimbra/Marlin into 4th-extruders 
Conflicts:
	Marlin/temperature.cpp
 2015-01-24 13:41:15 +01:00
MagoKimbra
986e723eeb Add 4th extruder 2015-01-24 13:37:58 +01:00
Scott Lahteine
f16bdd2ff2 Borrow from Ultimaker to fix MAX6675 SPI conflict 
Changes to temperature.cpp from Ultimaker fork, intended to address
#1226 and #1227
 2015-01-24 03:49:15 -08:00
Scott Lahteine
06c3b37933 Formatting cleanup of quiet sources 
Formatting for code-folding plus minor style changes to less active
code.
 2015-01-23 22:26:52 -08:00
Scott Lahteine
23fcd1ecb2 Merge pull request #1407 from thinkyhead/cleanup_marlinserial 
Formatting cleanup of quiet sources
 2015-01-23 21:33:43 -08:00
Scott Lahteine
fd78902194 Formatting cleanup of quiet sources 2015-01-23 21:11:50 -08:00
Scott Lahteine
5c1814383a Merge pull request #1390 from floyd871/Development 
Show Custom M_Code for Z-Probe Offset when entering M503
 2015-01-23 20:08:23 -08:00
MagoKimbra
0ebf896070 Add 4th extruder 2015-01-23 23:13:06 +01:00
Michael Neumann
a9d7ab9530 Update ConfigurationStore.cpp 
Done
 2015-01-23 21:05:27 +01:00
Scott Lahteine
3a9a3e5ed8 Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET 
This define is not used.
 2015-01-23 10:51:06 -08:00
Scott Lahteine
54d5b52a2e Merge pull request #1399 from beanz/use-bed-defines-not-extruder-ones 
Code wont compile with extruder but without bed runaway protection defined.
 2015-01-23 08:36:25 -08:00
Mark Hindess
0ce252ba7a This ifdef is for bed code so should use bed constants for testing. 
Without this fix, the code wont compile with extruder but without bed
runaway protection defined.
 2015-01-23 16:30:13 +00:00
Scott Lahteine
9040446780 Merge pull request #1395 from AnHardt/iss1394 
removed function step_wait() from stepper.cpp
 2015-01-23 06:58:10 -08:00
Scott Lahteine
25f79c5010 Merge pull request #1391 from CONSULitAS/Development-newBoard_K8200 
Add: Board for Vellemann K8200 (derived from 3Drag)
 2015-01-23 06:08:38 -08:00
Scott Lahteine
9ce75ab7de Merge pull request #1386 from roglio/Development 
Fixing a build error for melzi and gfx display
 2015-01-23 06:00:24 -08:00
Scott Lahteine
15a00a5a7c Add 1µs delay in other appropriate spots 2015-01-23 03:24:45 -08:00
AnHardt
23cb899c5a removed function step_wait() from stepper.cpp 
removed function step_wait() from stepper.cpp because its used nowhere.
 2015-01-21 16:30:45 +01:00
Scott Lahteine
d9d4a78e0f Add proper delay in stepper.cpp 
Issue #1385 describes a delay that the compiler is optimizing out and
this solution.
 2015-01-21 01:51:29 -08:00
CONSULitAS
d1322dafc9 Add: Example Configuration for Vellemann K8200 - based on new BOARD_K8200 #1391 
# Add: Example Configuration for Vellemann K8200 - based on new
BOARD_K8200 #1391

* K8200: new folder in example_configurations for Vellemann K8200 (3Drag
clone - should work with 3Drag http://reprap.org/wiki/3drag, too. Please
report)
* K8200/Configuration.h/Configuration_adv.h: updated manually with
parameters form genuine Vellemann Firmware "firmware_k8200_marlinv2"
based on the recent development branch

I tested the changes on my K8200 with 20x4-LCD and Arduino 1.0.5 for
Windows (SD library added to IDE manually) - everything works well
 2015-01-20 23:13:44 +01:00
CONSULitAS
3b50a5e2e6 Add: Board for Vellemann K8200 (derived from 3Drag) 
## Add: Board for Vellemann K8200 (derived from 3Drag)

* Boards.h: updated comment for board 3Drag - K8200 removed
* Boards.h: added `BOARD_K8200` with ID 78

* language.h.: machine name and firmware URL for new board

* pins.h: added `K8200` to any `#if` with `3Drag` and corresponding
comments
 2015-01-20 20:46:20 +01:00
Michael Neumann
2d454da3af Update ConfigurationStore.cpp 
Show Custom M Code when entering M503
 2015-01-20 16:21:44 +01:00
Scott Lahteine
4f35de991a Merge pull request #1383 from CONSULitAS/Development 
Update Boards.h for Vellemann K8200 - comment only
 2015-01-19 15:59:38 -08:00
roglio
22571ca13d Revert "Configuration for Aurora Z605" 
This reverts commit 935ee968a7.
 2015-01-19 15:02:11 +01:00
roglio
935ee968a7 Configuration for Aurora Z605 
Still not fine tuned but working.
 2015-01-19 11:18:52 +01:00
roglio
ccdbeda526 Fixing a build error for melzi and gfx display 
When a melzi board and a full gfx are both selected, the build fails
blaming for some missing defines.

This is a fix for the issue: now my configuration works.
 2015-01-19 10:43:26 +01:00
CONSULitAS
e13f159343 Update Boards.h for Vellemann K8200 - comment only 
## Update Boards.h for Vellemann K8200 - comment only

* Boards.h: updated comment for board 3Drag - K8200 uses same board
 2015-01-19 00:53:17 +01:00
CONSULitAS
51c7f2fd5a Revert "## Add: Example Configuration for Vellemann K8200" 
This reverts commit 5333590ac2.
 2015-01-19 00:37:57 +01:00
CONSULitAS
5333590ac2 ## Add: Example Configuration for Vellemann K8200 
* K8200: new folder in example_configurations for Vellemann K8200 (3Drag
clone - should work with 3Drag too, please report)

* K8200/language.h: updated machine name and URL for K8200

* K8200/Configuration.h/Configuration_adv.h: updated manually with
parameters
form genuine Vellemann Firmware "firmware_k8200_marlinv2" based on the
recent development branch

* K8200/files by Vellemann: added folder with original files from
Vellemann homepage, since there is no GitHub fork you could link to by
them

I tested the changes on my K8200 with 20x4-LCD and Arduino 1.0.5 for
Windows - everything works well
 2015-01-19 00:28:55 +01:00
Denis Chertykov
ba3ac40b9d Remove hardcoded programmer option (-cwiring). Use variable AVRDUDE_PROGRAMMER. 
Change default value of AVRDUDE_PROGRAMMER to 'wiring'.
 2015-01-18 20:18:43 +03:00
daid
53f971095d Revert "Reduce PROGMEM warnings" 2015-01-16 16:48:22 +01:00
PxT
67b597ad46 Update printrboard pin assignments 
Backported from Printrbot branch, allows the fan to work correctly.
 2015-01-15 19:48:40 -08:00
galexander1
d4880a9e60 Revert "Move Sd library out into library" 2015-01-15 18:52:10 -05:00
Bo Herrmannsen
ccdb086fc8 Merge pull request #1363 from PxT/patch-1 
Fixes #1361
 2015-01-15 10:57:44 +01:00
Bo Herrmannsen
5151db5c2f Merge pull request #1349 from msutas/patch-2 
Improvement - G29 Option for Not Retracting Servo
 2015-01-15 10:56:31 +01:00
Bo Herrmannsen
1746b2582b Merge pull request #1332 from Sniffle/Development 
Rambo FAN_PIN documentation and servo support
 2015-01-15 10:56:17 +01:00
Bo Herrmannsen
4b51b5a46d Merge pull request #1357 from odewdney/SDlib 
Move Sd library out into library
 2015-01-15 10:56:07 +01:00
Bo Herrmannsen
f2cb4a3655 Merge pull request #1353 from thawkins/Development 
fix avrdude upload in makefile
 2015-01-15 10:55:33 +01:00
PxT
9fd4292923 Fixes #1361 2015-01-13 10:59:50 -08:00
odewdney
f84ff4ba7d Move SD Fat library out of main src 2015-01-13 13:31:55 +00:00
Bo Herrmannsen
ab074dac17 Merge pull request #1344 from grob6000/independent_pid 
Independent PID parameters for each extruder
 2015-01-13 12:10:37 +01:00
Bo Herrmannsen
d4a665694a Merge pull request #1350 from odewdney/Development 
Reduce PROGMEM warnings
 2015-01-13 11:26:50 +01:00
odewdney
9d9c859ac1 First move of SdFat library 2015-01-13 08:04:32 +00:00
Tim Hawkins
5045d17a39 fix avrdude upload in makefile 2015-01-13 13:01:43 +08:00
msutas
3a5a6f42fb Corrected the ABL grid option 
G29 E was not retracting the probe on the last probe point when used with ABL grid. Corrected.
 2015-01-12 11:07:46 +02:00
odewdney
cd55a93a13 re-add blank line 2015-01-11 19:22:35 +00:00
odewdney
23bfe30036 moved include themister to temperature.c 2015-01-11 18:18:32 +00:00
odewdney
538859669d Removing compiler warnings for progmem 2015-01-11 18:14:21 +00:00