Skip to content

Commit 6429609

Browse files
authored
Add cpp format (#30)
1 parent 038282e commit 6429609

File tree

17 files changed

+869
-972
lines changed

17 files changed

+869
-972
lines changed

.clang-format

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
BasedOnStyle: Google
2+
ColumnLimit: 0

.github/workflows/clang_format.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Clang formatting
2+
3+
on:
4+
push:
5+
branches: [master]
6+
pull_request:
7+
branches: [master]
8+
9+
jobs:
10+
clang-format-check:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout code
14+
uses: actions/checkout@v2
15+
- name: Install Clang Format
16+
run: sudo apt-get install -y clang-format
17+
- name: Check Clang Format for arduino_lib
18+
run: |
19+
find arduino_lib -name '*.cpp' -o -name '*.h' | xargs clang-format -i
20+
git diff --exit-code
21+
- name: Check Clang Format for sketches
22+
run: |
23+
find arduino_lib -name '*.cpp' -o -name '*.h' | xargs clang-format -i
24+
git diff --exit-code

arduino_lib/ArduinoAtomS3Hardware.h

Lines changed: 13 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,57 +2,35 @@
22

33
#define SERIAL_CLASS HWCDC
44

5-
class ArduinoHardware
6-
{
7-
public:
8-
ArduinoHardware(SERIAL_CLASS* io, long baud = 57600)
9-
{
5+
class ArduinoHardware {
6+
public:
7+
ArduinoHardware(SERIAL_CLASS* io, long baud = 57600) {
108
iostream = io;
119
baud_ = baud;
1210
}
13-
ArduinoHardware()
14-
{
11+
ArduinoHardware() {
1512
iostream = &Serial;
1613
baud_ = 57600;
1714
}
18-
ArduinoHardware(ArduinoHardware& h)
19-
{
15+
ArduinoHardware(ArduinoHardware& h) {
2016
this->iostream = h.iostream;
2117
this->baud_ = h.baud_;
2218
}
2319

24-
void setBaud(long baud)
25-
{
26-
this->baud_ = baud;
27-
}
20+
void setBaud(long baud) { this->baud_ = baud; }
2821

29-
int getBaud()
30-
{
31-
return baud_;
32-
}
22+
int getBaud() { return baud_; }
3323

34-
void init()
35-
{
36-
iostream->begin(baud_);
37-
}
24+
void init() { iostream->begin(baud_); }
3825

39-
int read()
40-
{
41-
return iostream->read();
42-
};
43-
void write(uint8_t* data, int length)
44-
{
45-
for (int i = 0; i < length; i++)
46-
iostream->write(data[i]);
26+
int read() { return iostream->read(); };
27+
void write(uint8_t* data, int length) {
28+
for (int i = 0; i < length; i++) iostream->write(data[i]);
4729
}
4830

49-
unsigned long time()
50-
{
51-
return millis();
52-
}
31+
unsigned long time() { return millis(); }
5332

54-
protected:
33+
protected:
5534
SERIAL_CLASS* iostream;
5635
long baud_;
5736
};
58-

arduino_lib/devices/stickv2_util.h

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,34 @@
22
#define STICKV2_UTIL_H
33

44
#include <Arduino.h>
5-
65
#include <ArduinoJson.h>
76

87
#define BUFSIZE 2048
98

10-
bool send_data_to_serial(HardwareSerial &serial, StaticJsonDocument<BUFSIZE> &doc)
11-
{
12-
String request;
13-
serializeJson(doc, request);
14-
serial.println(request);
15-
return true;
9+
bool send_data_to_serial(HardwareSerial &serial,
10+
StaticJsonDocument<BUFSIZE> &doc) {
11+
String request;
12+
serializeJson(doc, request);
13+
serial.println(request);
14+
return true;
1615
}
1716

18-
bool read_data_from_serial(HardwareSerial &serial, StaticJsonDocument<BUFSIZE> &doc)
19-
{
20-
String response = serial.readStringUntil('\n');
21-
DeserializationError error = deserializeJson(doc, response);
22-
if (error)
23-
{
24-
return false;
25-
}
26-
return true;
17+
bool read_data_from_serial(HardwareSerial &serial,
18+
StaticJsonDocument<BUFSIZE> &doc) {
19+
String response = serial.readStringUntil('\n');
20+
DeserializationError error = deserializeJson(doc, response);
21+
if (error) {
22+
return false;
23+
}
24+
return true;
2725
}
2826

29-
bool set_object_recognition_model(HardwareSerial &serial, const String &model_path)
30-
{
31-
StaticJsonDocument<BUFSIZE> doc;
32-
doc["function"] = "object_recognition";
33-
doc["args"][0] = model_path;
34-
return send_data_to_serial(serial, doc);
27+
bool set_object_recognition_model(HardwareSerial &serial,
28+
const String &model_path) {
29+
StaticJsonDocument<BUFSIZE> doc;
30+
doc["function"] = "object_recognition";
31+
doc["args"][0] = model_path;
32+
return send_data_to_serial(serial, doc);
3533
}
3634

3735
#endif

arduino_lib/devices/uwb_module_util.h

Lines changed: 20 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define UWB_MODULE_UTIL_H
33

44
#include <Arduino.h>
5+
56
#include <optional>
67

78
/**
@@ -14,30 +15,24 @@ String testUWB(HardwareSerial& serial);
1415
bool resetUWB(HardwareSerial& serial);
1516
bool initUWB(bool tag, int id, HardwareSerial& serial);
1617

17-
std::optional<String> readUWB(HardwareSerial& serial, int timeout = 1000)
18-
{
18+
std::optional<String> readUWB(HardwareSerial& serial, int timeout = 1000) {
1919
String DATA;
2020
auto start = millis();
21-
while (timeout > millis() - start)
22-
{
23-
if (serial.available())
24-
{
21+
while (timeout > millis() - start) {
22+
if (serial.available()) {
2523
DATA = serial.readStringUntil('\n');
2624
return DATA;
2725
}
2826
}
2927
return std::nullopt;
3028
}
3129

32-
std::optional<std::tuple<int, float>> getDistanceUWB(HardwareSerial& serial)
33-
{
30+
std::optional<std::tuple<int, float>> getDistanceUWB(HardwareSerial& serial) {
3431
std::optional<String> ret = readUWB(serial);
35-
if (ret)
36-
{
32+
if (ret) {
3733
auto data = *ret;
3834
auto index = data.indexOf(':');
39-
if (index != -1)
40-
{
35+
if (index != -1) {
4136
auto id_str = data.substring(0, index);
4237
id_str.replace(String("an"), String(""));
4338
auto id = id_str.toInt();
@@ -50,59 +45,45 @@ std::optional<std::tuple<int, float>> getDistanceUWB(HardwareSerial& serial)
5045
return std::nullopt;
5146
}
5247

53-
void clearReadUWB(HardwareSerial& serial, int timeout = 1000)
54-
{
48+
void clearReadUWB(HardwareSerial& serial, int timeout = 1000) {
5549
auto start = millis();
56-
while (timeout > millis() - start)
57-
{
58-
if (serial.available())
59-
{
50+
while (timeout > millis() - start) {
51+
if (serial.available()) {
6052
serial.readStringUntil('\n');
6153
}
6254
}
6355
}
6456

65-
String testUWB(HardwareSerial& serial)
66-
{
57+
String testUWB(HardwareSerial& serial) {
6758
serial.write("AT\r\n");
6859
delay(100);
6960
auto ret = readUWB(serial);
70-
if (ret)
71-
{
61+
if (ret) {
7262
return *ret;
73-
}
74-
else
75-
{
63+
} else {
7664
return "No response";
7765
}
7866
}
7967

80-
bool resetUWB(HardwareSerial& serial)
81-
{
68+
bool resetUWB(HardwareSerial& serial) {
8269
serial.write("AT+RST\r\n");
8370
delay(500);
8471
auto ret = readUWB(serial);
8572
clearReadUWB(serial);
86-
if (ret)
87-
{
73+
if (ret) {
8874
return true;
89-
}
90-
else
91-
{
75+
} else {
9276
return false;
9377
}
9478
}
9579

96-
bool initUWB(bool tag, int id, HardwareSerial& serial)
97-
{
80+
bool initUWB(bool tag, int id, HardwareSerial& serial) {
9881
String DATA;
9982
auto ret = resetUWB(serial);
100-
if (!ret)
101-
{
83+
if (!ret) {
10284
return false;
10385
}
104-
if (tag)
105-
{
86+
if (tag) {
10687
serial.printf("AT+anchor_tag=0\r\n", id);
10788
delay(100);
10889
readUWB(serial);
@@ -116,9 +97,7 @@ bool initUWB(bool tag, int id, HardwareSerial& serial)
11697
serial.write("AT+switchdis=1\r\n");
11798
delay(100);
11899
readUWB(serial);
119-
}
120-
else
121-
{
100+
} else {
122101
serial.printf("AT+anchor_tag=1,%d\r\n", id);
123102
delay(100);
124103
readUWB(serial);

0 commit comments

Comments
 (0)