🧗 Rock Climbing logger

CMakeLists.txt

@@ -37,6 +37,15 @@ set_property(CACHE TARGET_DEVICE PROPERTY STRINGS PINETIME MOY_TFK5 MOY_TIN5 MOY
 
 set(PROJECT_GIT_COMMIT_HASH "")
 
+# Optional custom build tag (e.g. "om001"), appended to the on-watch version
+# display (Settings > System info, and the post-flash validation screen) so
+# a ClimbLogger dev build is unmistakable from an official InfiniTime
+# release at a glance. Left empty for a plain "1.16.0"-style display when
+# not set (e.g. simulator builds, or a manual cmake invocation) -- the
+# top-level project's `make firmware` target sets this to an incrementing
+# om<NNN> value on every real hardware build.
+set(CLIMBLOGGER_BUILD_TAG "" CACHE STRING "Custom build tag suffix shown on-watch (e.g. om001); empty for a plain official-style version")
+
 execute_process(COMMAND git rev-parse --short HEAD
                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
                 OUTPUT_VARIABLE PROJECT_GIT_COMMIT_HASH
@@ -53,6 +62,9 @@ message("    * Mode : " ${CMAKE_BUILD_TYPE})
 message("    * Version : " ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 message("    * Toolchain : " ${ARM_NONE_EABI_TOOLCHAIN_PATH})
 message("    * GitRef(S) : " ${PROJECT_GIT_COMMIT_HASH})
+if(CLIMBLOGGER_BUILD_TAG)
+  message("    * ClimbLogger build tag : " ${CLIMBLOGGER_BUILD_TAG})
+endif()
 message("    * NRF52 SDK : " ${NRF5_SDK_PATH})
 message("    * Target device : " ${TARGET_DEVICE})
 if(BUILD_DFU)

docker/build.sh

@@ -80,6 +80,7 @@ CmakeGenerate() {
   CMAKE_ARGS=()
   [ -n "$ENABLE_USERAPPS" ]  && CMAKE_ARGS+=("-DENABLE_USERAPPS=$ENABLE_USERAPPS")
   [ -n "$ENABLE_WATCHFACES" ] && CMAKE_ARGS+=("-DENABLE_WATCHFACES=$ENABLE_WATCHFACES")
+  [ -n "$CLIMBLOGGER_BUILD_TAG" ] && CMAKE_ARGS+=("-DCLIMBLOGGER_BUILD_TAG=$CLIMBLOGGER_BUILD_TAG")
 
   cmake -G "Unix Makefiles" \
     -S "$SOURCES_DIR" \

src/CMakeLists.txt

@@ -396,6 +396,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/PassKey.cpp
         displayapp/screens/Error.cpp
         displayapp/screens/Alarm.cpp
+        displayapp/screens/ClimbLogger.cpp
         displayapp/screens/Styles.cpp
         displayapp/screens/WeatherSymbols.cpp
         displayapp/Colors.cpp

src/Version.h.in

@@ -12,11 +12,16 @@ namespace Pinetime {
       static constexpr uint32_t Patch() {return patch;}
       static constexpr const char* GitCommitHash() {return commitHash;}
       static constexpr const char* VersionString() {return versionString;}
+      // Empty ("") for an official-style build; a non-empty tag (e.g.
+      // "om001") marks a custom ClimbLogger dev build -- see CMakeLists.txt's
+      // CLIMBLOGGER_BUILD_TAG.
+      static constexpr const char* BuildTag() {return buildTag;}
     private:
       static constexpr uint32_t major = @PROJECT_VERSION_MAJOR@;
       static constexpr uint32_t minor = @PROJECT_VERSION_MINOR@;
       static constexpr uint32_t patch = @PROJECT_VERSION_PATCH@;
       static constexpr const char* commitHash = "@PROJECT_GIT_COMMIT_HASH@";
       static constexpr const char* versionString = "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@";
+      static constexpr const char* buildTag = "@CLIMBLOGGER_BUILD_TAG@";
   };
 }

src/displayapp/UserApps.h

@@ -15,6 +15,8 @@
 #include "displayapp/screens/WatchFacePineTimeStyle.h"
 #include "displayapp/screens/WatchFaceTerminal.h"
 #include "displayapp/screens/WatchFacePrideFlag.h"
+#include "displayapp/screens/TapCounter.h"
+#include "displayapp/screens/ClimbLogger.h"
 
 namespace Pinetime {
   namespace Applications {

src/displayapp/apps/Apps.h.in

@@ -29,6 +29,8 @@ namespace Pinetime {
       Calculator,
       Steps,
       Dice,
+      TapCounter,
+      ClimbLogger,
       Weather,
       PassKey,
       QuickSettings,

src/displayapp/fonts/fonts.json

@@ -7,7 +7,7 @@
          },
          {
             "file": "FontAwesome5-Solid+Brands+Regular.woff",
-            "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, 0xf3ed"
+            "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, 0xf3ed, 0xf6fc"
          }
       ],
       "bpp": 1,