Commits · 45c9ec734ed4cc4fb9df67281a759b657f984a6c · machinery / MarlinKimbra · GitLab

05 Jun, 2016 23 commits
- Merge branch 'dev' into k40_noflow_nocooler · 45c9ec73
  Franco (nextime) Lanza authored Jun 05, 2016
  
  45c9ec73
- Merge remote-tracking branch 'upstream/dev' into dev · 1c1be28c
  Franco (nextime) Lanza authored Jun 05, 2016
  
  1c1be28c
- Merge branch 'dev' into k40_noflow_nocooler · b753c34f
  Franco (nextime) Lanza authored Jun 05, 2016
  
  b753c34f
- Fix Configuration_Basic · a31c8515
  Franco (nextime) Lanza authored Jun 05, 2016
  
  a31c8515
- Remove Configuration_Basic from Laser examples, it's not needed · 107ecd74
  Franco (nextime) Lanza authored Jun 05, 2016
  
  107ecd74
- Merge branch 'dev' into k40_noflow_nocooler · 0b6d01a6
  Franco (nextime) Lanza authored Jun 05, 2016
  
  0b6d01a6
- Fix declaration of setPwmFrequency · 328ca582
  Franco (nextime) Lanza authored Jun 05, 2016
  
  328ca582
- Fix · 12a5e1eb
  MagoKimbra authored Jun 05, 2016
  
  12a5e1eb
- Fix possible buffer overflow · ba3710cc
  Franco (nextime) Lanza authored Jun 05, 2016
  
  ba3710cc
- Avoid integer overflow warning on SD_CFG_SECONDS · d3727b3e
  Franco (nextime) Lanza authored Jun 05, 2016
  
  d3727b3e
- wait_tempbed has to be called only if there is a tempbed! · 8feaa0b2
  Franco (nextime) Lanza authored Jun 05, 2016
  
  8feaa0b2
- Merge branch 'master' into k40_noflow_nocooler · 42740854
  Franco (nextime) Lanza authored Jun 05, 2016
  
  42740854
- Merge branch 'dev' · d868a7aa
  Franco (nextime) Lanza authored Jun 05, 2016
  
  d868a7aa
- Update V4.2.85 · 8e0c00ec
  MagoKimbra authored Jun 05, 2016
```
Add Stop and Save for Restart (SSR)
```
  8e0c00ec
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · f4169b74
  MagoKimbra authored Jun 05, 2016
  
  f4169b74
- Fix #147 · 252a4446
  MagoKimbra authored Jun 05, 2016
  
  252a4446
- Merge remote-tracking branch 'refs/remotes/origin/dev' · 354a9dfe
  MagoKimbra authored Jun 05, 2016
  
  354a9dfe
- Merge pull request #148 from nextime/dev · bdd8a0e4
  MagoKimbra authored Jun 05, 2016
```
Fix example configs for lasers
```
  bdd8a0e4
- Put right configs · 0a12eb70
  Franco (nextime) Lanza authored Jun 05, 2016
  
  0a12eb70
- Merge branch 'master' into k40_noflow_nocooler · 43b24ed7
  Franco (nextime) Lanza authored Jun 05, 2016
  
  43b24ed7
- Merge branch 'dev' · 8cd7f8fa
  Franco (nextime) Lanza authored Jun 05, 2016
  
  8cd7f8fa
- Fix example configs · eabec724
  Franco (nextime) Lanza authored Jun 05, 2016
  
  eabec724
- Merge branch 'dev' · 55a2c790
  Franco (nextime) Lanza authored Jun 05, 2016
  
  55a2c790
04 Jun, 2016 10 commits
- Merge remote-tracking branch 'refs/remotes/origin/dev' · a2f53e69
  MagoKimbra authored Jun 04, 2016
  
  a2f53e69
- Bug FIX · e5d046c6
  MagoKimbra authored Jun 04, 2016
  
  e5d046c6
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 9db5f36a
  MagoKimbra authored Jun 04, 2016
  
  9db5f36a
- Fix Sanitychek Z_ENDSTOP_SERVO_ANGLES · 33759619
  MagoKimbra authored Jun 04, 2016
  
  33759619
- Merge remote-tracking branch 'refs/remotes/origin/dev' · 01d6d651
  MagoKimbra authored Jun 04, 2016
  
  01d6d651
- Fix plan_bed_level_matrix · 338341f2
  MagoKimbra authored Jun 04, 2016
  
  338341f2
- Merge remote-tracking branch 'refs/remotes/origin/dev' · 56529752
  MagoKimbra authored Jun 04, 2016
  
  56529752
- Delete old Z_RAISE_BEFORE_HOMING · 0a03e4e3
  MagoKimbra authored Jun 04, 2016
  
  0a03e4e3
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · a9a87ac3
  MagoKimbra authored Jun 04, 2016
  
  a9a87ac3
- Fix · 2244eb2c
  MagoKimbra authored Jun 04, 2016
  
  2244eb2c
03 Jun, 2016 2 commits
- Merge branch 'master' into k40_noflow_nocooler · 074ff436
  Franco (nextime) Lanza authored Jun 03, 2016
  
  074ff436
- Merge branch 'dev' · 18664abd
  Franco (nextime) Lanza authored Jun 03, 2016
  
  18664abd
02 Jun, 2016 5 commits
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · fd791097
  MagoKimbra authored Jun 02, 2016
  
  fd791097
- Fix Delta no PROBE · 088e7558
  MagoKimbra authored Jun 02, 2016
  
  088e7558
- Merge branch 'master' into k40_noflow_nocooler · 0aafdca7
  Franco (nextime) Lanza authored Jun 02, 2016
  
  0aafdca7
- Update readme and eeprom settings · 5e21bf70
  Franco (nextime) Lanza authored Jun 02, 2016
  
  5e21bf70
- Merge remote-tracking branch 'refs/remotes/origin/dev' · e65a0a9b
  MagoKimbra authored Jun 02, 2016
  
  e65a0a9b