Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hi #2

Closed
wants to merge 146 commits into from
Closed

Hi #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
146 commits
Select commit Hold shift + click to select a range
7907edf
first compile using arduino22
bkubicek Aug 22, 2011
36d1c3f
better settings
bkubicek Aug 22, 2011
57d0011
dis-funcional ad595
bkubicek Aug 23, 2011
5b93020
unworking temp reading still, added lcd support
bkubicek Aug 23, 2011
4fd12ae
ah wirking f** it up
bkubicek Aug 23, 2011
4630b16
ok, now it seems to work with the temperatures
bkubicek Aug 23, 2011
b84f6e1
tuned configuration
bkubicek Aug 23, 2011
d471651
Fixes to allow simple LCD display. Added FANCY_BUTTONS define to al…
Aug 24, 2011
e35f914
Implemented Max Endstops for X,Y,Z axis
Aug 24, 2011
6096262
Updated Readme for this fork
Aug 24, 2011
f1a7c8b
Updated Readme typos
Aug 24, 2011
3d0ce29
Corrected one more readme typo
Aug 24, 2011
6416e20
Fixed max endstops locking other axis' movements
Aug 24, 2011
7d7ad08
Credits..
bkubicek Aug 25, 2011
b203697
Let me introduce myself :-)
lampmaker Aug 26, 2011
535506a
Edited README via GitHub
ErikZalm Aug 26, 2011
461e267
pre-update
bkubicek Aug 28, 2011
fae0bc5
Merge branch 'master' of https://github.com/bkubicek/Marlin
bkubicek Aug 28, 2011
e7e7b35
lcd improvement, real speed override for lcd/sd printing, config.h ba…
bkubicek Aug 28, 2011
b430763
Version number
bkubicek Aug 29, 2011
0156fda
buttons improvement, actual measures
bkubicek Aug 29, 2011
37321fb
trying to add redbutton sd-reset, so that moving to the file page doe…
bkubicek Aug 29, 2011
f231c9e
Reapply code for implementing max endstops for X,Y,Z axis and fixing…
Sep 4, 2011
ed7ee42
protospace: Analog fan
bkubicek Sep 9, 2011
05a816d
solved problem with floating buttons, limit of maximum velocity.
bkubicek Sep 9, 2011
083ff50
timer
bkubicek Sep 9, 2011
7d753d2
autostart debugging
bkubicek Sep 9, 2011
acaefb5
back to default config
bkubicek Sep 9, 2011
a9f2c95
added minute counting for no-sdcard printing
bkubicek Sep 10, 2011
07d1962
Keep floating point math pure -- to attempt to prevent rounding error…
Sep 13, 2011
c8f734d
Disable SDSUPPORT by default so that folks can use RepG to connect
Sep 13, 2011
659f607
step debugging
bkubicek Sep 13, 2011
5c1eda9
Merge branch 'master' of https://github.com/bkubicek/Marlin
bkubicek Sep 13, 2011
e8f05ea
disabled the step debugging for default users
bkubicek Sep 14, 2011
309774a
larger speed limits
bkubicek Sep 14, 2011
87eb941
leftovers
bkubicek Sep 14, 2011
4670145
Merge branch 'master' of https://github.com/bkubicek/Marlin
bkubicek Sep 14, 2011
c4b330c
Extruder Stepper now properly disables as necessary
Sep 14, 2011
a6de9cf
added a lot of corrections
bkubicek Sep 16, 2011
20019c4
Merge branch 'master' of https://github.com/bkubicek/Marlin
bkubicek Sep 16, 2011
6c11c3d
Added a MIN_SEGMENT_TIME option in configuration.h. this sets the min…
lampmaker Sep 17, 2011
c6e6a78
Changed defines for SIMPLE or FANCY LCD (removing FANCY_BUTTONS). It…
Sep 17, 2011
cf4c468
No lcd should be enabled by default, IMHO, in the current all lcd stu…
bkubicek Sep 18, 2011
58b0fb8
Modified step counter to follow plan_set_position's input.
lampmaker Sep 18, 2011
3dae132
Wrapped prev commit in #ifdef DEBUG_STEPS
lampmaker Sep 18, 2011
d6f6bdc
making acceleration and max speeds value changeable by gcode.
bkubicek Sep 20, 2011
063e7c7
unix end of line
bkubicek Sep 20, 2011
712ca8d
made acceration and feedrate limits software-configurable.
bkubicek Sep 20, 2011
4799597
Merge branch 'master' of https://github.com/bkubicek/Marlin
bkubicek Sep 20, 2011
0375751
typos, stupid me
bkubicek Sep 20, 2011
849a021
removed enquecommand lcd dependency, its also used for sd
bkubicek Sep 20, 2011
25e71c4
Decreased command buffer size for SIMPLE_LCD. Added boot-up message.…
Sep 21, 2011
afad7d0
Whoops! Disable SIMPLE_LCD by default
Sep 21, 2011
2ce018c
prefetch
bkubicek Sep 21, 2011
a0677ff
Merge branch 'master' of https://github.com/bkubicek/Marlin
bkubicek Sep 21, 2011
72936b0
tuned config.
bkubicek Sep 21, 2011
152e7f4
sane config for average users. If you survive the homeing, your build…
bkubicek Sep 21, 2011
7c6b0f9
Decreased the max speeds so average users can use this firmware
bkubicek Sep 21, 2011
5da29eb
checkautostart caused a compile error.
bkubicek Sep 21, 2011
405e7ed
Branch to test alternative method of slowing down.
lampmaker Sep 23, 2011
e7e3ffe
Prevent div by 0 in case blockcount==0
lampmaker Sep 25, 2011
dee0da7
Fixed error when extruding only
lampmaker Sep 29, 2011
60a4bf7
Merged with main; fixed acceleration error when extruding only
lampmaker Sep 29, 2011
a3d9721
Edited README via GitHub
bkubicek Oct 1, 2011
91e0025
Edited README via GitHub
bkubicek Oct 1, 2011
994f4d7
minimum feedrate
bkubicek Oct 1, 2011
2194521
Merge branch 'master' of https://github.com/bkubicek/Marlin
bkubicek Oct 1, 2011
cb56af5
add flattr button to github
bkubicek Oct 1, 2011
bea1c7c
sane public config
bkubicek Oct 1, 2011
478f68a
corrected readme
bkubicek Oct 1, 2011
48517b8
Edited README.md via GitHub
bkubicek Oct 1, 2011
c884af2
Edited README.md via GitHub
bkubicek Oct 1, 2011
61b665c
Edited README.md via GitHub
bkubicek Oct 1, 2011
e3b53eb
remove old menu
bkubicek Oct 1, 2011
bb0402d
cleanup
bkubicek Oct 1, 2011
0431f77
no test
bkubicek Oct 1, 2011
7b9d8b2
pretestingextruder
bkubicek Oct 2, 2011
3890e37
Merge commit '61b665c35ff92d32957234160a8feebfab95ba77' into Slowdown
lampmaker Oct 4, 2011
b2bf43b
Added possibility to store data in EEPROM
lampmaker Oct 4, 2011
a43fe1a
Set default minimum feedrates to 0
lampmaker Oct 4, 2011
fde9550
main menu and status seem ok
bkubicek Oct 8, 2011
c651bbd
prepare menu start
bkubicek Oct 8, 2011
8b18a3d
menu filled, missing changeable number system
bkubicek Oct 8, 2011
b117d44
found error
bkubicek Oct 8, 2011
9d196b5
sd menu/printing seems to work
bkubicek Oct 9, 2011
2b2bb3a
file error
bkubicek Oct 10, 2011
1cc85ea
whoa, amazing. the control menu seems to work, and the xyjerk now has…
bkubicek Oct 10, 2011
6891beb
wow, xy_jerk higher makes a big difference in print quality
bkubicek Oct 10, 2011
9ac43c9
joris found a bug
bkubicek Oct 10, 2011
3765075
maybe remove trapping in submenus
bkubicek Oct 10, 2011
0bbe1dc
increased default xy and z-jerk
lampmaker Oct 11, 2011
78c631e
menu to enum.
bkubicek Oct 11, 2011
22eb4f6
Merge remote-tracking branch 'remotes/origin/Slowdown'
bkubicek Oct 12, 2011
c4450ac
Merge branch 'newlcd'
bkubicek Oct 12, 2011
0d1cb1c
sd card refresh working
bkubicek Oct 12, 2011
77791a6
added disable for ultipanel
bkubicek Oct 12, 2011
40ec9ed
encoder updates more often
bkubicek Oct 12, 2011
f0cba28
fixed thermistor tables and sane config for average user
bkubicek Oct 12, 2011
12e6bfb
for joris.
bkubicek Oct 12, 2011
b958fd5
sane config for everybody
bkubicek Oct 12, 2011
4589ab3
Added back Simple LCD functionality that was obliterated by Berhnard'…
Oct 12, 2011
9358b45
Merge remote-tracking branch 'origin/master'
Oct 12, 2011
8cf8408
added support for smaller lcd in a useful, compatible way
bkubicek Oct 12, 2011
1a8ef67
Allow ULTRA_LCD (any lcd) to compile without SDSUPPORT
Oct 13, 2011
e7cc585
Allow non-Ultipanel lcd's to display message text on bottom line
Oct 13, 2011
bac956e
Enabled PID. EXPERIMENTAL!
lampmaker Oct 14, 2011
2942d3a
Changed PID parameters: max integral limit
lampmaker Oct 14, 2011
8766972
Some modifications to PID:
lampmaker Oct 14, 2011
1f3c0e5
EEPROM now stores & retreives PID settings
lampmaker Oct 14, 2011
1fc8fa3
Disabled EEPROM info sent to serial
lampmaker Oct 15, 2011
3e3e8dd
removed more info sent to serial
lampmaker Oct 15, 2011
b3f5d1e
strange lcd problem with newpanel
bkubicek Oct 15, 2011
e807a8f
Merge branch 'master' of https://github.com/bkubicek/Marlin
bkubicek Oct 15, 2011
1a0195b
sane config
bkubicek Oct 15, 2011
c96c076
better default values
bkubicek Oct 15, 2011
0c7a39f
Some minor mistakes found by action68
bkubicek Oct 16, 2011
9f57cdd
; fixed
bkubicek Oct 16, 2011
d72e485
Included Streaming lib; added ECHO
lampmaker Oct 18, 2011
300549d
fixed typo
lampmaker Oct 18, 2011
f335826
Echo PID settings
lampmaker Oct 18, 2011
d029252
Merge remote-tracking branch 'Bkubicek/Slowdown' into Slowdown
lampmaker Oct 18, 2011
e4ff5e5
found the bug in the new panels. Pullup on output pins instead of inp…
bkubicek Oct 21, 2011
67c63c1
SD card autodetect added.
bkubicek Oct 21, 2011
cf397ca
enable beep again
bkubicek Oct 21, 2011
10c2489
now there is pid enabled by defualt
bkubicek Oct 21, 2011
73d5bd5
minimize offset temperature in pid
bkubicek Oct 21, 2011
ad4ae7c
make pid possible to be disabled
bkubicek Oct 21, 2011
743f775
added fan control into menu
bkubicek Oct 21, 2011
1aa236f
updates full for lcd
bkubicek Oct 23, 2011
0ad9779
Fixed bug in M105 processing when PID is disabled.
lampmaker Oct 24, 2011
062da65
fix minimum feedrate
bkubicek Oct 26, 2011
328a5dd
smaller memory footprint of without advance.
bkubicek Oct 26, 2011
6d55967
enable watchdog with manual reset (still untested, but doing at least…
bkubicek Oct 26, 2011
0e5054a
Disabled PID because its not working while in print..
bkubicek Oct 30, 2011
b65970e
better PID values.
bkubicek Nov 1, 2011
873903f
Merge branch 'master' of https://github.com/bkubicek/Marlin
bkubicek Nov 1, 2011
742fb2e
disabled lcd for most users
bkubicek Nov 1, 2011
5877a0f
circumvent the display from overwriting the speed-factor
bkubicek Nov 1, 2011
e1e0abd
next try.
bkubicek Nov 1, 2011
c896db5
display update bug
bkubicek Nov 1, 2011
786b83d
PID now working. Actually, its more than pid, lets call it PIDC. Addi…
bkubicek Nov 2, 2011
1353ab3
a bit higher even.
bkubicek Nov 2, 2011
566ed1f
PID-I was a bit too low.
bkubicek Nov 2, 2011
3a49a0d
float should be sufficient.
bkubicek Nov 3, 2011
259a5ac
trying just PI instead of PID
bkubicek Nov 3, 2011
81202a8
made it possible to have an intermediate M92 command without the extr…
bkubicek Nov 3, 2011
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
solved problem with floating buttons, limit of maximum velocity.
  • Loading branch information
bkubicek committed Sep 9, 2011
commit 05a816dedc8a040169f036f1e504847d892445b6
2 changes: 1 addition & 1 deletion Marlin/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ double Kd = 80/PID_dT;
// hooke's law says: force = k * distance
// bernoulli's priniciple says: v ^ 2 / 2 + g . h + pressure / density = constant
// so: v ^ 2 is proportional to number of steps we advance the extruder
#define ADVANCE
//#define ADVANCE

#ifdef ADVANCE
#define EXTRUDER_ADVANCE_K 0.02
Expand Down
1 change: 1 addition & 0 deletions Marlin/buttons.pde
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ void buttons_init()
pinMode(SHIFT_LD,OUTPUT);
pinMode(SHIFT_EN,OUTPUT);
pinMode(SHIFT_OUT,INPUT);
digitalWrite(SHIFT_OUT,HIGH);
digitalWrite(SHIFT_LD,HIGH); //load has inverse logic
digitalWrite(SHIFT_EN,LOW); //low active
}
Expand Down