Merge main into unifyDockerDevcontainer

Author: BloodStainedCrow

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -41,10 +41,10 @@ body:
     attributes:
       label: Version
       description: |
-        What [version of the firmware](https://github.com/JF002/InfiniTime/blob/develop/doc/gettingStarted/gettingStarted-1.0.md#how-to-check-the-version-of-infinitime-and-the-bootloader) are you running?
-        If you are running an older version, please consider [updating to the latest firmware](https://github.com/JF002/InfiniTime/blob/develop/doc/gettingStarted/gettingStarted-1.0.md#how-to-update-your-pinetime).
+        What [version of the firmware](https://github.com/InfiniTimeOrg/InfiniTime/blob/main/doc/gettingStarted/updating-software.md#checking-the-version-of-infinitime) are you running?
+        If you are running an older version, please consider [updating to the latest firmware](https://github.com/InfiniTimeOrg/InfiniTime/blob/main/doc/gettingStarted/updating-software.md#updating-with-companion-apps).
         If you are running directly from git, specify the branch or the commit hash directly.
-      placeholder: "Ex. v1.6.0 or develop or fc922b60"
+      placeholder: "Ex. v1.11.0 or main or fc922b60"
     validations:
       required: true
   - type: input

.github/ISSUE_TEMPLATE/issue-report.yaml

@@ -23,9 +23,9 @@ body:
   attributes:
     label: Version
     description: |
-      What [version of the firmware](https://github.com/JF002/InfiniTime/blob/develop/doc/gettingStarted/gettingStarted-1.0.md#how-to-check-the-version-of-infinitime-and-the-bootloader) are you running?
-      If you are running an older version, please consider [updating to the latest firmware](https://github.com/JF002/InfiniTime/blob/develop/doc/gettingStarted/gettingStarted-1.0.md#how-to-update-your-pinetime).
+      What [version of the firmware](https://github.com/InfiniTimeOrg/InfiniTime/blob/main/doc/gettingStarted/updating-software.md#checking-the-version-of-infinitime) are you running?
+      If you are running an older version, please consider [updating to the latest firmware](https://github.com/InfiniTimeOrg/InfiniTime/blob/main/doc/gettingStarted/updating-software.md#updating-with-companion-apps).
       If you are running directly from git, specify the branch or the commit hash directly.
-    placeholder: Ex. v1.6.0 or develop or fc922b60
+    placeholder: Ex. v1.11.0 or main or fc922b60
   validations:
     required: false

.github/workflows/docker.yml

@@ -2,11 +2,11 @@ name: Build and push Docker image
 
 on:
   push:
-    branches: [ develop ]
+    branches: [ main ]
     paths:
       - 'docker/**'
   pull_request:
-    branches: [ develop ]
+    branches: [ main ]
     paths:
       - 'docker/**'
   # Allows you to run this workflow manually from the Actions tab

.github/workflows/format.yml

@@ -2,7 +2,7 @@ name: Code formatting
 
 on:
   pull_request:
-    branches: [ develop ]
+    branches: [ main ]
     paths:
       - '**.cpp'
       - '**.h'

.github/workflows/main.yml

@@ -3,12 +3,12 @@ name: CI
 # Run this workflow whenever the build may be affected
 on:
   push:
-    branches: [ master, develop ]
+    branches: [ main ]
     paths-ignore:
       - 'doc/**'
       - '**.md'
   pull_request:
-    branches: [ develop ]
+    branches: [ main ]
     paths-ignore:
       - 'doc/**'
       - '**.md'

.github/workflows/pr-comment.yml

@@ -5,7 +5,7 @@ name: PR comment
 
 on:
   pull_request_target:
-    branches: [ develop ]
+    branches: [ main ]
     paths-ignore:
       - 'doc/**'
       - '**.md'
@@ -23,9 +23,16 @@ jobs:
         ref: ${{ github.event.pull_request.head.sha }}
 
     - if: steps.wait-for-build.outputs.conclusion != 'success'
-      run: exit 1
+      run: |
+        tee comment << EOF
+        Build checks have not completed. Possible reasons for this are:
+        1. The checks need to be approved by a maintainer
+        2. The branch has conflicts
+        3. The firmware build has failed
+        EOF
 
-    - name: Download artifact
+    - if: steps.wait-for-build.outputs.conclusion == 'success'
+      name: Download artifact
       uses: dawidd6/action-download-artifact@bd10f381a96414ce2b13a11bfa89902ba7cea07f
       with:
         workflow: main.yml
@@ -39,7 +46,6 @@ jobs:
       with:
         issue-number: ${{ github.event.pull_request.number }}
         comment-author: 'github-actions[bot]'
-        body-includes: Build size and comparison to
 
     - name: Create or update comment
       uses: peter-evans/create-or-update-comment@5adcb0bb0f9fb3f95ef05400558bdb3f329ee808

.gitmodules

@@ -1,12 +1,9 @@
 [submodule "src/libs/lvgl"]
 	path = src/libs/lvgl
-	url = https://github.com/joaquimorg/lvgl.git
+	url = https://github.com/InfiniTimeOrg/lvgl.git
 [submodule "src/libs/littlefs"]
 	path = src/libs/littlefs
 	url = https://github.com/littlefs-project/littlefs.git
 [submodule "src/libs/QCBOR"]
 	path = src/libs/QCBOR
 	url = https://github.com/laurencelundblade/QCBOR.git
-[submodule "src/libs/date"]
-	path = src/libs/date
-	url = https://github.com/HowardHinnant/date.git

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10)
 
 set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose Debug or Release")
 
-project(pinetime VERSION 1.11.0 LANGUAGES C CXX ASM)
+project(pinetime VERSION 1.12.0 LANGUAGES C CXX ASM)
 
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_CXX_STANDARD 14)

CONTRIBUTING.md

@@ -6,7 +6,7 @@ Here are things you can do to help.
 - [Write and improve documentation](#documentation)
 - [Fix bugs, add functionalities and improve the code](#how-to-create-a-pull-request)
 - Participate in the discussions within issues and PRs. Your feedback is appreciated!
-- Review pull requests. Follow the instructions [here](maintainer-guide.md#reviewing-prs)
+- Review pull requests. Follow the instructions [here](doc/maintainer-guide.md#reviewing-prs)
 
 ## Documentation
 
@@ -22,7 +22,7 @@ The workflow is based on [GitHub flow](https://docs.github.com/en/get-started/qu
 
 To create a pull request,
 you need a [fork](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/about-forks) of the repo.
-Create a new [branch](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches) from develop,
+Create a new [branch](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches) from main,
 make changes in this branch,
 [commit](https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/about-commits) them,
 and create a [pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request).
@@ -31,11 +31,11 @@ and create a [pull request](https://docs.github.com/en/pull-requests/collaborati
 
 When making changes to the firmware:
 
-- Consider if your feature aligns with the [InfiniTime vision](InfiniTimeVision.md)
+- Consider if your feature aligns with the [InfiniTime vision](doc/InfiniTimeVision.md)
 - Test your changes on a PineTime or InfiniSim
-- Make sure the code conforms to the [coding conventions](coding-convention.md)
+- Make sure the code conforms to the [coding conventions](doc/coding-convention.md)
 
-You can also check the [maintainer's guide](maintainer-guide.md)
+You can also check the [maintainer's guide](doc/maintainer-guide.md)
 for what maintainers will look at in PRs.
 
 ### Commit conventions

README.md

@@ -1,7 +1,5 @@
 # [InfiniTime](https://github.com/InfiniTimeOrg/InfiniTime)
 
-[![Build PineTime Firmware](https://github.com/InfiniTimeOrg/InfiniTime/workflows/Build%20PineTime%20Firmware/badge.svg?branch=master)](https://github.com/InfiniTimeOrg/InfiniTime/actions)
-
 ![InfiniTime logo](doc/logo/infinitime-logo-small.jpg "InfiniTime Logo")
 
 Fast open-source firmware for the [PineTime smartwatch](https://www.pine64.org/pinetime/) with many features, written in modern C++.