diff --git a/README.md b/README.md index d3d1130f..765d5d4b 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,8 @@ Fast open-source firmware for the [PineTime smartwatch](https://pine64.org/devic - [Getting started with InfiniTime](doc/gettingStarted/gettingStarted-1.0.md) - [Updating the software](doc/gettingStarted/updating-software.md) - [About the firmware and bootloader](doc/gettingStarted/about-software.md) +- [Available apps](doc/gettingStarted/Applications.md) +- [Available watch faces](/doc/gettingStarted/Watchfaces.md) - [PineTimeStyle Watch face](https://pine64.org/documentation/PineTime/Watchfaces/PineTimeStyle) - [Weather integration](https://pine64.org/documentation/PineTime/Software/InfiniTime_weather/) @@ -35,7 +37,7 @@ Fast open-source firmware for the [PineTime smartwatch](https://pine64.org/devic ### Contributing -- [How to contribute?](CONTRIBUTING.md) +- [How to contribute](CONTRIBUTING.md) - [Coding conventions](doc/coding-convention.md) ### Build, flash and debug diff --git a/doc/gettingStarted/Applications.md b/doc/gettingStarted/Applications.md new file mode 100644 index 00000000..8ca2b252 --- /dev/null +++ b/doc/gettingStarted/Applications.md @@ -0,0 +1,99 @@ +# Applications + +InfiniTime has 13 apps on the `main` branch at the time of writing. + +## List of apps +- Stopwatch +- Alarm +- Timer +- Steps +- Heartrate +- Music +- InfiniPaint +- Paddle +- 2 +- InfiniDice +- Metronome +- Maps +- Weather + +### Stopwatch +![Stopwatch UI](/doc/gettingStarted/AppsScreenshots/stopwatch.png) +- Press the Start button (bottom right) to start or stop the timer. + - You can also press the side button while the timer is running to pause the timer. +- Press the Flag button (bottom left) to add a lap. +- The stopwatch will not yet continue counting time while the app is closed. + +### Alarm +![Alarm UI](/doc/gettingStarted/AppsScreenshots/alarm.png) +- Ajust the time with the time picker. +- Press the Info button in the top middle to see time remaning. +- Use the toggle in the bottom left to turn the alarm on/off. +- Use the button in the bottom right to change the alarm frequency. + - You can choose between once, daily, or Monday - Friday. + +### Timer +![Timer UI](/doc/gettingStarted/AppsScreenshots/timer.png) +- Ajust how long the timer should go for with the time picker. +- Press the Start button at the bottom to start/stop the timer. + +### Steps +![Steps UI](/doc/gettingStarted/AppsScreenshots/steps.png) +- The total count of steps for the current display will show in the middle of the screen. +- The Reset button in the bottom middle resets the Trip counter. (Total of all steps taken.) +- The progress circle shows the percentage of your daily goal completed. + +### Heartrate +![Heartrate UI](/doc/gettingStarted/AppsScreenshots/Heartrate.png) +- Press Start to start measuring your heartrate. + - It may take a bit to get the first measurement. + +### Music +![Music UI](/doc/gettingStarted/AppsScreenshots/Music.png) +- This app shows currently playing music. + - Please note that this app is not very useful without a device connected. +- Press the button in the center to play/pause, and the buttons on the left and right to go to the previous and next tracks, respectively. +- Swipe up to get to volume controls. + +### InfiniPaint +![InfiniPaint UI](/doc/gettingStarted/AppsScreenshots/Paint.png) +- This app does not allow you to swipe from the top to exit, use the side button instead. +- Draw on the screen to add lines. +- Hold down in one spot to change paint colors. + +### Paddle +![Paddle UI](/doc/gettingStarted/AppsScreenshots/Pong.png) +- This app does not allow you to swipe from the top to exit, use the side button instead. +- Drag your finger to move the paddle. +- Goal: Don't let the ball go off the left side of the screen. + +### 2 +![2 UI](/doc/gettingStarted/AppsScreenshots/2048.png) +- This app does not allow you to swipe from the top to exit, use the side button instead. +- Play a game of 2048. +- Swipe up, down, left, or right tomove the tiles. +- When two tiles with the same number run into each other, they will add together. +- Goal: Don't let the screen fill up with tiles, and get to the 2048 tile to win. + +### InfiniDice +![InfiniDice UI](/doc/gettingStarted/AppsScreenshots/Dice.png) +- Ajust the count to change the number of dice. +- Ajust the sides to change the number of sides. +- Press the button at the bottom to roll. +- The result will be on the right side of the screen. + +### Metronome +![Metronome UI](/doc/gettingStarted/AppsScreenshots/Metronome.png) +- Ajust the BPM with the circular slider. + - A bug currently makes it always snap to 98 BPM. +- Use the button in the bottom left to start the metronome. + +### Maps +![Maps UI](/doc/gettingStarted/AppsScreenshots/Maps.png) +- This app shows info from a navigation app. + - Please note that this app is not very useful without a device connected. + +### Weather +![Weather UI](/doc/gettingStarted/AppsScreenshots/Weather.png) +- This app shows weather info. + - Please note that this app is not very useful without a device connected. diff --git a/doc/gettingStarted/AppsScreenshots/2048.png b/doc/gettingStarted/AppsScreenshots/2048.png new file mode 100644 index 00000000..472e4fce Binary files /dev/null and b/doc/gettingStarted/AppsScreenshots/2048.png differ diff --git a/doc/gettingStarted/AppsScreenshots/Dice.png b/doc/gettingStarted/AppsScreenshots/Dice.png new file mode 100644 index 00000000..f5421c83 Binary files /dev/null and b/doc/gettingStarted/AppsScreenshots/Dice.png differ diff --git a/doc/gettingStarted/AppsScreenshots/Heartrate.png b/doc/gettingStarted/AppsScreenshots/Heartrate.png new file mode 100644 index 00000000..ed0470dc Binary files /dev/null and b/doc/gettingStarted/AppsScreenshots/Heartrate.png differ diff --git a/doc/gettingStarted/AppsScreenshots/Maps.png b/doc/gettingStarted/AppsScreenshots/Maps.png new file mode 100644 index 00000000..84e3ebef Binary files /dev/null and b/doc/gettingStarted/AppsScreenshots/Maps.png differ diff --git a/doc/gettingStarted/AppsScreenshots/Metronome.png b/doc/gettingStarted/AppsScreenshots/Metronome.png new file mode 100644 index 00000000..989fbfda Binary files /dev/null and b/doc/gettingStarted/AppsScreenshots/Metronome.png differ diff --git a/doc/gettingStarted/AppsScreenshots/Music.png b/doc/gettingStarted/AppsScreenshots/Music.png new file mode 100644 index 00000000..063603e7 Binary files /dev/null and b/doc/gettingStarted/AppsScreenshots/Music.png differ diff --git a/doc/gettingStarted/AppsScreenshots/Paint.png b/doc/gettingStarted/AppsScreenshots/Paint.png new file mode 100644 index 00000000..147487f9 Binary files /dev/null and b/doc/gettingStarted/AppsScreenshots/Paint.png differ diff --git a/doc/gettingStarted/AppsScreenshots/Pong.png b/doc/gettingStarted/AppsScreenshots/Pong.png new file mode 100644 index 00000000..08f739ef Binary files /dev/null and b/doc/gettingStarted/AppsScreenshots/Pong.png differ diff --git a/doc/gettingStarted/AppsScreenshots/Weather.png b/doc/gettingStarted/AppsScreenshots/Weather.png new file mode 100644 index 00000000..89714aa4 Binary files /dev/null and b/doc/gettingStarted/AppsScreenshots/Weather.png differ diff --git a/doc/gettingStarted/AppsScreenshots/alarm.png b/doc/gettingStarted/AppsScreenshots/alarm.png new file mode 100644 index 00000000..5d840e80 Binary files /dev/null and b/doc/gettingStarted/AppsScreenshots/alarm.png differ diff --git a/doc/gettingStarted/AppsScreenshots/steps.png b/doc/gettingStarted/AppsScreenshots/steps.png new file mode 100644 index 00000000..1d7f5608 Binary files /dev/null and b/doc/gettingStarted/AppsScreenshots/steps.png differ diff --git a/doc/gettingStarted/AppsScreenshots/stopwatch.png b/doc/gettingStarted/AppsScreenshots/stopwatch.png new file mode 100644 index 00000000..19b34a5a Binary files /dev/null and b/doc/gettingStarted/AppsScreenshots/stopwatch.png differ diff --git a/doc/gettingStarted/AppsScreenshots/timer.png b/doc/gettingStarted/AppsScreenshots/timer.png new file mode 100644 index 00000000..a0d3babf Binary files /dev/null and b/doc/gettingStarted/AppsScreenshots/timer.png differ diff --git a/doc/gettingStarted/Watchfaces.md b/doc/gettingStarted/Watchfaces.md new file mode 100644 index 00000000..9edff0bb --- /dev/null +++ b/doc/gettingStarted/Watchfaces.md @@ -0,0 +1,31 @@ +# Watchfaces + +InfiniTime has 6 apps on the `main` branch at the time of writing. + +## List of apps +- Digital +- Analog +- PineTimeStyle +- Terminal +- Infinineat +- Casio G7710 + +### Digital +![Digital face](/doc/gettingStarted/Watchfaces/Digital.png) + +### Analog +![Analog face](/doc/gettingStarted/Watchfaces/Analog.png) + +### PineTimeStyle +![PineTimeStyle face](/doc/gettingStarted/Watchfaces/PineTimeStyle.png) + - You can long-press on the display to change colors, step style, and weather. + +### Terminal +![Terminal face](/doc/gettingStarted/Watchfaces/Terminal.png) + +### Infinineat +![Infinineat face](/doc/gettingStarted/Watchfaces/Infinineat.png) + - You can long-press on the display to change colors. + +### Casio G7710 +![Casio G7710 face](/doc/gettingStarted/Watchfaces/CasioG7710.png) diff --git a/doc/gettingStarted/Watchfaces/Analog.png b/doc/gettingStarted/Watchfaces/Analog.png new file mode 100644 index 00000000..9e64e5aa Binary files /dev/null and b/doc/gettingStarted/Watchfaces/Analog.png differ diff --git a/doc/gettingStarted/Watchfaces/CasioG7710.png b/doc/gettingStarted/Watchfaces/CasioG7710.png new file mode 100644 index 00000000..b8a55cd5 Binary files /dev/null and b/doc/gettingStarted/Watchfaces/CasioG7710.png differ diff --git a/doc/gettingStarted/Watchfaces/Digital.png b/doc/gettingStarted/Watchfaces/Digital.png new file mode 100644 index 00000000..242c9d5b Binary files /dev/null and b/doc/gettingStarted/Watchfaces/Digital.png differ diff --git a/doc/gettingStarted/Watchfaces/Infinineat.png b/doc/gettingStarted/Watchfaces/Infinineat.png new file mode 100644 index 00000000..6b8cd614 Binary files /dev/null and b/doc/gettingStarted/Watchfaces/Infinineat.png differ diff --git a/doc/gettingStarted/Watchfaces/PineTimeStyle.png b/doc/gettingStarted/Watchfaces/PineTimeStyle.png new file mode 100644 index 00000000..46f0b42b Binary files /dev/null and b/doc/gettingStarted/Watchfaces/PineTimeStyle.png differ diff --git a/doc/gettingStarted/Watchfaces/Terminal.png b/doc/gettingStarted/Watchfaces/Terminal.png new file mode 100644 index 00000000..3f148c5f Binary files /dev/null and b/doc/gettingStarted/Watchfaces/Terminal.png differ diff --git a/doc/gettingStarted/gadgetbridge0.jpg b/doc/gettingStarted/gadgetbridge0.jpg index 7ea2e3cd..2a0a295e 100644 Binary files a/doc/gettingStarted/gadgetbridge0.jpg and b/doc/gettingStarted/gadgetbridge0.jpg differ diff --git a/doc/gettingStarted/gadgetbridge1.jpg b/doc/gettingStarted/gadgetbridge1.jpg index 470b0b3c..20fa7d5a 100644 Binary files a/doc/gettingStarted/gadgetbridge1.jpg and b/doc/gettingStarted/gadgetbridge1.jpg differ diff --git a/doc/gettingStarted/gadgetbridge2.jpg b/doc/gettingStarted/gadgetbridge2.jpg index 8f75b232..a03b071a 100644 Binary files a/doc/gettingStarted/gadgetbridge2.jpg and b/doc/gettingStarted/gadgetbridge2.jpg differ diff --git a/doc/gettingStarted/gadgetbridge3.jpg b/doc/gettingStarted/gadgetbridge3.jpg index cfb83f52..2e9bea34 100644 Binary files a/doc/gettingStarted/gadgetbridge3.jpg and b/doc/gettingStarted/gadgetbridge3.jpg differ diff --git a/doc/gettingStarted/gadgetbridge4.jpg b/doc/gettingStarted/gadgetbridge4.jpg index e41aff04..1b4210ca 100644 Binary files a/doc/gettingStarted/gadgetbridge4.jpg and b/doc/gettingStarted/gadgetbridge4.jpg differ diff --git a/doc/gettingStarted/gadgetbridge5.jpg b/doc/gettingStarted/gadgetbridge5.jpg index 1ef9f779..15efb4d4 100644 Binary files a/doc/gettingStarted/gadgetbridge5.jpg and b/doc/gettingStarted/gadgetbridge5.jpg differ diff --git a/doc/gettingStarted/gettingStarted-1.0.md b/doc/gettingStarted/gettingStarted-1.0.md index 5c607444..2c35f1c1 100644 --- a/doc/gettingStarted/gettingStarted-1.0.md +++ b/doc/gettingStarted/gettingStarted-1.0.md @@ -14,7 +14,7 @@ You can sync the time using companion apps. - Gadgetbridge automatically synchronizes the time when you connect it to your watch. More information on Gadgetbridge [here](/doc/gettingStarted/ota-gadgetbridge.md) - [Sync the time with NRFConnect](/doc/gettingStarted/time-nrfconnect.md) -- Sync the time with your browser https://hubmartin.github.io/WebBLEWatch/ +- [Sync the time with your browser](https://hubmartin.github.io/WebBLEWatch/) You can also set the time in the settings without a companion app. (version >1.7.0) @@ -46,7 +46,7 @@ On the bottom right, you can see how many steps you have taken today. ![Settings](ui/settings.jpg) - Swipe **up** to display the application menus. Apps (stopwatch, music, step, games,...) can be started from this menu. -- Swipe **down** to display the notification panel. Notification sent by your companion app will be displayed here. +- Swipe **down** to display the notification panel. Notifications sent by your companion app will be displayed here. - Swipe **right** to display the Quick Actions menu. This menu allows you to - Set the brightness of the display - Start the **flashlight** app diff --git a/doc/gettingStarted/ota-gadgetbridge.md b/doc/gettingStarted/ota-gadgetbridge.md index fe26c03b..76f99145 100644 --- a/doc/gettingStarted/ota-gadgetbridge.md +++ b/doc/gettingStarted/ota-gadgetbridge.md @@ -1,29 +1,35 @@ # Connecting to Gadgetbridge -Launch Gadgetbridge and tap on the **"+"** button on the bottom right to add a new device: +Launch Gadgetbridge and tap on the menu button in the top left: ![Gadgetbridge 0](gadgetbridge0.jpg) -Wait for the scan to complete, your PineTime should be detected: +Press the "Connect new device" button: ![Gadgetbridge 1](gadgetbridge1.jpg) +Your PineTime should appear on the list. Tap on it. + Tap on it. Gadgdetbridge will pair and connect to your device: ![Gadgetbridge 2](gadgetbridge2.jpg) # Updating with Gadgetbridge -Now that Gadgetbridge is connected to your PineTime, use a file browser application and find the DFU file (`pinetime-mcuboot-app-dfu-x.x.x.zip`) you downloaded previously. Tap on it and open it using the Gadgetbridge application/firmware installer: +Now that Gadgetbridge is connected to your PineTime, press the three dots on the device card: ![Gadgetbridge 3](gadgetbridge3.jpg) -Read the warning carefully and tap **Install**: +Now press the "File Installer" button: ![Gadgetbridge 4](gadgetbridge4.jpg) -Wait for the transfer to finish. Your PineTime should reset and reboot with the new version of InfiniTime! - -Don't forget to **validate** your firmware. In the InfiniTime go to the settings (swipe right, select gear icon) and Firmware option and click **validate**. Otherwise after reboot the previous firmware will be used. +Select the firmware you downloaded (`pinetime-mcuboot-app-dfu-x.x.x.zip`) from the [Releases tab](https://github.com/InfiniTimeOrg/InfiniTime/releases/latest): ![Gadgetbridge 5](gadgetbridge5.jpg) + +Wait for the transfer to finish. There will be a progress bar on both the watch and the phone. Your PineTime should reboot with the new version of InfiniTime! + +Don't forget to **validate** your firmware. In the InfiniTime go to the settings (swipe right, select gear icon) and scroll to the Firmware option and click **validate**. Otherwise, after reboot the previous firmware will be used. + +![Validate](validate.png) diff --git a/doc/gettingStarted/updating-software.md b/doc/gettingStarted/updating-software.md index 2b5d5d92..95149975 100644 --- a/doc/gettingStarted/updating-software.md +++ b/doc/gettingStarted/updating-software.md @@ -6,7 +6,7 @@ If you just want to flash or upgrade InfiniTime on your PineTime, this page is f You can check the InfiniTime version by first swiping right on the watch face to open quick settings, tapping the cogwheel to open settings, swipe up until you find an entry named "About" and tap on it. -![InfiniTime 1.0 version](version-1.0.jpg) +![InfiniTime 1.14 version](version.png) PineTimes shipped after June 2021 will ship with the latest version of [the bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader/releases/tag/1.0.0) and [recovery firmware](https://github.com/InfiniTimeOrg/InfiniTime/releases/tag/0.14.1) @@ -49,7 +49,7 @@ Since those resources are not part of the firmware, they need to be flashed and Resources are packaged into a single .zip file named `infinitime-resources-x.y.z.zip` (where `x`, `y` and `z` are the version numbers of InfiniTime). You can use the companion app of your choice to flash the resources. -**Note : at the time of writing this page, [Amazfish](https://github.com/piggz/harbour-amazfish) and [ITD](https://gitea.arsenm.dev/Arsen6331/itd) have already integrated this functionality. Other companion apps will hopefully implement it soon!* +**Note: at the time of writing this page, [Amazfish](https://github.com/piggz/harbour-amazfish) and [ITD](https://gitea.arsenm.dev/Arsen6331/itd) have already integrated this functionality. Other companion apps will hopefully implement it soon!* ## Amazfish Use the `Download file` functionality of Amazfish. diff --git a/doc/gettingStarted/validate.png b/doc/gettingStarted/validate.png new file mode 100644 index 00000000..a6f3286b Binary files /dev/null and b/doc/gettingStarted/validate.png differ diff --git a/doc/gettingStarted/version.png b/doc/gettingStarted/version.png new file mode 100644 index 00000000..89f505a3 Binary files /dev/null and b/doc/gettingStarted/version.png differ