Browse Source

fix includes for deps/reorg

main
John Robinson 3 years ago
parent
commit
276d37396f
No known key found for this signature in database
4 changed files with 8 additions and 8 deletions
  1. +2
    -2
      src/serial-flash/SerialFlash.h
  2. +2
    -2
      src/serial-flash/SerialFlashChip.cpp
  3. +1
    -1
      src/serial-flash/SerialFlashDirectory.cpp
  4. +3
    -3
      src/serial-flash/util/SerialFlash_directwrite.h

+ 2
- 2
src/serial-flash/SerialFlash.h View File

#ifndef SerialFlash_h_ #ifndef SerialFlash_h_
#define SerialFlash_h_ #define SerialFlash_h_


#include <Arduino.h>
#include <SPI.h>
#include <core/Arduino.h>
#include <spi/SPI.h>


class SerialFlashFile; class SerialFlashFile;



+ 2
- 2
src/serial-flash/SerialFlashChip.cpp View File

* THE SOFTWARE. * THE SOFTWARE.
*/ */


#include "SerialFlash.h"
#include "util/SerialFlash_directwrite.h"
#include "./SerialFlash.h"
#include "./util/SerialFlash_directwrite.h"


#define CSASSERT() DIRECT_WRITE_LOW(cspin_basereg, cspin_bitmask) #define CSASSERT() DIRECT_WRITE_LOW(cspin_basereg, cspin_bitmask)
#define CSRELEASE() DIRECT_WRITE_HIGH(cspin_basereg, cspin_bitmask) #define CSRELEASE() DIRECT_WRITE_HIGH(cspin_basereg, cspin_bitmask)

+ 1
- 1
src/serial-flash/SerialFlashDirectory.cpp View File

* THE SOFTWARE. * THE SOFTWARE.
*/ */


#include "SerialFlash.h"
#include "./SerialFlash.h"


/* On-chip SerialFlash file allocation data structures: /* On-chip SerialFlash file allocation data structures:



+ 3
- 3
src/serial-flash/util/SerialFlash_directwrite.h View File

// Adapted from OneWire.h // Adapted from OneWire.h


#if ARDUINO >= 100 #if ARDUINO >= 100
#include "Arduino.h" // for delayMicroseconds, digitalPinToBitMask, etc
#include <core/Arduino.h> // for delayMicroseconds, digitalPinToBitMask, etc
#else #else
#include "WProgram.h" // for delayMicroseconds
#include "pins_arduino.h" // for digitalPinToBitMask, etc
#include <core/WProgram.h> // for delayMicroseconds
#include <core/pins_arduino.h> // for digitalPinToBitMask, etc
#endif #endif


// Platform specific I/O definitions // Platform specific I/O definitions

Loading…
Cancel
Save