Skip to content

Commit 6989854

Browse files
committed
Changed access modified indentation
1 parent 40d45d9 commit 6989854

84 files changed

Lines changed: 175 additions & 175 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.clang-format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
Language: Cpp
3-
AccessModifierOffset: 2
3+
AccessModifierOffset: -2
44
AlignAfterOpenBracket: Align
55
AlignConsecutiveMacros: true
66
AlignConsecutiveAssignments: false

src/BootloaderVersion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Pinetime {
44
class BootloaderVersion {
5-
public:
5+
public:
66
static uint32_t Major();
77
static uint32_t Minor();
88
static uint32_t Patch();

src/components/battery/BatteryController.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Pinetime {
1212
is given as the template parameter N.
1313
*/
1414
template <int N> class CircBuffer {
15-
public:
15+
public:
1616
CircBuffer() : arr {}, sz {}, cap {N}, head {} {
1717
}
1818
/**
@@ -32,15 +32,15 @@ namespace Pinetime {
3232
return (sum / sz);
3333
}
3434

35-
private:
35+
private:
3636
std::array<int, N> arr; /**< internal array used to store the values*/
3737
uint8_t sz; /**< The current size of the array.*/
3838
uint8_t cap; /**< Total capacity of the CircBuffer.*/
3939
uint8_t head; /**< The current head of the CircBuffer*/
4040
};
4141

4242
class Battery {
43-
public:
43+
public:
4444
Battery();
4545

4646
void Init();
@@ -61,7 +61,7 @@ namespace Pinetime {
6161
return isPowerPresent;
6262
}
6363

64-
private:
64+
private:
6565
static Battery* instance;
6666
nrf_saadc_value_t saadc_value;
6767

src/components/ble/AlertNotificationClient.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace Pinetime {
1919
class NotificationManager;
2020

2121
class AlertNotificationClient : public BleClient {
22-
public:
22+
public:
2323
explicit AlertNotificationClient(Pinetime::System::SystemTask& systemTask,
2424
Pinetime::Controllers::NotificationManager& notificationManager);
2525

@@ -34,7 +34,7 @@ namespace Pinetime {
3434
void Reset();
3535
void Discover(uint16_t connectionHandle, std::function<void(uint16_t)> lambda) override;
3636

37-
private:
37+
private:
3838
static constexpr uint16_t ansServiceId {0x1811};
3939
static constexpr uint16_t supportedNewAlertCategoryId = 0x2a47;
4040
static constexpr uint16_t supportedUnreadAlertCategoryId = 0x2a48;

src/components/ble/AlertNotificationService.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace Pinetime {
2020
class NotificationManager;
2121

2222
class AlertNotificationService {
23-
public:
23+
public:
2424
AlertNotificationService(Pinetime::System::SystemTask& systemTask, Pinetime::Controllers::NotificationManager& notificationManager);
2525
void Init();
2626

@@ -32,7 +32,7 @@ namespace Pinetime {
3232

3333
enum class IncomingCallResponses : uint8_t { Reject = 0x00, Answer = 0x01, Mute = 0x02 };
3434

35-
private:
35+
private:
3636
enum class Categories : uint8_t {
3737
SimpleAlert = 0x00,
3838
Email = 0x01,

src/components/ble/BatteryInformationService.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ namespace Pinetime {
1212
namespace Controllers {
1313
class Battery;
1414
class BatteryInformationService {
15-
public:
15+
public:
1616
BatteryInformationService(Controllers::Battery& batteryController);
1717
void Init();
1818

1919
int OnBatteryServiceRequested(uint16_t connectionHandle, uint16_t attributeHandle, ble_gatt_access_ctxt* context);
2020

21-
private:
21+
private:
2222
Controllers::Battery& batteryController;
2323
static constexpr uint16_t batteryInformationServiceId {0x180F};
2424
static constexpr uint16_t batteryLevelId {0x2A19};

src/components/ble/BleClient.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace Pinetime {
66
namespace Controllers {
77
class BleClient {
8-
public:
8+
public:
99
virtual void Discover(uint16_t connectionHandle, std::function<void(uint16_t)> lambda) = 0;
1010
};
1111
}

src/components/ble/BleController.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Pinetime {
77
namespace Controllers {
88
class Ble {
9-
public:
9+
public:
1010
using BleAddress = std::array<uint8_t, 6>;
1111
enum class FirmwareUpdateStates { Idle, Running, Validated, Error };
1212
enum class AddressTypes { Public, Random };
@@ -49,7 +49,7 @@ namespace Pinetime {
4949
addressType = t;
5050
}
5151

52-
private:
52+
private:
5353
bool isConnected = false;
5454
bool isFirmwareUpdating = false;
5555
uint32_t firmwareUpdateTotalBytes = 0;

src/components/ble/CurrentTimeClient.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Pinetime {
1212
class DateTime;
1313

1414
class CurrentTimeClient : public BleClient {
15-
public:
15+
public:
1616
explicit CurrentTimeClient(DateTime& dateTimeController);
1717
void Init();
1818
void Reset();
@@ -27,7 +27,7 @@ namespace Pinetime {
2727
}
2828
void Discover(uint16_t connectionHandle, std::function<void(uint16_t)> lambda) override;
2929

30-
private:
30+
private:
3131
typedef struct __attribute__((packed)) {
3232
uint16_t year;
3333
uint8_t month;

src/components/ble/CurrentTimeService.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
namespace Pinetime {
1313
namespace Controllers {
1414
class CurrentTimeService {
15-
public:
15+
public:
1616
CurrentTimeService(DateTime& dateTimeController);
1717
void Init();
1818

1919
int OnTimeAccessed(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt* ctxt);
2020

21-
private:
21+
private:
2222
static constexpr uint16_t ctsId {0x1805};
2323
static constexpr uint16_t ctsCharId {0x2a2b};
2424

0 commit comments

Comments
 (0)