Skip to content

Commit dee66d5

Browse files
committed
define editor config for clang-format + format SCD30
1 parent 0c96c2c commit dee66d5

File tree

2 files changed

+74
-28
lines changed

2 files changed

+74
-28
lines changed

.editorconfig

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
[*]
2+
cpp_indent_braces=false
3+
cpp_indent_multi_line_relative_to=innermost_parenthesis
4+
cpp_indent_within_parentheses=indent
5+
cpp_indent_preserve_within_parentheses=false
6+
cpp_indent_case_labels=false
7+
cpp_indent_case_contents=true
8+
cpp_indent_case_contents_when_block=false
9+
cpp_indent_lambda_braces_when_parameter=true
10+
cpp_indent_goto_labels=one_left
11+
cpp_indent_preprocessor=leftmost_column
12+
cpp_indent_access_specifiers=false
13+
cpp_indent_namespace_contents=true
14+
cpp_indent_preserve_comments=true
15+
cpp_new_line_before_open_brace_namespace=ignore
16+
cpp_new_line_before_open_brace_type=ignore
17+
cpp_new_line_before_open_brace_function=same_line
18+
cpp_new_line_before_open_brace_block=same_line
19+
cpp_new_line_before_open_brace_lambda=ignore
20+
cpp_new_line_scope_braces_on_separate_lines=false
21+
cpp_new_line_close_brace_same_line_empty_type=false
22+
cpp_new_line_close_brace_same_line_empty_function=false
23+
cpp_new_line_before_catch=true
24+
cpp_new_line_before_else=true
25+
cpp_new_line_before_while_in_do_while=false
26+
cpp_space_before_function_open_parenthesis=remove
27+
cpp_space_within_parameter_list_parentheses=false
28+
cpp_space_between_empty_parameter_list_parentheses=false
29+
cpp_space_after_keywords_in_control_flow_statements=true
30+
cpp_space_within_control_flow_statement_parentheses=false
31+
cpp_space_before_lambda_open_parenthesis=false
32+
cpp_space_within_cast_parentheses=false
33+
cpp_space_after_cast_close_parenthesis=false
34+
cpp_space_within_expression_parentheses=false
35+
cpp_space_before_block_open_brace=true
36+
cpp_space_between_empty_braces=false
37+
cpp_space_before_initializer_list_open_brace=false
38+
cpp_space_within_initializer_list_braces=true
39+
cpp_space_preserve_in_initializer_list=true
40+
cpp_space_before_open_square_bracket=false
41+
cpp_space_within_square_brackets=false
42+
cpp_space_before_empty_square_brackets=false
43+
cpp_space_between_empty_square_brackets=false
44+
cpp_space_group_square_brackets=true
45+
cpp_space_within_lambda_brackets=false
46+
cpp_space_between_empty_lambda_brackets=false
47+
cpp_space_before_comma=false
48+
cpp_space_after_comma=true
49+
cpp_space_remove_around_member_operators=true
50+
cpp_space_before_inheritance_colon=true
51+
cpp_space_before_constructor_colon=true
52+
cpp_space_remove_before_semicolon=true
53+
cpp_space_after_semicolon=false
54+
cpp_space_remove_around_unary_operator=true
55+
cpp_space_around_binary_operator=insert
56+
cpp_space_around_assignment_operator=insert
57+
cpp_space_pointer_reference_alignment=left
58+
cpp_space_around_ternary_operator=insert
59+
cpp_wrap_preserve_blocks=one_liners

