Browse Source

Merge pull request #4554 from thinkyhead/rc_anhardt_rep-max6675

Repair SPI-pins, some other pins
pull/1/head
Scott Lahteine 8 years ago
committed by GitHub
parent
commit
0a1a2fea30
  1. 6
      .travis.yml
  2. 50
      Marlin/pins.h
  3. 16
      Marlin/pins_BQ_ZUM_MEGA_3D.h
  4. 2
      Marlin/pins_BRAINWAVE_PRO.h
  5. 1
      Marlin/pins_RAMPS.h
  6. 2
      Marlin/pins_TEENSY2.h
  7. 0
      buildroot/bin/opt_disable_adv
  8. 2
      buildroot/bin/restore_configs

6
.travis.yml

@ -93,6 +93,12 @@ script:
- opt_enable PIDTEMPBED - opt_enable PIDTEMPBED
- build_marlin - build_marlin
# #
# Test MAX6675
#
- restore_configs
- opt_set TEMP_SENSOR_0 -2
- build_marlin
#
# Test a "Fix Mounted" Probe along with Safe Homing # Test a "Fix Mounted" Probe along with Safe Homing
# #
- restore_configs - restore_configs

50
Marlin/pins.h

@ -214,6 +214,9 @@
#ifndef FAN2_PIN #ifndef FAN2_PIN
#define FAN2_PIN -1 #define FAN2_PIN -1
#endif #endif
#ifndef CONTROLLERFAN_PIN
#define CONTROLLERFAN_PIN -1
#endif
#ifndef HEATER_0_PIN #ifndef HEATER_0_PIN
#define HEATER_0_PIN -1 #define HEATER_0_PIN -1
@ -456,17 +459,56 @@
#define HAS_DIGIPOTSS (PIN_EXISTS(DIGIPOTSS)) #define HAS_DIGIPOTSS (PIN_EXISTS(DIGIPOTSS))
/**
* Define SPI Pins: SCK, MISO, MOSI, SS
*/
#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega328__) || defined(__AVR_ATmega328P__)
#define AVR_SCK_PIN 13
#define AVR_MISO_PIN 12
#define AVR_MOSI_PIN 11
#define AVR_SS_PIN 10
#elif defined(__AVR_ATmega644__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__) || defined(__AVR_ATmega1284P__)
#define AVR_SCK_PIN 7
#define AVR_MISO_PIN 6
#define AVR_MOSI_PIN 5
#define AVR_SS_PIN 4
#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
#define AVR_SCK_PIN 52
#define AVR_MISO_PIN 50
#define AVR_MOSI_PIN 51
#define AVR_SS_PIN 53
#elif defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__)
#if ENABLED(AT90USBxx_TEENSYPP_ASSIGNMENTS)
// Teensy pin assignments
#define AVR_SCK_PIN 21
#define AVR_MISO_PIN 23
#define AVR_MOSI_PIN 22
#define AVR_SS_PIN 20
#else
// Traditional pin assignments
#define AVR_SCK_PIN 9
#define AVR_MISO_PIN 11
#define AVR_MOSI_PIN 10
#define AVR_SS_PIN 8
#endif
#elif defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__)
#define AVR_SCK_PIN 10
#define AVR_MISO_PIN 12
#define AVR_MOSI_PIN 11
#define AVR_SS_PIN 16
#endif
#ifndef SCK_PIN #ifndef SCK_PIN
#define SCK_PIN SCK #define SCK_PIN AVR_SCK_PIN
#endif #endif
#ifndef MISO_PIN #ifndef MISO_PIN
#define MISO_PIN MISO #define MISO_PIN AVR_MISO_PIN
#endif #endif
#ifndef MOSI_PIN #ifndef MOSI_PIN
#define MOSI_PIN MOSI #define MOSI_PIN AVR_MOSI_PIN
#endif #endif
#ifndef SS_PIN #ifndef SS_PIN
#define SS_PIN SS #define SS_PIN AVR_SS_PIN
#endif #endif
#endif //__PINS_H #endif //__PINS_H

16
Marlin/pins_BQ_ZUM_MEGA_3D.h

