Code

Hi#2

Code

Closed

bkubicek wants to merge 146 commits intoMarlinFirmware:masterMarlinFirmware/Marlin:masterfrom bkubicek:masterbkubicek/Marlin:masterCopy head branch name to clipboard

Commits

Commits on Aug 22, 2011

• first compile using arduino22

  bkubicek

  committed
  7907edf

  Copy full SHA for 7907edf

• better settings

  bkubicek

  committed
  36d1c3f

  Copy full SHA for 36d1c3f

Commits on Aug 23, 2011

• dis-funcional ad595

  bkubicek

  committed
  57d0011

  Copy full SHA for 57d0011

• unworking temp reading still, added lcd support

  bkubicek

  committed
  5b93020

  Copy full SHA for 5b93020

• ah wirking f** it up

  bkubicek

  committed
  4fd12ae

  Copy full SHA for 4fd12ae

• ok, now it seems to work with the temperatures

  bkubicek

  committed
  4630b16

  Copy full SHA for 4630b16

• tuned configuration

  bkubicek

  committed
  b84f6e1

  Copy full SHA for b84f6e1

Commits on Aug 24, 2011

• Fixes to allow simple LCD display. Added FANCY_BUTTONS define to allow Bernhard's console to function as well

  

  bradleyf

  committed
  d471651

  Copy full SHA for d471651

• Implemented Max Endstops for X,Y,Z axis

  

  bradleyf

  committed
  e35f914

  Copy full SHA for e35f914

• Updated Readme for this fork

  

  bradleyf

  committed
  6096262

  Copy full SHA for 6096262

• Updated Readme typos

  

  bradleyf

  committed
  f1a7c8b

  Copy full SHA for f1a7c8b

• Corrected one more readme typo

  

  bradleyf

  committed
  3d0ce29

  Copy full SHA for 3d0ce29

• Fixed max endstops locking other axis' movements

  

  bradleyf

  committed
  6416e20

  Copy full SHA for 6416e20

Commits on Aug 25, 2011

• Credits..

  bkubicek

  committed
  7d7ad08

  Copy full SHA for 7d7ad08

Commits on Aug 26, 2011

• Let me introduce myself :-)

  lampmaker

  committed
  b203697

  Copy full SHA for b203697

• Edited README via GitHub

  ErikZalm

  committed
  535506a

  Copy full SHA for 535506a

Commits on Aug 28, 2011

• pre-update

  bkubicek

  committed
  461e267

  Copy full SHA for 461e267

• Merge branch 'master' of https://github.com/bkubicek/Marlin

  Show description for fae0bc5
  bkubicek

  committed
  fae0bc5

  Copy full SHA for fae0bc5

• lcd improvement, real speed override for lcd/sd printing, config.h back to linux eol, addidional gcode for disable steppers.

  bkubicek

  committed
  e7e7b35

  Copy full SHA for e7e7b35

Commits on Aug 29, 2011

• Version number

  bkubicek

  committed
  b430763

  Copy full SHA for b430763

• buttons improvement, actual measures

  bkubicek

  committed
  0156fda

  Copy full SHA for 0156fda

• trying to add redbutton sd-reset, so that moving to the file page does not stop sd printing

  bkubicek

  committed
  37321fb

  Copy full SHA for 37321fb

Commits on Sep 4, 2011

• Reapply code for implementing max endstops for X,Y,Z axis and fixing max endstops locking other axis' movements that was overwritten by Berhnard's last commits

  

  bradleyf

  committed
  f231c9e

  Copy full SHA for f231c9e

Commits on Sep 9, 2011

• protospace: Analog fan

  bkubicek

  committed
  ed7ee42

  Copy full SHA for ed7ee42

• solved problem with floating buttons, limit of maximum velocity.

  bkubicek

  committed
  05a816d

  Copy full SHA for 05a816d

• timer

  bkubicek

  committed
  083ff50

  Copy full SHA for 083ff50

• autostart debugging

  bkubicek

  committed
  7d753d2

  Copy full SHA for 7d753d2

• back to default config

  bkubicek

  committed
  acaefb5

  Copy full SHA for acaefb5

Commits on Sep 10, 2011

• added minute counting for no-sdcard printing

  bkubicek

  committed
  a9f2c95

  Copy full SHA for a9f2c95

