Compare commits

...

140 Commits

Author SHA1 Message Date
JF 187ea0f06d Merge branch 'develop' of JF/PineTime into master 2022-04-02 16:34:53 +02:00
JF adc7909c98 Merge branch 'develop' of JF/PineTime into master 2022-01-07 17:31:01 +01:00
JF cfef0131b7 Merge branch 'develop' of JF/PineTime into master 2021-11-15 20:50:22 +01:00
Jean-François Milants f6d0ec49e6 Merge branch 'develop'
# Conflicts:
#	doc/buildAndProgram.md
2021-11-11 10:08:20 +01:00
JF f41aaad683 Merge branch 'develop' of JF/PineTime into master 2021-09-28 20:23:12 +02:00
JF 6652ec6f71 Merge branch 'develop' of JF/PineTime into master 2021-09-26 11:16:55 +02:00
JF 6c3d6fb257 Merge branch 'develop' of JF/PineTime into master 2021-09-02 20:35:56 +02:00
JF db6a701644 Merge branch 'develop' of JF/PineTime into master 2021-07-23 11:59:08 +02:00
JF d96395c810 Merge branch 'develop' of JF/PineTime into master 2021-06-20 17:09:24 +02:00
JF fb133a0167 Merge branch 'develop' of JF/PineTime into master 2021-05-21 11:58:49 +02:00
JF de69905c06 Merge branch 'develop' of JF/PineTime into master 2021-05-21 11:38:38 +02:00
JF a80e782f26 Merge branch 'develop' of JF/PineTime into master 2021-04-21 20:19:57 +02:00
JF 24d3eea4fb Merge branch 'develop' of JF/PineTime into master 2021-03-21 18:15:07 +01:00
JF 5cd4b36d6b Merge branch 'develop' of JF/PineTime into master 2021-03-07 21:29:59 +01:00
JF b89c92b71d Merge branch 'develop' of JF/PineTime into master 2021-02-24 20:28:59 +01:00
JF 9d7955b6c0 Merge branch 'develop' of JF/PineTime into master 2021-02-14 16:37:28 +01:00
JF f534fb0356 Merge branch 'develop' of JF/PineTime into master 2021-02-07 18:11:46 +01:00
JF 09bd6fdbc7 Merge branch 'develop' of JF/PineTime into master 2021-02-04 17:57:12 +01:00
JF 3f7360ca18 Merge branch 'develop' of JF/PineTime into master 2021-02-04 17:36:34 +01:00
JF 76ab14fa5f Merge branch 'develop' of JF/PineTime into master 2021-01-23 17:41:29 +01:00
JF 1d940af924 Merge branch 'develop' of JF/PineTime into master 2021-01-04 19:56:56 +01:00
JF 04abc91f15 Merge branch 'develop' into master 2020-11-10 20:32:36 +01:00
JF 65ecb65b57 Fix changes that were lost in the last revert. 2020-09-28 22:23:56 +02:00
JF 92d9c58a92 Fix merge from develop to master. 2020-09-27 13:18:54 +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
Lee Lup Yuen 944194a1d6
Delete unused workflow 2020-09-27 18:41:36 +08:00
Lee Lup Yuen 4c7b6330f8
Upgrade Arm Toolchain to 9-2020-q2. Handle version number in outputs..
Synced from https://github.com/lupyuen/pinetime-lab/blob/master/.github/workflows/main.yml
2020-09-27 18:38:19 +08:00
Lee Lup Yuen 641b1e41b4 Commit from GitHub Actions 2020-09-27 05:18:57 +00:00
Lee Lup Yuen df52d01f8b
Merge branch 'master' into master 2020-09-27 13:14:50 +08:00
JF b6a910e52e Merge branch 'develop' of JF/PineTime into master 2020-09-26 17:09:24 +02:00
Lee Lup Yuen 2a48c5d3ba Commit from GitHub Actions 2020-08-20 03:13:13 +00:00
Lee Lup Yuen 423717c29b
Added doc 2020-08-18 09:07:28 +08:00
Lee Lup Yuen 787a82d905 Commit from GitHub Actions 2020-08-17 17:52:07 +00:00
Lee Lup Yuen 7b16c5eb5c
Delete index.md 2020-08-18 01:50:56 +08:00
Lee Lup Yuen 9578eaca0e Commit from GitHub Actions 2020-08-17 17:45:34 +00:00
Lee Lup Yuen d93591cd4d
Delete index.md 2020-08-18 01:44:24 +08:00
Lee Lup Yuen b009bb5837 Commit from GitHub Actions 2020-08-17 17:35:55 +00:00
Lee Lup Yuen 0fe5ce0fd9 Commit from GitHub Actions 2020-08-17 17:35:28 +00:00
Lee Lup Yuen 4de4bf4099 Commit from GitHub Actions 2020-08-17 17:35:19 +00:00
Lee Lup Yuen 54c9992f59 Commit from GitHub Actions 2020-08-17 17:35:08 +00:00
Lee Lup Yuen 797b8087bc
Add index and lvgl to docs 2020-08-18 01:35:00 +08:00
Lee Lup Yuen e0e33ffb22
Delete lvgl.wasm 2020-08-18 01:34:30 +08:00
Lee Lup Yuen fe56e32250
Delete lvgl.txt 2020-08-18 01:34:22 +08:00
Lee Lup Yuen 3edab78b47
Delete lvgl.old.html 2020-08-18 01:34:14 +08:00
Lee Lup Yuen 77d5e2ec33
Delete lvgl.js 2020-08-18 01:34:03 +08:00
Lee Lup Yuen 2b379b6e37 Commit from GitHub Actions 2020-08-17 17:26:52 +00:00
Lee Lup Yuen e8ec8ff204
Commit docs to GitHub Pages 2020-08-18 01:25:59 +08:00
Lee Lup Yuen c0acab856d
Remove Rust support 2020-08-18 01:20:56 +08:00
Lee Lup Yuen c4162b08d0
Update simulate.yml 2020-08-17 19:31:07 +08:00
Lee Lup Yuen 0226c5bc95
Update simulate.yml 2020-08-17 19:18:45 +08:00
Lee Lup Yuen a72751ba98
Copy files to simulator 2020-08-17 19:13:06 +08:00
Lee Lup Yuen cc1ec5061d
Added lvgl-wasm 2020-08-17 19:02:30 +08:00
Lee Lup Yuen afcaa40505
Create simulate.yml
Copy from https://github.com/lupyuen/pinetime-lab/blob/master/.github/workflows/main.yml
2020-08-17 18:58:03 +08:00
Lee Lup Yuen a17261f0a7
Create DFU package 2020-07-30 14:41:33 +08:00
Lee Lup Yuen 7ff323df58
Update main2.yml 2020-07-29 09:42:08 +08:00
Lee Lup Yuen 774100f0d3
Update main2.yml 2020-07-29 09:36:55 +08:00
Lee Lup Yuen 2574b8db51
Unzip DFU package 2020-07-29 09:21:28 +08:00
Lee Lup Yuen c7b39ff709
Update main2.yml 2020-07-28 15:42:40 +08:00
Lee Lup Yuen 37419e1f26
Update main2.yml 2020-07-28 15:38:13 +08:00
Lee Lup Yuen 29bbb445d7
Update main2.yml 2020-07-28 15:33:37 +08:00
Lee Lup Yuen cca1eafb00
Update main2.yml 2020-07-28 15:21:27 +08:00
Lee Lup Yuen c10538ff46
Update main2.yml 2020-07-28 15:19:11 +08:00
Lee Lup Yuen de2f01bd9b
Update main2.yml 2020-07-28 15:17:36 +08:00
Lee Lup Yuen c29b912c6f
Update main2.yml 2020-07-28 15:11:18 +08:00
Lee Lup Yuen 27af2364a5
Update main2.yml 2020-07-28 15:08:20 +08:00
Lee Lup Yuen ce0446c5e8
Update main2.yml 2020-07-28 15:06:16 +08:00
Lee Lup Yuen 01bf5c35e8
Update main2.yml 2020-07-28 15:03:55 +08:00
Lee Lup Yuen dfd413bcd7
Update main2.yml 2020-07-28 15:02:24 +08:00
Lee Lup Yuen 98c6c5ee88
Update main2.yml 2020-07-28 14:59:54 +08:00
Lee Lup Yuen 885a68d2f4
Update main2.yml 2020-07-28 14:54:34 +08:00
Lee Lup Yuen fdb493bb9c
Update main2.yml 2020-07-28 14:51:26 +08:00
Lee Lup Yuen 9b0292a723
Update main2.yml 2020-07-28 14:48:02 +08:00
Lee Lup Yuen 5d17292e3a
Added wheel 2020-07-28 14:41:36 +08:00
Lee Lup Yuen 57fb9e4ccd
Update main2.yml 2020-07-28 14:34:04 +08:00
Lee Lup Yuen 2ddf1ed2f3
Update main2.yml 2020-07-28 14:29:58 +08:00
Lee Lup Yuen cb5b69b904
Added setuptools 2020-07-28 14:28:38 +08:00
Lee Lup Yuen 6469566cbe
Create DFU package 2020-07-28 14:26:41 +08:00
Lee Lup Yuen 4233997067
Update main2.yml 2020-07-28 14:22:27 +08:00
Lee Lup Yuen 3dcaf6c6c6
Update c-cpp.yml 2020-07-28 14:03:05 +08:00
Lee Lup Yuen 4fd950f2e8
Update main2.yml 2020-07-28 14:00:46 +08:00
Lee Lup Yuen 57507a689c
Update main2.yml 2020-07-28 13:58:29 +08:00
Lee Lup Yuen d91ae6cd50
Update main2.yml 2020-07-28 13:47:08 +08:00
Lee Lup Yuen ea393fac26
Create firmware image 2020-07-28 13:01:36 +08:00
Lee Lup Yuen 6bd617551c
Download MCUBoot 2020-07-28 12:49:37 +08:00
Lee Lup Yuen 4f2e3e1af8
Clean up 2020-07-28 10:40:34 +08:00
Lee Lup Yuen 8d353aa79f
Empty workflow 2020-07-28 10:36:16 +08:00
Lee Lup Yuen 72a5ecd0b6
Empty workflow 2020-07-28 10:34:51 +08:00
Lee Lup Yuen b75c9a8474
Clean up 2020-07-28 10:27:38 +08:00
Lee Lup Yuen c794dbd24b
Add empty rule to prevent errors 2020-07-28 10:27:04 +08:00
Lee Lup Yuen 606bdfeed4
Build mcuboot first 2020-07-27 23:43:12 +08:00
Lee Lup Yuen 724758a13b
Merge pull request #1 from DRG-developer/patch-3
Make the overview header an actual header
2020-07-27 23:11:43 +08:00
Lee Lup Yuen 3ac2321cf0
Copied from main.yml 2020-07-27 23:09:58 +08:00
Dexter 1731bd12d3
Make the overview header an actual header
I was too lazy to fix more, you should pull the file from the orig project to have all the typo's fixed, this is just the most notable error
2020-07-27 13:15:03 +01:00
Lee Lup Yuen 4c4cb06453
Update main.yml 2020-07-27 16:01:58 +08:00
Lee Lup Yuen 1e0ec474b3
Disable parallel build 2020-07-26 22:40:44 +08:00
Lee Lup Yuen 7ed2ee539f
Update Clock.cpp 2020-07-26 21:50:11 +08:00
Lee Lup Yuen 3d2ddcb311
Copied from c-cpp.yml 2020-07-26 19:15:33 +08:00
Lee Lup Yuen dc64676c28
Update c-cpp.yml 2020-07-26 19:12:31 +08:00
Lee Lup Yuen 33270cad7e
Rename artifact 2020-07-22 11:40:22 +08:00
Lee Lup Yuen dc59bde197
Upload firmware 2020-07-22 11:36:42 +08:00
Lee Lup Yuen 44b0893b4a
Find output 2020-07-22 11:33:23 +08:00
Lee Lup Yuen 3e89f9fd49
Parallel make 2020-07-22 11:19:34 +08:00
Lee Lup Yuen 60eb0ac181
Build OK yay! Removed trace 2020-07-22 11:15:15 +08:00
Lee Lup Yuen ea45300e88
Fixing include 2020-07-22 11:10:18 +08:00
Lee Lup Yuen 9f1ce39bcf
Fixed include paths for nRF5 SDK
/home/runner/work/pinetime-lab/pinetime-lab/src/drivers/TwiMaster.cpp:1:10: fatal error: sdk/integration/nrfx/nrfx_log.h: No such file or directory: #include <sdk/integration/nrfx/nrfx_log.h>
2020-07-22 10:52:55 +08:00
Lee Lup Yuen b4c2b4f811
Added sample command 2020-07-22 10:46:56 +08:00
Lee Lup Yuen 9d4e4f0637
Fixing include error
/home/runner/work/pinetime-lab/pinetime-lab/src/drivers/TwiMaster.cpp:1:10: fatal error: sdk/integration/nrfx/nrfx_log.h: No such file or directory
 #include <sdk/integration/nrfx/nrfx_log.h>
