zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
657 commits 1 branch 0 tags 156 MiB
Commit graph

592 commits

Author SHA1 Message Date
daid303 ffc69537aa Update on some comments, make the MOTHERBOARD list complete again. 2012-11-09 09:10:51 +01:00
daid303 71efcfc648 Most likely fixing issue #295. 2012-11-08 21:08:05 +01:00
daid303 04be9d6001 God damn. Sorry, my mistake, forgot to add this file. 2012-11-07 23:16:43 +01:00
daid303 c17da4b707 Add ConfigurationStore to the Makefile. 2012-11-07 22:43:01 +01:00
daid ccd9fd0dc3 Merge pull request #292 from jothan/lcdfix 
Lcd fixes
 2012-11-07 13:10:59 -08:00
Jonathan Bastien-Filiatrault 46b9988e26 Search and replace failure. 2012-11-07 16:09:30 -05:00
Jonathan Bastien-Filiatrault 0f73afb0b0 Avoid defining overriding definitions for the RepRapDiscount Smart 
Controller. Remove common definitions. Harmonize declaration order.
 2012-11-07 16:04:28 -05:00
Jonathan Bastien-Filiatrault 36b452c7ac Remove abbrs. 2012-11-07 15:42:18 -05:00
YanFM 332344bd43 Update Marlin/language.h 
Included Portuguese language
 2012-11-07 09:43:13 -02:00
daid303 e6c1cadea0 Set the watchdog to a 4 second timeout, as with 1 second it can timeout during SD card init. 2012-11-07 12:32:17 +01:00
daid faea7d72b8 Merge pull request #290 from buildrob/Marlin_v1 
Clean up special serial port cases
 2012-11-07 02:00:26 -08:00
daid303 12a4d60e18 Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template. 2012-11-07 10:02:45 +01:00
Jonathan Bastien-Filiatrault 9606f4d04f Include Marlin_main.cpp in source files. 2012-11-06 20:32:48 -05:00
Jonathan Bastien-Filiatrault 3cbaad9288 RepRapDiscount Smart Controller pin definitions. 2012-11-06 20:32:13 -05:00
Robert F-C 99692dc99e Clean up special serial port cases 
Assume SERIAL_PORT 0 if not defined. Collapse un-numbered register
special case. Clarify comments.
 2012-11-07 09:00:21 +11:00
daid303 5a998558a9 Update suggested by Robert F-C. #289 2012-11-06 21:04:29 +01:00
daid303 f6ff0ab767 signed/unsigned fixes. 2012-11-06 15:33:49 +01:00
daid303 5d471e0f34 Also reset the PID values to defaults. Fixes #281 2012-11-06 15:21:00 +01:00
daid303 d3ebc34958 Hopefully also support chips with a single UART in MarlinSerial now. 2012-11-06 14:43:36 +01:00
daid303 b6ff45254e Better explain the watchdog "problem" and rename the config define so it explains that the feature belongs to the watchdog. 2012-11-06 13:33:00 +01:00
daid303 7e348fcb5f By mistake enabled the watchdog by default. This should be off by default. 2012-11-06 13:20:08 +01:00
daid303 06b58a9c4f First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions. 2012-11-06 12:06:41 +01:00
daid 539f3b3fe4 Merge pull request #284 from brackendawson/Marlin_v1 
Use the right pins for Gen7 1.4
 2012-11-06 01:06:24 -08:00
Robert F-C 65c9a0728f Set default serial port back to 0. 2012-11-05 22:15:07 +11:00
Robert F-C ab9d183024 Make serial port configurable. 
This change makes the choice of serial port configurable so that
wireless capability can be easily added by connecting Bluetooth modules
(such as BlueSmirf or JY-MCU) to the expansion port pins.
 2012-11-05 21:34:27 +11:00
Bracken Dawson f5631a89e8 Add dummy Emergancy Pin to Gen7 1.4 
Change required after pulling from ErikZalm.
 2012-10-26 22:28:37 +01:00
