0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #9468 from Bob-the-Kuhn/remove--/src

Browse source 
[2.0.x] Cleanup - remove not needed "../src"
This commit is contained in:
Bob-the-Kuhn 2018-02-03 21:57:49 -06:00 committed by GitHub
parent 33ec599ca0 3d72fe0730
commit d08597c65a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/HAL/HAL_LPC1768/HAL_LCD_pin_routines.c
View file

@ -34,7 +34,7 @@
#include <LPC17xx.h> #include <LPC17xx.h>
#include <lpc17xx_pinsel.h> #include <lpc17xx_pinsel.h>
#include "../../src/core/macros.h" #include "../core/macros.h"
//#include "pinmapping.h" //#include "pinmapping.h"
#define LPC_PORT_OFFSET (0x0020) #define LPC_PORT_OFFSET (0x0020)

2
Marlin/src/HAL/HAL_STM32F1/HAL_Servo_Stm32f1.cpp
View file

@ -23,7 +23,7 @@
#ifdef __STM32F1__ #ifdef __STM32F1__
#include "../../../src/inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"
#if HAS_SERVOS #if HAS_SERVOS

2
Marlin/src/HAL/HAL_STM32F1/watchdog_Stm32f1.h
View file

@ -29,7 +29,7 @@
#include <libmaple/iwdg.h> #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 * The watchdog clock is 40Khz. We need a 4 seconds interval, so use a /256 preescaler and

2
Marlin/src/HAL/HAL_STM32F7/HAL_Servo_STM32F7.cpp
View file

@ -23,7 +23,7 @@
#ifdef STM32F7 #ifdef STM32F7
#include "../../../src/inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"
#if HAS_SERVOS #if HAS_SERVOS

2
Marlin/src/HAL/HAL_STM32F7/watchdog_STM32F7.h
View file

@ -23,7 +23,7 @@
#ifndef WATCHDOG_STM32F7_H #ifndef WATCHDOG_STM32F7_H
#define WATCHDOG_STM32F7_H #define WATCHDOG_STM32F7_H
#include "../../../src/inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"
extern IWDG_HandleTypeDef hiwdg; extern IWDG_HandleTypeDef hiwdg;