8000 Adjust formate · RedBearLab/nRF51822-Arduino@0f32f8a · GitHub
[go: up one dir, main page]
Skip to content

Commit 0f32f8a

Browse files
author
jixing.zou
committed
Adjust formate
1 parent f300e45 commit 0f32f8a

File tree

6 files changed

+459
-506
lines changed

6 files changed

+459
-506
lines changed

‎arduino-1.6.x/hardware/RBL/RBL_nRF51822/libraries/SPI_Master/SPI_Master.cpp

Lines changed: 31 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ static void spi_release(spi_t *obj, int slave)
3434
obj->spis->ENABLE = (SPIS_ENABLE_ENABLE_Disabled << SPIS_ENABLE_ENABLE_Pos);
3535
} else {
3636
obj->spi->ENABLE = (SPI_ENABLE_ENABLE_Disabled << SPI_ENABLE_ENABLE_Pos);
37-
}
37+
}
3838
}
3939

4040
static void spi_start(spi_t *obj, int slave)
@@ -48,79 +48,68 @@ static void spi_start(spi_t *obj, int slave)
4848

4949
static void spi_BitOrder(spi_t *obj, BitOrder bit)
5050
{
51-
//spi_release(obj, 0);
52-
if(bit == MSBFIRST)
53-
obj->spi->CONFIG |= (SPI_CONFIG_ORDER_MsbFirst << SPI_CONFIG_ORDER_Pos);
54-
else
55-
obj->spi->CONFIG |= (SPI_CONFIG_ORDER_LsbFirst << SPI_CONFIG_ORDER_Pos);
56-
//spi_start(obj, 0);
51+
//spi_release(obj, 0);
52+
if(bit == MSBFIRST)
53+
obj->spi->CONFIG |= (SPI_CONFIG_ORDER_MsbFirst << SPI_CONFIG_ORDER_Pos);
54+
else
55+
obj->spi->CONFIG |= (SPI_CONFIG_ORDER_LsbFirst << SPI_CONFIG_ORDER_Pos);
56+
//spi_start(obj, 0);
5757
}
5858

5959
SPIClass::SPIClass()
6060
{
61-
//do nothing
61+
//do nothing
6262
}
6363

6464
void SPIClass::begin(uint32_t scl, uint32_t mosi, uint32_t miso)
6565
{
66-
PinName nrf_scl, nrf_mosi, nrf_miso;
67-
68-
nrf_scl = Pin_nRF51822_to_Arduino(scl);
69-
nrf_mosi = Pin_nRF51822_to_Arduino(mosi);
70-
nrf_miso = Pin_nRF51822_to_Arduino(miso);
71-
72-
spi_init(&spi, nrf_mosi, nrf_miso, nrf_scl, (PinName)NC);
73-
/* 8-bits, MODE0, master(0)/slave(1) */
74-
spi_format(&spi, 8, SPI_MODE0, 0);
75-
/* Default speed : 1MHz */
76-
spi_frequency(&spi, SPI_1M);
66+
PinName nrf_scl, nrf_mosi, nrf_miso;
67+
68+
nrf_scl = Pin_nRF51822_to_Arduino(scl);
69+
nrf_mosi = Pin_nRF51822_to_Arduino(mosi);
70+
nrf_miso = Pin_nRF51822_to_Arduino(miso);
71+
72+
spi_init(&spi, nrf_mosi, nrf_miso, nrf_scl, (PinName)NC);
73+
/* 8-bits, MODE0, master(0)/slave(1) */
74+
spi_format(&spi, 8, SPI_MODE0, 0);
75+
/* Default speed : 1MHz */
76+
spi_frequency(&spi, SPI_1M);
7777
}
7878

7979
void SPIClass::begin()
8080
{
81-
begin(SCK, MOSI, MISO);
81+
begin(SCK, MOSI, MISO);
8282
}
8383