2020-07-22 10:34:09 +08:00
Lee Lup Yuen 03bfc7e3db
Update c-cpp.yml 2020-07-22 10:28:26 +08:00
Lee Lup Yuen e5930d54ed
Update c-cpp.yml 2020-07-22 10:21:32 +08:00
Lee Lup Yuen 774325eb12
Update c-cpp.yml 2020-07-22 10:19:12 +08:00
Lee Lup Yuen bc77e36ca4
Update c-cpp.yml 2020-07-22 10:16:21 +08:00
Lee Lup Yuen a29336c268
Update c-cpp.yml 2020-07-22 10:07:44 +08:00
Lee Lup Yuen 2bde1d87ac
Update c-cpp.yml 2020-07-22 04:18:46 +08:00
Lee Lup Yuen 3dc724c7cc
Update c-cpp.yml 2020-07-22 04:12:07 +08:00
Lee Lup Yuen de7bd924b8
Update c-cpp.yml 2020-07-22 04:04:37 +08:00
Lee Lup Yuen bd982816af
Update c-cpp.yml 2020-07-22 03:53:29 +08:00
Lee Lup Yuen e603303061
Update c-cpp.yml 2020-07-22 03:51:27 +08:00
Lee Lup Yuen 613a031f5a
Update c-cpp.yml 2020-07-22 03:42:44 +08:00
Lee Lup Yuen 1e1472b13c
Update c-cpp.yml 2020-07-22 03:40:08 +08:00
Lee Lup Yuen 596bf8e8b7
Update c-cpp.yml 2020-07-22 03:35:08 +08:00
Lee Lup Yuen 372a3c7c8d
Update c-cpp.yml 2020-07-22 03:25:01 +08:00
Lee Lup Yuen fa98ea272d
Update c-cpp.yml 2020-07-22 03:18:01 +08:00
Lee Lup Yuen 9760249bf4
Create c-cpp.yml 2020-07-22 03:02:38 +08:00

Diff Content Not Available