Merge pull request #1 from CardputerZero/release/0.1.1

Prepare 0.1.1 package launch

Author: Forairaaaaa

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.16)
 
-project(M5CardputerZeroCompass VERSION 0.1.0 LANGUAGES C CXX ASM)
+project(M5CardputerZeroCompass VERSION 0.1.1 LANGUAGES C CXX ASM)
 
 option(COMPASS_USE_SDL "Use LVGL's SDL backend for desktop testing" ON)
 option(COMPASS_CONVERT_ASSETS "Convert image assets during CMake configure" ON)

README.md

@@ -97,8 +97,7 @@ Run the SDL build:
 ```
 
 Calibration data is saved to `calibration.conf` for SDL builds. Packaged
-CardputerZero launches set `COMPASS_CONFIG_DIR="$HOME/.config/Compass"`, so
-calibration data is saved to `$HOME/.config/Compass/calibration.conf`.
+CardputerZero launches use `$HOME/.config/Compass/calibration.conf` by default.
 
 Override the calibration path:
 
@@ -126,5 +125,5 @@ build and produces an `arm64` APPLaunch package.
 The generated package is written to `dist/`:
 
 ```text
-dist/m5cardputerzero-compass_0.1.0_m5stack1_arm64.deb
+dist/m5cardputerzero-compass_0.1.1_m5stack1_arm64.deb
 ```

packaging/deb/compass.desktop.in

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Compass
-Exec=@DESKTOP_EXEC@
+Exec=/usr/share/APPLaunch/bin/M5CardputerZero-Compass
 Terminal=false
 Icon=share/images/@PACKAGE_ICON_NAME@
 Type=Application

packaging/deb/package_deb.sh

@@ -13,7 +13,6 @@ STAGE_DIR="${STAGE_DIR:-${ROOT_DIR}/build/deb-root}"
 DIST_DIR="${DIST_DIR:-${ROOT_DIR}/dist}"
 BIN_NAME="M5CardputerZero-Compass"
 PACKAGE_ICON_NAME="${PACKAGE_ICON_NAME:-m5cardputerzero-compass.png}"
-CONFIG_DIR="${CONFIG_DIR:-\$HOME/.config/Compass}"
 CMAKE_BIN="${CMAKE:-cmake}"
 CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Release}"
 
@@ -90,9 +89,7 @@ mkdir -p \
     "${DIST_DIR}"
 
 install -m 755 "${EXECUTABLE}" "${STAGE_DIR}/usr/share/APPLaunch/bin/${BIN_NAME}"
-DESKTOP_EXEC="mkdir -p \"${CONFIG_DIR}\" && COMPASS_CONFIG_DIR=\"${CONFIG_DIR}\" exec /usr/share/APPLaunch/bin/${BIN_NAME}"
 sed \
-    -e "s|@DESKTOP_EXEC@|${DESKTOP_EXEC}|g" \
     -e "s|@PACKAGE_ICON_NAME@|${PACKAGE_ICON_NAME}|g" \
     "${DESKTOP_TEMPLATE}" >"${STAGE_DIR}/usr/share/APPLaunch/applications/compass.desktop"
 install -m 644 "${ICON_FILE}" "${STAGE_DIR}/usr/share/APPLaunch/share/images/${PACKAGE_ICON_NAME}"

src/models/calibration_model.cpp

@@ -10,13 +10,13 @@ namespace compass {
 
 namespace {
 
-constexpr uint32_t kAutoFinishMs             = 20000;
+constexpr uint32_t kAutoFinishMs              = 20000;
 constexpr uint32_t kMinimumCalibrationSamples = 20;
-constexpr float kMinimumAxisSpan             = 0.01f;
-constexpr float kCoverageTarget              = 80.0f;
-constexpr const char* kCalibrationPathEnv    = "COMPASS_CALIBRATION_PATH";
-constexpr const char* kConfigDirEnv          = "COMPASS_CONFIG_DIR";
-constexpr const char* kCalibrationFileName   = "calibration.conf";
+constexpr float kMinimumAxisSpan              = 0.01f;
+constexpr float kCoverageTarget               = 80.0f;
+constexpr const char* kCalibrationPathEnv     = "COMPASS_CALIBRATION_PATH";
+constexpr const char* kConfigDirEnv           = "COMPASS_CONFIG_DIR";
+constexpr const char* kCalibrationFileName    = "calibration.conf";
 
 float axisValue(const Axis3& value, size_t index)
 {
@@ -68,6 +68,19 @@ bool envValue(const char* key, std::filesystem::path& path)
     return true;
 }
 
+std::filesystem::path defaultConfigDir()
+{
+#if COMPASS_USE_MOCK_IMU
+    return ".";
+#else
+    const char* home = std::getenv("HOME");
+    if (home && home[0] != '\0') {
+        return std::filesystem::path(home) / ".config" / "Compass";
+    }
+    return "/tmp/Compass";
+#endif
+}
+
 float configFloat(const std::unordered_map<std::string, std::string>& values, const char* key, float fallback)
 {
     const auto it = values.find(key);
@@ -182,7 +195,7 @@ std::filesystem::path CalibrationModel::configPath()
 #if COMPASS_USE_MOCK_IMU
     return kCalibrationFileName;
 #else
-    return std::filesystem::path("/var/lib/Compass") / kCalibrationFileName;
+    return defaultConfigDir() / kCalibrationFileName;
 #endif
 }