andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #5331 from esenapaj/Fix-for-the-PR-#5072 

Fix for the PR #5072 (Add predefined AUTO_FAN_PINs to pins files), etc
pull/1/head
Scott Lahteine 8 years ago
committed by GitHub
parent
14b1500525 0909cf3d46
commit
47b4b21308
19 changed files with 7 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Marlin/example_configurations/Cartesio/Configuration_adv.h
  2. 1
      Marlin/example_configurations/Felix/Configuration_adv.h
  3. 4
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  4. 1
      Marlin/example_configurations/Hephestos/Configuration_adv.h
  5. 1
      Marlin/example_configurations/Hephestos_2/Configuration_adv.h
  6. 1
      Marlin/example_configurations/K8200/Configuration_adv.h
  7. 1
      Marlin/example_configurations/K8400/Configuration_adv.h
  8. 4
      Marlin/example_configurations/K8400/Dual-head/Configuration.h
  9. 1
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  10. 1
      Marlin/example_configurations/SCARA/Configuration_adv.h
  11. 1
      Marlin/example_configurations/TAZ4/Configuration_adv.h
  12. 2
      Marlin/example_configurations/WITBOX/Configuration_adv.h
  13. 5
      Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
  14. 1
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  15. 1
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  16. 1
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  17. 1
      Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
  18. 1
      Marlin/example_configurations/makibox/Configuration_adv.h
  19. 1
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h

1
Marlin/example_configurations/Cartesio/Configuration_adv.h
View File

