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

General cleanups for HAL

pull/1/head
Scott Lahteine 7 years ago
parent
42933c804a
commit
2c18faf3e4
7 changed files with 70 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      Marlin/src/HAL/HAL_TEENSY35_36/HAL_Servo_Teensy.h
  2. 92
      Marlin/src/pins/pins_THE_BORG.h

22
Marlin/src/HAL/HAL_TEENSY35_36/HAL_Servo_Teensy.h
View File

@ -1,18 +1,18 @@
#ifndef HAL_Servo_Teensy_h #ifndef _HAL_SERVO_TEENSY_H_
#define HAL_Servo_Teensy_h #define _HAL_SERVO_TEENSY_H_
#include <Servo.h> #include <Servo.h>
// Inherit and expand on the official library // Inherit and expand on the official library
class libServo : public Servo { class libServo : public Servo {
public: public:
int8_t attach(const int pin); int8_t attach(const int pin);
int8_t attach(const int pin, const int min, const int max); int8_t attach(const int pin, const int min, const int max);
void move(const int value); void move(const int value);
private: private:
uint16_t min_ticks; uint16_t min_ticks;
uint16_t max_ticks; uint16_t max_ticks;
uint8_t servoIndex; // index into the channel data for this servo uint8_t servoIndex; // index into the channel data for this servo
}; };
#endif // HAL_Servo_Teensy_h #endif // _HAL_SERVO_TEENSY_H_

92
Marlin/src/pins/pins_THE_BORG.h
View File