Commits on Sep 13, 2011

• Keep floating point math pure -- to attempt to prevent rounding errors and skewing

  

  bradleyf

  committed
  07d1962

  Copy full SHA for 07d1962

• Disable SDSUPPORT by default so that folks can use RepG to connect

  

  bradleyf

  committed
  c8f734d

  Copy full SHA for c8f734d

• step debugging

  bkubicek

  committed
  659f607

  Copy full SHA for 659f607

• Merge branch 'master' of https://github.com/bkubicek/Marlin

  bkubicek

  committed
  5c1eda9

  Copy full SHA for 5c1eda9

Commits on Sep 14, 2011

• disabled the step debugging for default users

  bkubicek

  committed
  e8f05ea

  Copy full SHA for e8f05ea

• larger speed limits

  bkubicek

  committed
  309774a

  Copy full SHA for 309774a

• leftovers

  bkubicek

  committed
  87eb941

  Copy full SHA for 87eb941

• Merge branch 'master' of https://github.com/bkubicek/Marlin

  Show description for 4670145
  bkubicek

  committed
  4670145

  Copy full SHA for 4670145

• Extruder Stepper now properly disables as necessary

  

  bradleyf

  committed
  c4b330c

  Copy full SHA for c4b330c

Commits on Sep 16, 2011

• added a lot of corrections

  bkubicek

  committed
  a6de9cf

  Copy full SHA for a6de9cf

• Merge branch 'master' of https://github.com/bkubicek/Marlin

  Show description for 20019c4
  bkubicek

  committed
  20019c4

  Copy full SHA for 20019c4

Commits on Sep 17, 2011

• Added a MIN_SEGMENT_TIME option in configuration.h. this sets the minimum time a motion segment should take if the buffer is empty.

  Show description for 6c11c3d
  lampmaker

  committed
  6c11c3d

  Copy full SHA for 6c11c3d

• Changed defines for SIMPLE or FANCY LCD (removing FANCY_BUTTONS). It was too confusing. Simple LCD is a 16x2 for temp monitoring only. Fancy LCD is for 20x4 multipage LCD console with buttons and e…

  Show description for c6e6a78
  

  bradleyf

  committed
  c6e6a78

  Copy full SHA for c6e6a78

Commits on Sep 18, 2011

• No lcd should be enabled by default, IMHO, in the current all lcd stuff could cause a tiny bit of layer-pausing.

  bkubicek

  committed
  cf4c468

  Copy full SHA for cf4c468

• Modified step counter to follow plan_set_position's input.

  lampmaker

  committed
  58b0fb8

  Copy full SHA for 58b0fb8

• Wrapped prev commit in #ifdef DEBUG_STEPS

  lampmaker

  committed
  3dae132

  Copy full SHA for 3dae132

Commits on Sep 20, 2011

• making acceleration and max speeds value changeable by gcode.

  Show description for d6f6bdc
  bkubicek

  committed
  d6f6bdc

  Copy full SHA for d6f6bdc

• unix end of line

  bkubicek

  committed
  063e7c7

  Copy full SHA for 063e7c7

• made acceration and feedrate limits software-configurable.

  Show description for 712ca8d
  bkubicek

  committed
  712ca8d

  Copy full SHA for 712ca8d

• Merge branch 'master' of https://github.com/bkubicek/Marlin

  bkubicek

  committed
  4799597

  Copy full SHA for 4799597

• typos, stupid me

  bkubicek

  committed
  0375751

  Copy full SHA for 0375751

• removed enquecommand lcd dependency, its also used for sd

  Show description for 849a021
  bkubicek

  committed
  849a021

  Copy full SHA for 849a021

Commits on Sep 21, 2011

• Decreased command buffer size for SIMPLE_LCD. Added boot-up message. Cleared "Heating.." message after pre-heat completes

  

  bradleyf

  committed
  25e71c4

  Copy full SHA for 25e71c4

• Whoops! Disable SIMPLE_LCD by default

  

  bradleyf

  committed
  afad7d0

  Copy full SHA for afad7d0

• prefetch

  bkubicek

  committed
  2ce018c

  Copy full SHA for 2ce018c