src/components/i2c/drivers/WipperSnapper_I2C_Driver_SCD30.h

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ class WipperSnapper_I2C_Driver_SCD30 : public WipperSnapper_I2C_Driver
3737
7-bit device address.
3838
*/
3939
/*******************************************************************************/
40-
WipperSnapper_I2C_Driver_SCD30(TwoWire *i2c, uint16_t sensorAddress)
41-
: WipperSnapper_I2C_Driver(i2c, sensorAddress)
42-
{
40+
WipperSnapper_I2C_Driver_SCD30(TwoWire* i2c, uint16_t sensorAddress)
41+
: WipperSnapper_I2C_Driver(i2c, sensorAddress) {
4342
_i2c = i2c;
4443
_sensorAddress = sensorAddress;
4544
}
@@ -50,8 +49,7 @@ class WipperSnapper_I2C_Driver_SCD30 : public WipperSnapper_I2C_Driver
5049
@returns True if initialized successfully, False otherwise.
5150
*/
5251
/*******************************************************************************/
53-
bool begin()
54-
{
52+
bool begin() {
5553
_scd = new Adafruit_SCD30();
5654
return _scd->begin((uint8_t)_sensorAddress, _i2c);
5755
}
@@ -62,26 +60,21 @@ class WipperSnapper_I2C_Driver_SCD30 : public WipperSnapper_I2C_Driver
6260
@returns True if the sensor was read successfully, False otherwise.
6361
*/
6462
/*******************************************************************************/
65-
bool readSensor()
66-
{
63+
bool readSensor() {
6764
// dont read sensor more than once per second
68-
if (_lastRead != 0 && millis() - _lastRead < 1000)
69-
{
65+
if (_lastRead != 0 && millis() - _lastRead < 1000) {
7066
return true;
7167
}
7268

73-
if (!_scd->dataReady())
74-
{
69+
if (!_scd->dataReady()) {
7570
delay(100);
76-
if (!_scd->dataReady())
77-
{
71+
if (!_scd->dataReady()) {
7872
return false;
7973
}
8074
}
8175
sensors_event_t tempEvent;
8276
sensors_event_t humidEvent;
83-
if (!_scd->getEvent(&humidEvent, &tempEvent))
84-
{
77+
if (!_scd->getEvent(&humidEvent, &tempEvent)) {
8578
return false;
8679
}
8780
_temperature = tempEvent.temperature;
@@ -100,11 +93,9 @@ class WipperSnapper_I2C_Driver_SCD30 : public WipperSnapper_I2C_Driver
10093
otherwise.
10194
*/
10295
/*******************************************************************************/
103-
bool getEventAmbientTemp(sensors_event_t *tempEvent)
104-
{
96+
bool getEventAmbientTemp(sensors_event_t* tempEvent) {
10597
// check if sensor is enabled and data is available
106-
if (!readSensor())
107-
{
98+
if (!readSensor()) {
10899
return false;
109100
}
110101

@@ -121,11 +112,9 @@ class WipperSnapper_I2C_Driver_SCD30 : public WipperSnapper_I2C_Driver
121112
otherwise.
122113
*/
123114
/*******************************************************************************/
124-
bool getEventRelativeHumidity(sensors_event_t *humidEvent)
125-
{
115+
bool getEventRelativeHumidity(sensors_event_t* humidEvent) {
126116
// check if sensor is enabled and data is available
127-
if (!readSensor())
128-
{
117+
if (!readSensor()) {
129118
return false;
130119
}
131120

@@ -142,11 +131,9 @@ class WipperSnapper_I2C_Driver_SCD30 : public WipperSnapper_I2C_Driver
142131
otherwise.
143132
*/
144133
/*******************************************************************************/
145-
bool getEventCO2(sensors_event_t *co2Event)
146-
{
134+
bool getEventCO2(sensors_event_t* co2Event) {
147135
// check if sensor is enabled and data is available
148-
if (!readSensor())
149-
{
136+
if (!readSensor()) {
150137
return false;
151138
}
152139

@@ -155,7 +142,7 @@ class WipperSnapper_I2C_Driver_SCD30 : public WipperSnapper_I2C_Driver
155142
}
156143

157144
protected:
158-
Adafruit_SCD30 *_scd = nullptr; ///< SCD30 driver object
145+
Adafruit_SCD30* _scd = nullptr; ///< SCD30 driver object
159146
ulong _lastRead = 0; ///< Last time the sensor was read
160147
float _temperature = 0; ///< Temperature
161148
float _humidity = 0; ///< Relative Humidity

0 commit comments

Comments
 (0)