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

707 commits

This branch
This branch
All branches
Author SHA1 Message Date
daid303 40ce057a3e Fixing issue #297 2012-11-10 14:37:01 +01:00
daid303 625ac81acc Yes, makes sense, lets NOT use the value directly from the configuration define but modify it before setting it. This will not confuse people (including me) at all! 2012-11-09 22:36:31 +01:00
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
daid a394ac9f95 Merge pull request #294 from YanFM/patch-1 
Update Marlin/language.h
 2012-11-07 06:21:28 -08: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
Robert F-C 08337e01f7 Added change to feature list. 2012-11-07 17:28:46 +11: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
daid 2f20df3f55 Merge pull request #289 from buildrob/Marlin_v1 
Marlin v1 configurable serial port
 2012-11-06 01:00:50 -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
ErikZalm 23b0f8ed4b Merge pull request #279 from MaikStohn/Marlin_v1 
Fixed wrong code (will not even compile when EXTRUDERS>2)
 2012-10-23 09:48:02 -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
ErikZalm bfdf0932c1 Merge pull request #274 from DanieleSdei/Marlin_v1 
Italian language support
 2012-10-17 04:09:13 -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
ErikZalm 654387297f Merge pull request #268 from brupje/Marlin_v1 
Marlin v1
 2012-10-14 08:55:01 -07:00