• Merge branch 'master' of https://github.com/bkubicek/Marlin

  bkubicek

  committed
  a0677ff

  Copy full SHA for a0677ff

• tuned config.

  Show description for 72936b0
  bkubicek

  committed
  72936b0

  Copy full SHA for 72936b0

• sane config for average users. If you survive the homeing, your build should be good.

  bkubicek

  committed
  152e7f4

  Copy full SHA for 152e7f4

• Decreased the max speeds so average users can use this firmware

  bkubicek

  committed
  7c6b0f9

  Copy full SHA for 7c6b0f9

• checkautostart caused a compile error.

  bkubicek

  committed
  5da29eb

  Copy full SHA for 5da29eb

Commits on Sep 23, 2011

• Branch to test alternative method of slowing down.

  Show description for 405e7ed
  lampmaker

  committed
  405e7ed

  Copy full SHA for 405e7ed

Commits on Sep 25, 2011

• Prevent div by 0 in case blockcount==0

  lampmaker

  committed
  e7e3ffe

  Copy full SHA for e7e3ffe

Commits on Sep 29, 2011

• Fixed error when extruding only

  lampmaker

  committed
  dee0da7

  Copy full SHA for dee0da7

• Merged with main; fixed acceleration error when extruding only

  lampmaker

  committed
  60a4bf7

  Copy full SHA for 60a4bf7

Commits on Oct 1, 2011

• Edited README via GitHub

  bkubicek

  committed
  a3d9721

  Copy full SHA for a3d9721

• Edited README via GitHub

  bkubicek

  committed
  91e0025

  Copy full SHA for 91e0025

• minimum feedrate

  bkubicek

  committed
  994f4d7

  Copy full SHA for 994f4d7

• Merge branch 'master' of https://github.com/bkubicek/Marlin

  bkubicek

  committed
  2194521

  Copy full SHA for 2194521

• add flattr button to github

  bkubicek

  committed
  cb56af5

  Copy full SHA for cb56af5

• sane public config

  bkubicek

  committed
  bea1c7c

  Copy full SHA for bea1c7c

• corrected readme

  bkubicek

  committed
  478f68a

  Copy full SHA for 478f68a

• Edited README.md via GitHub

  bkubicek

  committed
  48517b8

  Copy full SHA for 48517b8

• Edited README.md via GitHub

  bkubicek

  committed
  c884af2

  Copy full SHA for c884af2

• Edited README.md via GitHub

  bkubicek

  committed
  61b665c

  Copy full SHA for 61b665c

• remove old menu

  bkubicek

  committed
  e3b53eb

  Copy full SHA for e3b53eb

• cleanup

  bkubicek

  committed
  bb0402d

  Copy full SHA for bb0402d

• no test

  bkubicek

  committed
  0431f77

  Copy full SHA for 0431f77

Commits on Oct 2, 2011

• pretestingextruder

  bkubicek

  committed
  7b9d8b2

  Copy full SHA for 7b9d8b2

Commits on Oct 4, 2011

• Merge commit '61b665c35ff92d32957234160a8feebfab95ba77' into Slowdown

  lampmaker

  committed
  3890e37

  Copy full SHA for 3890e37

• Added possibility to store data in EEPROM

  Show description for b2bf43b
  lampmaker

  committed
  b2bf43b

  Copy full SHA for b2bf43b

• Set default minimum feedrates to 0

  Show description for a43fe1a
  lampmaker

  committed
  a43fe1a

  Copy full SHA for a43fe1a

Commits on Oct 8, 2011

• main menu and status seem ok

  bkubicek

  committed
  fde9550

  Copy full SHA for fde9550

• prepare menu start

  bkubicek

  committed
  c651bbd

  Copy full SHA for c651bbd

• menu filled, missing changeable number system

  bkubicek

  committed
  8b18a3d

  Copy full SHA for 8b18a3d

• found error

  bkubicek

  committed
  b117d44

  Copy full SHA for b117d44

Commits on Oct 9, 2011

• sd menu/printing seems to work

  bkubicek

  committed
  9d196b5

  Copy full SHA for 9d196b5

Commits on Oct 10, 2011

• file error

  bkubicek

  committed
  2b2bb3a

  Copy full SHA for 2b2bb3a