8484
uint8_t SPIClass::transfer(uint8_t data)
8585
{
86-
return ((uint8_t)spi_master_write(&spi, data));
86+
return ((uint8_t)spi_master_write(&spi, data));
8787
}
8888

8989
void SPIClass::endTransfer(void)
9090
{
91-
spi_release(&spi, 0);
91+
spi_release(&spi, 0);
9292
}
9393

9494
void SPIClass::setSPIMode(uint8_t mode)
9595
{
96-
if(mode > 3)
97-
return;
98-
/* 8-bits, MODE0, master(0)/slave(1) */
99-
spi_format(&spi, 8, mode, 0);
96+
if(mode > 3)
97+
return;
98+
/* 8-bits, MODE0, master(0)/slave(1) */
99+
spi_format(&spi, 8, mode, 0);
100100
}
101101

102102
void SPIClass::setFrequency(uint32_t speed )
103-
{
104-
/* Default speed : 1MHz */
105-
spi_frequency(&spi, speed);
103+
{
104+
/* Default speed : 1MHz */
105+
spi_frequency(&spi, speed);
106106
}
107107

108108
void SPIClass::setBitORDER( BitOrder bit)
109109
{
110-
spi_BitOrder(&spi, bit);
110+
spi_BitOrder(&spi, bit);
111111
}
112112

113113

114-
SPIClass SPI_Master;
115-
116-
117-
118-
119-
120-
121-
122-
123-
124-
125-
10000 114+
SPIClass SPI_Master;
126115

‎arduino-1.6.x/hardware/RBL/RBL_nRF51822/libraries/SPI_Master/SPI_Master.h

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -32,44 +32,41 @@
3232

3333
#include "Arduino.h"
3434

35-
#define SPI_125K 125000
36-
#define SPI_250K 250000
37-
#define SPI_500K 500000
38-
#define SPI_1M 1000000
39-
#define SPI_2M 2000000
40-
#define SPI_4M 4000000
41-
#define SPI_8M 8000000
35+
#define SPI_125K 125000
36+
#define SPI_250K 250000
37+
#define SPI_500K 500000
38+
#define SPI_1M 1000000
39+
#define SPI_2M 2000000
40+
#define SPI_4M 4000000
41+
#define SPI_8M 8000000
4242

43-
#define SPI_MODE0 0
44-
#define SPI_MODE1 1
45-
#define SPI_MODE2 2
46-
#define SPI_MODE3 3
43+
#define SPI_MODE0 0
44+
#define SPI_MODE1 1
45+
#define SPI_MODE2 2
46+
#define SPI_MODE3 3
4747

4848

4949
class SPIClass
5050
{
51-
public:
52-
SPIClass();
53-
54-
void begin();
55-
void begin(uint32_t scl, uint32_t mosi, uint32_t miso);
56-
uint8_t transfer(uint8_t data);
57-
void endTransfer(void);
58-
59-
/*This also set bitOrder to MSBFIRST, so don't use setBitORDER befor this */
60-
void setSPIMode(uint8_t mode);
61-
void setFrequency(uint32_t speed );
62-
/*Set bitOrder, this must be after setSPIMode */
63-
void setBitORDER( BitOrder bit);
64-
65-
protected:
66-
67-
spi_t spi;
68-
};
51+
public:
52+
SPIClass();
6953

70-
extern SPIClass SPI_Master;
54+
void begin();
55+
void begin(uint32_t scl, uint32_t mosi, uint32_t miso);
56+
uint8_t transfer(uint8_t data);
57+
void endTransfer(void);
7158

72-
#endif
59+
/*This also set bitOrder to MSBFIRST, so don't use setBitORDER befor this */
60+
void setSPIMode(uint8_t mode);
61+
void setFrequency(uint32_t speed );
62+
/*Set bitOrder, this must be after setSPIMode */
63+
void setBitORDER( BitOrder bit);
7364

65+
protected:
7466

67+
spi_t spi;
68+
};
7569

70+
extern SPIClass SPI_Master;
71+
72+
#endif

0 commit comments

Comments
 (0)
0