@ -971,7 +971,6 @@
// @section L6470
/**
* Enable this section if you have L6470 motor drivers.
* You need to import the L6470 library into the Arduino IDE for this.

1
Marlin/example_configurations/Felix/Configuration_adv.h
View File

@ -971,7 +971,6 @@
// @section L6470
/**
* Enable this section if you have L6470 motor drivers.
* You need to import the L6470 library into the Arduino IDE for this.

4
Marlin/example_configurations/Felix/DUAL/Configuration.h
View File

@ -1020,9 +1020,9 @@
// Here you may choose the language used by Marlin on the LCD menus, the following
// list of languages are available:
// en, an, bg, ca, cn, cz, de, el, el-gr, es, eu, fi, fr, gl, hr, it,
// kana, kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, tr, test
// kana, kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, tr, uk, test
//
// :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cn':'Chinese', 'cz':'Czech', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'kana':'Japanese', 'kana_utf8':'Japanese (UTF8)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'pt-br_utf8':'Portuguese (Brazilian UTF8)', 'pt_utf8':'Portuguese (UTF8)', 'ru':'Russian', 'tr':'Turkish', 'test':'TEST' }
// :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cn':'Chinese', 'cz':'Czech', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'kana':'Japanese', 'kana_utf8':'Japanese (UTF8)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'pt-br_utf8':'Portuguese (Brazilian UTF8)', 'pt_utf8':'Portuguese (UTF8)', 'ru':'Russian', 'tr':'Turkish', 'uk':'Ukrainian', 'test':'TEST' }
//
//#define LCD_LANGUAGE en

1
Marlin/example_configurations/Hephestos/Configuration_adv.h
View File

@ -971,7 +971,6 @@
// @section L6470
/**
* Enable this section if you have L6470 motor drivers.
* You need to import the L6470 library into the Arduino IDE for this.

1
Marlin/example_configurations/Hephestos_2/Configuration_adv.h
View File

@ -971,7 +971,6 @@
// @section L6470
/**
* Enable this section if you have L6470 motor drivers.
* You need to import the L6470 library into the Arduino IDE for this.

1
Marlin/example_configurations/K8200/Configuration_adv.h
View File

@ -984,7 +984,6 @@
// @section L6470
/**
* Enable this section if you have L6470 motor drivers.
* You need to import the L6470 library into the Arduino IDE for this.

1
Marlin/example_configurations/K8400/Configuration_adv.h
View File

@ -971,7 +971,6 @@
// @section L6470
/**
* Enable this section if you have L6470 motor drivers.
* You need to import the L6470 library into the Arduino IDE for this.

4
Marlin/example_configurations/K8400/Dual-head/Configuration.h
View File

@ -1037,9 +1037,9 @@
// Here you may choose the language used by Marlin on the LCD menus, the following
// list of languages are available:
// en, an, bg, ca, cn, cz, de, el, el-gr, es, eu, fi, fr, gl, hr, it,
// kana, kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, tr, test
// kana, kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, tr, uk, test
//
// :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cn':'Chinese', 'cz':'Czech', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'kana':'Japanese', 'kana_utf8':'Japanese (UTF8)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'pt-br_utf8':'Portuguese (Brazilian UTF8)', 'pt_utf8':'Portuguese (UTF8)', 'ru':'Russian', 'tr':'Turkish', 'test':'TEST' }
// :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cn':'Chinese', 'cz':'Czech', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'kana':'Japanese', 'kana_utf8':'Japanese (UTF8)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'pt-br_utf8':'Portuguese (Brazilian UTF8)', 'pt_utf8':'Portuguese (UTF8)', 'ru':'Russian', 'tr':'Turkish', 'uk':'Ukrainian', 'test':'TEST' }
//
#define LCD_LANGUAGE en

1
Marlin/example_configurations/RigidBot/Configuration_adv.h
View File

@ -971,7 +971,6 @@
// @section L6470
/**
* Enable this section if you have L6470 motor drivers.
* You need to import the L6470 library into the Arduino IDE for this.

1
Marlin/example_configurations/SCARA/Configuration_adv.h
View File

@ -971,7 +971,6 @@
// @section L6470
/**
* Enable this section if you have L6470 motor drivers.
* You need to import the L6470 library into the Arduino IDE for this.

1
Marlin/example_configurations/TAZ4/Configuration_adv.h
View File

@ -979,7 +979,6 @@
// @section L6470
/**
* Enable this section if you have L6470 motor drivers.
* You need to import the L6470 library into the Arduino IDE for this.

2
Marlin/example_configurations/WITBOX/Configuration_adv.h
View File

@ -764,6 +764,7 @@
// @section TMC2130
/**
* Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers.
*
@ -970,7 +971,6 @@
// @section L6470
/**
* Enable this section if you have L6470 motor drivers.
* You need to import the L6470 library into the Arduino IDE for this.

5
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
View File

@ -211,8 +211,8 @@
* Extruder auto fans automatically turn on when their extruders'
* temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE.
*
* Your board's pins file specifies the recommended pins.
* Override those here. Set to -1 to disable unused fans.
* Your board's pins file specifies the recommended pins. Override those here
* or set to -1 to disable completely.
*
* Multiple extruders can be assigned to the same pin in which case
* the fan will turn on when any selected extruder is above the threshold.
@ -973,7 +973,6 @@
// @section L6470
/**
* Enable this section if you have L6470 motor drivers.
* You need to import the L6470 library into the Arduino IDE for this.

1
Marlin/example_configurations/delta/generic/Configuration_adv.h
View File

@ -973,7 +973,6 @@
// @section L6470
/**
* Enable this section if you have L6470 motor drivers.
* You need to import the L6470 library into the Arduino IDE for this.

1
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
View File

@ -973,7 +973,6 @@
// @section L6470
/**
* Enable this section if you have L6470 motor drivers.
* You need to import the L6470 library into the Arduino IDE for this.

1
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
View File

@ -978,7 +978,6 @@
// @section L6470
/**
* Enable this section if you have L6470 motor drivers.
* You need to import the L6470 library into the Arduino IDE for this.

1
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
View File

@ -973,7 +973,6 @@
// @section L6470
/**
* Enable this section if you have L6470 motor drivers.
* You need to import the L6470 library into the Arduino IDE for this.

1
Marlin/example_configurations/makibox/Configuration_adv.h
View File

@ -971,7 +971,6 @@
// @section L6470
/**
* Enable this section if you have L6470 motor drivers.
* You need to import the L6470 library into the Arduino IDE for this.

1
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
View File

@ -971,7 +971,6 @@
// @section L6470
/**
* Enable this section if you have L6470 motor drivers.
* You need to import the L6470 library into the Arduino IDE for this.

Write Preview
Loading…
Cancel
Save