Code

Development#1

Code

Open

i-make-robots wants to merge 34 commits intoErikZalm:StableErikZalm/Marlin:Stablefrom i-make-robots:Developmenti-make-robots/Marlin-polargraph:DevelopmentCopy head branch name to clipboard

+493-36

Commits

Commits on Dec 29, 2014

• Add Filament menu and add Filament/Retract settings to config store.

  wgm4321

  committed
  cb12161

  Copy full SHA for cb12161

• Fix syntax error caused by previous changes.

  wgm4321

  committed
  d60efc3

  Copy full SHA for d60efc3

Commits on Dec 31, 2014

• Due to the fix for MarlinFirmware#1248, X and Y probe offsets must not be floats.

  Show description for 2701dd8
  vandarin

  committed
  2701dd8

  Copy full SHA for 2701dd8

Commits on Jan 2, 2015

• Merge pull request MarlinFirmware#1261 from wgm4321/Development

  Show description for a18b625
  boelle

  committed
  a18b625

  Copy full SHA for a18b625

• Merge pull request MarlinFirmware#1282 from vandarin/Development

  Show description for 63da690
  boelle

  committed
  63da690

  Copy full SHA for 63da690

• temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.

  

  drf5n

  authored and

  alhirzel

  committed
  1d5d853

  Copy full SHA for 1d5d853

• temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.

  

  drf5n

  authored and

  alhirzel

  committed
  f3e503e

  Copy full SHA for f3e503e

• Fix typo, PID_BED_POWER -> MAX_BED_POWER

  alhirzel

  committed
  ecda6cd

  Copy full SHA for ecda6cd

• Add Filament menu and add Filament/Retract settings to config store.

  

  wgm4321

  authored and

  alhirzel

  committed
  edac64e

  Copy full SHA for edac64e

• Fix syntax error caused by previous changes.

  

  wgm4321

  authored and

  alhirzel

  committed
  b32be2d

  Copy full SHA for b32be2d

• Due to the fix for MarlinFirmware#1248, X and Y probe offsets must not be floats.

  Show description for 1f520a5
  

  vandarin

  authored and

  alhirzel

  committed
  1f520a5

  Copy full SHA for 1f520a5

• Merge branch 'Development' of https://github.com/alhirzel/Marlin into Development

  alhirzel

  committed
  f3209bb

  Copy full SHA for f3209bb

• rework analogInputToDigitalPin definition

  alhirzel

  committed
  eed451e

  Copy full SHA for eed451e

• Move scripts and documentation to subfolders

  thinkyhead

  committed
  b5e50cd

  Copy full SHA for b5e50cd

• Merge pull request MarlinFirmware#1292 from thinkyhead/docs_and_scripts

  Show description for 912ed15
  alexborro

  committed
  912ed15

  Copy full SHA for 912ed15

• Merge branch 'Development' of https://github.com/ErikZalm/Marlin into Development

  alhirzel

  committed
  f36fd3d

  Copy full SHA for f36fd3d

Commits on Jan 3, 2015

• Added .gitignore back into repo

  monkeydave

  committed
  3f9707a

  Copy full SHA for 3f9707a

• Readd .travis.yml, change build enviroment to use ino instead of gcc

  monkeydave

  committed
  86cc22d

  Copy full SHA for 86cc22d

• Updated .travis.yml for ErikZalm branch pull request

  monkeydave

  committed
  21cc188

  Copy full SHA for 21cc188

• Merge pull request MarlinFirmware#1295 from monkeydave/Re-add_gitignore

  Show description for 9d9a2d7
  boelle

  committed
  9d9a2d7

  Copy full SHA for 9d9a2d7

• Update .gitignore

  boelle

  committed
  206b7f4

  Copy full SHA for 206b7f4

• Merge pull request MarlinFirmware#1297 from monkeydave/Readd-Travis-CI

  Show description for b5c6f11
  boelle

  committed
  b5c6f11

  Copy full SHA for b5c6f11

• Updated .travis.yml so others forks will also compile

  monkeydave

  committed
  be81dfa

  Copy full SHA for be81dfa

• Added compile checks for lots of defines in Configuration.h

  monkeydave

  committed
  07b85f8

  Copy full SHA for 07b85f8

• Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER defined

  wgm4321

  committed
  f8aa5ff

  Copy full SHA for f8aa5ff

• Add English defines for filament menu to non-English to prevent compile errors until translated

  wgm4321

  committed
  04fb34c

  Copy full SHA for 04fb34c

• Commented out configs that are failing with no easy fixes for the moment

  monkeydave

  committed
  9d57c37

  Copy full SHA for 9d57c37

Commits on Jan 4, 2015

• Merge pull request MarlinFirmware#1303 from wgm4321/Development

  Show description for 3d9f4ac
  boelle

  committed
  3d9f4ac

  Copy full SHA for 3d9f4ac

• Merge pull request MarlinFirmware#1304 from monkeydave/Travis-CI

  Show description for efca4af
  boelle

  committed
  efca4af

  Copy full SHA for efca4af

• Merge pull request MarlinFirmware#1291 from alhirzel/Development

  Show description for c5f138e
  boelle

  committed
  c5f138e

  Copy full SHA for c5f138e

• temp runaway: proper cast to prevent any overflow.

  

  Philippe L

  committed
  3024821

  Copy full SHA for 3024821

• Merge pull request MarlinFirmware#1309 from philfifi/fix_temp_runaway

  Show description for d2b6e62
  alexborro

  committed
  d2b6e62

  Copy full SHA for d2b6e62

• issue 968 for dev branch

  Show description for 9472bbe
  i-make-robots

  committed
  9472bbe

  Copy full SHA for 9472bbe

Commits on Jan 6, 2015

• issue 1318

  Show description for 0978619
  i-make-robots

  committed
  0978619

  Copy full SHA for 0978619