Cleanup, hex formatting, includes
This commit is contained in:
parent
d174d610bd
commit
db90a180c2
@ -582,7 +582,8 @@ MSerialT customizedSerial1(MSerialT::HasEmergencyParser);
|
|||||||
|
|
||||||
template class MarlinSerial< MarlinSerialCfg<SERIAL_PORT_2> >;
|
template class MarlinSerial< MarlinSerialCfg<SERIAL_PORT_2> >;
|
||||||
MSerialT2 customizedSerial2(MSerialT2::HasEmergencyParser);
|
MSerialT2 customizedSerial2(MSerialT2::HasEmergencyParser);
|
||||||
#endif
|
|
||||||
|
#endif // SERIAL_PORT_2
|
||||||
|
|
||||||
#ifdef MMU2_SERIAL_PORT
|
#ifdef MMU2_SERIAL_PORT
|
||||||
|
|
||||||
@ -596,7 +597,8 @@ MSerialT customizedSerial1(MSerialT::HasEmergencyParser);
|
|||||||
|
|
||||||
template class MarlinSerial< MMU2SerialCfg<MMU2_SERIAL_PORT> >;
|
template class MarlinSerial< MMU2SerialCfg<MMU2_SERIAL_PORT> >;
|
||||||
MSerialT3 mmuSerial(MSerialT3::HasEmergencyParser);
|
MSerialT3 mmuSerial(MSerialT3::HasEmergencyParser);
|
||||||
#endif
|
|
||||||
|
#endif // MMU2_SERIAL_PORT
|
||||||
|
|
||||||
#ifdef LCD_SERIAL_PORT
|
#ifdef LCD_SERIAL_PORT
|
||||||
|
|
||||||
@ -622,7 +624,7 @@ MSerialT customizedSerial1(MSerialT::HasEmergencyParser);
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif // LCD_SERIAL_PORT
|
||||||
|
|
||||||
#endif // !USBCON && (UBRRH || UBRR0H || UBRR1H || UBRR2H || UBRR3H)
|
#endif // !USBCON && (UBRRH || UBRR0H || UBRR1H || UBRR2H || UBRR3H)
|
||||||
|
|
||||||
|
@ -21,6 +21,7 @@
|
|||||||
*/
|
*/
|
||||||
#ifdef TARGET_LPC1768
|
#ifdef TARGET_LPC1768
|
||||||
|
|
||||||
|
#include "../../inc/MarlinConfig.h"
|
||||||
#include "HAL.h"
|
#include "HAL.h"
|
||||||
|
|
||||||
#if ENABLED(POSTMORTEM_DEBUGGING)
|
#if ENABLED(POSTMORTEM_DEBUGGING)
|
||||||
|
@ -21,15 +21,12 @@
|
|||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
#include "../../inc/MarlinConfig.h"
|
#include "../../inc/MarlinConfig.h"
|
||||||
|
|
||||||
// ------------------------
|
// ------------------------
|
||||||
// Defines
|
// Defines
|
||||||
// ------------------------
|
// ------------------------
|
||||||
|
|
||||||
#define FORCE_INLINE __attribute__((always_inline)) inline
|
|
||||||
|
|
||||||
// STM32 timers may be 16 or 32 bit. Limiting HAL_TIMER_TYPE_MAX to 16 bits
|
// STM32 timers may be 16 or 32 bit. Limiting HAL_TIMER_TYPE_MAX to 16 bits
|
||||||
// avoids issues with STM32F0 MCUs, which seem to pause timers if UINT32_MAX
|
// avoids issues with STM32F0 MCUs, which seem to pause timers if UINT32_MAX
|
||||||
// is written to the register. STM32F4 timers do not manifest this issue,
|
// is written to the register. STM32F4 timers do not manifest this issue,
|
||||||
|
@ -25,9 +25,10 @@
|
|||||||
* HAL for stm32duino.com based on Libmaple and compatible (STM32F1)
|
* HAL for stm32duino.com based on Libmaple and compatible (STM32F1)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdint.h>
|
#include "../../inc/MarlinConfig.h"
|
||||||
|
#include "HAL.h"
|
||||||
|
|
||||||
#include <libmaple/timer.h>
|
#include <libmaple/timer.h>
|
||||||
#include "../../core/boards.h"
|
|
||||||
|
|
||||||
// ------------------------
|
// ------------------------
|
||||||
// Defines
|
// Defines
|
||||||
@ -37,7 +38,6 @@
|
|||||||
* TODO: Check and confirm what timer we will use for each Temps and stepper driving.
|
* TODO: Check and confirm what timer we will use for each Temps and stepper driving.
|
||||||
* We should probable drive temps with PWM.
|
* We should probable drive temps with PWM.
|
||||||
*/
|
*/
|
||||||
#define FORCE_INLINE __attribute__((always_inline)) inline
|
|
||||||
|
|
||||||
typedef uint16_t hal_timer_t;
|
typedef uint16_t hal_timer_t;
|
||||||
#define HAL_TIMER_TYPE_MAX 0xFFFF
|
#define HAL_TIMER_TYPE_MAX 0xFFFF
|
||||||
|
@ -21,11 +21,12 @@
|
|||||||
*/
|
*/
|
||||||
#ifdef __MK20DX256__
|
#ifdef __MK20DX256__
|
||||||
|
|
||||||
|
#include "../../inc/MarlinConfig.h"
|
||||||
#include "HAL.h"
|
#include "HAL.h"
|
||||||
|
|
||||||
#include <SPI.h>
|
#include <SPI.h>
|
||||||
#include <pins_arduino.h>
|
#include <pins_arduino.h>
|
||||||
#include "spi_pins.h"
|
#include "spi_pins.h"
|
||||||
#include "../../core/macros.h"
|
|
||||||
|
|
||||||
static SPISettings spiConfig;
|
static SPISettings spiConfig;
|
||||||
|
|
||||||
|
@ -26,11 +26,12 @@
|
|||||||
|
|
||||||
#if defined(__MK64FX512__) || defined(__MK66FX1M0__)
|
#if defined(__MK64FX512__) || defined(__MK66FX1M0__)
|
||||||
|
|
||||||
|
#include "../../inc/MarlinConfig.h"
|
||||||
#include "HAL.h"
|
#include "HAL.h"
|
||||||
|
|
||||||
#include <SPI.h>
|
#include <SPI.h>
|
||||||
#include <pins_arduino.h>
|
#include <pins_arduino.h>
|
||||||
#include "spi_pins.h"
|
#include "spi_pins.h"
|
||||||
#include "../../core/macros.h"
|
|
||||||
|
|
||||||
static SPISettings spiConfig;
|
static SPISettings spiConfig;
|
||||||
|
|
||||||
|
@ -26,10 +26,11 @@
|
|||||||
|
|
||||||
#ifdef __IMXRT1062__
|
#ifdef __IMXRT1062__
|
||||||
|
|
||||||
|
#include "../../inc/MarlinConfig.h"
|
||||||
#include "HAL.h"
|
#include "HAL.h"
|
||||||
|
|
||||||
#include "../shared/Delay.h"
|
#include "../shared/Delay.h"
|
||||||
#include "timers.h"
|
#include "timers.h"
|
||||||
|
|
||||||
#include <Wire.h>
|
#include <Wire.h>
|
||||||
|
|
||||||
#define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false, Serial##X)
|
#define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false, Serial##X)
|
||||||
|
@ -26,11 +26,12 @@
|
|||||||
|
|
||||||
#ifdef __IMXRT1062__
|
#ifdef __IMXRT1062__
|
||||||
|
|
||||||
|
#include "../../inc/MarlinConfig.h"
|
||||||
#include "HAL.h"
|
#include "HAL.h"
|
||||||
|
|
||||||
#include <SPI.h>
|
#include <SPI.h>
|
||||||
#include <pins_arduino.h>
|
#include <pins_arduino.h>
|
||||||
#include "spi_pins.h"
|
#include "spi_pins.h"
|
||||||
#include "../../core/macros.h"
|
|
||||||
|
|
||||||
static SPISettings spiConfig;
|
static SPISettings spiConfig;
|
||||||
|
|
||||||
|
@ -82,4 +82,8 @@
|
|||||||
#define UNUSED(x) ((void)(x))
|
#define UNUSED(x) ((void)(x))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef FORCE_INLINE
|
||||||
|
#define FORCE_INLINE inline __attribute__((always_inline))
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "progmem.h"
|
#include "progmem.h"
|
||||||
|
@ -34,8 +34,8 @@
|
|||||||
#include "../HAL/platforms.h"
|
#include "../HAL/platforms.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "../core/boards.h"
|
|
||||||
#include "../core/macros.h"
|
#include "../core/macros.h"
|
||||||
|
#include "../core/boards.h"
|
||||||
#include "../../Configuration.h"
|
#include "../../Configuration.h"
|
||||||
|
|
||||||
#ifdef CUSTOM_VERSION_FILE
|
#ifdef CUSTOM_VERSION_FILE
|
||||||
|
@ -26,19 +26,16 @@
|
|||||||
|
|
||||||
#include "../DGUSScreenHandler.h"
|
#include "../DGUSScreenHandler.h"
|
||||||
|
|
||||||
|
#include "../../../../../inc/MarlinConfig.h"
|
||||||
|
|
||||||
#include "../../../../../MarlinCore.h"
|
#include "../../../../../MarlinCore.h"
|
||||||
#include "../../../../../gcode/queue.h"
|
|
||||||
#include "../../../../../libs/duration_t.h"
|
|
||||||
#include "../../../../../module/settings.h"
|
#include "../../../../../module/settings.h"
|
||||||
#include "../../../../../module/temperature.h"
|
#include "../../../../../module/temperature.h"
|
||||||
#include "../../../../../module/motion.h"
|
#include "../../../../../module/motion.h"
|
||||||
#include "../../../../../module/planner.h"
|
#include "../../../../../module/planner.h"
|
||||||
#include "../../../../../module/printcounter.h"
|
#include "../../../../../module/printcounter.h"
|
||||||
#include "../../../../../sd/cardreader.h"
|
|
||||||
|
|
||||||
#include "../../../../../gcode/gcode.h"
|
#include "../../../../../gcode/gcode.h"
|
||||||
#include "../../../../../pins/pins.h"
|
|
||||||
#include "../../../../../libs/nozzle.h"
|
|
||||||
|
|
||||||
#if ENABLED(HAS_STEALTHCHOP)
|
#if ENABLED(HAS_STEALTHCHOP)
|
||||||
#include "../../../../../module/stepper/trinamic.h"
|
#include "../../../../../module/stepper/trinamic.h"
|
||||||
|
@ -25,11 +25,7 @@
|
|||||||
// Based on https://github.com/niteris/ArduinoSoftSpi
|
// Based on https://github.com/niteris/ArduinoSoftSpi
|
||||||
//
|
//
|
||||||
|
|
||||||
#include "../HAL/shared/Marduino.h"
|
#include "../HAL/shared/Marduino.h" // CORE_TEENSY
|
||||||
|
|
||||||
#ifndef FORCE_INLINE
|
|
||||||
#define FORCE_INLINE inline __attribute__((always_inline))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define nop __asm__ volatile ("nop") // NOP for timing
|
#define nop __asm__ volatile ("nop") // NOP for timing
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user