microlab
/
scube
1
1
Fork 0
Code Issues Pull Requests Releases Activity
1,200 Commits
1 Branch
0 Tags
110 MiB
2.0.x
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '477b6fa1df'
${ noResults }
Commit Graph

1044 Commits (477b6fa1df30d1ff6021df103d5bb5efef31ee4a)

Author SHA1 Message Date
Erik van der Zalm 8a08cca0f2 Added temperature status less. 
Hopefully fixed viky button handling without braking other boards
 11 years ago
Erik van der Zalm 667d278f54 Revert "Fix for Viki display" 
This reverts commit 314fd13c39.
 11 years ago
Erik van der Zalm bf27e79e74 Small BlinkM fix 11 years ago
Erik van der Zalm 87e28c0599 Added ifdefs to blinkm 11 years ago
Erik van der Zalm 24c6b2ab35 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 11 years ago
ErikZalm 6a803ba9c5 Merge pull request #590 from timkoster/Marlin_v1 
Added BlinkM support over i2c
 11 years ago
Erik van der Zalm 457d8a0acb Fixed merge conflicts 11 years ago
Alex Borro 6f85a8c7aa Bed auto Leveling change: Raise Z before homing 
- Added "Z_RAISE_BEFORE_HOMING" for raising Z the defined distance
before homing. This is useful to avoid Z-Probe collision when hotend is
near bed.

- Fixed the issue of Z not going bellow Z_PROBE_OFFSET when
"min_software_endstops" is true.
Now the Z_PROBE_OFFSET is not set in Z_MIN_POS, it is added after
homing.
 11 years ago
Alex Borro dd3086d3f2 Show Temperature ADC values 
If "SHOW_TEMP_ADC_VALUES" is defined in Configuration_adv.h, the M105
command will present, after tradicional temperatures, the ADC value read
from temp sensors. This is great for adjusting thermistor tables with
thermocouple.

From Pronterface you can see the ADC value and compare with a
thermocouple reading.. then you just need to create your own thermistor
table.

Since this merge doesnt change the original information, it doesnt mess
with PC software parsing (tested under Pronterface and Repetier-Host).
 11 years ago
bkubicek 7fad13a1e2 Reverse SD card file name order. 
This is _not_ automatically the cronological, since deleting a file will free
the filesystem descriptor for it, which then will be used by the next file copied on it.
Since this makes the auto0.g file very inaccessible, I put the option back, to have it in the prepare menu.

this should satisfy https://github.com/ErikZalm/Marlin/pull/373

as a reminder, auto0.g will be executed every time after a boot with sd card present and file present.
thereafter, if there is a file auto1.g this will be done. Thats IMHO the best place to put settings, and prepare heating.
I also execute again after each (now again via the prepare menu) before starting a new print/ after a failed one.
It for me 100% replaces any start.gcode form the slicers.
 11 years ago
bkubicek b832f5b9f6 added delta tower babystepping. Its untested, but hopefully florian horsch will be able to try. 
also, removed some trouble for compilation with corexy.
I think that babystepping is only possible in z for a delta tower.
not sure if it would be usefull to step individual motors on a delta, i don't own one
 11 years ago
bkubicek c38b0855c8 I think that filament change is ready for the masses. I have tested very often with my ultimaker. 
I strongly vote for it being a single gcode, because otherwise the triggering from the menu is terrible.
 11 years ago
bkubicek d147a057ac Add the socalled "Babystepping" feature. 
It is a realtime control over the head position via the LCD menu system that works _while_ printing.
Using it, one can e.g. tune the z-position in realtime, while printing the first layer.
Also, lost steps can be manually added/removed, but thats not the prime feature.
Stuff is placed into the Tune->Babystep *

It is not possible to have realtime control via gcode sending due to the buffering, so I did not include a gcode yet. However, it could be added, but it movements will not be realtime then.

