mirror of
https://github.com/esp8266/Arduino.git
synced 2025-07-30 16:24:09 +03:00
Migrate from astyle to clang-format (#8464)
This commit is contained in:
committed by
Max Prokhorov
parent
46190b61f1
commit
19b7a29720
@ -17,73 +17,68 @@
|
||||
#include <SPI.h>
|
||||
|
||||
class ESPMaster {
|
||||
private:
|
||||
uint8_t _ss_pin;
|
||||
private:
|
||||
uint8_t _ss_pin;
|
||||
|
||||
public:
|
||||
ESPMaster(uint8_t pin): _ss_pin(pin) {}
|
||||
void begin() {
|
||||
pinMode(_ss_pin, OUTPUT);
|
||||
digitalWrite(_ss_pin, HIGH);
|
||||
}
|
||||
public:
|
||||
ESPMaster(uint8_t pin)
|
||||
: _ss_pin(pin) {}
|
||||
void begin() {
|
||||
pinMode(_ss_pin, OUTPUT);
|
||||
digitalWrite(_ss_pin, HIGH);
|
||||
}
|
||||
|
||||
uint32_t readStatus() {
|
||||
digitalWrite(_ss_pin, LOW);
|
||||
SPI.transfer(0x04);
|
||||
uint32_t status = (SPI.transfer(0) | ((uint32_t)(SPI.transfer(0)) << 8) | ((uint32_t)(SPI.transfer(0)) << 16) | ((uint32_t)(SPI.transfer(0)) << 24));
|
||||
digitalWrite(_ss_pin, HIGH);
|
||||
return status;
|
||||
}
|
||||
uint32_t readStatus() {
|
||||
digitalWrite(_ss_pin, LOW);
|
||||
SPI.transfer(0x04);
|
||||
uint32_t status = (SPI.transfer(0) | ((uint32_t)(SPI.transfer(0)) << 8) | ((uint32_t)(SPI.transfer(0)) << 16) | ((uint32_t)(SPI.transfer(0)) << 24));
|
||||
digitalWrite(_ss_pin, HIGH);
|
||||
return status;
|
||||
}
|
||||
|
||||
void writeStatus(uint32_t status) {
|
||||
digitalWrite(_ss_pin, LOW);
|
||||
SPI.transfer(0x01);
|
||||
SPI.transfer(status & 0xFF);
|
||||
SPI.transfer((status >> 8) & 0xFF);
|
||||
SPI.transfer((status >> 16) & 0xFF);
|
||||
SPI.transfer((status >> 24) & 0xFF);
|
||||
digitalWrite(_ss_pin, HIGH);
|
||||
}
|
||||
void writeStatus(uint32_t status) {
|
||||
digitalWrite(_ss_pin, LOW);
|
||||
SPI.transfer(0x01);
|
||||
SPI.transfer(status & 0xFF);
|
||||
SPI.transfer((status >> 8) & 0xFF);
|
||||
SPI.transfer((status >> 16) & 0xFF);
|
||||
SPI.transfer((status >> 24) & 0xFF);
|
||||
digitalWrite(_ss_pin, HIGH);
|
||||
}
|
||||
|
||||
void readData(uint8_t * data) {
|
||||
digitalWrite(_ss_pin, LOW);
|
||||
SPI.transfer(0x03);
|
||||
SPI.transfer(0x00);
|
||||
for (uint8_t i = 0; i < 32; i++) {
|
||||
data[i] = SPI.transfer(0);
|
||||
}
|
||||
digitalWrite(_ss_pin, HIGH);
|
||||
}
|
||||
void readData(uint8_t *data) {
|
||||
digitalWrite(_ss_pin, LOW);
|
||||
SPI.transfer(0x03);
|
||||
SPI.transfer(0x00);
|
||||
for (uint8_t i = 0; i < 32; i++) { data[i] = SPI.transfer(0); }
|
||||
digitalWrite(_ss_pin, HIGH);
|
||||
}
|
||||
|
||||
void writeData(uint8_t * data, size_t len) {
|
||||
uint8_t i = 0;
|
||||
digitalWrite(_ss_pin, LOW);
|
||||
SPI.transfer(0x02);
|
||||
SPI.transfer(0x00);
|
||||
while (len-- && i < 32) {
|
||||
SPI.transfer(data[i++]);
|
||||
}
|
||||
while (i++ < 32) {
|
||||
SPI.transfer(0);
|
||||
}
|
||||
digitalWrite(_ss_pin, HIGH);
|
||||
}
|
||||
void writeData(uint8_t *data, size_t len) {
|
||||
uint8_t i = 0;
|
||||
digitalWrite(_ss_pin, LOW);
|
||||
SPI.transfer(0x02);
|
||||
SPI.transfer(0x00);
|
||||
while (len-- && i < 32) { SPI.transfer(data[i++]); }
|
||||
while (i++ < 32) { SPI.transfer(0); }
|
||||
digitalWrite(_ss_pin, HIGH);
|
||||
}
|
||||
|
||||
String readData() {
|
||||
char data[33];
|
||||
data[32] = 0;
|
||||
readData((uint8_t *)data);
|
||||
return String(data);
|
||||
}
|
||||
String readData() {
|
||||
char data[33];
|
||||
data[32] = 0;
|
||||
readData((uint8_t *)data);
|
||||
return String(data);
|
||||
}
|
||||
|
||||
void writeData(const char * data) {
|
||||
writeData((uint8_t *)data, strlen(data));
|
||||
}
|
||||
void writeData(const char *data) {
|
||||
writeData((uint8_t *)data, strlen(data));
|
||||
}
|
||||
};
|
||||
|
||||
ESPMaster esp(SS);
|
||||
|
||||
void send(const char * message) {
|
||||
void send(const char *message) {
|
||||
Serial.print("Master: ");
|
||||
Serial.println(message);
|
||||
esp.writeData(message);
|
||||
|
@ -18,77 +18,73 @@
|
||||
#include <SPI.h>
|
||||
|
||||
class ESPSafeMaster {
|
||||
private:
|
||||
uint8_t _ss_pin;
|
||||
void _pulseSS() {
|
||||
digitalWrite(_ss_pin, HIGH);
|
||||
delayMicroseconds(5);
|
||||
digitalWrite(_ss_pin, LOW);
|
||||
}
|
||||
public:
|
||||
ESPSafeMaster(uint8_t pin): _ss_pin(pin) {}
|
||||
void begin() {
|
||||
pinMode(_ss_pin, OUTPUT);
|
||||
_pulseSS();
|
||||
}
|
||||
private:
|
||||
uint8_t _ss_pin;
|
||||
void _pulseSS() {
|
||||
digitalWrite(_ss_pin, HIGH);
|
||||
delayMicroseconds(5);
|
||||
digitalWrite(_ss_pin, LOW);
|
||||
}
|
||||
|
||||
uint32_t readStatus() {
|
||||
_pulseSS();
|
||||
SPI.transfer(0x04);
|
||||
uint32_t status = (SPI.transfer(0) | ((uint32_t)(SPI.transfer(0)) << 8) | ((uint32_t)(SPI.transfer(0)) << 16) | ((uint32_t)(SPI.transfer(0)) << 24));
|
||||
_pulseSS();
|
||||
return status;
|
||||
}
|
||||
public:
|
||||
ESPSafeMaster(uint8_t pin)
|
||||
: _ss_pin(pin) {}
|
||||
void begin() {
|
||||
pinMode(_ss_pin, OUTPUT);
|
||||
_pulseSS();
|
||||
}
|
||||
|
||||
void writeStatus(uint32_t status) {
|
||||
_pulseSS();
|
||||
SPI.transfer(0x01);
|
||||
SPI.transfer(status & 0xFF);
|
||||
SPI.transfer((status >> 8) & 0xFF);
|
||||
SPI.transfer((status >> 16) & 0xFF);
|
||||
SPI.transfer((status >> 24) & 0xFF);
|
||||
_pulseSS();
|
||||
}
|
||||
uint32_t readStatus() {
|
||||
_pulseSS();
|
||||
SPI.transfer(0x04);
|
||||
uint32_t status = (SPI.transfer(0) | ((uint32_t)(SPI.transfer(0)) << 8) | ((uint32_t)(SPI.transfer(0)) << 16) | ((uint32_t)(SPI.transfer(0)) << 24));
|
||||
_pulseSS();
|
||||
return status;
|
||||
}
|
||||
|
||||
void readData(uint8_t * data) {
|
||||
_pulseSS();
|
||||
SPI.transfer(0x03);
|
||||
SPI.transfer(0x00);
|
||||
for (uint8_t i = 0; i < 32; i++) {
|
||||
data[i] = SPI.transfer(0);
|
||||
}
|
||||
_pulseSS();
|
||||
}
|
||||
void writeStatus(uint32_t status) {
|
||||
_pulseSS();
|
||||
SPI.transfer(0x01);
|
||||
SPI.transfer(status & 0xFF);
|
||||
SPI.transfer((status >> 8) & 0xFF);
|
||||
SPI.transfer((status >> 16) & 0xFF);
|
||||
SPI.transfer((status >> 24) & 0xFF);
|
||||
_pulseSS();
|
||||
}
|
||||
|
||||
void writeData(uint8_t * data, size_t len) {
|
||||
uint8_t i = 0;
|
||||
_pulseSS();
|
||||
SPI.transfer(0x02);
|
||||
SPI.transfer(0x00);
|
||||
while (len-- && i < 32) {
|
||||
SPI.transfer(data[i++]);
|
||||
}
|
||||
while (i++ < 32) {
|
||||
SPI.transfer(0);
|
||||
}
|
||||
_pulseSS();
|
||||
}
|
||||
void readData(uint8_t *data) {
|
||||
_pulseSS();
|
||||
SPI.transfer(0x03);
|
||||
SPI.transfer(0x00);
|
||||
for (uint8_t i = 0; i < 32; i++) { data[i] = SPI.transfer(0); }
|
||||
_pulseSS();
|
||||
}
|
||||
|
||||
String readData() {
|
||||
char data[33];
|
||||
data[32] = 0;
|
||||
readData((uint8_t *)data);
|
||||
return String(data);
|
||||
}
|
||||
void writeData(uint8_t *data, size_t len) {
|
||||
uint8_t i = 0;
|
||||
_pulseSS();
|
||||
SPI.transfer(0x02);
|
||||
SPI.transfer(0x00);
|
||||
while (len-- && i < 32) { SPI.transfer(data[i++]); }
|
||||
while (i++ < 32) { SPI.transfer(0); }
|
||||
_pulseSS();
|
||||
}
|
||||
|
||||
void writeData(const char * data) {
|
||||
writeData((uint8_t *)data, strlen(data));
|
||||
}
|
||||
String readData() {
|
||||
char data[33];
|
||||
data[32] = 0;
|
||||
readData((uint8_t *)data);
|
||||
return String(data);
|
||||
}
|
||||
|
||||
void writeData(const char *data) {
|
||||
writeData((uint8_t *)data, strlen(data));
|
||||
}
|
||||
};
|
||||
|
||||
ESPSafeMaster esp(SS);
|
||||
|
||||
void send(const char * message) {
|
||||
void send(const char *message) {
|
||||
Serial.print("Master: ");
|
||||
Serial.println(message);
|
||||
esp.writeData(message);
|
||||
|
@ -24,9 +24,9 @@ void setup() {
|
||||
// data has been received from the master. Beware that len is always 32
|
||||
// and the buffer is autofilled with zeroes if data is less than 32 bytes long
|
||||
// It's up to the user to implement protocol for handling data length
|
||||
SPISlave.onData([](uint8_t * data, size_t len) {
|
||||
SPISlave.onData([](uint8_t *data, size_t len) {
|
||||
String message = String((char *)data);
|
||||
(void) len;
|
||||
(void)len;
|
||||
if (message.equals("Hello Slave!")) {
|
||||
SPISlave.setData("Hello Master!");
|
||||
} else if (message.equals("Are you alive?")) {
|
||||
@ -50,7 +50,7 @@ void setup() {
|
||||
// Can be used to exchange small data or status information
|
||||
SPISlave.onStatus([](uint32_t data) {
|
||||
Serial.printf("Status: %u\n", data);
|
||||
SPISlave.setStatus(millis()); //set next status
|
||||
SPISlave.setStatus(millis()); // set next status
|
||||
});
|
||||
|
||||
// The master has read the status register
|
||||
|
Reference in New Issue
Block a user