Commits · daa752345bf862a263b88cc71583d4a6a1b0e734 · machinery / MarlinKimbra · GitLab

23 May, 2016 3 commits
- Merge remote-tracking branch 'origin/dev' · daa75234
  Franco (nextime) Lanza authored May 23, 2016
  
  daa75234
- Merge remote-tracking branch 'upstream/dev' into dev · 050b88de
  Franco (nextime) Lanza authored May 23, 2016
  
  050b88de
- Merge branch 'dev' into 'master' · 15fe0abd
  Franco (nextime) Lanza authored May 23, 2016
```
Dev



See merge request !1
```
  15fe0abd
22 May, 2016 2 commits
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 58e2369b
  MagoKimbra authored May 22, 2016
  
  58e2369b
- Fix printcounter · 937fd2ed
  MagoKimbra authored May 22, 2016
  
  937fd2ed
21 May, 2016 7 commits
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 8e6da881
  MagoKimbra authored May 21, 2016
  
  8e6da881
- Fix #137 · b9104098
  MagoKimbra authored May 21, 2016
  
  b9104098
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 315cf588
  MagoKimbra authored May 21, 2016
  
  315cf588
- Fix · e30b5fb7
  MagoKimbra authored May 21, 2016
  
  e30b5fb7
- Merge remote-tracking branch 'refs/remotes/origin/dev' · cd948299
  MagoKimbra authored May 21, 2016
  
  cd948299
- Fix printcounter · 62b0e7f2
  MagoKimbra authored May 21, 2016
  
  62b0e7f2
- Better defaults for K40 · 608868a2
  Franco (nextime) Lanza authored May 21, 2016
  
  608868a2
20 May, 2016 5 commits
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 8ff49054
  MagoKimbra authored May 20, 2016
  
  8ff49054
- Delete old Arduino libraries · dd4af352
  MagoKimbra authored May 20, 2016
  
  dd4af352
- Merge remote-tracking branch 'refs/remotes/origin/dev' · d124d2e2
  MagoKimbra authored May 20, 2016
  
  d124d2e2
- Add MFRC522 · a60bcd96
  MagoKimbra authored May 20, 2016
  
  a60bcd96
- Merge remote-tracking branch 'upstream/dev' into dev · ffae6ccd
  Franco (nextime) Lanza authored May 20, 2016
  
  ffae6ccd
19 May, 2016 2 commits
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 3f127b2a
  MagoKimbra authored May 19, 2016
  
  3f127b2a
- Fix · fc4ef25c
  MagoKimbra authored May 19, 2016
  
  fc4ef25c
16 May, 2016 4 commits
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 81a76d86
  MagoKimbra authored May 16, 2016
  
  81a76d86
- Fix Z_SAFE · 4a191428
  MagoKimbra authored May 16, 2016
  
  4a191428
- Restore right beaviour for updatePID · 2a614266
  Franco (nextime) Lanza authored May 16, 2016
  
  2a614266
- Fix a bug preventing multiple consecutive raster in one sequence · 9008eeb4
  Franco (nextime) Lanza authored May 16, 2016
  
  9008eeb4
15 May, 2016 1 commit
- Avoid Z axis homing when laser has no focus · b8cef095
  Franco (nextime) Lanza authored May 15, 2016
  
  b8cef095
14 May, 2016 7 commits
- Fixed a bug preventing lasering multiple objects in one file · 23c8f27c
  Franco (nextime) Lanza authored May 14, 2016
  
  23c8f27c
- Restore old buffer size · 591c6a69
  Franco (nextime) Lanza authored May 14, 2016
  
  591c6a69
- Change buffer size in example config · bdb30c16
  Franco (nextime) Lanza authored May 14, 2016
  
  bdb30c16
- Fix warning on nextion hw · ab966bc5
  Franco (nextime) Lanza authored May 14, 2016
  
  ab966bc5
- Fix build with LASER on and COOLER off · f5a98602
  Franco (nextime) Lanza authored May 14, 2016
  
  f5a98602
- Fix build when LASER is enabled and COOLER isn't · 2d6b47d5
  Franco (nextime) Lanza authored May 14, 2016
  
  2d6b47d5
- Update SENSITIVE_PIN list for M42 · 367b216d
  Franco (nextime) Lanza authored May 14, 2016
  
  367b216d
13 May, 2016 9 commits
- Add Example Configuration Pins for K40 · 891506b4
  Franco (nextime) Lanza authored May 13, 2016
  
  891506b4
- Raster is now tested and working great · b422e564
  Franco (nextime) Lanza authored May 13, 2016
  
  b422e564
- Ok, now it works. Really. · 6ecfabca
  Franco (nextime) Lanza authored May 13, 2016
  
  6ecfabca
- Finally, all seems to work as expected. Eureka! · eaac0a2f
  Franco (nextime) Lanza authored May 13, 2016
  
  eaac0a2f
- Other fix · 50c07eba
  Franco (nextime) Lanza authored May 13, 2016
  
  50c07eba
- More fixes... · 873d87e8
  Franco (nextime) Lanza authored May 13, 2016
  
  873d87e8
- Other typos. Hoping they are the last one... · 70129fc2
  Franco (nextime) Lanza authored May 13, 2016
  
  70129fc2
- Another missing ; · d5c937f0
  Franco (nextime) Lanza authored May 13, 2016
  
  d5c937f0
- Some typos in flowmeter.cpp · a34d4d42
  Franco (nextime) Lanza authored May 13, 2016
  
  a34d4d42