@ -73,7 +73,7 @@
#define STEPPER_ENABLE_PIN _STM32_PIN(PORTE, 0) #define STEPPER_ENABLE_PIN _STM32_PIN(PORTE, 0)
#define X_STEP_PIN _STM32_PIN(PORTC, 6) //96, 39 in arduino #define X_STEP_PIN _STM32_PIN(PORTC, 6) //96, 39 in arduino
#define X_DIR_PIN _STM32_PIN(PORTC, 7) #define X_DIR_PIN _STM32_PIN(PORTC, 7)
#define X_ENABLE_PIN _STM32_PIN(PORTC, 8) #define X_ENABLE_PIN _STM32_PIN(PORTC, 8)
@ -111,17 +111,17 @@
#define SCK_PIN _STM32_PIN(PORTA, 5) #define SCK_PIN _STM32_PIN(PORTA, 5)
#define MISO_PIN _STM32_PIN(PORTA, 6) #define MISO_PIN _STM32_PIN(PORTA, 6)
#define MOSI_PIN _STM32_PIN(PORTA, 7) #define MOSI_PIN _STM32_PIN(PORTA, 7)
#define SPI1_SCK_PIN _STM32_PIN(PORTA, 5) #define SPI1_SCK_PIN _STM32_PIN(PORTA, 5)
#define SPI1_MISO_PIN _STM32_PIN(PORTA, 6) #define SPI1_MISO_PIN _STM32_PIN(PORTA, 6)
#define SPI1_MOSI_PIN _STM32_PIN(PORTA, 7) #define SPI1_MOSI_PIN _STM32_PIN(PORTA, 7)
#define SPI6_SCK_PIN _STM32_PIN(PORTG, 13) #define SPI6_SCK_PIN _STM32_PIN(PORTG, 13)
#define SPI6_MISO_PIN _STM32_PIN(PORTG, 12) #define SPI6_MISO_PIN _STM32_PIN(PORTG, 12)
#define SPI6_MOSI_PIN _STM32_PIN(PORTG, 14) #define SPI6_MOSI_PIN _STM32_PIN(PORTG, 14)
@ -130,36 +130,36 @@
// Temperature Sensors // Temperature Sensors
// //
#define TEMP_0_PIN _STM32_PIN(PORTC, 3) // Analog Input #define TEMP_0_PIN _STM32_PIN(PORTC, 3) // Analog Input
#define TEMP_1_PIN _STM32_PIN(PORTC, 2) // Analog Input #define TEMP_1_PIN _STM32_PIN(PORTC, 2) // Analog Input
#define TEMP_2_PIN _STM32_PIN(PORTC, 1) // Analog Input #define TEMP_2_PIN _STM32_PIN(PORTC, 1) // Analog Input
#define TEMP_3_PIN _STM32_PIN(PORTC, 0) // Analog Input #define TEMP_3_PIN _STM32_PIN(PORTC, 0) // Analog Input
#define TEMP_BED_PIN _STM32_PIN(PORTF, 10) // Analog Input #define TEMP_BED_PIN _STM32_PIN(PORTF, 10) // Analog Input
#define TEMP_5_PIN _STM32_PIN(PORTE, 12) // Analog Input, Probe temp #define TEMP_5_PIN _STM32_PIN(PORTE, 12) // Analog Input, Probe temp
// //
// Heaters / Fans // Heaters / Fans
// //
#define HEATER_0_PIN _STM32_PIN(PORTD, 15) #define HEATER_0_PIN _STM32_PIN(PORTD, 15)
#define HEATER_1_PIN _STM32_PIN(PORTD, 14) #define HEATER_1_PIN _STM32_PIN(PORTD, 14)
#define HEATER_BED_PIN _STM32_PIN(PORTF, 6) #define HEATER_BED_PIN _STM32_PIN(PORTF, 6)
#define FAN_PIN _STM32_PIN(PORTD, 13) #define FAN_PIN _STM32_PIN(PORTD, 13)
#define FAN1_PIN _STM32_PIN(PORTA, 0) #define FAN1_PIN _STM32_PIN(PORTA, 0)
#define FAN2_PIN _STM32_PIN(PORTA, 1) #define FAN2_PIN _STM32_PIN(PORTA, 1)
//#define E0_AUTO_FAN_PIN _STM32_PIN(PORTA, 1) //#define E0_AUTO_FAN_PIN _STM32_PIN(PORTA, 1)
// //
// Misc. Functions // Misc. Functions
// //
//#define CASE_LIGHT_PIN_CI _STM32_PIN(PORTF, 13) // //#define CASE_LIGHT_PIN_CI _STM32_PIN(PORTF, 13) //
//#define CASE_LIGHT_PIN_DO _STM32_PIN(PORTF, 14) // //#define CASE_LIGHT_PIN_DO _STM32_PIN(PORTF, 14) //
//#define NEOPIXEL_PIN _STM32_PIN(PORTF, 13) //#define NEOPIXEL_PIN _STM32_PIN(PORTF, 13)
// //
// Prusa i3 MK2 Multi Material Multiplexer Support // Prusa i3 MK2 Multi Material Multiplexer Support
@ -172,37 +172,37 @@
// Servos // Servos
// //
#define SERVO0_PIN _STM32_PIN(PORTE, 13) #define SERVO0_PIN _STM32_PIN(PORTE, 13)
#define SERVO1_PIN _STM32_PIN(PORTE, 14) #define SERVO1_PIN _STM32_PIN(PORTE, 14)
#define SDSS _STM32_PIN(PORTA, 8) #define SDSS _STM32_PIN(PORTA, 8)
#define SS_PIN _STM32_PIN(PORTA, 8) #define SS_PIN _STM32_PIN(PORTA, 8)
#define LED_PIN _STM32_PIN(PORTA, 2) //Alive #define LED_PIN _STM32_PIN(PORTA, 2) //Alive
#define PS_ON_PIN _STM32_PIN(PORTA, 3) #define PS_ON_PIN _STM32_PIN(PORTA, 3)
#define KILL_PIN -1//_STM32_PIN(PORTD, 5) //EXP2-10 #define KILL_PIN -1//_STM32_PIN(PORTD, 5) //EXP2-10
#define PWR_LOSS _STM32_PIN(PORTG, 5) //Power loss / nAC_FAULT #define PWR_LOSS _STM32_PIN(PORTG, 5) //Power loss / nAC_FAULT
// //
//MAX7219_DEBUG //MAX7219_DEBUG
// //
#define MAX7219_CLK_PIN _STM32_PIN(PORTG, 10) //EXP1-1 #define MAX7219_CLK_PIN _STM32_PIN(PORTG, 10) //EXP1-1
#define MAX7219_DIN_PIN _STM32_PIN(PORTD, 7) //EXP1-3 #define MAX7219_DIN_PIN _STM32_PIN(PORTD, 7) //EXP1-3
#define MAX7219_LOAD_PIN _STM32_PIN(PORTD, 1) //EXP1-5 #define MAX7219_LOAD_PIN _STM32_PIN(PORTD, 1) //EXP1-5
//#define NEOPIXEL_PIN 4 //#define NEOPIXEL_PIN 4
// //
// LCD / Controller // LCD / Controller
// //
//#define SD_DETECT_PIN -1 //_STM32_PIN(PORTB, 6)) //EXP2-4 //#define SD_DETECT_PIN -1 //_STM32_PIN(PORTB, 6)) //EXP2-4
#define BEEPER_PIN _STM32_PIN(PORTG, 10) //EXP1-1 #define BEEPER_PIN _STM32_PIN(PORTG, 10) //EXP1-1
#define LCD_PINS_RS _STM32_PIN(PORTG, 9) //EXP1-4 #define LCD_PINS_RS _STM32_PIN(PORTG, 9) //EXP1-4
#define LCD_PINS_ENABLE _STM32_PIN(PORTD, 7) //EXP1-3 #define LCD_PINS_ENABLE _STM32_PIN(PORTD, 7) //EXP1-3
#define LCD_PINS_D4 _STM32_PIN(PORTD, 1) //EXP1-5 #define LCD_PINS_D4 _STM32_PIN(PORTD, 1) //EXP1-5
#define LCD_PINS_D5 _STM32_PIN(PORTF, 0) //EXP1-6 #define LCD_PINS_D5 _STM32_PIN(PORTF, 0) //EXP1-6
#define LCD_PINS_D6 _STM32_PIN(PORTD, 3) //EXP1-7 #define LCD_PINS_D6 _STM32_PIN(PORTD, 3) //EXP1-7
#define LCD_PINS_D7 _STM32_PIN(PORTD, 4) //EXP1-8 #define LCD_PINS_D7 _STM32_PIN(PORTD, 4) //EXP1-8
#define BTN_EN1 _STM32_PIN(PORTD, 6) //EXP2-5 #define BTN_EN1 _STM32_PIN(PORTD, 6) //EXP2-5
#define BTN_EN2 _STM32_PIN(PORTD, 0) //EXP2-3 #define BTN_EN2 _STM32_PIN(PORTD, 0) //EXP2-3
#define BTN_ENC _STM32_PIN(PORTG, 11) //EXP1-2 #define BTN_ENC _STM32_PIN(PORTG, 11) //EXP1-2

Write Preview
Loading…
Cancel
Save