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

Apply #ifdef/#ifndef where possible

Browse Source
This commit is contained in:
Scott Lahteine
2019-09-01 23:54:41 -05:00
parent 4078f2672e
commit 34b73426e5
32 changed files with 141 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/basic/ftdi_basic.h
View File

@ -24,7 +24,7 @@
#include "../compat.h"
#if !defined(__MARLIN_FIRMWARE__)
#ifndef __MARLIN_FIRMWARE__
#define FTDI_BASIC
#endif

12
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/basic/spi.cpp
View File

@ -27,7 +27,7 @@
/********************************* SPI Functions *********************************/
namespace FTDI {
#if !defined(CLCD_USE_SOFT_SPI)
#ifndef CLCD_USE_SOFT_SPI
SPISettings SPI::spi_settings(SPI_FREQUENCY, MSBFIRST, SPI_MODE0);
#endif
@ -108,7 +108,7 @@ namespace FTDI {
void SPI::spi_read_bulk (void *data, uint16_t len) {
uint8_t* p = (uint8_t *)data;
#if !defined(CLCD_USE_SOFT_SPI)
#ifndef CLCD_USE_SOFT_SPI
::SPI.transfer(p, len);
#else
while (len--) *p++ = spi_recv();
@ -123,7 +123,7 @@ namespace FTDI {
// CLCD SPI - Chip Select
void SPI::spi_ftdi_select (void) {
#if !defined(CLCD_USE_SOFT_SPI)
#ifndef CLCD_USE_SOFT_SPI
::SPI.beginTransaction(spi_settings);
#endif
WRITE(CLCD_SPI_CS, 0);
@ -133,7 +133,7 @@ namespace FTDI {
// CLCD SPI - Chip Deselect
void SPI::spi_ftdi_deselect (void) {
WRITE(CLCD_SPI_CS, 1);
#if !defined(CLCD_USE_SOFT_SPI)
#ifndef CLCD_USE_SOFT_SPI
::SPI.endTransaction();
#endif
}
@ -141,7 +141,7 @@ namespace FTDI {
#ifdef SPI_FLASH_SS
// Serial SPI Flash SPI - Chip Select
void SPI::spi_flash_select () {
#if !defined(CLCD_USE_SOFT_SPI)
#ifndef CLCD_USE_SOFT_SPI
::SPI.beginTransaction(spi_settings);
#endif
WRITE(SPI_FLASH_SS, 0);
@ -151,7 +151,7 @@ namespace FTDI {
// Serial SPI Flash SPI - Chip Deselect
void SPI::spi_flash_deselect () {
WRITE(SPI_FLASH_SS, 1);
#if !defined(CLCD_USE_SOFT_SPI)
#ifndef CLCD_USE_SOFT_SPI
::SPI.endTransaction();
#endif
}

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/basic/spi.h
View File

@ -22,13 +22,13 @@
#pragma once
#if !defined(CLCD_USE_SOFT_SPI)
#ifndef CLCD_USE_SOFT_SPI
#include <SPI.h>
#endif
namespace FTDI {
namespace SPI {
#if !defined(CLCD_USE_SOFT_SPI)
#ifndef CLCD_USE_SOFT_SPI
extern SPISettings spi_settings;
#endif

2
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/compat.h
View File

@ -31,7 +31,7 @@
#include <Arduino.h>
#if !defined(CLCD_USE_SOFT_SPI)
#ifndef CLCD_USE_SOFT_SPI
#include <SPI.h>
#endif

2
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/ftdi_extended.h
View File

@ -25,7 +25,7 @@
#include "../compat.h"
#include "../basic/ftdi_basic.h"
#if !defined(__MARLIN_FIRMWARE__)
#ifndef __MARLIN_FIRMWARE__
#define FTDI_EXTENDED
#endif

2
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.h
View File

@ -209,7 +209,7 @@ class SpinnerDialogBox : public DialogBoxBaseClass, public CachedScreen<SPINNER_
static void enqueueAndWait_P(const progmem_str message, const progmem_str commands);
};
#if !defined(LULZBOT_USE_BIOPRINTER_UI)
#ifndef LULZBOT_USE_BIOPRINTER_UI
class StatusScreen : public BaseScreen, public CachedScreen<STATUS_SCREEN_CACHE,STATUS_SCREEN_DL_SIZE> {
private:
static void draw_axis_position(draw_mode_t);