Dependency adjustments

This commit is contained in:
Scott Lahteine 2017-11-19 13:59:40 -06:00
parent 550f1025f0
commit 1d4571b88d
8 changed files with 17 additions and 18 deletions

View file

@ -60,7 +60,10 @@
* See the end of this file for details on the hardware/firmware interaction * See the end of this file for details on the hardware/firmware interaction
*/ */
#include "fastio.h" #ifndef _LPC1768_PWM_H_
#define _LPC1768_PWM_H_
#include "pinmapping.h"
#define LPC_PWM1_MR0 19999 // base repetition rate minus one count - 20mS #define LPC_PWM1_MR0 19999 // base repetition rate minus one count - 20mS
#define LPC_PWM1_PR 24 // prescaler value - prescaler divide by 24 + 1 - 1 MHz output #define LPC_PWM1_PR 24 // prescaler value - prescaler divide by 24 + 1 - 1 MHz output
@ -73,3 +76,5 @@ bool LPC1768_PWM_attach_pin(pin_t pin, uint32_t min=1, uint32_t max=(LPC_PWM1_MR
bool LPC1768_PWM_write(pin_t pin, uint32_t value); bool LPC1768_PWM_write(pin_t pin, uint32_t value);
bool LPC1768_PWM_detach_pin(pin_t pin); bool LPC1768_PWM_detach_pin(pin_t pin);
bool useable_hardware_PWM(pin_t pin); bool useable_hardware_PWM(pin_t pin);
#endif // _LPC1768_PWM_H_

View file

@ -22,11 +22,11 @@
#ifdef TARGET_LPC1768 #ifdef TARGET_LPC1768
#include "../../inc/MarlinConfig.h"
#include "LPC1768_PWM.h" #include "LPC1768_PWM.h"
#include <lpc17xx_pinsel.h> #include <lpc17xx_pinsel.h>
#include "../../inc/MarlinConfig.h"
// Interrupts // Interrupts
void cli(void) { __disable_irq(); } // Disable void cli(void) { __disable_irq(); } // Disable
void sei(void) { __enable_irq(); } // Enable void sei(void) { __enable_irq(); } // Enable

View file

@ -24,6 +24,8 @@
#define __HAL_PINMAPPING_H__ #define __HAL_PINMAPPING_H__
#include "../../core/macros.h" #include "../../core/macros.h"
#include <stdint.h>
typedef int16_t pin_t; typedef int16_t pin_t;
#define PORT_0 000 #define PORT_0 000

View file

@ -28,12 +28,8 @@
#ifndef _SPI_H_ #ifndef _SPI_H_
#define _SPI_H_ #define _SPI_H_
//#include "../inc/MarlinConfig.h"
#include <stdint.h> #include <stdint.h>
#ifndef SPI_FULL_SPEED
/** /**
* SPI speed where 0 <= index <= 6 * SPI speed where 0 <= index <= 6
* *
@ -73,6 +69,4 @@ void spiRead(uint8_t* buf, uint16_t nbyte);
/** Write token and then write from 512 byte buffer to SPI (for SD card) */ /** Write token and then write from 512 byte buffer to SPI (for SD card) */
void spiSendBlock(uint8_t token, const uint8_t* buf); void spiSendBlock(uint8_t token, const uint8_t* buf);
#endif // SPI_FULL_SPEED
#endif // _SPI_H_ #endif // _SPI_H_

View file

@ -22,16 +22,16 @@
#ifndef __MARLIN_H__ #ifndef __MARLIN_H__
#define __MARLIN_H__ #define __MARLIN_H__
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include "inc/MarlinConfig.h" #include "inc/MarlinConfig.h"
#ifdef DEBUG_GCODE_PARSER #ifdef DEBUG_GCODE_PARSER
#include "gcode/parser.h" #include "gcode/parser.h"
#endif #endif
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
void stop(); void stop();
void idle( void idle(

View file

@ -26,7 +26,6 @@
#include "../core/boards.h" #include "../core/boards.h"
#include "../core/macros.h" #include "../core/macros.h"
#include "Version.h" #include "Version.h"
#include "../HAL/SPI.h"
#include "../../Configuration.h" #include "../../Configuration.h"
#include "Conditionals_LCD.h" #include "Conditionals_LCD.h"
#include "../../Configuration_adv.h" #include "../../Configuration_adv.h"

View file

@ -29,11 +29,10 @@
#include "../inc/MarlinConfig.h" #include "../inc/MarlinConfig.h"
bool set_probe_deployed(const bool deploy);
float probe_pt(const float &rx, const float &ry, const bool, const uint8_t, const bool printable=true);
#if HAS_BED_PROBE #if HAS_BED_PROBE
extern float zprobe_zoffset; extern float zprobe_zoffset;
bool set_probe_deployed(const bool deploy);
float probe_pt(const float &rx, const float &ry, const bool, const uint8_t, const bool printable=true);
#define DEPLOY_PROBE() set_probe_deployed(true) #define DEPLOY_PROBE() set_probe_deployed(true)
#define STOW_PROBE() set_probe_deployed(false) #define STOW_PROBE() set_probe_deployed(false)
#else #else

View file

@ -54,12 +54,12 @@
#include "planner.h" #include "planner.h"
#include "motion.h" #include "motion.h"
#include "../Marlin.h"
#include "../module/temperature.h" #include "../module/temperature.h"
#include "../lcd/ultralcd.h" #include "../lcd/ultralcd.h"
#include "../core/language.h" #include "../core/language.h"
#include "../gcode/queue.h" #include "../gcode/queue.h"
#include "../sd/cardreader.h" #include "../sd/cardreader.h"
#include "../Marlin.h"
#if MB(ALLIGATOR) #if MB(ALLIGATOR)
#include "../feature/dac/dac_dac084s085.h" #include "../feature/dac/dac_dac084s085.h"