Skip to content

Small cleanup #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 23, 2019
Merged

Small cleanup #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cfddd0
Remove commented out __get_PRIMASK().
nseidle Sep 21, 2019
bb6649c
Remove warning for SS. Change warning to SCK.
nseidle Sep 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions libraries/SPI/src/SPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,9 @@ void SPIClass::end()
static inline unsigned char __interruptsStatus(void) __attribute__((always_inline, unused));
static inline unsigned char __interruptsStatus(void)
{
// // See http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0497a/CHDBIBGJ.html
// return (__get_PRIMASK() ? 0 : 1);
// See http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0497a/CHDBIBGJ.html - Cortex-M0
// Equivalent Cortex-M3 http://infocenter.arm.com/help/topic/com.arm.doc.dui0552a/CHDBIBGJ.html
return (__get_PRIMASK() ? 0 : 1);
}
#endif

Expand Down Expand Up @@ -300,12 +301,15 @@ void SPIClass::_transfer(void *buf_out, void *buf_in, size_t count)
}

uint32_t retVal32 = 0;
if( iomTransfer.eDirection == AM_HAL_IOM_FULLDUPLEX ){
if (iomTransfer.eDirection == AM_HAL_IOM_FULLDUPLEX)
{
retVal32 = am_hal_iom_spi_blocking_fullduplex(_handle, &iomTransfer);
}else{
}
else
{
retVal32 = am_hal_iom_blocking_transfer(_handle, &iomTransfer);
}

// if (retVal32 != 0)
// {
// Serial.printf("got an error on _transfer: %d\n", retVal32);
Expand Down
89 changes: 48 additions & 41 deletions libraries/SPI/src/SPI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,15 @@
#include "ap3_iomaster.h"

// Give a warning if the variant did not define these symbols:
#ifndef SS
#warning "variant has no definition for pin number 'SS'"
#endif // SS
#ifndef MOSI
#warning "variant has no definition for pin number 'MOSI'"
#endif // MOSI
#endif // MOSI
#ifndef MISO
#warning "variant has no definition for pin number 'MISO'"
#endif // MISO
#ifndef CLK
#warning "variant has no definition for pin number 'CLK'"
#endif // CLK
#endif // MISO
#ifndef SCK
#warning "variant has no definition for pin number 'SCK'"
#endif // SCK

// SPI_HAS_TRANSACTION means SPI has
// - beginTransaction()
Expand All @@ -52,34 +49,43 @@
#define SPI_MODE2 AM_HAL_IOM_SPI_MODE_2
#define SPI_MODE3 AM_HAL_IOM_SPI_MODE_3

typedef enum{
typedef enum
{
ap3_spi_tx_only = 1,
ap3_spi_rx_only = 2,
ap3_spi_full_duplex = 3,
}ap3_spi_duplex_e;

class SPISettings {
public:
SPISettings(uint32_t clock, BitOrder bitOrder, uint8_t dataMode) {
if (__builtin_constant_p(clock)) {
} ap3_spi_duplex_e;

class SPISettings
{
public:
SPISettings(uint32_t clock, BitOrder bitOrder, uint8_t dataMode)
{
if (__builtin_constant_p(clock))
{
init_AlwaysInline(clock, bitOrder, dataMode);
} else {
}
else
{
init_MightInline(clock, bitOrder, dataMode);
}
}

// Default speed set to 4MHz, SPI mode set to MODE 0 and Bit order set to MSB first.
SPISettings() {
init_AlwaysInline(4000000, MSBFIRST, SPI_MODE0);
SPISettings()
{
init_AlwaysInline(4000000, MSBFIRST, SPI_MODE0);
}

private:
public: // temporary
void init_MightInline(uint32_t clock, BitOrder bitOrder, uint8_t dataMode) {
private:
public: // temporary
void init_MightInline(uint32_t clock, BitOrder bitOrder, uint8_t dataMode)
{
init_AlwaysInline(clock, bitOrder, dataMode);
}

void init_AlwaysInline(uint32_t clock, BitOrder bitOrder, uint8_t dataMode) __attribute__((__always_inline__)) {
void init_AlwaysInline(uint32_t clock, BitOrder bitOrder, uint8_t dataMode) __attribute__((__always_inline__))
{
this->clockFreq = clock;
this->bitOrder = bitOrder;
this->dataMode = (am_hal_iom_spi_mode_e)dataMode;
Expand All @@ -92,8 +98,9 @@ class SPISettings {
friend class SPIClass;
};

class SPIClass : public IOMaster {
public:
class SPIClass : public IOMaster
{
public:
SPIClass(uint8_t iom_instance);
SPIClass(uint8_t iom_instance, ap3_spi_duplex_e duplex);

Expand Down Expand Up @@ -122,7 +129,7 @@ class SPIClass : public IOMaster {

private:
void config(SPISettings settings);
void _transfer(void* buf_out = NULL, void* buf_in = NULL, size_t count = 0);
void _transfer(void *buf_out = NULL, void *buf_in = NULL, size_t count = 0);

// Bit Order (need a better way to handle this)
BitOrder _order;
Expand All @@ -131,9 +138,9 @@ class SPIClass : public IOMaster {
ap3_spi_duplex_e _duplex;

// Pads (for reference)
ap3_gpio_pin_t _padSCLK;
ap3_gpio_pin_t _padMOSI;
ap3_gpio_pin_t _padMISO;
ap3_gpio_pin_t _padSCLK;
ap3_gpio_pin_t _padMOSI;
ap3_gpio_pin_t _padMISO;

// SERCOM *_p_sercom;
// uint8_t _uc_pinMiso;
Expand All @@ -150,34 +157,34 @@ class SPIClass : public IOMaster {
};

#if SPI_INTERFACES_COUNT > 0
extern SPIClass SPI;
extern SPIClass SPI;
#endif
#if SPI_INTERFACES_COUNT > 1
extern SPIClass SPI1;
extern SPIClass SPI1;
#endif
#if SPI_INTERFACES_COUNT > 2
extern SPIClass SPI2;
extern SPIClass SPI2;
#endif
#if SPI_INTERFACES_COUNT > 3
extern SPIClass SPI3;
extern SPIClass SPI3;
#endif
#if SPI_INTERFACES_COUNT > 4
extern SPIClass SPI4;
extern SPIClass SPI4;
#endif
#if SPI_INTERFACES_COUNT > 5
extern SPIClass SPI5;
extern SPIClass SPI5;
#endif

// For compatibility with sketches designed for AVR @ 16 MHz
// New programs should use SPI.beginTransaction to set the SPI clock
#if F_CPU == 48000000
#define SPI_CLOCK_DIV2 6
#define SPI_CLOCK_DIV4 12
#define SPI_CLOCK_DIV8 24
#define SPI_CLOCK_DIV16 48
#define SPI_CLOCK_DIV32 96
#define SPI_CLOCK_DIV64 192
#define SPI_CLOCK_DIV128 255
#define SPI_CLOCK_DIV2 6
#define SPI_CLOCK_DIV4 12
#define SPI_CLOCK_DIV8 24
#define SPI_CLOCK_DIV16 48
#define SPI_CLOCK_DIV32 96
#define SPI_CLOCK_DIV64 192
#define SPI_CLOCK_DIV128 255
#endif

#endif