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

410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MaikStohn
e48f5aa6a7 fixed typo 2012-05-11 15:22:06 +02:00
MaikStohn
1efe9ab497 changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu 2012-05-11 15:19:09 +02:00
MaikStohn
b657a18449 Revert "magic PROGMEM defines to avoid hundreds of wrong GCC warnings" 
This reverts commit 3682d9bd5b.
 2012-05-04 12:24:07 +02:00
MaikStohn
d188ae4c9d added missing declaration of buttons_init() 
This is required when moving the buttons_init() function to the
lcd_init() function
 2012-05-03 15:48:44 +02:00
MaikStohn
3682d9bd5b magic PROGMEM defines to avoid hundreds of wrong GCC warnings 2012-05-03 15:43:23 +02:00
MaikStohn
032df0b2c6 Moved LCD initialization out of constructor 
Since the class "MainMenu" was used within a static variable the
initialization of the object (constructor call) was done before Arduino
library startup. It always caused a crash when using AVRStudio with
JTAG debugger (caused from calling the LCD initialization / the lot of
I/O work / the stack used during this calls). By moving the LCD_INIT
out of the constructor and using an explicit call inside of Arduino
setup() implementation immediately fixed all problems and the JTAG
debugger runs fine.
 2012-05-03 14:28:17 +02:00
MaikStohn
bd1ad7c76a explicit includes to make it compile with AVRStudio/Eclipse 2012-05-03 14:22:43 +02:00
MaikStohn
060b38de5c delete obsolete and wrong code 
"i" runs from 0 to 4 but "add_homeing" array size is 3 only. On the
other hand the calculated value gets overwritten by either one of the
if choice.
 2012-05-03 14:15:46 +02:00
MaikStohn
789ba02d43 fixed typo in comment 2012-05-03 14:13:53 +02:00
Erik van der Zalm
1874cb71a6 Added option to increase the FAN PWM frequency. 2012-05-02 19:26:14 +02:00
Erik van der Zalm
6a5a34e0ff Small cleanup 2012-04-30 13:37:49 +02:00
Erik van der Zalm
e3821bd86f Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 2012-04-30 13:36:27 +02:00
Erik van der Zalm
02af69911e Added temperature window to M109. This is needed for systems with no overshoot PID. 2012-04-30 13:36:19 +02:00
ErikZalm
e203b8c754 Merge pull request #154 from daid/Marlin_v1 
Added 2nd extruder temperature LCD readout and setting.
 2012-04-28 13:19:55 -07:00
ErikZalm
362ddc4efc Merge pull request #155 from Atntias/patch-1 
adding M120 and 121 for turning on and off the endstops only for homing
 2012-04-28 13:19:19 -07:00
ErikZalm
58cad83253 Merge pull request #156 from Atntias/patch-2 
Fix to allow M120/M121
 2012-04-28 13:19:00 -07:00
sefi
c27081aa4a Fix to allow M120/M121 2012-04-28 17:35:51 +03:00
sefi
e11e072eca adding M120 and 121 for turning on and off the endstops only for homing function 2012-04-28 17:31:22 +03:00
Daid
8e68c6cf89 Show proper temperature for extruder 2 2012-04-27 15:00:01 +02:00
Daid
8503b78876 Added support for 2nd extruder temperature to UltraLCD 2012-04-27 14:51:32 +02:00
Bernhard Kubicek
8446c9dc92 Merge pull request #152 from loganb/Marlin_v1 
Fix compile error on boards without a bed heater.

I could not find why this problem was introduced. 
Its quite obvious, so I think its in general interest to merge.
 2012-04-25 22:23:31 -07:00
Logan Bowers
3eacb4c16d Wrap the call to turn off the bed heater in a #if to prevent a compile error on boards that do not have a bed heater 2012-04-25 19:22:38 -07:00
Bernhard
e4d2138dbd reinitialize the lcd, if the SD card is inserted or removed. It seems that LCDs can confused by electrical discharges from time to time. 
Since a removal or insert of the sd card takes a long time in firmware, just reinitializing the lcd does not hurt.
actually, it solves a problem with the UltiControlle
 2012-04-22 21:12:17 +02:00
Bernhard
464b755918 added support for the UltiController 2012-04-22 20:55:56 +02:00
Bernhard
44fd8d46d2 fixed quickhome 2012-04-22 20:44:27 +02:00
Bernhard
33bb044d7c fixed catsting to (int)e in serial error messages. 
see https://github.com/ErikZalm/Marlin/issues/148
 2012-04-22 20:04:39 +02:00