Bracken Dawson a4f9e1ebf2 Merge git://github.com/ErikZalm/Marlin into Marlin_v1 2012-10-26 22:20:35 +01:00
Bracken Dawson 2873d67b17 Put bogus temp override back in Gen7 up to 1.3 
Took out the ifdef when I split 1.4 out and forgot to permanently
define it for <=1.3.
 2012-10-26 22:17:26 +01:00
ErikZalm a7e40b2903 Merge pull request #276 from setar/Marlin_v1 
Fix num of digits on LCD for E and Z axis.
 2012-10-23 09:48:55 -07:00
MaikStohn 6ed02c86be Fixed wrong code (will not even compile when EXTRUDERS>2) 2012-10-23 18:08:43 +02:00
Sergey Taranenko 2a67363e27 Fix ‘prog_uchar’ definition in LiquidCrystalRus.cpp 2012-10-22 11:05:17 +04:00
Sergey Taranenko 205304ddee Merge git://github.com/ErikZalm/Marlin into Marlin_v1 2012-10-22 10:59:27 +04:00
Erik vd Zalm 58bca87c72 fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 ' 2012-10-21 14:40:06 +02:00
Erik vd Zalm febeb43197 Revert "fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '" 
This reverts commit cb02c2f9d8.
 2012-10-21 14:36:31 +02:00
Sergey Taranenko 8178dec4c3 Fix num of digits on LCD for E and Z axis. 
The number of steps per mm often contains 4 digits before the decimal point and does not require precision greater than 0.1
 2012-10-18 17:45:40 +04:00
ErikZalm 70f57a6844 Merge pull request #273 from setar/Marlin_v1 
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
 2012-10-17 04:10:18 -07:00
ErikZalm ff14199e58 Merge pull request #270 from jothan/Marlin_v1 
Create an explicit rule for building applet/Marlin.cpp.
 2012-10-17 04:09:36 -07:00
Daniele Sdei 695938ba3f Italian language support 2012-10-17 12:48:26 +02:00
Sergey Taranenko cb02c2f9d8 fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 ' 2012-10-17 10:49:05 +04:00
Jonathan Bastien-Filiatrault e4a5e333ef Generalize. 2012-10-15 21:34:33 -04:00
Jonathan Bastien-Filiatrault e10d3136c8 Create an explicit rule for building applet/Marlin.cpp. 
It would seem that the pattern matches do not work when the source
file is created when make is running. The result of this is that it is
necessary to run "make" twice to build the firmware.

This adds an explicit rule without a pattern match for building
applet/Marlin.cpp it corrects the make behaviour at the cost of adding
a little redundancy in the Makefile.
 2012-10-15 21:16:25 -04:00
ErikZalm 9f089756b7 Merge pull request #265 from setar/Marlin_v1 
Added Russian translation
 2012-10-14 14:11:58 -07:00
brupje 326423719f Add support for Megatronics 2012-10-14 14:05:57 +03:00
brupje d07b6e93d5 Add support for Megatronics 2012-10-14 14:05:12 +03:00
Sergey Taranenko efcc28d347 Fix check for include LiquidCrystalRus.h 2012-10-13 00:29:34 +04:00
Sergey Taranenko cfc193cdac Enables support the Cyrillic alphabet for LCD 2012-10-12 19:06:43 +04:00
Sergey Taranenko 24bcc9647d Added Russian translation 2012-10-12 18:33:05 +04:00
Mark Finn bf7e453d02 Unwanted artifacts from unclean merge of bed-pid tree 2012-10-09 14:47:35 -05:00
ErikZalm 36a746d7d5 Merge pull request #244 from markfinn/pidbed 
PID for heated bed
 2012-10-08 11:15:16 -07:00
elgambitero df09e2adce Spanish updated 2012-09-26 19:14:07 +02:00
elgambitero ddf6603d81 Spanish language updated. Bug fixes on dialogs. 2012-09-26 19:11:45 +02:00
elgambitero 4bf8b1aeee fesfas 2012-09-26 19:05:31 +02:00
elgambitero 7afd202b89 New dialogs translated to spanish. Bug fixes. 
Dialogs from M119 translated, and "Set Preheat" dialogs adapted to the
screen size.
 2012-09-25 19:16:57 +02:00
