melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • d0319d45af Merge pull request #335 from jcrocholl/Marlin_v1 daid 2012-12-11 02:59:58 -08:00
  • ca409e5531 Fix X/Y/Z_MIN_PIN for Printrboard. Johann Rocholl 2012-12-11 01:59:48 -08:00
  • 1f45cb0a51 Fix typo in MANUAL_HOME_POSITION (plural S missing) and improve comments. Johann Rocholl 2012-12-11 01:54:40 -08:00
  • 931a0052ea Fix typo in MANUAL_HOME_POSITION (plural S missing) and reduce BLOCK_BUFFER_SIZE because 64 wasn't working for some reason. Johann Rocholl 2012-12-11 01:22:04 -08:00
  • 46ec4b648c Added some missing Mxxx comments to M commands. Fixed the unsetting of the timer dividers for the fast PWM fan. daid303 2012-12-11 10:21:44 +01:00
  • 724f5aa36b Update on makefile for moved Arduino addons. Daid 2012-12-10 12:06:30 +01:00
  • 6d9dfa96c3 Move the Arduino related stuff out of the Marlin tree, as they are not directly related to Marlin functionality but addons for the Arduino IDE. Also split up the addons for pre 1.0.0 Arduino and post 1.0.0 Arduino. daid303 2012-12-10 12:02:29 +01:00
  • 3fb07d9b8d Add MINTEMP/MAXTEMP error to LCD, and fix temperature bug with more then 1 extruder. daid303 2012-12-10 10:48:46 +01:00
  • 8e2519e88b Add realtime delta geometry in Marlin_main.cpp. Johann Rocholl 2012-12-10 01:04:12 -08:00
  • cec7283b21 Enable QUICK_HOME for deltabot. Johann Rocholl 2012-12-10 00:43:47 -08:00
  • 2292441f0c Use X/Y/Z_MAX_PIN instead of X/Y/Z_MIN_PIN for top endstops on deltabot. Johann Rocholl 2012-12-10 00:43:14 -08:00
  • c430906d3b Deltabot settings and configuration adjustments. Johann Rocholl 2012-12-10 00:10:56 -08:00
  • 82c8724b33 Fix compile with PID_DEBUG daid303 2012-12-09 23:50:12 +01:00
  • 9b160972a1 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 daid303 2012-12-09 23:46:42 +01:00
  • e036750bdf Use the disable macros on initialization. Which fixes a bug when there is no pin defined for stepper enabled (motherboard 4) daid303 2012-12-09 23:46:25 +01:00
  • fcd9de72ef Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 Daid 2012-12-09 23:31:07 +01:00
  • 32d4373e0f Add printrboard and brainwave to Makefile. Daid 2012-12-09 23:30:55 +01:00
  • b3ddbcee2a Merge pull request #329 from jcrocholl/Marlin_v1 daid 2012-12-09 14:29:26 -08:00
  • 29435dfb4b Proper avr for Sanguino in Makefile. Daid 2012-12-09 23:02:03 +01:00
  • 52158dffcc Big temperature code update. No longer converts back and forwards between temperature and raw sample value. Reducing complexity, removing code. Also named some variables better. While keeping the safety intact and functionality the same. daid303 2012-12-09 23:00:06 +01:00
  • ca7acbe6d9 Allow specification of which arduino hardware subvariant in Makefile. Daid 2012-12-09 19:19:57 +01:00
  • 33247733e0 Teensylu and Printrboard use different analog pins for thermistors. Johann Rocholl 2012-12-09 02:19:13 -08:00
  • 621c24a10f AT90USB is only defined after pins.h is included. Johann Rocholl 2012-12-09 01:40:33 -08:00
  • 6cba11f087 Stop redefining MOTHERBOARD and #define AT90USB instead. Also put #ifndef AT90USB around the HardwareSerial_h trick, so now Printrboard / Brainwave support compiles on Arduino 1.0.2 as well. Johann Rocholl 2012-12-09 01:32:09 -08:00
  • 4d351b4846 Improved formatting and comments for consistency. Johann Rocholl 2012-12-08 20:15:53 -08:00
  • a30007caa4 If fastio.h is not messed up then Teensylu and Printrboard are actually using the same pins. Johann Rocholl 2012-12-08 19:46:42 -08:00
  • 6aa87a7b67 Use the same fastio.h definition for AT90USB1286/7 and AT90USB646/7. Johann Rocholl 2012-12-08 15:16:38 -08:00
  • b1c38d4c82 Avoid compiler warnings (redefined MOTHERBOARD) in Arduino 1.0 and greater. Johann Rocholl 2012-12-08 11:34:18 -08:00
  • 42e21bb06e Add support for Printrboard (from https://github.com/lincomatic/Marlin) and Brainwave (from https://github.com/metrix/Sprinter). Johann Rocholl 2012-12-08 10:49:01 -08:00
  • ce4b5bbeaa Add AT90USB646 support from Sprinter to fastio.h. Johann Rocholl 2012-12-08 10:45:58 -08:00
  • f413aa33b3 Small makefile change, posibility to add defines on the commandline, and fix compiling with watchdog enabled when using the Makefile. Daid 2012-12-08 11:49:53 +01:00
  • 587154c01b Fix the WATCHPERIOD implementation. It did not work correctly in a multi extruder setup, it did not work after 32 seconds after startup (int16 used as millies timestamp). And it did not work if you gave an M104 or M109 when the target was already around the target setpoint. So on average, it did not work at all. The new implementation should be robust in detecting a failure to heat up. daid303 2012-12-06 10:36:07 +01:00
  • 1f27870d41 Fix compiling the watchdog error message when the manual reset watchdog is used. daid303 2012-12-06 10:27:50 +01:00
  • c5d4225804 Mistake there, not sure why I did that. My bad. daid303 2012-12-05 20:23:13 +01:00
  • 529748894c Minor changes in the temperature code for some cleanup. daid303 2012-12-05 19:54:01 +01:00
  • 4e26ecc940 The Partial release message (which does not really tell you anything) overwrites the final print time on the LCD, which is a real shame. So I removed the message. daid303 2012-12-05 19:32:26 +01:00
  • c421774422 The Partial release message (which does not really tell you anything) overwrites the final print time on the LCD, which is a real shame. So I removed the message. daid303 2012-12-05 19:32:02 +01:00
  • 16078e47d4 Fixed #325 daid303 2012-12-04 16:27:21 +01:00
  • 6a9bee27cc Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup. daid303 2012-12-03 12:52:00 +01:00
  • 94ea26ff46 Some minor changes on code style. And a bugfix where the counters for positioning in the stepper where wrong depending on compiler settings. (Caused strange values to reported back with M114 and endstop triggers). Also fixed compiling with FWRETRACT enabled. daid303 2012-12-03 12:13:20 +01:00
  • 6c51fe5039 Fix the bug where the SD percentage calculation is wrong when the file is larger then 42MB daid303 2012-12-03 11:35:36 +01:00
  • 34b2de4cd8 Merge pull request #320 from brupje/patch-1 daid 2012-12-01 01:02:32 -08:00
  • 57429cb9fe Fix for keypad brupje 2012-11-29 21:42:19 +01:00
  • 97fa2a9c30 Few simple fixes that save RAM, as static strings are stored in RAM by default. daid303 2012-11-28 10:30:34 +01:00
  • c94ca24adc Fixed #317 Daid 2012-11-24 17:32:30 +01:00
  • 99e9554edd Some fixes in the Makefile to support Arduino 1.0.0 or higher and added the Rambo. Still needs some more work for the different arduino hardware variants. Daid 2012-11-24 11:46:31 +01:00
  • dbbf050005 More rambo fixes Erik vd Zalm 2012-11-21 20:53:56 +01:00
  • f934d0ef5b Merge remote-tracking branch 'tonokip/Marlin_v1' into Marlin_v1 Erik vd Zalm 2012-11-21 20:36:30 +01:00
  • e48dfcc2b3 Tmp copy before merge Erik vd Zalm 2012-11-21 20:29:31 +01:00
  • b98fb17fe9 Small FREQUENCY_LIMIT changes Erik vd Zalm 2012-11-21 20:17:44 +01:00
  • bce67ec2c9 Merge pull request #312 from gege2b/Marlin_v1 daid 2012-11-18 13:43:07 -08:00
  • 9b1d2483a0 I hope last changes to french translation Gege 2012-11-18 22:34:56 +01:00
  • b1adc567da Correction to french translation (non-ASCII chars only) Gege 2012-11-18 20:00:41 +01:00
  • 0807d82af0 Correction to french translation (plain text only) Gege 2012-11-18 19:39:56 +01:00
  • 5cd7a90b32 Added new temperature lookup table creation tool. This one uses stein hart-hart equations. You need 3 temperature resistance:combinations. This gives a better result then using beta. Erik vd Zalm 2012-11-16 23:51:05 +01:00
  • bb119739b0 Added french translation gege2b 2012-11-16 18:38:50 +01:00
  • df8dd5ac21 Merge pull request #306 from nothinman/Marlin_v1 daid 2012-11-14 01:59:33 -08:00
  • b7c8e5bbcf Merge pull request #308 from MStohn/Marlin_v1 daid 2012-11-13 05:53:58 -08:00
  • 2b7b1e52b1 allow marlin internal 0°C represenation MaikStohn 2012-11-13 14:37:08 +01:00
  • 2f771b3979 Added automatic build numbering. Martin Lukasik 2012-11-12 21:06:59 +00:00
  • 9bebe9b631 Merge pull request #302 from nothinman/Marlin_v1 daid 2012-11-12 12:13:30 -08:00
  • a2032afa3a Fixed #303 daid303 2012-11-12 21:04:07 +01:00
  • 6a55ca8370 Added Polish translation. Cosmetic changes to English. Martin Lukasik 2012-11-12 15:54:07 +00:00
  • 8f20562f49 Fix some of the crowded code style. And fixed the conditional. #300 daid303 2012-11-12 15:49:40 +01:00
  • 43018a48c4 Fix for a few -Wextra warnings. daid303 2012-11-12 15:35:28 +01:00
  • 72586eb30a Solved few warnings. daid303 2012-11-12 09:29:12 +01:00
  • 7a02ba361c Header multiple include protection should match the filename, not just _ARDUINO_H, which is almost bound to go wrong some day. daid303 2012-11-12 09:24:28 +01:00
  • 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