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

Format header files

Browse Source 
In my PR updating clang-format, I forgot to also format the headers.
This commit is contained in:
Finlay Davidson
2023-01-07 21:23:15 +01:00
committed by JF
parent 09db67e003
commit 96165a8541
55 changed files with 144 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/alarm/AlarmController.h
View File

@@ -26,6 +26,7 @@ namespace Pinetime {
namespace System {
class SystemTask;
}
namespace Controllers {
class AlarmController {
public:
@@ -40,18 +41,23 @@ namespace Pinetime {
void StopAlerting();
enum class AlarmState { Not_Set, Set, Alerting };
enum class RecurType { None, Daily, Weekdays };
uint8_t Hours() const {
return hours;
}
uint8_t Minutes() const {
return minutes;
}
AlarmState State() const {
return state;
}
RecurType Recurrence() const {
return recurrence;
}
void SetRecurrence(RecurType recurType) {
recurrence = recurType;
}

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

@@ -17,6 +17,7 @@ namespace Pinetime {
uint8_t PercentRemaining() const {
return percentRemaining;
}
bool BatteryIsLow() const {
return percentRemaining <= lowBatteryThreshold;
}

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

@@ -16,6 +16,7 @@ namespace Pinetime {
namespace System {
class SystemTask;
}
namespace Controllers {
class NotificationManager;

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

@@ -9,8 +9,10 @@ namespace Pinetime {
namespace System {
class SystemTask;
}
namespace Controllers {
class Battery;
class BatteryInformationService {
public:
BatteryInformationService(Controllers::Battery& batteryController);

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

@@ -24,6 +24,7 @@ namespace Pinetime {
void StopFirmwareUpdate();
void FirmwareUpdateTotalBytes(uint32_t totalBytes);
void FirmwareUpdateCurrentBytes(uint32_t currentBytes);
void State(FirmwareUpdateStates state) {
firmwareUpdateState = state;
}
@@ -31,12 +32,15 @@ namespace Pinetime {
bool IsFirmwareUpdating() const {
return isFirmwareUpdating;
}
uint32_t FirmwareUpdateTotalBytes() const {
return firmwareUpdateTotalBytes;
}
uint32_t FirmwareUpdateCurrentBytes() const {
return firmwareUpdateCurrentBytes;
}
FirmwareUpdateStates State() const {
return firmwareUpdateState;
}
@@ -44,15 +48,19 @@ namespace Pinetime {
void Address(BleAddress&& addr) {
address = addr;
}
const BleAddress& Address() const {
return address;
}
void AddressType(AddressTypes t) {
addressType = t;
}
void SetPairingKey(uint32_t k) {
pairingKey = k;
}
uint32_t GetPairingKey() const {
return pairingKey;
}

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

@@ -19,12 +19,15 @@ namespace Pinetime {
bool OnDiscoveryEvent(uint16_t connectionHandle, const ble_gatt_error* error, const ble_gatt_svc* service);
int OnCharacteristicDiscoveryEvent(uint16_t conn_handle, const ble_gatt_error* error, const ble_gatt_chr* characteristic);
int OnCurrentTimeReadResult(uint16_t conn_handle, const ble_gatt_error* error, const ble_gatt_attr* attribute);
static constexpr const ble_uuid16_t* Uuid() {
return &CurrentTimeClient::ctsServiceUuid;
}
static constexpr const ble_uuid16_t* CurrentTimeCharacteristicUuid() {
return &CurrentTimeClient::currentTimeCharacteristicUuid;
}
void Discover(uint16_t connectionHandle, std::function<void(uint16_t)> lambda) override;
private:

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

@@ -13,9 +13,11 @@ namespace Pinetime {
namespace System {
class SystemTask;
}
namespace Drivers {
class SpiNorFlash;
}
namespace Controllers {
class Ble;
@@ -46,10 +48,12 @@ namespace Pinetime {
void OnNotificationTimer();
void Reset();
};
class DfuImage {
public:
DfuImage(Pinetime::Drivers::SpiNorFlash& spiNorFlash) : spiNorFlash {spiNorFlash} {
}
void Init(size_t chunkSize, size_t totalSize, uint16_t expectedCrc);
void Erase();
void Append(uint8_t* data, size_t size);

6
src/components/ble/FSService.h
View File

@@ -11,8 +11,10 @@ namespace Pinetime {
namespace System {
class SystemTask;
}
namespace Controllers {
class Ble;
class FSService {
public:
FSService(Pinetime::System::SystemTask& systemTask, Pinetime::Controllers::FS& fs);
@@ -71,6 +73,7 @@ namespace Pinetime {
FSState state;
char filepath[maxpathlen]; // TODO ..ugh fixed filepath len
int fileSize;
using ReadHeader = struct __attribute__((packed)) {
commands command;
uint8_t padding;
@@ -89,6 +92,7 @@ namespace Pinetime {
uint32_t chunklen;
uint8_t chunk[];
};
using ReadPacing = struct __attribute__((packed)) {
commands command;
uint8_t status;
@@ -124,6 +128,7 @@ namespace Pinetime {
uint32_t dataSize;
uint8_t data[];
};
using ListDirHeader = struct __attribute__((packed)) {
commands command;
uint8_t padding;
@@ -171,6 +176,7 @@ namespace Pinetime {
commands command;
uint8_t status;
};
using MoveHeader = struct __attribute__((packed)) {
commands command;
uint8_t padding;

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

@@ -10,8 +10,10 @@ namespace Pinetime {
namespace System {
class SystemTask;
}
namespace Controllers {
class HeartRateController;
class HeartRateService {
public:
HeartRateService(Pinetime::System::SystemTask& system, Controllers::HeartRateController& heartRateController);

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

@@ -9,8 +9,10 @@ namespace Pinetime {
namespace System {
class SystemTask;
}
namespace Controllers {
class NotificationManager;
class ImmediateAlertService {
public:
enum class Levels : uint8_t { NoAlert = 0, MildAlert = 1, HighAlert = 2 };

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

@@ -10,8 +10,10 @@ namespace Pinetime {
namespace System {
class SystemTask;
}
namespace Controllers {
class MotionController;
class MotionService {
public:
MotionService(Pinetime::System::SystemTask& system, Controllers::MotionController& motionController);

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

@@ -30,6 +30,7 @@ namespace Pinetime {
namespace System {
class SystemTask;
}
namespace Controllers {
class MusicService {
public:

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

@@ -30,6 +30,7 @@ namespace Pinetime {
namespace System {
class SystemTask;
}
namespace Controllers {
class NavigationService {

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

@@ -58,12 +58,15 @@ namespace Pinetime {
Pinetime::Controllers::MusicService& music() {
return musicService;
};
Pinetime::Controllers::NavigationService& navigation() {
return navService;
};
Pinetime::Controllers::AlertNotificationService& alertService() {
return anService;
};
Pinetime::Controllers::WeatherService& weather() {
return weatherService;
};

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

@@ -51,9 +51,11 @@ namespace Pinetime {
static constexpr size_t MaximumMessageSize() {
return MessageSize;
};
bool IsEmpty() const {
return size == 0;
}
size_t NbNotifications() const;
private:

1
src/components/ble/weather/WeatherService.h
View File

@@ -39,6 +39,7 @@ namespace Pinetime {
namespace System {
class SystemTask;
}
namespace Controllers {
class WeatherService {

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

@@ -9,6 +9,7 @@ namespace Pinetime {
namespace System {
class SystemTask;
}
namespace Controllers {
class DateTime {
public:
@@ -51,24 +52,31 @@ namespace Pinetime {
void SetTimeZone(int8_t timezone, int8_t dst);
void UpdateTime(uint32_t systickCounter);
uint16_t Year() const {
return year;
}
Months Month() const {
return month;
}
uint8_t Day() const {
return day;
}
Days DayOfWeek() const {
return dayOfWeek;
}
uint8_t Hours() const {
return hour;
}
uint8_t Minutes() const {
return minute;
}
uint8_t Seconds() const {
return second;
}
@@ -117,9 +125,11 @@ namespace Pinetime {
std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> CurrentDateTime() const {
return currentDateTime;
}
std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> UTCDateTime() const {
return currentDateTime - std::chrono::seconds((tzOffset + dstOffset) * 15 * 60);
}
std::chrono::seconds Uptime() const {
return uptime;
}

1
src/components/fs/FS.h
View File

@@ -35,6 +35,7 @@ namespace Pinetime {
static size_t getSize() {
return size;
}
static size_t getBlockSize() {
return blockSize;
}

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

@@ -10,6 +10,7 @@ namespace Pinetime {
namespace Drivers {
class St7789;
}
namespace Components {
class Gfx : public Pinetime::Drivers::BufferProvider {
public:
@@ -33,9 +34,11 @@ namespace Pinetime {
static constexpr uint8_t height = 240;
enum class Action { None, FillRectangle, DrawChar };
struct State {
State() : busy {false}, action {Action::None}, remainingIterations {0}, currentIteration {0} {
}
volatile bool busy;
volatile Action action;
volatile uint16_t remainingIterations;

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

@@ -7,9 +7,11 @@ namespace Pinetime {
namespace Applications {
class HeartRateTask;
}
namespace System {
class SystemTask;
}
namespace Controllers {
class HeartRateController {
public:
@@ -21,9 +23,11 @@ namespace Pinetime {
void Update(States newState, uint8_t heartRate);
void SetHeartRateTask(Applications::HeartRateTask* task);
States State() const {
return state;
}
uint8_t HeartRate() const {
return heartRate;
}

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

@@ -19,12 +19,15 @@ namespace Pinetime {
int16_t X() const {
return x;
}
int16_t Y() const {
return y;
}
int16_t Z() const {
return z;
}
uint32_t NbSteps() const {
return nbSteps;
}
@@ -32,6 +35,7 @@ namespace Pinetime {
void ResetTrip() {
currentTripSteps = 0;
}
uint32_t GetTripSteps() const {
return currentTripSteps;
}
@@ -40,6 +44,7 @@ namespace Pinetime {
bool Should_RaiseWake(bool isSleeping);
int32_t currentShakeSpeed();
void IsSensorOk(bool isOk);
bool IsSensorOk() const {
return isSensorOk;
}

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

@@ -45,6 +45,7 @@ namespace Pinetime {
Colors ColorBG = Colors::Black;
PTSGaugeStyle gaugeStyle = PTSGaugeStyle::Full;
};
struct WatchFaceInfineat {
bool showSideCover = true;
int colorIndex = 0;
@@ -66,6 +67,7 @@ namespace Pinetime {
}
settings.clockFace = face;
};
uint8_t GetClockFace() const {
return settings.clockFace;
};
@@ -76,6 +78,7 @@ namespace Pinetime {
}
settings.chimesOption = chimeOption;
};
ChimesOption GetChimeOption() const {
return settings.chimesOption;
};
@@ -85,6 +88,7 @@ namespace Pinetime {
settingsChanged = true;
settings.PTS.ColorTime = colorTime;
};
Colors GetPTSColorTime() const {
return settings.PTS.ColorTime;
};
@@ -94,6 +98,7 @@ namespace Pinetime {
settingsChanged = true;
settings.PTS.ColorBar = colorBar;
};
Colors GetPTSColorBar() const {
return settings.PTS.ColorBar;
};
@@ -103,6 +108,7 @@ namespace Pinetime {
settingsChanged = true;
settings.PTS.ColorBG = colorBG;
};
Colors GetPTSColorBG() const {
return settings.PTS.ColorBG;
};
@@ -113,6 +119,7 @@ namespace Pinetime {
settingsChanged = true;
}
};
bool GetInfineatShowSideCover() const {
return settings.watchFaceInfineat.showSideCover;
};
@@ -123,6 +130,7 @@ namespace Pinetime {
settingsChanged = true;
}
};
int GetInfineatColorIndex() const {
return settings.watchFaceInfineat.colorIndex;
};
@@ -132,6 +140,7 @@ namespace Pinetime {
settingsChanged = true;
settings.PTS.gaugeStyle = gaugeStyle;
};
PTSGaugeStyle GetPTSGaugeStyle() const {
return settings.PTS.gaugeStyle;
};
@@ -147,6 +156,7 @@ namespace Pinetime {
void SetSettingsMenu(uint8_t menu) {
settingsMenu = menu;
};
uint8_t GetSettingsMenu() const {
return settingsMenu;
};
@@ -157,6 +167,7 @@ namespace Pinetime {
}
settings.clockType = clocktype;
};
ClockType GetClockType() const {
return settings.clockType;
};
@@ -167,6 +178,7 @@ namespace Pinetime {
}
settings.notificationStatus = status;
};
Notification GetNotificationStatus() const {
return settings.notificationStatus;
};
@@ -255,6 +267,7 @@ namespace Pinetime {
Pinetime::Controllers::FS& fs;
static constexpr uint32_t settingsVersion = 0x0004;
struct SettingsData {
uint32_t version = settingsVersion;
uint32_t stepsGoal = 10000;

1
src/components/timer/TimerController.h
View File

@@ -7,6 +7,7 @@ namespace Pinetime {
namespace System {
class SystemTask;
}
namespace Controllers {
class TimerController {