bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fysetc AIO II / Cheetah STM32F1 (#14407)

Browse Source
This commit is contained in:
Eric Ptak
2019-06-26 07:40:29 +02:00
committed by Scott Lahteine
parent 8e23e9b16c
commit 8934b32f1b
26 changed files with 14513 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/src/HAL/HAL_AVR/HAL.h
View File

@ -68,6 +68,7 @@ typedef uint16_t hal_timer_t;
typedef int8_t pin_t;
#define SHARED_SERVOS HAS_SERVOS
#define HAL_SERVO_LIB Servo
// --------------------------------------------------------------------------

1
Marlin/src/HAL/HAL_DUE/HAL.h
View File

@ -80,6 +80,7 @@
typedef int8_t pin_t;
#define SHARED_SERVOS HAS_SERVOS
#define HAL_SERVO_LIB Servo
//

2
Marlin/src/HAL/HAL_LINUX/HAL.h
View File

@ -63,6 +63,8 @@ uint8_t _getc();
#include "HAL_timers.h"
#include "serial.h"
#define SHARED_SERVOS HAS_SERVOS
extern HalSerial usb_serial;
#define MYSERIAL0 usb_serial
#define NUM_SERIAL 1

1
Marlin/src/HAL/HAL_STM32/HAL_Servo_STM32.cpp
View File

@ -22,7 +22,6 @@
*/
#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
#include "../../inc/MarlinConfig.h"
#if HAS_SERVOS

16
Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.h
View File

@ -49,7 +49,7 @@
#define TEMP_TIMER 17
#endif
#elif defined STM32F1xx
#elif defined(STM32F1xx)
#define HAL_TIMER_RATE (F_CPU) // frequency of timer peripherals
@ -61,19 +61,7 @@
#define TEMP_TIMER 2
#endif
#elif defined STM32F4xx
#define HAL_TIMER_RATE (F_CPU/2) // frequency of timer peripherals
#ifndef STEP_TIMER
#define STEP_TIMER 5
#endif
#ifndef TEMP_TIMER
#define TEMP_TIMER 7
#endif
#elif defined STM32F7xx
#elif defined(STM32F4xx) || defined(STM32F7xx)
#define HAL_TIMER_RATE (F_CPU/2) // frequency of timer peripherals

4
Marlin/src/HAL/HAL_STM32F1/HAL_timers_STM32F1.h
View File

@ -55,8 +55,10 @@ typedef uint16_t hal_timer_t;
#else
#define STEP_TIMER_NUM 5 // for other boards, five is fine.
#endif
#define TEMP_TIMER_NUM 2 // index of timer to use for temperature
#define TEMP_TIMER_NUM 2 // index of timer to use for temperature
//#define TEMP_TIMER_NUM 4 // 2->4, Timer 2 for Stepper Current PWM
#define PULSE_TIMER_NUM STEP_TIMER_NUM
#define SERVO0_TIMER_NUM 1 // SERVO0 or BLTOUCH
#define TEMP_TIMER_PRESCALE 1000 // prescaler for setting Temp timer, 72Khz
#define TEMP_TIMER_FREQUENCY 1000 // temperature interrupt frequency

4
Marlin/src/HAL/shared/servo.cpp
View File

@ -53,7 +53,7 @@
#include "../../inc/MarlinConfig.h"
#if HAS_SERVOS && !(IS_32BIT_TEENSY || defined(TARGET_LPC1768) || defined(STM32F1) || defined(STM32F1xx) || defined(STM32F4) || defined(STM32F4xx) || defined(STM32F7xx) || defined(ARDUINO_ARCH_ESP32))
#if SHARED_SERVOS
#include "servo.h"
#include "servo_private.h"
@ -157,4 +157,4 @@ void Servo::move(const int value) {
}
}
#endif // HAS_SERVOS
#endif // SHARED_SERVOS