Historically, a very similar thing was implemented for the "Kaamermaker" project, while Joris was babysitting his offspring, hence the name.

say goodby to fuddling around with the z-axis.
 11 years ago
Erik van der Zalm bca353cc12 Fixed duplicate define in fastio.h 11 years ago
Alex Borro 253dfc4bc1 Bed Auto Leveling feature 
Check the Readme for instruction how to enable and configure the feature
 11 years ago
ErikZalm 1bda6bf862 Merge pull request #609 from phq1910/patch-1 
Update Configuration.h
 11 years ago
ErikZalm c80aac1518 Merge pull request #610 from phq1910/patch-2 
Update pins.h
 11 years ago
Erik van der Zalm 314fd13c39 Fix for Viki display 11 years ago
phq1910 4f7c6dfe35 Update pins.h 
Include Pins cpu Sethi 3D
 11 years ago
phq1910 57173739a1 Update Configuration.h 
Include CPU Sethi 3D
 11 years ago
Erik van der Zalm 0dca49a7c0 Added Azteeg X3 board. 11 years ago
Erik van der Zalm d8c2c810b4 Added info to the delta configuration files in the configuration.h file 11 years ago
Erik van der Zalm 9bc88f8bab Placed optional ENCODER_PULSES_PER_STEP in the configuration.h file 11 years ago
Erik van der Zalm 3ca1ca6869 Fixed missing ENCODER_PULSES_PER_STEP 11 years ago
Tim Koster 97b0da0c2e Removed #ifndef BLINKM 11 years ago
Tim Koster 61db046b32 Added #ifdef BLINKM around new code. Also refined BlinkM.h. 11 years ago
Richard Miles 77df2ab0e7 Make Y_DUAL_STEPPER_DRIVERS disabled by default 11 years ago
Richard Miles ed1ab42186 Added Y_DUAL_STEPPER_DRIVERS 
Enables two stepper drivers to be used for the Y axis (useful for
Shapeoko style machines)
Each Y driver can be stepped in either the same way or in opposite
directions, accounting for different hardware setups (leadscrew vs. belt
driven)
 11 years ago
Richard Miles f4a59e4ce5 Revert "Added Y_DUAL_STEPPER_DRIVERS" 
This reverts commit 7ee275b620.
 11 years ago
Richard Miles 7ee275b620 Added Y_DUAL_STEPPER_DRIVERS 
Enables two stepper drivers to be used for the Y axis (useful for
Shapeoko style machines)
Each Y driver can be stepped either the same way or in opposite
directions, accounting for different hardware setups (leadscrew vs. belt
driven)
 11 years ago
ErikZalm 6a1e980c6d Merge pull request #600 from xoan/Encoder_Pulses_Per_Step 
add ENCODER_PULSES_PER_STEP
 11 years ago
