Commit Graph

Select branches

Hide Pull Requests

master

2.0.5.3_Merge

2.0.7.2_Merge

2.0.7_Merge

2.1.2

Mono Color

• f4a89ec776 SDCARDINSERTED is always defined, and thus we do not need the #ifdefs. daid303 2012-11-12 09:16:27 +01:00
• 57834776ad Made the 2nd speed lookup table condition more explicit. daid303 2012-11-11 12:02:48 +01:00
• caa2b25b40 Fix Gen7 compile if you have avr-libc version 1.7.1 or higher. See http://code.google.com/p/arduino/issues/detail?id=604 Daid 2012-11-11 11:17:54 +01:00
• a27fef8750 Store the pre-heat constants outside of the ULTIPANEL define, so we can use them when storing EEPROM in a build without the ULTIPANEL. daid303 2012-11-11 11:06:58 +01:00
• 789be03b4f Update on makefile, should make it easier to compile for different boards without changing the makefile. (Still missing Arduino 1.x.x support). daid303 2012-11-11 11:05:52 +01:00
• 40ce057a3e Fixing issue #297 daid303 2012-11-10 14:37:01 +01:00
• 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! daid303 2012-11-09 22:36:31 +01:00
• ffc69537aa Update on some comments, make the MOTHERBOARD list complete again. daid303 2012-11-09 09:10:51 +01:00
• 71efcfc648 Most likely fixing issue #295. daid303 2012-11-08 21:08:05 +01:00
• 04be9d6001 God damn. Sorry, my mistake, forgot to add this file. daid303 2012-11-07 23:16:43 +01:00
• c17da4b707 Add ConfigurationStore to the Makefile. daid303 2012-11-07 22:43:01 +01:00
• ccd9fd0dc3 Merge pull request #292 from jothan/lcdfix daid 2012-11-07 13:10:59 -08:00
• 46b9988e26 Search and replace failure. Jonathan Bastien-Filiatrault 2012-11-07 16:09:30 -05:00
• 0f73afb0b0 Avoid defining overriding definitions for the RepRapDiscount Smart Controller. Remove common definitions. Harmonize declaration order. Jonathan Bastien-Filiatrault 2012-11-07 16:04:28 -05:00
• 36b452c7ac Remove abbrs. Jonathan Bastien-Filiatrault 2012-11-07 15:42:18 -05:00
• a394ac9f95 Merge pull request #294 from YanFM/patch-1 daid 2012-11-07 06:21:28 -08:00
• 332344bd43 Update Marlin/language.h YanFM 2012-11-07 09:43:13 -02:00
• e6c1cadea0 Set the watchdog to a 4 second timeout, as with 1 second it can timeout during SD card init. daid303 2012-11-07 12:32:17 +01:00
• faea7d72b8 Merge pull request #290 from buildrob/Marlin_v1 daid 2012-11-07 02:00:26 -08:00
• 12a4d60e18 Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template. daid303 2012-11-07 10:02:45 +01:00
• 08337e01f7 Added change to feature list. Robert F-C 2012-11-07 17:28:46 +11:00
• 9606f4d04f Include Marlin_main.cpp in source files. Jonathan Bastien-Filiatrault 2012-11-06 20:18:26 -05:00
• 3cbaad9288 RepRapDiscount Smart Controller pin definitions. Jonathan Bastien-Filiatrault 2012-11-06 20:32:13 -05:00
• 99692dc99e Clean up special serial port cases Robert F-C 2012-11-07 09:00:21 +11:00
• 5a998558a9 Update suggested by Robert F-C. #289 daid303 2012-11-06 21:04:29 +01:00
• f6ff0ab767 signed/unsigned fixes. daid303 2012-11-06 15:33:49 +01:00
• 5d471e0f34 Also reset the PID values to defaults. Fixes #281 daid303 2012-11-06 15:21:00 +01:00
• d3ebc34958 Hopefully also support chips with a single UART in MarlinSerial now. daid303 2012-11-06 14:43:36 +01:00
• b6ff45254e Better explain the watchdog "problem" and rename the config define so it explains that the feature belongs to the watchdog. daid303 2012-11-06 13:33:00 +01:00
• 7e348fcb5f By mistake enabled the watchdog by default. This should be off by default. daid303 2012-11-06 13:20:08 +01:00
• 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. daid303 2012-11-06 12:06:41 +01:00
• 539f3b3fe4 Merge pull request #284 from brackendawson/Marlin_v1 daid 2012-11-06 01:06:24 -08:00
• 2f20df3f55 Merge pull request #289 from buildrob/Marlin_v1 daid 2012-11-06 01:00:50 -08:00
• 65c9a0728f Set default serial port back to 0. Robert F-C 2012-11-05 22:15:07 +11:00
• ab9d183024 Make serial port configurable. Robert F-C 2012-11-05 21:34:27 +11:00
• f5631a89e8 Add dummy Emergancy Pin to Gen7 1.4 Bracken Dawson 2012-10-26 22:28:37 +01:00
• a4f9e1ebf2 Merge git://github.com/ErikZalm/Marlin into Marlin_v1 Bracken Dawson 2012-10-26 22:20:35 +01:00
• 2873d67b17 Put bogus temp override back in Gen7 up to 1.3 Bracken Dawson 2012-10-26 22:17:26 +01:00
• a7e40b2903 Merge pull request #276 from setar/Marlin_v1 ErikZalm 2012-10-23 09:48:55 -07:00
• 23b0f8ed4b Merge pull request #279 from MaikStohn/Marlin_v1 ErikZalm 2012-10-23 09:48:02 -07:00
• 6ed02c86be Fixed wrong code (will not even compile when EXTRUDERS>2) MaikStohn 2012-10-23 18:08:43 +02:00
• 2a67363e27 Fix ‘prog_uchar’ definition in LiquidCrystalRus.cpp Sergey Taranenko 2012-10-22 11:05:17 +04:00
• 205304ddee Merge git://github.com/ErikZalm/Marlin into Marlin_v1 Sergey Taranenko 2012-10-22 10:59:27 +04:00
• 58bca87c72 fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 ' Erik vd Zalm 2012-10-21 14:40:06 +02:00
• febeb43197 Revert "fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '" Erik vd Zalm 2012-10-21 14:36:31 +02:00
• 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 Sergey Taranenko 2012-10-18 17:45:40 +04:00
• 70f57a6844 Merge pull request #273 from setar/Marlin_v1 ErikZalm 2012-10-17 04:10:18 -07:00
• ff14199e58 Merge pull request #270 from jothan/Marlin_v1 ErikZalm 2012-10-17 04:09:36 -07:00
• bfdf0932c1 Merge pull request #274 from DanieleSdei/Marlin_v1 ErikZalm 2012-10-17 04:09:13 -07:00
• 695938ba3f Italian language support Daniele Sdei 2012-10-17 12:48:26 +02:00
• cb02c2f9d8 fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 ' Sergey Taranenko 2012-10-17 10:49:05 +04:00
• e4a5e333ef Generalize. Jonathan Bastien-Filiatrault 2012-10-15 21:34:33 -04:00
• e10d3136c8 Create an explicit rule for building applet/Marlin.cpp. Jonathan Bastien-Filiatrault 2012-10-15 21:16:25 -04:00
• 9f089756b7 Merge pull request #265 from setar/Marlin_v1 ErikZalm 2012-10-14 14:11:58 -07:00
• 654387297f Merge pull request #268 from brupje/Marlin_v1 ErikZalm 2012-10-14 08:55:01 -07:00
• 326423719f Add support for Megatronics brupje 2012-10-14 14:05:57 +03:00
• d07b6e93d5 Add support for Megatronics brupje 2012-10-14 14:05:12 +03:00
• efcc28d347 Fix check for include LiquidCrystalRus.h Sergey Taranenko 2012-10-13 00:29:34 +04:00
• cfc193cdac Enables support the Cyrillic alphabet for LCD Sergey Taranenko 2012-10-12 19:06:43 +04:00
• 24bcc9647d Added Russian translation Sergey Taranenko 2012-10-12 18:33:05 +04:00
• bc27d809fb Merge pull request #262 from markfinn/bedpid-clean3 ErikZalm 2012-10-09 13:18:58 -07:00
• bf7e453d02 Unwanted artifacts from unclean merge of bed-pid tree Mark Finn 2012-10-09 14:47:35 -05:00
• 36a746d7d5 Merge pull request #244 from markfinn/pidbed ErikZalm 2012-10-08 11:15:16 -07:00
• ca811156a0 Merge pull request #1 from johnnyr/patch-1 tonokip 2012-10-01 23:55:08 -07:00
• 50daf27e5a Merge pull request #255 from elgambitero/Marlin_v1 ErikZalm 2012-09-26 10:29:03 -07:00
• df09e2adce Spanish updated elgambitero 2012-09-26 19:14:07 +02:00
• ddf6603d81 Spanish language updated. Bug fixes on dialogs. elgambitero 2012-09-26 19:11:45 +02:00
• 4bf8b1aeee fesfas elgambitero 2012-09-26 19:05:31 +02:00
• be1e099f1b Union whit Erick version drakelive 2012-09-25 19:17:15 +02:00
• 7afd202b89 New dialogs translated to spanish. Bug fixes. elgambitero 2012-09-25 19:16:57 +02:00
• ebc4601185 Some new dialogs translated to Spanish elgambitero 2012-09-07 14:55:39 +02:00
• c8ea9b0e58 Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin drakelive 2012-09-25 18:51:20 +02:00
• ca7ca4572e primo commit drakelive 2012-09-25 18:46:38 +02:00
• c0aad4c28a Merge pull request #254 from ZetaPhoenix/Marlin_v1_bugfix ErikZalm 2012-09-25 00:10:38 -07:00
• 8016f058bc fix max endstop pins johnnyr 2012-09-19 13:15:17 -05:00
• d197f8504b clean up and changes from testing Mark Finn 2012-09-17 19:18:09 -05:00
• eb06a886c4 missed Mark Finn 2012-09-17 14:23:49 -05:00
• 04631d2250 cleanup for pull Mark Finn 2012-09-17 14:17:24 -05:00
• 0a5ad3ab85 move comment to correct place Mark Finn 2012-09-17 08:42:35 -05:00
• 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. ZetaPhoenix 2012-09-16 14:51:24 -07:00
• 0a31ccb1d1 Merge pull request #251 from ZetaPhoenix/Marlin_v1_bugfix ErikZalm 2012-09-16 01:47:51 -07:00
• 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. ZetaPhoenix 2012-09-15 15:25:49 -07:00
• 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. ZetaPhoenix 2012-09-14 21:48:49 -07:00
• ba898faa7d Merge pull request #249 from gwelchc/patch-2 ErikZalm 2012-09-14 12:13:36 -07:00
• 0152ee71a5 Merge pull request #248 from gwelchc/patch-1 ErikZalm 2012-09-14 12:10:28 -07:00
• 348d543425 Merge pull request #245 from andrey-vasilyev/patch-1 ErikZalm 2012-09-14 12:04:57 -07:00
• 6ccbfeb80c Update Marlin/Marlin.pde G. W. C. 2012-09-14 16:38:54 +03:00
• c433142abf Update Marlin/ultralcd.pde G. W. C. 2012-09-14 16:29:43 +03:00
• 1d389ad3a8 Fix M81 not working reliably on Gen7 andrey-vasilyev 2012-09-13 19:23:48 +04:00
• 5bfccab650 readme Mark Finn 2012-09-12 21:52:16 -05:00
• 9698f4ea64 bed pid Mark Finn 2012-09-12 21:01:31 -05:00
• 769796ed4c Merge pull request #240 from ZetaPhoenix/Marlin_v1_bugfix ErikZalm 2012-09-11 02:10:39 -07:00
• e5c39b7c2a commit drakelive 2012-09-10 14:25:49 +02:00
• 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) ZetaPhoenix 2012-09-09 16:06:02 -07:00
• bf2071871c Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin drake 2012-09-08 23:08:34 +02:00
• fc32e20881 first commit drake 2012-09-08 22:26:23 +02:00
• abf0693e8e Added KILL_PIN -1 to gen7 boards Erik vd Zalm 2012-09-04 08:20:27 +02:00
• 47319cf64e Fixed typo in SF arc fix code. Erik vd Zalm 2012-09-03 21:28:31 +02:00
• e358a2d7af Added fix for SF Arc Point fillet procedure Erik vd Zalm 2012-09-02 01:12:49 +02:00
• 044a64a1fb Merge pull request #225 from Justblair/Marlin_v1 ErikZalm 2012-09-01 04:41:49 -07:00