Skip to content

Commit cafbf98

Browse files
authored
Add simple calculator app
Having a calculator is always handy and calculator watches are cool. Seems like this PR from minacode is in a good state and about to be merged upstream.
2 parents 7aa6ca7 + 98b84c8 commit cafbf98

File tree

8 files changed

+465
-1
lines changed

8 files changed

+465
-1
lines changed

src/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,7 @@ list(APPEND SOURCE_FILES
380380
displayapp/screens/Metronome.cpp
381381
displayapp/screens/Motion.cpp
382382
displayapp/screens/Weather.cpp
383+
displayapp/screens/Calculator.cpp
383384
displayapp/screens/FirmwareValidation.cpp
384385
displayapp/screens/ApplicationList.cpp
385386
displayapp/screens/Notifications.cpp

src/displayapp/DisplayApp.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "displayapp/screens/Weather.h"
3131
#include "displayapp/screens/PassKey.h"
3232
#include "displayapp/screens/Error.h"
33+
#include "displayapp/screens/Calculator.h"
3334

3435
#include "drivers/Cst816s.h"
3536
#include "drivers/St7789.h"

src/displayapp/apps/Apps.h.in

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ namespace Pinetime {
2626
StopWatch,
2727
Metronome,
2828
Motion,
29+
Calculator,
2930
Steps,
3031
Dice,
3132
Weather,

src/displayapp/apps/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ else ()
1313
set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Dice")
1414
set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Metronome")
1515
set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Navigation")
16+
set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Calculator")
1617
set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Weather")
1718
#set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Motion")
1819
set(USERAPP_TYPES "${DEFAULT_USER_APP_TYPES}" CACHE STRING "List of user apps to build into the firmware")

src/displayapp/fonts/fonts.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
{
99
"file": "FontAwesome5-Solid+Brands+Regular.woff",
10-
"range": "0xf294, 0xf242, 0xf54b, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xf015, 0xf00c, 0xf0f3, 0xf522, 0xf743"
10+
"range": "0xf294, 0xf242, 0xf54b, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xf015, 0xf00c, 0xf0f3, 0xf522, 0xf743, 0xf1ec, 0xf55a"
1111
}
1212
],
1313
"bpp": 1,

0 commit comments

Comments
 (0)