MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
932 Commits 1 Branch 0 Tags 129 MiB
6588933c04
Commit Graph

102 Commits

Author SHA1 Message Date
Erik van der Zalm
79374f0b93 Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1 2013-06-05 17:44:48 +02:00
Erik van der Zalm
5090c56651 More redundant temp sensor changes. (After testing and debugging by reifsnderb) 2013-05-29 19:29:30 +02:00
Gatulibu
b78fa6bb70 Added support for Megatronics v2.0 and Minitronics v1.0 
merged from code downloaded from reprapworld.com
 2013-05-28 14:03:31 +02:00
Erik van der Zalm
7231a20dba Put #ifdef around servo pins in pins.h. This allows the pins to be used for M42. 2013-05-24 21:05:11 +02:00
Bas Spaans
424101110c Add Panelolu2 support for Melzi 2013-05-19 12:09:34 +02:00
Robert F-C
dfa549f268 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-05-18 21:59:39 +10:00
ErikZalm
64360164ad Merge pull request #482 from codexmas/Marlin_v1 
servosupport
 2013-05-16 10:19:00 -07:00
Gord Christmas
dc59f07d24 First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple. 2013-05-16 07:03:01 -07:00
MaikStohn
9cc15876be Add support for RUMBA thermocouple add on 2013-05-16 01:16:08 +02:00
Erik van der Zalm
bd2cd4903e Added #ifdef BARICUDA around the BariCUDA changes 2013-05-14 23:56:32 +02:00
Jordan Miller
fbd899a37d Support for BariCUDA Paste Extruder derived from MakerBot Frostruder. Using Ultimachine RAMBo board. M126/M127 and M128/M129. 2013-05-14 23:34:45 +02:00
gregor
2739c26c4f changes: 
- changed the variables from keypad to reprapworld_keypad
- added a missing ifdef check
 2013-05-10 22:20:02 +02:00
gregor
6fb9573157 added support for the reprapworld keypad 2013-05-10 21:57:17 +02:00
Robert F-C
788d62bcc4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 
Conflicts:
	Marlin/Marlin.pde
	Marlin/ultralcd.cpp
	Marlin/ultralcd_implementation_hitachi_HD44780.h
 2013-04-29 21:13:46 +10:00
daid
4b2ece159b Merge pull request #453 from brackendawson/Marlin_v1 
Make Gen7 1.4+ heater temp sensort pins match silkscreen.
 2013-04-16 10:12:25 -07:00
Bracken Dawson
d5ee2a5a62 Make Gen7 1.4 heater pins match silkscreen 2013-04-16 17:37:38 +01:00
ErikZalm
86867928ac Merge pull request #434 from DDRBoxman/Marlin_v1 
Add support for M300: Play beep sound
 2013-03-30 08:49:54 -07:00
Colin Edwards
0d075378d5 Add LARGE_FLASH define and enable it for some of the beefier boards 
The LARGE_FLASH flag allows superfluous features to be excluded
on boards with less memory
 2013-03-25 10:42:27 -05:00
blddk
91bea43332 Added rumba pinout 2013-03-22 18:29:47 +01:00
Dirk Eichel
140e095c6e Add pins for Motherboard variant 64 
These definition contain also the definition for the graphics LCD.
 2013-03-01 17:47:32 +01:00
Robert F-C
1292d735ba Converge all I2C LCD branches (PANELOLU2, VIKI & PCF8575) 
This includes refactoring the buttons code to remove a large amount of
non-pin dependent duplication from pins.h.
 2013-02-28 02:04:51 +11:00
Bas Spaans
12c41423ad Fixed typo in comment 2013-01-30 22:54:04 +01:00
Bas Spaans
0995eaa492 Chenged LED_PIN for Melzi boards, added comment about broken versions of the Sanguino libraries 2013-01-30 22:25:01 +01:00
daid303
408b349a84 Fixed #368. Commented out the wrong pin definition, but explained why it is there. 2013-01-21 15:46:17 +01:00
Yuri Valentini
86358dd6cd Panelolu pin assignment for sanguinololu from http://reprap.org/wiki/Panelolu 2013-01-10 12:23:20 +01:00
daid303
bbe7d3d0fe Fixed #312 2013-01-08 17:09:57 +01:00
daid
30254e3388 Merge pull request #350 from jcrocholl/Marlin_v1 
Automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR.
 2012-12-17 02:16:31 -08:00
Johann Rocholl
8caf5d252d Remove bogus blank line. 2012-12-16 12:50:20 -08:00
Johann Rocholl
b39f5d614a For boards with only one endstop per axis, automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR. 2012-12-16 12:09:53 -08:00
oni303
ab09fa4bbf fixed pwm generation at pin D12 and D13 when one of them is used as FAN_PIN on Sanguino, added soft pwm entry for FAN_PIN in temperature.cpp 2012-12-16 01:36:57 +01:00
daid303
5ff5cee8ce Fix the sensitive pin definitions, there where analogue numbers in the digital pin list. Also made M42 without a P function on the LED_PIN (which was otherwise a useless pin definition) 2012-12-11 14:53:53 +01:00
Johann Rocholl
ca409e5531 Fix X/Y/Z_MIN_PIN for Printrboard. 2012-12-11 01:59:48 -08:00
Johann Rocholl
33247733e0 Teensylu and Printrboard use different analog pins for thermistors. 2012-12-09 02:19:13 -08:00
Johann Rocholl
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. 2012-12-09 01:32:09 -08:00
Johann Rocholl
4d351b4846 Improved formatting and comments for consistency. 2012-12-08 20:15:53 -08:00
Johann Rocholl
a30007caa4 If fastio.h is not messed up then Teensylu and Printrboard are actually using the same pins. 2012-12-08 19:46:42 -08:00
Johann Rocholl
b1c38d4c82 Avoid compiler warnings (redefined MOTHERBOARD) in Arduino 1.0 and greater. 2012-12-08 11:34:18 -08:00
Johann Rocholl
42e21bb06e Add support for Printrboard (from https://github.com/lincomatic/Marlin) and Brainwave (from https://github.com/metrix/Sprinter). 2012-12-08 10:49:01 -08:00
brupje
57429cb9fe Fix for keypad 2012-11-29 21:42:19 +01:00
Erik vd Zalm
f934d0ef5b Merge remote-tracking branch 'tonokip/Marlin_v1' into Marlin_v1 
Conflicts:
	Marlin/Configuration.h
 2012-11-21 20:36:30 +01:00
daid303
ffc69537aa Update on some comments, make the MOTHERBOARD list complete again. 2012-11-09 09:10:51 +01: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
Jonathan Bastien-Filiatrault
3cbaad9288 RepRapDiscount Smart Controller pin definitions. 2012-11-06 20:32:13 -05: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
brupje
d07b6e93d5 Add support for Megatronics 2012-10-14 14:05:12 +03:00
johnnyr
8016f058bc fix max endstop pins 2012-09-19 13:15:17 -05:00
Erik vd Zalm
abf0693e8e Added KILL_PIN -1 to gen7 boards 2012-09-04 08:20:27 +02:00