• whoa, amazing. the control menu seems to work, and the xyjerk now has an actualy usual value.

  bkubicek

  committed
  1cc85ea

  Copy full SHA for 1cc85ea

• wow, xy_jerk higher makes a big difference in print quality

  bkubicek

  committed
  6891beb

  Copy full SHA for 6891beb

• joris found a bug

  bkubicek

  committed
  9ac43c9

  Copy full SHA for 9ac43c9

• maybe remove trapping in submenus

  bkubicek

  committed
  3765075

  Copy full SHA for 3765075

Commits on Oct 11, 2011

• increased default xy and z-jerk

  lampmaker

  committed
  0bbe1dc

  Copy full SHA for 0bbe1dc

• menu to enum.

  bkubicek

  committed
  78c631e

  Copy full SHA for 78c631e

Commits on Oct 12, 2011

• Merge remote-tracking branch 'remotes/origin/Slowdown'

  Show description for 22eb4f6
  bkubicek

  committed
  22eb4f6

  Copy full SHA for 22eb4f6

• Merge branch 'newlcd'

  Show description for c4450ac
  bkubicek

  committed
  c4450ac

  Copy full SHA for c4450ac

• sd card refresh working

  bkubicek

  committed
  0d1cb1c

  Copy full SHA for 0d1cb1c

• added disable for ultipanel

  bkubicek

  committed
  77791a6

  Copy full SHA for 77791a6

• encoder updates more often

  bkubicek

  committed
  40ec9ed

  Copy full SHA for 40ec9ed

• fixed thermistor tables and sane config for average user

  bkubicek

  committed
  f0cba28

  Copy full SHA for f0cba28

• for joris.

  bkubicek

  committed
  12e6bfb

  Copy full SHA for 12e6bfb

• sane config for everybody

  bkubicek

  committed
  b958fd5

  Copy full SHA for b958fd5

• Added back Simple LCD functionality that was obliterated by Berhnard's checkins. Thanks for doing this for the fourth time!

  

  bradleyf

  committed
  4589ab3

  Copy full SHA for 4589ab3

• Merge remote-tracking branch 'origin/master'

  

  bradleyf

  committed
  9358b45

  Copy full SHA for 9358b45

• added support for smaller lcd in a useful, compatible way

  Show description for 8cf8408
  bkubicek

  committed
  8cf8408

  Copy full SHA for 8cf8408

Commits on Oct 13, 2011

• Allow ULTRA_LCD (any lcd) to compile without SDSUPPORT

  

  bradleyf

  committed
  1a8ef67

  Copy full SHA for 1a8ef67

• Allow non-Ultipanel lcd's to display message text on bottom line

  

  bradleyf

  committed
  e7cc585

  Copy full SHA for e7cc585

Commits on Oct 14, 2011

• Enabled PID. EXPERIMENTAL!

  Show description for bac956e
  lampmaker

  committed
  bac956e

  Copy full SHA for bac956e

• Changed PID parameters: max integral limit

  lampmaker

  committed
  2942d3a

  Copy full SHA for 2942d3a

• Some modifications to PID:

  Show description for 8766972
  lampmaker

  committed
  8766972

  Copy full SHA for 8766972

• EEPROM now stores & retreives PID settings

  lampmaker

  committed
  1f3c0e5

  Copy full SHA for 1f3c0e5

Commits on Oct 15, 2011

• Disabled EEPROM info sent to serial

  lampmaker

  committed
  1fc8fa3

  Copy full SHA for 1fc8fa3

• removed more info sent to serial

  lampmaker

  committed
  3e3e8dd

  Copy full SHA for 3e3e8dd

• strange lcd problem with newpanel

  bkubicek

  committed
  b3f5d1e

  Copy full SHA for b3f5d1e

• Merge branch 'master' of https://github.com/bkubicek/Marlin

  Show description for e807a8f
  bkubicek

  committed
  e807a8f

  Copy full SHA for e807a8f

• sane config

  bkubicek

  committed
  1a0195b

  Copy full SHA for 1a0195b

• better default values

  bkubicek

  committed
  c96c076

  Copy full SHA for c96c076

Commits on Oct 16, 2011

• Some minor mistakes found by action68

  bkubicek

  committed
  0c7a39f

  Copy full SHA for 0c7a39f

