Commit Graph

511 Commits

Author SHA1 Message Date
Avamander
aba3d65e3a Merge remote-tracking branch 'origin-origin/patch-3'
# Conflicts:
#	src/systemtask/SystemTask.cpp
2020-10-04 16:23:13 +03:00
Avamander
77f4d5448b Fixed a small warning with Screen's constructor 2020-10-04 15:14:09 +03:00
Avamander
9b7ba7b5b8 Fixed a typo in SystemTask 2020-10-04 15:13:01 +03:00
Avamander
1d96758acd Minor #include improvements 2020-10-04 15:11:21 +03:00
Avamander
e85d1ffc62 Replaced NULL with nullptr 2020-10-04 15:09:17 +03:00
Avamander
13da1e38f0 Switched from NULL to nullptr 2020-10-04 14:53:11 +03:00
JF
e4f0a95af8 Add coding conventions in contribute.md 2020-10-04 12:52:48 +02:00
JF002
ce44570022
Merge pull request #75 from Avamander/patch-4
Added a code style configuration to the repository
2020-10-04 12:27:29 +02:00
JF002
39954bbd3a
Merge pull request #68 from Avamander/patch-1
Rename folders to follow a consistent style
2020-10-04 12:21:22 +02:00
JF002
5adc97702c
Merge pull request #69 from Avamander/patch-3
Added the nRF52 SVD file for ease-of-use to the repository
2020-10-04 11:52:19 +02:00
Avamander
03bb433e04 Added a code style configuration to the repository 2020-10-03 18:53:00 +03:00
Avamander
d5717c7ee8 Added the nRF52 SVD file for ease-of-use to the repository 2020-10-02 23:11:27 +03:00
Avamander
6c86d1d9d7 Fixed all the includes that were broken due to the renames 2020-10-02 22:16:48 +03:00
Avamander
4daab26926 Renamed displayapp/Screens to displayapp/screens 2020-10-02 21:49:55 +03:00
Avamander
e3fb2f0b89 Renamed DisplayApp/ to displayapp/ 2020-10-02 21:46:41 +03:00
Avamander
30c261028e Renamed Logging/ to logging/ 2020-10-02 21:45:51 +03:00
Avamander
e25c4edbcf Renamed SystemTask/ to systemtask/ 2020-10-02 21:45:21 +03:00
Avamander
40a643d203 Renamed Components/ to components/ 2020-10-02 21:44:27 +03:00
Avamander
455d8319e4 Reformatted the CMakeLists for consistency 2020-10-02 21:43:30 +03:00
Avamander
9348f9936d Renamed documentation folder for consistency 2020-10-02 21:40:25 +03:00
JF
65ecb65b57 Fix changes that were lost in the last revert. 2020-09-28 22:23:56 +02:00
JF
0e2a3d4394 Fix typo 2020-09-28 22:10:33 +02:00
JF002
e26a5afcac Add doc : using OpenOCD and STLinkV2 to flash the firmware 2020-09-28 22:07:54 +02:00
JF
db2b248130 Add missing bootloader binary file. 2020-09-28 21:22:02 +02:00
JF
f3728c41bb Add Immediate Alert Service, needed by the "Find Me" profile from BLE spec. 2020-09-27 20:59:06 +02:00
JF
efd0c9eff7 Merge branch 'batteryInformationService' of JF/PineTime into develop 2020-09-27 20:04:17 +02:00
JF
5d3a974493 Add BatteryInformationService to expose the battery level to BLE host. 2020-09-27 20:02:47 +02:00
JF002
079d437016
Merge pull request #66 from Avamander/patch-4
Added a few more folders to gitignore before they end up in the repository
2020-09-27 13:25:02 +02:00
JF
92d9c58a92 Fix merge from develop to master. 2020-09-27 13:18:54 +02:00
Avamander
f1719b3b92 Added a few more folders to gitignore before they end up in the repository 2020-09-27 14:15:00 +03:00
JF
ffe0eb3a92 Merge branch 'develop' of https://github.com/JF002/Pinetime into develop 2020-09-27 13:10:44 +02:00
JF
1bb7342cdb Backport Github Actions files from master branch. 2020-09-27 13:10:00 +02:00
Lee Lup Yuen
c094f898f8
Undo commit 2020-09-27 19:04:03 +08:00
Lee Lup Yuen
56f5fa8aa1
Undo commit 2020-09-27 19:03:52 +08:00
Lee Lup Yuen
7edb30a685
Undo commit 2020-09-27 19:03:00 +08:00
Lee Lup Yuen
be1add7653
Undo commit 2020-09-27 19:02:46 +08:00
Lee Lup Yuen
7ab48a8c34
Undo commit 2020-09-27 19:02:35 +08:00
Lee Lup Yuen
56266fd1e0
Undo commit 2020-09-27 19:02:20 +08:00
Lee Lup Yuen
6385c28bdb Commit from GitHub Actions 2020-09-27 11:02:03 +00:00
Lee Lup Yuen
255b33ec62 Commit from GitHub Actions 2020-09-27 11:01:28 +00:00
Lee Lup Yuen
d5088ef037 Commit from GitHub Actions 2020-09-27 11:01:03 +00:00
Lee Lup Yuen
499e33626c
Undo commit 2020-09-27 19:01:02 +08:00
Lee Lup Yuen
f955be9bed Commit from GitHub Actions 2020-09-27 11:00:48 +00:00
Lee Lup Yuen
5fe1f7c947
Undo commit 2020-09-27 19:00:38 +08:00
Lee Lup Yuen
4bfd983efe
Undo commit 2020-09-27 19:00:26 +08:00
Lee Lup Yuen
7dada6d943
Undo commit 2020-09-27 19:00:10 +08:00
Lee Lup Yuen
94f5fbe0c2
Undo commit 2020-09-27 18:59:59 +08:00
Lee Lup Yuen
e1bfed9216 Commit from GitHub Actions 2020-09-27 10:59:29 +00:00
Lee Lup Yuen
20970053d4
Undo commit 2020-09-27 18:58:30 +08:00
Lee Lup Yuen
bbe6bf8b20
Delete unused workflow 2020-09-27 18:41:53 +08:00