Erik van der Zalm
ffea8008ca Update readme file 2012-04-15 22:44:03 +02:00
ErikZalm
c2557abc03 Merge pull request #138 from triffid/fix-makefile 
make should rebuild if configuration or Makefile is changed
 2012-04-15 10:21:46 -07:00
Erik van der Zalm
67cf105bc6 Fixed AUTOTEMP (M109 S215 B260 F1 starts autotemp) 
Changed SLOWDOWN. IF this does not work ok OLD_SLOWDOWN is the old algo.
 2012-04-15 19:17:33 +02:00
Erik van der Zalm
8aee9d51b6 Disabled disable_heater in PID_autotune. 2012-04-12 21:12:31 +02:00
ErikZalm
939f1fab46 Merge pull request #140 from daid/Marlin_v1 
Fix for wrong systax in #ifdef.
 2012-04-12 05:29:24 -07:00
Daid
414408b2d0 Fix for wrong systax in #ifdef. 2012-04-12 14:01:30 +02:00
Michael Moon
77d503fa13 Fix Makefile 2012-04-11 11:39:35 +10:00
Erik van der Zalm
cf7c8c458f Fixed MAX6675 2012-04-10 21:57:57 +02:00
ErikZalm
325f0651ac Merge pull request #136 from grrf/patch-1 
This breaks temperature readout for pronterface!
 2012-04-10 09:48:45 -07:00
grrf
03b0850e63 This breaks temperature readout for pronterface! 2012-04-09 23:37:34 +03:00
ErikZalm
2a019a53d2 Merge pull request #134 from tgiphil/Marlin_v1 
- Fixed a typo
 2012-04-08 05:16:29 -07:00
tgiphil
ad8bc71d3e - Fixed a typo 2012-04-07 20:01:31 -07:00
Erik van der Zalm
46feae79c6 Fixed typo in arc 2012-04-02 17:19:20 +02:00
Erik van der Zalm
4ca2f336f0 Changed default MINIMUM_PLANNER_SPEED -> 0.05 
Fixed small bug in arcs
M105 prints now actual_temp/target_temp
 2012-04-01 16:23:40 +02:00
Erik van der Zalm
ae0bf8068b Fixed arc offset. 2012-03-27 19:03:33 +02:00
Erik van der Zalm
0c1b863755 Ignore ":" in comments. 2012-03-25 14:41:26 +02:00
Erik van der Zalm
63aec3c56e Replaced Kill by Stop. If the printer is stopped. Fix the error and use M999 to restart. 
Moved the PID_dT in the Ki and Kd calculation from the configuration.h to temperature.cpp
 2012-03-25 14:36:51 +02:00
ErikZalm
8b785f75a6 Merge pull request #123 from buserror-uk/for-upstream 
For upstream
 2012-03-23 11:54:58 -07:00
ErikZalm
5b8758f42b Merge pull request #126 from tommycheng/patch-1 
Fix compilation error when PIDTEMP is undefined and ULTIPANEL is defined...
 2012-03-23 11:54:37 -07:00
Tommy Cheng
520f1a54a8 Fix compilation error when PIDTEMP is undefined and ULTIPANEL is defined. 2012-03-24 02:26:59 +08:00
Michel Pollet
5550e893d5 New board variant, Open Motion Controller 
Open Hardware board currently used by the group build of http://tvrrug.org.uk
The board can be found at http://solderpad.com/folknology/open-motion-controller/

Signed-off-by: Michel Pollet <buserror@gmail.com>
 2012-03-22 13:51:21 +00:00
Michel Pollet
aa6e6e914e Makefile: Redone 
+ Removed most explicit pathnames, use the standard make "VPATH" to let
make find the files for itself.

+ Added a "hardware variant" variable that allows compiging Sanguino and
Gen7 as well as "generic" arduino.

+ Allows overriding the MOTHERBOARD define from the Makefile

+ Removed the 'preprocessor' bit that wasn't needed, now just "include" the
files that are needed, since it allows gcc to show the right file/line
when displaying error/warnings.

+ Uses gcc's own dependency generator to generate the .d files, and
and include these instead of self-patching the makefile

Signed-off-by: Michel Pollet <buserror@gmail.com>
 2012-03-22 13:48:10 +00:00
Bernhard
0183e6332a made prepare->autostart independent of current folder. 2012-03-19 20:24:40 +01:00
Bernhard
1532200435 found error in filenames. 
One array was too short. This had nothing to do with long filenames, other than if they were 12 characters exactly, which could only happen if the extension and the text before were filled completely
 2012-03-19 20:06:58 +01:00