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.

Sign up for GitHub

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

Development #1

Open
wants to merge 34 commits into
base: Stable
Choose a base branch
from
+493 −36
Open

Development #1

Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
cb12161
Add Filament menu and add Filament/Retract settings to config store.
wgm4321 Dec 29, 2014
d60efc3
Fix syntax error caused by previous changes.
wgm4321 Dec 29, 2014
2701dd8
Due to the fix for #1248, X and Y probe offsets must not be floats.
vandarin Dec 31, 2014
a18b625
Merge pull request #1261 from wgm4321/Development
boelle Jan 2, 2015
63da690
Merge pull request #1282 from vandarin/Development
boelle Jan 2, 2015
1d5d853
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
drf5n Jan 2, 2015
f3e503e
temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.
drf5n Jan 2, 2015
ecda6cd
Fix typo, PID_BED_POWER -> MAX_BED_POWER
alhirzel Jan 2, 2015
edac64e
Add Filament menu and add Filament/Retract settings to config store.
wgm4321 Dec 29, 2014
b32be2d
Fix syntax error caused by previous changes.
wgm4321 Dec 29, 2014
1f520a5
Due to the fix for #1248, X and Y probe offsets must not be floats.
vandarin Dec 31, 2014
f3209bb
Merge branch 'Development' of https://github.com/alhirzel/Marlin into…
alhirzel Jan 2, 2015
eed451e
rework analogInputToDigitalPin definition
alhirzel Jan 2, 2015
b5e50cd
Move scripts and documentation to subfolders
thinkyhead Jan 2, 2015
912ed15
Merge pull request #1292 from thinkyhead/docs_and_scripts
alexborro Jan 2, 2015
f36fd3d
Merge branch 'Development' of https://github.com/ErikZalm/Marlin into…
alhirzel Jan 2, 2015
3f9707a
Added .gitignore back into repo
monkeydave Jan 3, 2015
86cc22d
Readd .travis.yml, change build enviroment to use ino instead of gcc
monkeydave Jan 3, 2015
21cc188
Updated .travis.yml for ErikZalm branch pull request
monkeydave Jan 3, 2015
9d9a2d7
Merge pull request #1295 from monkeydave/Re-add_gitignore
boelle Jan 3, 2015
206b7f4
Update .gitignore
boelle Jan 3, 2015
b5c6f11
Merge pull request #1297 from monkeydave/Readd-Travis-CI
boelle Jan 3, 2015
be81dfa
Updated .travis.yml so others forks will also compile
monkeydave Jan 3, 2015
07b85f8
Added compile checks for lots of defines in Configuration.h
monkeydave Jan 3, 2015
f8aa5ff
Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLL…
wgm4321 Jan 3, 2015
04fb34c
Add English defines for filament menu to non-English to prevent compi…
wgm4321 Jan 3, 2015
9d57c37
Commented out configs that are failing with no easy fixes for the moment
monkeydave Jan 3, 2015
3d9f4ac
Merge pull request #1303 from wgm4321/Development
boelle Jan 4, 2015
efca4af
Merge pull request #1304 from monkeydave/Travis-CI
boelle Jan 4, 2015
c5f138e
Merge pull request #1291 from alhirzel/Development
boelle Jan 4, 2015
3024821
temp runaway: proper cast to prevent any overflow.
Jan 3, 2015
d2b6e62
Merge pull request #1309 from philfifi/fix_temp_runaway
alexborro Jan 4, 2015
9472bbe
issue 968 for dev branch
i-make-robots Jan 4, 2015
0978619
issue 1318
i-make-robots Jan 6, 2015
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
Added compile checks for lots of defines in Configuration.h
@monkeydave
monkeydave committed Jan 3, 2015
commit 07b85f8b92a836e6c1566a4a52eaf80db3110392
122 changes: 122 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -29,10 +29,132 @@ before_script:
# remove Marlin.pde as it confuses ino after it finds Marlin.ino
- rm Marlin/Marlin.pde
script:
# build default config
- ino build -m mega2560
# backup configuration.h
- cp Marlin/Configuration.h Marlin/Configuration.h.backup
- cp Marlin/Configuration_adv.h Marlin/Configuration_adv.h.backup
# change extruder numbers from 1 to 2
- sed -i 's/#define EXTRUDERS 1/#define EXTRUDERS 2/g' Marlin/Configuration.h
- rm -rf .build/
- ino build -m mega2560
# change extruder numbers from 2 to 3
- sed -i 's/#define EXTRUDERS 2/#define EXTRUDERS 3/g' Marlin/Configuration.h
- rm -rf .build/
- ino build -m mega2560
# enable PIDTEMPBED
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define PIDTEMPBED/#define PIDTEMPBED/g' Marlin/Configuration.h
- rm -rf .build/
- ino build -m mega2560
# enable THERMAL RUNAWAY PROTECTION for extruders & bed
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define THERMAL_RUNAWAY_PROTECTION_PERIOD/#define THERMAL_RUNAWAY_PROTECTION_PERIOD/g' Marlin/Configuration.h
- sed -i 's/\/\/#define THERMAL_RUNAWAY_PROTECTION_HYSTERESIS/#define THERMAL_RUNAWAY_PROTECTION_HYSTERESIS/g' Marlin/Configuration.h
- sed -i 's/\/\/#define THERMAL_RUNAWAY_PROTECTION_BED_PERIOD/#define THERMAL_RUNAWAY_PROTECTION_BED_PERIOD/g' Marlin/Configuration.h
- sed -i 's/\/\/#define THERMAL_RUNAWAY_PROTECTION_BED_HYSTERESIS/#define THERMAL_RUNAWAY_PROTECTION_BED_HYSTERESIS/g' Marlin/Configuration.h
- rm -rf .build/
- ino build -m mega2560
# enable AUTO_BED_LEVELING
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define ENABLE_AUTO_BED_LEVELING/#define ENABLE_AUTO_BED_LEVELING/g' Marlin/Configuration.h
- rm -rf .build/
- ino build -m mega2560
# enable EEPROM_SETTINGS & EEPROM_CHITCHAT
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define EEPROM_SETTINGS/#define EEPROM_SETTINGS/g' Marlin/Configuration.h
- sed -i 's/\/\/#define EEPROM_CHITCHAT/#define EEPROM_CHITCHAT/g' Marlin/Configuration.h
- rm -rf .build/
- ino build -m mega2560
### LCDS ###
# ULTIMAKERCONTROLLER
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define ULTIMAKERCONTROLLER/#define ULTIMAKERCONTROLLER/g' Marlin/Configuration.h
- rm -rf .build/
- ino build -m mega2560
# MAKRPANEL
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define MAKRPANEL/#define MAKRPANEL/g' Marlin/Configuration.h
- rm -rf .build/
- ino build -m mega2560
# REPRAP_DISCOUNT_SMART_CONTROLLER
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define REPRAP_DISCOUNT_SMART_CONTROLLER/#define REPRAP_DISCOUNT_SMART_CONTROLLER/g' Marlin/Configuration.h
- rm -rf .build/
- ino build -m mega2560
# G3D_PANE
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define G3D_PANEL/#define G3D_PANEL/g' Marlin/Configuration.h
- rm -rf .build/
- ino build -m mega2560
# REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER/#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER/g' Marlin/Configuration.h
- rm -rf .build/
- ino build -m mega2560
# REPRAPWORLD_KEYPAD
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define ULTRA_LCD/#define ULTRA_LCD/g' Marlin/Configuration.h
- sed -i 's/\/\/#define REPRAPWORLD_KEYPAD/#define REPRAPWORLD_KEYPAD/g' Marlin/Configuration.h
- sed -i 's/\/\/#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0/#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0/g' Marlin/Configuration.h
- rm -rf .build/
- ino build -m mega2560
# RA_CONTROL_PANEL
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define RA_CONTROL_PANEL/#define RA_CONTROL_PANEL/g' Marlin/Configuration.h
- rm -rf .build/
- ino build -m mega2560
### I2C PANELS ###
# LCD_I2C_SAINSMART_YWROBOT
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define LCD_I2C_SAINSMART_YWROBOT/#define LCD_I2C_SAINSMART_YWROBOT/g' Marlin/Configuration.h
- rm -rf .build/
- ino build -m mega2560
# LCD_I2C_PANELOLU2
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define LCD_I2C_PANELOLU2/#define LCD_I2C_PANELOLU2/g' Marlin/Configuration.h
- rm -rf .build/
- ino build -m mega2560
# LCD_I2C_VIKI
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define LCD_I2C_VIKI/#define LCD_I2C_VIKI/g' Marlin/Configuration.h
- rm -rf .build/
- ino build -m mega2560
# SAV_3DLCD
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define SAV_3DLCD/#define SAV_3DLCD/g' Marlin/Configuration.h
- rm -rf .build/
- ino build -m mega2560
# Enable filament sensor
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define FILAMENT_SENSOR/#define FILAMENT_SENSOR/g' Marlin/Configuration.h
- rm -rf .build/
- ino build -m mega2560
# Enable filament sensor with LCD display
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define ULTIMAKERCONTROLLER/#define ULTIMAKERCONTROLLER/g' Marlin/Configuration.h
- sed -i 's/\/\/#define FILAMENT_SENSOR/#define FILAMENT_SENSOR/g' Marlin/Configuration.h
- sed -i 's/\/\/#define FILAMENT_LCD_DISPLAY/#define FILAMENT_LCD_DISPLAY/g' Marlin/Configuration.h
- rm -rf .build/
- ino build -m mega2560
######## Example Configurations ##############
# Delta Config
- cp Marlin/example_configurations/delta/Configuration* Marlin/
- rm -rf .build/
- ino build -m mega2560
# Makibox Config need to check board type for Teensy++ 2.0
#- cp Marlin/example_configurations/makibox/Configuration* Marlin/
#- rm -rf .build/
#- ino build -m mega2560
# SCARA Config
- cp Marlin/example_configurations/SCARA/Configuration* Marlin/
- rm -rf .build/
- ino build -m mega2560
# tvrrug Config need to check board type for sanguino atmega644p
#- cp Marlin/example_configurations/tvrrug/Round2/Configuration* Marlin/
#- rm -rf .build/
#- ino build -m mega2560
######## Board Types #############
- sed -i 's/#define MOTHERBOARD BOARD_RAMPS_13_EFB/#define MOTHERBOARD BOARD_DUEMILANOVE_328P/g' Marlin/Configuration.h
- rm -rf .build/
- ino build -m atmega328