Browse Source
Merge pull request #9468 from Bob-the-Kuhn/remove--/src
[2.0.x] Cleanup - remove not needed "../src"
pull/1/head
Bob-the-Kuhn
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
5 additions and
5 deletions
-
Marlin/src/HAL/HAL_LPC1768/HAL_LCD_pin_routines.c
-
Marlin/src/HAL/HAL_STM32F1/HAL_Servo_Stm32f1.cpp
-
Marlin/src/HAL/HAL_STM32F1/watchdog_Stm32f1.h
-
Marlin/src/HAL/HAL_STM32F7/HAL_Servo_STM32F7.cpp
-
Marlin/src/HAL/HAL_STM32F7/watchdog_STM32F7.h
|
|
|
@ -34,7 +34,7 @@ |
|
|
|
|
|
|
|
#include <LPC17xx.h> |
|
|
|
#include <lpc17xx_pinsel.h> |
|
|
|
#include "../../src/core/macros.h" |
|
|
|
#include "../core/macros.h" |
|
|
|
//#include "pinmapping.h"
|
|
|
|
|
|
|
|
#define LPC_PORT_OFFSET (0x0020) |
|
|
|
|
|
|
|
@ -23,7 +23,7 @@ |
|
|
|
|
|
|
|
#ifdef __STM32F1__ |
|
|
|
|
|
|
|
#include "../../../src/inc/MarlinConfig.h" |
|
|
|
#include "../../inc/MarlinConfig.h" |
|
|
|
|
|
|
|
#if HAS_SERVOS |
|
|
|
|
|
|
|
|
|
|
|
@ -29,7 +29,7 @@ |
|
|
|
|
|
|
|
#include <libmaple/iwdg.h> |
|
|
|
|
|
|
|
#include "../../../src/inc/MarlinConfig.h" |
|
|
|
#include "../../inc/MarlinConfig.h" |
|
|
|
|
|
|
|
/**
|
|
|
|
* The watchdog clock is 40Khz. We need a 4 seconds interval, so use a /256 preescaler and |
|
|
|
|
|
|
|
@ -23,7 +23,7 @@ |
|
|
|
|
|
|
|
#ifdef STM32F7 |
|
|
|
|
|
|
|
#include "../../../src/inc/MarlinConfig.h" |
|
|
|
#include "../../inc/MarlinConfig.h" |
|
|
|
|
|
|
|
#if HAS_SERVOS |
|
|
|
|
|
|
|
|
|
|
|
@ -23,7 +23,7 @@ |
|
|
|
#ifndef WATCHDOG_STM32F7_H |
|
|
|
#define WATCHDOG_STM32F7_H |
|
|
|
|
|
|
|
#include "../../../src/inc/MarlinConfig.h" |
|
|
|
#include "../../inc/MarlinConfig.h" |
|
|
|
|
|
|
|
extern IWDG_HandleTypeDef hiwdg; |
|
|
|
|
|
|
|
|