elgambitero ebc4601185 Some new dialogs translated to Spanish 2012-09-25 19:08:44 +02:00
johnnyr 8016f058bc fix max endstop pins 2012-09-19 13:15:17 -05:00
Mark Finn d197f8504b clean up and changes from testing 2012-09-17 19:18:50 -05:00
Mark Finn eb06a886c4 missed 2012-09-17 14:23:49 -05:00
Mark Finn 04631d2250 cleanup for pull 2012-09-17 14:17:24 -05:00
Mark Finn 0a5ad3ab85 move comment to correct place 2012-09-17 08:42:35 -05:00
ZetaPhoenix 8ac5b29e02 Changes to M119 response for easier visual comparison 
Changed to report on individual lines with "TRIGGERED" or "open" instead of "H" or "L" on one line as H&L could be confused with logic levels High and Low which may be wrong if using inverted logic.  Added strings to language.h.

Fixed typo "deu" in English language that was fixed in #134 but got added back in via 9f7f7354f5
 2012-09-16 14:51:24 -07:00
ZetaPhoenix c6caa45ae2 Limit Switch locations based on MIN/MAX limits and homing direction 
fixes #246
Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined.
Relocated code based on feedback.
 2012-09-15 15:25:49 -07:00
ZetaPhoenix dc566d654f fixes #246 
Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined.
 2012-09-14 21:48:49 -07:00
ErikZalm ba898faa7d Merge pull request #249 from gwelchc/patch-2 
Slight modification for byte savings
 2012-09-14 12:13:36 -07:00
ErikZalm 0152ee71a5 Merge pull request #248 from gwelchc/patch-1 
Binary representation for characters in ultraldc.pde
 2012-09-14 12:10:28 -07:00
G. W. C. 6ccbfeb80c Update Marlin/Marlin.pde 
Added function 'setTargetedHotend' that turns into a function an operation repeated 3 times through the M-codes processing.

This modification saves a few bytes that can be used to add support for new commands.
 2012-09-14 16:38:54 +03:00
G. W. C. c433142abf Update Marlin/ultralcd.pde 
The joris' char drawins are expressed in binary so to show their content's in a more visual fashion.

This is not a code modification as much as a readibility modification.
 2012-09-14 16:29:43 +03:00
andrey-vasilyev 1d389ad3a8 Fix M81 not working reliably on Gen7 
Some discussion of the issue is here http://forums.reprap.org/read.php?181,118329,page=1
 2012-09-13 19:23:48 +04:00
Mark Finn 9698f4ea64 bed pid 
Conflicts:

	Marlin/Configuration.h
 2012-09-12 21:18:59 -05:00
ZetaPhoenix e8c92e0a95 Missing #else in temperature.cpp prevented reading bed temp when TEMP_BED_PIN <7. Thanks to Leland Wallace for helping me track this down via "Sesame Street" coding (what is not like the other) 2012-09-09 16:06:02 -07:00
Erik vd Zalm abf0693e8e Added KILL_PIN -1 to gen7 boards 2012-09-04 08:20:27 +02:00
Erik vd Zalm 47319cf64e Fixed typo in SF arc fix code. 2012-09-03 21:28:31 +02:00
Erik vd Zalm e358a2d7af Added fix for SF Arc Point fillet procedure 2012-09-02 01:12:49 +02:00
ErikZalm 044a64a1fb Merge pull request #225 from Justblair/Marlin_v1 
Added PDF file containing Menu Tree for documentation purposes.
 2012-09-01 04:41:49 -07:00
Drakelive d728e35658 Update Marlin/pins.h 2012-08-30 23:36:49 +03:00
tonokip 1c1fddc7ac Added support for the Rambo reprap electronics board. Added Mcodes to set 
motor current and microstepping pins.
 2012-08-30 00:16:57 -07:00