ErikZalm 20076a8bd3 Merge pull request #598 from GDV0/Marlin_v1 
FIx compilation error when enabling SERVO_ENDSTOPS (#591)
 11 years ago
Erik van der Zalm 3626b5ad8b Removed Delta from the default config file. 
Changed EEPROM CHITCHAT behavior. M503 is always enabled.
 11 years ago
Xoan Sampaiño bf7007d02f add ENCODER_PULSES_PER_STEP 11 years ago
GDV0 f17506c504 FIx compilation error when enabling SERVO_ENDSTOPS (#591) 11 years ago
Martin Lukasik acd8619809 Fan fix for Panelolu2+Sanguinololu. 11 years ago
George Roberts 595580556c Fixed bug that makes ulticontroller knob backwards introduced Feb 28 2013 by Robert. 
Bug introduced in version 6beb42cdf6.
Robert did a good job of simplifying but messed up this chunk of code.

Looking at working version: 839bef6d5d
it seems there is no case where encrot3 should be defined as 2
because if ULTICONTROLLER is defined then NEWPANEL is also defined.
 11 years ago
Tim Koster 88dfeefca3 Define BlinkM default disabled 11 years ago
Tim Koster 5350faf2a2 Merge https://github.com/timkoster/MarlinBlinkM into Marlin_v1 11 years ago
Tim Koster 7016cc9511 Added BlinkM support over i2c 11 years ago
Tim Koster 3b315b3da0 Added BlinkM support over i2c 11 years ago
Jim Morris f26f26b7bd Fix the example delta configuration as someone forgot to do it. 11 years ago
Peter Hercek 9aa2229077 add command M666 for adjusting delta printer endstop position 11 years ago
Robert F-C 9547fb9dfb Add duplication and auto-park mode for dual x-carriage support. 12 years ago
Steve Kelly 53614e5144 add pins for rambo lcd 12 years ago
Steve Kelly b42d24e31e add additional pins to avr2560 for rambo lcd 12 years ago
Nicolas Rossi b0c8120fcc Added feedrate setting in exemple config for manual moves from panel 12 years ago
Nicolas Rossi a54fe2d73c Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1 
Conflicts:
	Marlin/Marlin_main.cpp
 12 years ago
ErikZalm 7ea63d08df Merge pull request #565 from iXce/avrdudeconfpath 
Detect OS in Makefile to use the correct avrdude.conf path
 12 years ago
ErikZalm 4187b637a5 Merge pull request #570 from hg42/separate-INVERTING-macros-for-MIN-and-MAX-endstops 
separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)
 12 years ago
ErikZalm 07e7de3600 Merge pull request #569 from hg42/convert-PROTOCOL-macros-from-statements-to-expressions 
convert PROTOCOL macros from statements to (multiple, comma separated) expressions
 12 years ago
Guillaume Seguin c0c4c97db6 Detect OS in Makefile to use the correct avrdude.conf path 12 years ago
hg42@gmx.net 2ca983568d separate INVERTING for MIN and MAX endstops (6 #defines instead of 3) 12 years ago
hg42@gmx.net 3700f688f5 convert PROTOCOL macros from statements to (multiple, comma separated) expressions 12 years ago
daid a504c88346 Fix a bug where the PID controllers D action kicks in hard as soon as the PID controller starts. 12 years ago
Nicolas Rossi 394ed08f88 Added feedrate setting for manual moves from panel 12 years ago
Nicolas Rossi 9bf1cf1b22 Pre-calculate diagonal rod length squared 12 years ago
Nicolas Rossi 4623e78ce0 Added Honeywell thermistor 135-104LAF-J01 12 years ago
Brendan-csel d7f384f680 Skip SD menu refresh if nothing has changed 12 years ago
Brendan-csel abc8320a68 Save LCD_CLICKED before it is cleared 
The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.
 12 years ago
Guillaume Seguin f4c3135c6d Add Panelolu2 pins for RAMPS1.3 12 years ago
Guillaume Seguin aae42c68f9 Update French translation in language.h 12 years ago
Guillaume Seguin 4d435c38a6 Add support of LiquidTWI2-based panels to Makefile 
Use LIQUID_TWI2=1 as make argument to enable this support
 12 years ago
Guillaume Seguin 6c42a3a339 Woops, fix logic 12 years ago
Guillaume Seguin 376d8af2c8 Report temperatures for all extruders 12 years ago
ErikZalm 434b6a05c1 Merge pull request #552 from iXce/Marlin_v1 
Report temperatures for all extruders in reply to M105
 12 years ago
ErikZalm bdc2621119 Merge pull request #561 from Brendan-csel/Marlin_v1 
Fix for Viki LCD issues printing from SD card
 12 years ago
ErikZalm 6965bd4e15 Merge pull request #560 from njprossi/Marlin_v1 
Fixed move from panel for delta bot #557
 12 years ago
ErikZalm a55b33e613 Merge pull request #559 from iXce/panelolupinsramps13 
Add Panelolu2 pins for RAMPS1.3
 12 years ago
ErikZalm 8b34351537 Merge pull request #558 from iXce/frenchupdate 
Update French translation in language.h
 12 years ago
ErikZalm 735e556724 Merge pull request #555 from iXce/liquidtwi2_makefile 
Add support of LiquidTWI2-based panels to Makefile
 12 years ago
Brendan-csel d80aecda0a Skip SD menu refresh if nothing has changed 12 years ago
Brendan-csel be2dea1dc6 Save LCD_CLICKED before it is cleared 
The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.
 12 years ago
Nicolas Rossi 55c287a69e Fixed move from panel for delta bot #557 12 years ago
Guillaume Seguin 1902d339b0 Add Panelolu2 pins for RAMPS1.3 12 years ago
Guillaume Seguin eb23a68e92 Update French translation in language.h 12 years ago
ErikZalm 1561c6df51 Merge pull request #547 from wolfmanjm/delta-configuration 
Setup Default configuration for Deltas if DELTA is defined
 12 years ago
Guillaume Seguin 374bc99fa3 Add support of LiquidTWI2-based panels to Makefile 
Use LIQUID_TWI2=1 as make argument to enable this support
 12 years ago
Jim Morris ab624eac2a revert COnfiguratiuon to the same as head 12 years ago
Jim Morris 52f79ffeca add an example default configuration for delta style bots 12 years ago
Jim Morris b9d7ccf1cd Merge remote-tracking branch 'upstream/Marlin_v1' into delta-configuration 
Conflicts:
	Marlin/Marlin_main.cpp
 12 years ago
Guillaume Seguin d4d1540727 Use -fno-use-cxa-atexit to override gcc --enable-cxa_atexit 12 years ago
Guillaume Seguin 01ed99143c Woops, fix logic 12 years ago
Guillaume Seguin 76841450c8 Only display poweron/poweroff if PS_ON_PIN > -1 12 years ago
Guillaume Seguin 44f327d738 Uniformly reindent language.h 12 years ago
Guillaume Seguin 326d2db025 Update language.h so that all languages compile 
Some strings still need translation, but at least everything compiles.
 12 years ago
Guillaume Seguin 2cb716f513 Run Marlin/language.h through dos2unix 12 years ago
Guillaume Seguin 34da3a0a3f Merge github.com:ErikZalm/Marlin into Marlin_v1 
Conflicts:
	Marlin/language.h
 12 years ago
Guillaume Seguin 18199ff960 Merge github.com:ErikZalm/Marlin into Marlin_v1 12 years ago
Robert F-C fb5334f428 Fixed compile error when QUICK_HOME is defined. 
As well a couple of minor changes to handling of extruder offset for
dual x-carriage mode.
 12 years ago
Robert F-C c3568398b5 Disable DUAL_X_CARRIAGE by default 12 years ago
Robert F-C 39cd3dbdbe Remove dual x-carriage functionality that could/should be implemented in slicer 
Also added a couple of missed merge lines in homeaxis() from previous
commit.
 12 years ago
Jim Morris fb20ceabce enable soft endstops for delta 
disable delta by default
 12 years ago
Jim Morris d01ee7e7b5 fix zjerk being the same for delta as xy jerk 
add more delta defaults
on delta make second home even slower
 12 years ago
Robert F-C d7390e13d9 Support dual x-carriage printers 
Dual x-carriage designs offer some substantial improvements for dual
extruder printing.
 12 years ago
Jim Morris f3aa2a48e7 update max pos 12 years ago
Jim Morris 460751503e Added default configurations for deltas when DELTA is defined 12 years ago
Maik Stohn 9da94c247a fixed bad lcd commit from makr3d 
#elsif does not exist #elif is correct
 12 years ago
Erik van der Zalm 59004023fd Fixed typo 12 years ago
Erik van der Zalm 461dad6e05 Added : M32 - Select file and start SD print (Can be used when printing from SD card) 
Untested
 12 years ago