@ -30,6 +30,11 @@
#define BOARD_NAME "ZUM Mega 3D" #define BOARD_NAME "ZUM Mega 3D"
#define RAMPS_D8_PIN 10
#define RAMPS_D9_PIN 12
#define RAMPS_D10_PIN 9
#define MOSFET_D_PIN 7
#include "pins_RAMPS_13.h" #include "pins_RAMPS_13.h"
#undef X_MAX_PIN #undef X_MAX_PIN
@ -38,15 +43,6 @@
#undef Z_ENABLE_PIN #undef Z_ENABLE_PIN
#define Z_ENABLE_PIN 77 // 62 #define Z_ENABLE_PIN 77 // 62
#undef FAN_PIN
#define FAN_PIN 12 // 4
#undef HEATER_0_PIN
#define HEATER_0_PIN 9 // 10
#undef HEATER_1_PIN
#define HEATER_1_PIN 10 // 9
#undef TEMP_1_PIN #undef TEMP_1_PIN
#define TEMP_1_PIN 14 // 15 #define TEMP_1_PIN 14 // 15
@ -56,8 +52,6 @@
#define DIGIPOTSS_PIN 22 #define DIGIPOTSS_PIN 22
#define DIGIPOT_CHANNELS { 4, 5, 3, 0, 1 } #define DIGIPOT_CHANNELS { 4, 5, 3, 0, 1 }
#define FAN1_PIN 7
#undef PS_ON_PIN // 12 #undef PS_ON_PIN // 12
#define PS_ON_PIN 81 // External Power Supply #define PS_ON_PIN 81 // External Power Supply

2
Marlin/pins_BRAINWAVE_PRO.h

@ -33,7 +33,7 @@
#include "fastio.h" #include "fastio.h"
#ifndef AT90USBxx_TEENSYPP_ASSIGNMENTS // use Teensyduino Teensy++2.0 pin assignments instead of Marlin alphabetical. #if DISABLED(AT90USBxx_TEENSYPP_ASSIGNMENTS) // use Teensyduino Teensy++2.0 pin assignments instead of Marlin alphabetical.
#error "Uncomment #define AT90USBxx_TEENSYPP_ASSIGNMENTS in fastio.h for this config" #error "Uncomment #define AT90USBxx_TEENSYPP_ASSIGNMENTS in fastio.h for this config"
#endif #endif

1
Marlin/pins_RAMPS.h

@ -159,7 +159,6 @@
#elif ENABLED(IS_RAMPS_EFF) // Hotend, Fan, Fan #elif ENABLED(IS_RAMPS_EFF) // Hotend, Fan, Fan
#define FAN_PIN RAMPS_D9_PIN #define FAN_PIN RAMPS_D9_PIN
#define FAN1_PIN RAMPS_D8_PIN #define FAN1_PIN RAMPS_D8_PIN
#define CONTROLLERFAN_PIN -1
#elif ENABLED(IS_RAMPS_SF) // Spindle, Fan #elif ENABLED(IS_RAMPS_SF) // Spindle, Fan
#define FAN_PIN RAMPS_D8_PIN #define FAN_PIN RAMPS_D8_PIN
#else // Non-specific are "EFB" (i.e., "EFBF" or "EFBE") #else // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")

2
Marlin/pins_TEENSY2.h

@ -69,7 +69,7 @@
#error "Oops! Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu." #error "Oops! Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu."
#endif #endif
#ifndef AT90USBxx_TEENSYPP_ASSIGNMENTS // use Teensyduino Teensy++2.0 pin assignments instead of Marlin alphabetical. #if DISABLED(AT90USBxx_TEENSYPP_ASSIGNMENTS) // use Teensyduino Teensy++2.0 pin assignments instead of Marlin alphabetical.
#error "Uncomment #define AT90USBxx_TEENSYPP_ASSIGNMENTS in fastio.h for this config" #error "Uncomment #define AT90USBxx_TEENSYPP_ASSIGNMENTS in fastio.h for this config"
// (or build from command line) // (or build from command line)
#endif #endif

0
buildroot/bin/opt_disable_adv

2
buildroot/bin/restore_configs

@ -2,7 +2,7 @@
cp Marlin/Configuration.h.backup Marlin/Configuration.h cp Marlin/Configuration.h.backup Marlin/Configuration.h
cp Marlin/Configuration_adv.h.backup Marlin/Configuration_adv.h cp Marlin/Configuration_adv.h.backup Marlin/Configuration_adv.h
cp Marlin/pins_RAMPS_14.h.backup Marlin/pins_RAMPS_14.h cp Marlin/pins_RAMPS.h.backup Marlin/pins_RAMPS.h
if [ -f Marlin/_Bootscreen.h ]; then if [ -f Marlin/_Bootscreen.h ]; then
rm Marlin/_Bootscreen.h rm Marlin/_Bootscreen.h

Loading…
Cancel
Save