CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed access modified indentation

Browse Source
This commit is contained in:
Avamander
2021-04-24 12:00:45 +03:00
parent 40d45d923b
commit 6989854519
84 changed files with 175 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/battery/BatteryController.h
View File

@@ -12,7 +12,7 @@ namespace Pinetime {
is given as the template parameter N.
*/
template <int N> class CircBuffer {
public:
public:
CircBuffer() : arr {}, sz {}, cap {N}, head {} {
}
/**
@@ -32,7 +32,7 @@ namespace Pinetime {
return (sum / sz);
}
private:
private:
std::array<int, N> arr; /**< internal array used to store the values*/
uint8_t sz; /**< The current size of the array.*/
uint8_t cap; /**< Total capacity of the CircBuffer.*/
@@ -40,7 +40,7 @@ namespace Pinetime {
};
class Battery {
public:
public:
Battery();
void Init();
@@ -61,7 +61,7 @@ namespace Pinetime {
return isPowerPresent;
}
private:
private:
static Battery* instance;
nrf_saadc_value_t saadc_value;

4
src/components/ble/AlertNotificationClient.h
View File

@@ -19,7 +19,7 @@ namespace Pinetime {
class NotificationManager;
class AlertNotificationClient : public BleClient {
public:
public:
explicit AlertNotificationClient(Pinetime::System::SystemTask& systemTask,
Pinetime::Controllers::NotificationManager& notificationManager);
@@ -34,7 +34,7 @@ namespace Pinetime {
void Reset();
void Discover(uint16_t connectionHandle, std::function<void(uint16_t)> lambda) override;
private:
private:
static constexpr uint16_t ansServiceId {0x1811};
static constexpr uint16_t supportedNewAlertCategoryId = 0x2a47;
static constexpr uint16_t supportedUnreadAlertCategoryId = 0x2a48;

4
src/components/ble/AlertNotificationService.h
View File

@@ -20,7 +20,7 @@ namespace Pinetime {
class NotificationManager;
class AlertNotificationService {
public:
public:
AlertNotificationService(Pinetime::System::SystemTask& systemTask, Pinetime::Controllers::NotificationManager& notificationManager);
void Init();
@@ -32,7 +32,7 @@ namespace Pinetime {
enum class IncomingCallResponses : uint8_t { Reject = 0x00, Answer = 0x01, Mute = 0x02 };
private:
private:
enum class Categories : uint8_t {
SimpleAlert = 0x00,
Email = 0x01,

4
src/components/ble/BatteryInformationService.h
View File

@@ -12,13 +12,13 @@ namespace Pinetime {
namespace Controllers {
class Battery;
class BatteryInformationService {
public:
public:
BatteryInformationService(Controllers::Battery& batteryController);
void Init();
int OnBatteryServiceRequested(uint16_t connectionHandle, uint16_t attributeHandle, ble_gatt_access_ctxt* context);
private:
private:
Controllers::Battery& batteryController;
static constexpr uint16_t batteryInformationServiceId {0x180F};
static constexpr uint16_t batteryLevelId {0x2A19};

2
src/components/ble/BleClient.h
View File

@@ -5,7 +5,7 @@
namespace Pinetime {
namespace Controllers {
class BleClient {
public:
public:
virtual void Discover(uint16_t connectionHandle, std::function<void(uint16_t)> lambda) = 0;
};
}

4
src/components/ble/BleController.h
View File

@@ -6,7 +6,7 @@
namespace Pinetime {
namespace Controllers {
class Ble {
public:
public:
using BleAddress = std::array<uint8_t, 6>;
enum class FirmwareUpdateStates { Idle, Running, Validated, Error };
enum class AddressTypes { Public, Random };
@@ -49,7 +49,7 @@ namespace Pinetime {
addressType = t;
}
private:
private:
bool isConnected = false;
bool isFirmwareUpdating = false;
uint32_t firmwareUpdateTotalBytes = 0;

4
src/components/ble/CurrentTimeClient.h
View File

@@ -12,7 +12,7 @@ namespace Pinetime {
class DateTime;
class CurrentTimeClient : public BleClient {
public:
public:
explicit CurrentTimeClient(DateTime& dateTimeController);
void Init();
void Reset();
@@ -27,7 +27,7 @@ namespace Pinetime {
}
void Discover(uint16_t connectionHandle, std::function<void(uint16_t)> lambda) override;
private:
private:
typedef struct __attribute__((packed)) {
uint16_t year;
uint8_t month;

4
src/components/ble/CurrentTimeService.h
View File

@@ -12,13 +12,13 @@
namespace Pinetime {
namespace Controllers {
class CurrentTimeService {
public:
public:
CurrentTimeService(DateTime& dateTimeController);
void Init();
int OnTimeAccessed(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt* ctxt);
private:
private:
static constexpr uint16_t ctsId {0x1805};
static constexpr uint16_t ctsCharId {0x2a2b};

4
src/components/ble/DeviceInformationService.h
View File

@@ -9,13 +9,13 @@
namespace Pinetime {
namespace Controllers {
class DeviceInformationService {
public:
public:
DeviceInformationService();
void Init();
int OnDeviceInfoRequested(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt* ctxt);
private:
private:
static constexpr uint16_t deviceInfoId {0x180a};
static constexpr uint16_t manufacturerNameId {0x2a29};
static constexpr uint16_t modelNumberId {0x2a24};

14
src/components/ble/DfuService.h
View File

@@ -20,7 +20,7 @@ namespace Pinetime {
class Ble;
class DfuService {
public:
public:
DfuService(Pinetime::System::SystemTask& systemTask,
Pinetime::Controllers::Ble& bleController,
Pinetime::Drivers::SpiNorFlash& spiNorFlash);
@@ -30,24 +30,24 @@ namespace Pinetime {
void Reset();
class NotificationManager {
public:
public:
NotificationManager();
bool AsyncSend(uint16_t connection, uint16_t charactHandle, uint8_t* data, size_t size);
void Send(uint16_t connection, uint16_t characteristicHandle, const uint8_t* data, const size_t s);
private:
private:
TimerHandle_t timer;
uint16_t connectionHandle = 0;
uint16_t characteristicHandle = 0;
size_t size = 0;
uint8_t buffer[10];
public:
public:
void OnNotificationTimer();
void Reset();
};
class DfuImage {
public:
public:
DfuImage(Pinetime::Drivers::SpiNorFlash& spiNorFlash) : spiNorFlash {spiNorFlash} {
}
void Init(size_t chunkSize, size_t totalSize, uint16_t expectedCrc);
@@ -56,7 +56,7 @@ namespace Pinetime {
bool Validate();
bool IsComplete();
private:
private:
Pinetime::Drivers::SpiNorFlash& spiNorFlash;
static constexpr size_t bufferSize = 200;
bool ready = false;
@@ -73,7 +73,7 @@ namespace Pinetime {
uint16_t ComputeCrc(uint8_t const* p_data, uint32_t size, uint16_t const* p_crc);
};
private:
private:
Pinetime::System::SystemTask& systemTask;
Pinetime::Controllers::Ble& bleController;
DfuImage dfuImage;

4
src/components/ble/HeartRateService.h
View File

@@ -12,13 +12,13 @@ namespace Pinetime {
namespace Controllers {
class HeartRateController;
class HeartRateService {
public:
public:
HeartRateService(Pinetime::System::SystemTask& system, Controllers::HeartRateController& heartRateController);
void Init();
int OnHeartRateRequested(uint16_t connectionHandle, uint16_t attributeHandle, ble_gatt_access_ctxt* context);
void OnNewHeartRateValue(uint8_t hearRateValue);
private:
private:
Pinetime::System::SystemTask& system;
Controllers::HeartRateController& heartRateController;
static constexpr uint16_t heartRateServiceId {0x180D};

4
src/components/ble/ImmediateAlertService.h
View File

@@ -12,14 +12,14 @@ namespace Pinetime {
namespace Controllers {
class NotificationManager;
class ImmediateAlertService {
public:
public:
enum class Levels : uint8_t { NoAlert = 0, MildAlert = 1, HighAlert = 2 };
ImmediateAlertService(Pinetime::System::SystemTask& systemTask, Pinetime::Controllers::NotificationManager& notificationManager);
void Init();
int OnAlertLevelChanged(uint16_t connectionHandle, uint16_t attributeHandle, ble_gatt_access_ctxt* context);
private:
private:
Pinetime::System::SystemTask& systemTask;
NotificationManager& notificationManager;

4
src/components/ble/MusicService.h
View File

@@ -37,7 +37,7 @@ namespace Pinetime {
namespace Controllers {
class MusicService {
public:
public:
explicit MusicService(Pinetime::System::SystemTask& system);
void Init();
@@ -70,7 +70,7 @@ namespace Pinetime {
enum MusicStatus { NotPlaying = 0x00, Playing = 0x01 };
private:
private:
static constexpr uint8_t msId[2] = {0x00, 0x00};
static constexpr uint8_t msEventCharId[2] = {0x01, 0x00};
static constexpr uint8_t msStatusCharId[2] = {0x02, 0x00};

4
src/components/ble/NavigationService.h
View File

@@ -37,7 +37,7 @@ namespace Pinetime {
namespace Controllers {
class NavigationService {
public:
public:
explicit NavigationService(Pinetime::System::SystemTask& system);
void Init();
@@ -52,7 +52,7 @@ namespace Pinetime {
int getProgress();
private:
private:
static constexpr uint8_t navId[2] = {0x01, 0x00};
static constexpr uint8_t navFlagCharId[2] = {0x01, 0x00};
static constexpr uint8_t navNarrativeCharId[2] = {0x02, 0x00};

4
src/components/ble/NimbleController.h
View File

@@ -36,7 +36,7 @@ namespace Pinetime {
class NimbleController {
public:
public:
NimbleController(Pinetime::System::SystemTask& systemTask,
Pinetime::Controllers::Ble& bleController,
DateTime& dateTimeController,
@@ -71,7 +71,7 @@ namespace Pinetime {
uint16_t connHandle();
private:
private:
static constexpr const char* deviceName = "InfiniTime";
Pinetime::System::SystemTask& systemTask;
Pinetime::Controllers::Ble& bleController;

4
src/components/ble/NotificationManager.h
View File

@@ -8,7 +8,7 @@
namespace Pinetime {
namespace Controllers {
class NotificationManager {
public:
public:
enum class Categories {
Unknown,
SimpleAlert,
@@ -52,7 +52,7 @@ namespace Pinetime {
};
size_t NbNotifications() const;
private:
private:
Notification::Id GetNextId();
static constexpr uint8_t TotalNbNotifications = 5;
std::array<Notification, TotalNbNotifications> notifications;

4
src/components/ble/ServiceDiscovery.h
View File

@@ -8,12 +8,12 @@ namespace Pinetime {
class BleClient;
class ServiceDiscovery {
public:
public:
ServiceDiscovery(std::array<BleClient*, 2>&& bleClients);
void StartDiscovery(uint16_t connectionHandle);
private:
private:
BleClient** clientIterator;
std::array<BleClient*, 2> clients;
void OnServiceDiscovered(uint16_t connectionHandle);

4
src/components/brightness/BrightnessController.h
View File

@@ -5,7 +5,7 @@
namespace Pinetime {
namespace Controllers {
class BrightnessController {
public:
public:
enum class Levels { Off, Low, Medium, High };
void Init();
@@ -21,7 +21,7 @@ namespace Pinetime {
const char* GetIcon();
const char* ToString();
private:
private:
static constexpr uint8_t pinLcdBacklight1 = 14;
static constexpr uint8_t pinLcdBacklight2 = 22;
static constexpr uint8_t pinLcdBacklight3 = 23;

4
src/components/datetime/DateTimeController.h
View File

@@ -9,7 +9,7 @@ namespace Pinetime {
}
namespace Controllers {
class DateTime {
public:
public:
enum class Days : uint8_t { Unknown, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday };
enum class Months : uint8_t {
Unknown,
@@ -75,7 +75,7 @@ namespace Pinetime {
return uptime;
}
private:
private:
System::SystemTask& systemTask;
uint16_t year = 0;
Months month = Months::Unknown;

4
src/components/firmwarevalidator/FirmwareValidator.h
View File

@@ -5,13 +5,13 @@
namespace Pinetime {
namespace Controllers {
class FirmwareValidator {
public:
public:
void Validate();
bool IsValidated() const;
void Reset();
private:
private:
static constexpr uint32_t validBitAdress {0x7BFE8};
static constexpr uint32_t validBitValue {1};
};

4
src/components/gfx/Gfx.h
View File

@@ -12,7 +12,7 @@ namespace Pinetime {
}
namespace Components {
class Gfx : public Pinetime::Drivers::BufferProvider {
public:
public:
explicit Gfx(Drivers::St7789& lcd);
void Init();
void ClearScreen();
@@ -28,7 +28,7 @@ namespace Pinetime {
bool GetNextBuffer(uint8_t** buffer, size_t& size) override;
void pixel_draw(uint8_t x, uint8_t y, uint16_t color);
private:
private:
static constexpr uint8_t width = 240;
static constexpr uint8_t height = 240;

4
src/components/heartrate/Biquad.h
View File

@@ -4,11 +4,11 @@ namespace Pinetime {
namespace Controllers {
/// Direct Form II Biquad Filter
class Biquad {
public:
public:
Biquad(float b0, float b1, float b2, float a1, float a2);
float Step(float x);
private:
private:
float b0;
float b1;
float b2;

4
src/components/heartrate/HeartRateController.h
View File

@@ -12,7 +12,7 @@ namespace Pinetime {
}
namespace Controllers {
class HeartRateController {
public:
public:
enum class States { Stopped, NotEnoughData, NoTouch, Running };
explicit HeartRateController(System::SystemTask& systemTask);
@@ -31,7 +31,7 @@ namespace Pinetime {
void SetService(Pinetime::Controllers::HeartRateService* service);
private:
private:
System::SystemTask& systemTask;
Applications::HeartRateTask* task = nullptr;
States state = States::Stopped;

4
src/components/heartrate/Ppg.h
View File

@@ -7,7 +7,7 @@
namespace Pinetime {
namespace Controllers {
class Ppg {
public:
public:
explicit Ppg(float spl);
int Preprocess(float spl);
@@ -16,7 +16,7 @@ namespace Pinetime {
void SetOffset(uint16_t i);
void Reset();
private:
private:
std::array<int, 200> data;
size_t dataIndex = 0;
float offset;

4
src/components/heartrate/Ptagc.h
View File

@@ -3,11 +3,11 @@
namespace Pinetime {
namespace Controllers {
class Ptagc {
public:
public:
Ptagc(float start, float decay, float threshold);
float Step(float spl);
private:
private:
float peak;
float decay;
float boost;

4
src/components/motion/MotionController.h
View File

@@ -5,7 +5,7 @@
namespace Pinetime {
namespace Controllers {
class MotionController {
public:
public:
void Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps);
uint16_t X() const {
@@ -27,7 +27,7 @@ namespace Pinetime {
return isSensorOk;
}
private:
private:
uint32_t nbSteps;
int16_t x;
int16_t y;

4
src/components/motor/MotorController.h
View File

@@ -9,12 +9,12 @@ namespace Pinetime {
static constexpr uint8_t pinMotor = 16;
class MotorController {
public:
public:
MotorController(Controllers::Settings& settingsController);
void Init();
void SetDuration(uint8_t motorDuration);
private:
private:
Controllers::Settings& settingsController;
static void vibrate(void* p_context);
};

4
src/components/rle/RleDecoder.h
View File

@@ -11,13 +11,13 @@ namespace Pinetime {
* Code from https://github.com/daniel-thompson/wasp-bootloader by Daniel Thompson released under the MIT license.
*/
class RleDecoder {
public:
public:
RleDecoder(const uint8_t* buffer, size_t size);
RleDecoder(const uint8_t* buffer, size_t size, uint16_t foregroundColor, uint16_t backgroundColor);
void DecodeNext(uint8_t* output, size_t maxBytes);
private:
private:
const uint8_t* buffer;
size_t size;

4
src/components/settings/Settings.h
View File

@@ -8,7 +8,7 @@
namespace Pinetime {
namespace Controllers {
class Settings {
public:
public:
enum class ClockType { H24, H12 };
enum class Vibration { ON, OFF };
enum class WakeUpMode { None, SingleTap, DoubleTap, RaiseWrist };
@@ -86,7 +86,7 @@ namespace Pinetime {
return settings.brightLevel;
};
private:
private:
Pinetime::Drivers::SpiNorFlash& spiNorFlash;
struct SettingsData {