Blair Thompson dcd3e8a211 Tidy up 2012-08-29 22:53:41 +01:00
Blair Thompson ddd9d0cfd4 Added PDF file containing Menu Tree for documentation purposes. Source xlsx document included. 2012-08-29 21:08:41 +01:00
Erik vd Zalm 0e58ef6805 Some dialogs are corrected 2012-08-29 21:15:59 +02:00
Erik vd Zalm 0e89022cc3 Correct temptable_55 name. 2012-08-28 19:47:22 +02:00
Bracken Dawson 47d4f55bc0 Fix Gen7 1.4 pinout 
Gen7 1.4 uses very different pin assignments, might as well make a new
section and remove some of the conditionals from each. It's easier to change
your pin assingment this way if like me you don't wire it exactly to plan.
 2012-08-22 23:15:46 +01:00
elgambitero 6cd150842f Update Marlin/language.h 
Some dialogs corrected and Default language set to 1
 2012-08-22 21:46:22 +03:00
elgambitero 299c18596f Update Marlin/language.h 
Some dialogs are corrected
 2012-08-22 21:44:57 +03:00
ErikZalm b86336c3f5 Merge pull request #221 from daid/Marlin_v1 
Long filename support for LCD display
 2012-08-22 06:30:35 -07:00
daid b69e75c89a Added long filename support. 2012-08-22 14:49:57 +02:00
stohn 1d224cc031 merged with upstream and FIXED AGAIN bad translation commit 
PLEASE BE MORE CAREFUL WHEN SUBMITTING NEW TRANSLATIONS

When you add new menu items / messages always copy them to ALL
languages (just use english)
 2012-08-22 13:05:42 +02:00
stohn 06c03fe2f0 new method for message for making KILLED message visible 
The cli(); at the start of the kill() function also stops the internal
arduino timer which stops updating of millis() which prevents the
display of the "KILLED." message.
The new function updates the display directly without checking any
timers.
 2012-08-22 12:44:41 +02:00
daid 87ff61a8a6 Fix for #201 2012-08-22 10:54:55 +02:00
Blair Thompson aacbebbebe Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory. 2012-08-21 23:46:10 +01:00
stohn 31873ec707 changed int to long to overcome overflow of number display 
- related bug reports: Issue #201, Issue #213
 2012-08-21 16:47:39 +02:00
stohn de0448343f added KILL_PIN support / cleaned up manage_inactivity function definition 2012-08-21 14:48:29 +02:00
stohn 69961dbba3 fixed incorrect menu messages from last commit... 
- removed several multiple definitions of same message
- fixed definition of missing messages in german and spanish
- tweaked german translation (a lot)
- added note about changing and testing this file
 2012-08-21 14:44:20 +02:00
Blair Thompson 6c050b8440 Fixes error introduced at commit aee475aa55 which caused the sketch not to comile for language option 1. Several defines were removed but still referenced in ultralcd.pde 2012-08-20 21:54:47 +01:00
Blair Thompson b9f9f8f7d3 The pre-heat ABS and PLA options in the LCD Menu were broken a while back. The pre-heat worked fine, but the cooling fans were not switching on as intended. This is now fixed. 2012-08-20 21:49:37 +01:00
elgambitero d38b96fff1 Update Marlin/language.h 2012-08-12 22:45:11 +03:00
Erik vd Zalm 9f7f7354f5 Set default language 1 2012-08-12 21:29:42 +02:00
elgambitero aee475aa55 Update Marlin/language.h 
Spanish language included. It features the LCD screen messages and a small part of the Serial messages.
 2012-08-12 21:26:17 +03:00
Erik vd Zalm 9083966c22 Do not use feedrate multiiply on Z and E only moves. 2012-08-12 18:13:34 +02:00
Erik vd Zalm 5406c533db Disable FAST_PWM by default. On some systems it does not work ok. 2012-08-11 15:51:04 +02:00
Erik vd Zalm f92dc91c3d Enable M503 also when eeprom is disabled 2012-08-11 15:49:40 +02:00
James Adams 35a1dd081f no message 2012-08-11 15:33:35 +02:00