Skip to content

Commit 4cdc1a7

Browse files
committed
Style: Reorder imports, add default value
1 parent 63b5e57 commit 4cdc1a7

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

src/drivers/Bma421.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
#include <libraries/delay/nrf_delay.h>
1+
#include "drivers/Bma421.h"
22
#include "drivers/TwiMaster.h"
33
#include <drivers/Bma421_C/bma423.h>
4-
#include "drivers/Bma421.h"
4+
#include <libraries/delay/nrf_delay.h>
55

66
using namespace Pinetime::Drivers;
7-
87
namespace {
98
int8_t user_i2c_read(uint8_t reg_addr, uint8_t* reg_data, uint32_t length, void* intf_ptr) {
109
auto bma421 = static_cast<Bma421*>(intf_ptr);

src/drivers/Bma421.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3+
#include "drivers/AccelerationSensor.h"
34
#include <drivers/Bma421_C/bma4_defs.h>
4-
#include "AccelerationSensor.h"
55

66
namespace Pinetime {
77
namespace Drivers {

src/drivers/Cst816s.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ namespace Pinetime {
7777
uint8_t chipId;
7878
uint8_t vendorId;
7979
uint8_t fwVersion;
80-
Variant variant;
80+
Variant variant = Variant::Unknown;
8181

8282
bool firstEvent = true;
8383
};

src/drivers/SC7A20.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#include <libraries/delay/nrf_delay.h>
21
#include "drivers/SC7A20.h"
32
#include "drivers/SC7A20/SC7A20_registers.h"
3+
#include <libraries/delay/nrf_delay.h>
44
#include <task.h>
55

66
using namespace Pinetime::Drivers;

src/drivers/SC7A20.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include "AccelerationSensor.h"
3+
#include "drivers/AccelerationSensor.h"
44

55
namespace Pinetime {
66
namespace Drivers {

0 commit comments

Comments
 (0)