• ; fixed

  bkubicek

  committed
  9f57cdd

  Copy full SHA for 9f57cdd

Commits on Oct 18, 2011

• Included Streaming lib; added ECHO

  Show description for d72e485
  lampmaker

  committed
  d72e485

  Copy full SHA for d72e485

• fixed typo

  lampmaker

  committed
  300549d

  Copy full SHA for 300549d

• Echo PID settings

  lampmaker

  committed
  f335826

  Copy full SHA for f335826

• Merge remote-tracking branch 'Bkubicek/Slowdown' into Slowdown

  lampmaker

  committed
  d029252

  Copy full SHA for d029252

Commits on Oct 21, 2011

• found the bug in the new panels. Pullup on output pins instead of input pins on switch/encoder stuff.

  bkubicek

  committed
  e4ff5e5

  Copy full SHA for e4ff5e5

• SD card autodetect added.

  bkubicek

  committed
  67c63c1

  Copy full SHA for 67c63c1

• enable beep again

  bkubicek

  committed
  cf397ca

  Copy full SHA for cf397ca

• now there is pid enabled by defualt

  Show description for 10c2489
  bkubicek

  committed
  10c2489

  Copy full SHA for 10c2489

• minimize offset temperature in pid

  bkubicek

  committed
  73d5bd5

  Copy full SHA for 73d5bd5

• make pid possible to be disabled

  bkubicek

  committed
  ad4ae7c

  Copy full SHA for ad4ae7c

• added fan control into menu

  bkubicek

  committed
  743f775

  Copy full SHA for 743f775

Commits on Oct 23, 2011

• updates full for lcd

  bkubicek

  committed
  1aa236f

  Copy full SHA for 1aa236f

Commits on Oct 24, 2011

• Fixed bug in M105 processing when PID is disabled.

  lampmaker

  committed
  0ad9779

  Copy full SHA for 0ad9779

Commits on Oct 26, 2011

• fix minimum feedrate

  bkubicek

  committed
  062da65

  Copy full SHA for 062da65

• smaller memory footprint of without advance.

  bkubicek

  committed
  328a5dd

  Copy full SHA for 328a5dd

• enable watchdog with manual reset (still untested, but doing at least no harm) and adding some reasonable pid settings. Tested without actually printing.

  bkubicek

  committed
  6d55967

  Copy full SHA for 6d55967

Commits on Oct 30, 2011

• Disabled PID because its not working while in print..

  bkubicek

  committed
  0e5054a

  Copy full SHA for 0e5054a

Commits on Nov 1, 2011

• better PID values.

  Show description for b65970e
  bkubicek

  committed
  b65970e

  Copy full SHA for b65970e

• Merge branch 'master' of https://github.com/bkubicek/Marlin

  Show description for 873903f
  bkubicek

  committed
  873903f

  Copy full SHA for 873903f

• disabled lcd for most users

  bkubicek

  committed
  742fb2e

  Copy full SHA for 742fb2e

• circumvent the display from overwriting the speed-factor

  bkubicek

  committed
  5877a0f

  Copy full SHA for 5877a0f

• next try.

  bkubicek

  committed
  e1e0abd

  Copy full SHA for e1e0abd

• display update bug

  bkubicek

  committed
  c896db5

  Copy full SHA for c896db5

Commits on Nov 2, 2011

• PID now working. Actually, its more than pid, lets call it PIDC. Additionnally to the P, I, and D term I use a term that is proportional to the extruder motor speed. If its running faster, one expe…

  Show description for 786b83d
  bkubicek

  committed
  786b83d

  Copy full SHA for 786b83d

• a bit higher even.

  bkubicek

  committed
  1353ab3

  Copy full SHA for 1353ab3

• PID-I was a bit too low.

  bkubicek

  committed
  566ed1f

  Copy full SHA for 566ed1f

Commits on Nov 3, 2011

• float should be sufficient.

  bkubicek

  committed
  3a49a0d

  Copy full SHA for 3a49a0d

• trying just PI instead of PID

  bkubicek

  committed
  259a5ac

  Copy full SHA for 259a5ac

• made it possible to have an intermediate M92 command without the extruder motor running wild.

  bkubicek

  committed
  81202a8

  Copy full SHA for 81202a8