add QR viewer application with library

add qrcode library

add 29x29 QR viewer

viewer support for all QR sizes

change to c library for qrcodegeneration

add ble QrService

Add Qr app to application screen 3

improve Qr::drawQr

update QR code automatically

center QR code on screen

add possibility for 4 different qr codes

Author: petterhs

src/CMakeLists.txt

@@ -345,6 +345,10 @@ set(LVGL_SRC
         libs/lvgl/src/lv_widgets/lv_win.c
         )
 
+set(QRCODE_SRC
+        libs/qrcodegenerator/qrcodegen.c
+        )
+
 list(APPEND IMAGE_FILES
         displayapp/icons/battery/os_battery_error.c
         displayapp/icons/battery/os_battery_100.c
@@ -401,6 +405,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/ApplicationList.cpp
         displayapp/screens/Notifications.cpp
         displayapp/screens/Twos.cpp
+        displayapp/screens/Qr.cpp
         displayapp/screens/HeartRate.cpp
         displayapp/screens/Motion.cpp
         displayapp/screens/FlashLight.cpp
@@ -453,6 +458,7 @@ list(APPEND SOURCE_FILES
         components/ble/BatteryInformationService.cpp
         components/ble/ImmediateAlertService.cpp
         components/ble/ServiceDiscovery.cpp
+        components/ble/QrService.cpp
         components/ble/HeartRateService.cpp
         components/firmwarevalidator/FirmwareValidator.cpp
         components/motor/MotorController.cpp
@@ -515,6 +521,7 @@ list(APPEND RECOVERY_SOURCE_FILES
         components/ble/ServiceDiscovery.cpp
         components/ble/NavigationService.cpp
         components/ble/HeartRateService.cpp
+        components/ble/QrService.cpp
         components/firmwarevalidator/FirmwareValidator.cpp
         components/settings/Settings.cpp
         drivers/Cst816s.cpp
@@ -616,6 +623,7 @@ set(INCLUDE_FILES
         components/ble/BleClient.h
         components/ble/HeartRateService.h
         components/settings/Settings.h
+        components/ble/QrService.h
         drivers/Cst816s.h
         FreeRTOS/portmacro.h
         FreeRTOS/portmacro_cmsis.h
@@ -627,6 +635,7 @@ set(INCLUDE_FILES
         libs/date/includes/date/julian.h
         libs/date/includes/date/ptz.h
         libs/date/includes/date/tz_private.h
+        libs/qrcodegenerator/qrcodegen.h
         displayapp/LittleVgl.h
         displayapp/lv_pinetime_theme.h
         systemtask/SystemTask.h
@@ -647,6 +656,7 @@ include_directories(
         libs/
         FreeRTOS/
         libs/date/includes
+        libs/qrcodegenerator
         libs/mynewt-nimble/porting/npl/freertos/include
         libs/mynewt-nimble/nimble/include
         libs/mynewt-nimble/porting/nimble/include
@@ -787,13 +797,25 @@ target_compile_options(lvgl PRIVATE
         $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -x assembler-with-cpp>
         )
 
+# qrcode
+add_library(qrcode STATIC ${QRCODE_SRC})
+target_include_directories(qrcode SYSTEM PUBLIC . ../)
+target_include_directories(qrcode SYSTEM PUBLIC ${INCLUDES_FROM_LIBS})
+target_compile_options(qrcode PRIVATE
+        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
+        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
+        $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
+        $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
+        $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -std=c99 -x assembler-with-cpp>
+        )
+
 # Build autonomous binary (without support for bootloader)
 set(EXECUTABLE_NAME "pinetime-app")
 set(EXECUTABLE_FILE_NAME ${EXECUTABLE_NAME}-${pinetime_VERSION_MAJOR}.${pinetime_VERSION_MINOR}.${pinetime_VERSION_PATCH})
 set(NRF5_LINKER_SCRIPT "${CMAKE_SOURCE_DIR}/gcc_nrf52.ld")
 add_executable(${EXECUTABLE_NAME} ${SOURCE_FILES})
 set_target_properties(${EXECUTABLE_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_FILE_NAME})
-target_link_libraries(${EXECUTABLE_NAME} nimble nrf-sdk lvgl)
+target_link_libraries(${EXECUTABLE_NAME} nimble nrf-sdk lvgl qrcode)
 target_compile_options(${EXECUTABLE_NAME} PUBLIC
         $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
         $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
@@ -822,7 +844,7 @@ set(IMAGE_MCUBOOT_FILE_NAME ${EXECUTABLE_MCUBOOT_NAME}-image-${pinetime_VERSION_
 set(DFU_MCUBOOT_FILE_NAME ${EXECUTABLE_MCUBOOT_NAME}-dfu-${pinetime_VERSION_MAJOR}.${pinetime_VERSION_MINOR}.${pinetime_VERSION_PATCH}.zip)
 set(NRF5_LINKER_SCRIPT_MCUBOOT "${CMAKE_SOURCE_DIR}/gcc_nrf52-mcuboot.ld")
 add_executable(${EXECUTABLE_MCUBOOT_NAME} ${SOURCE_FILES})
-target_link_libraries(${EXECUTABLE_MCUBOOT_NAME} nimble nrf-sdk lvgl)
+target_link_libraries(${EXECUTABLE_MCUBOOT_NAME} nimble nrf-sdk lvgl qrcode)
 set_target_properties(${EXECUTABLE_MCUBOOT_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_MCUBOOT_FILE_NAME})
 target_compile_options(${EXECUTABLE_MCUBOOT_NAME} PUBLIC
         $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>

src/components/ble/NimbleController.cpp

@@ -38,6 +38,7 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
     navService {systemTask},
     batteryInformationService {batteryController},
     immediateAlertService {systemTask, notificationManager},
+    qrService(systemTask),
     heartRateService {systemTask, heartRateController},
     serviceDiscovery({&currentTimeClient, &alertNotificationClient}) {
 }
@@ -63,6 +64,7 @@ void NimbleController::Init() {
   dfuService.Init();
   batteryInformationService.Init();
   immediateAlertService.Init();
+  qrService.Init();
   heartRateService.Init();
   int res;
   res = ble_hs_util_ensure_addr(0);

src/components/ble/NimbleController.h

@@ -16,6 +16,7 @@
 #include "DfuService.h"
 #include "ImmediateAlertService.h"
 #include "MusicService.h"
+#include "QrService.h"
 #include "NavigationService.h"
 #include "ServiceDiscovery.h"
 #include "HeartRateService.h"
@@ -68,6 +69,10 @@ namespace Pinetime {
       Pinetime::Controllers::AlertNotificationService& alertService() {
         return anService;
       };
+      Pinetime::Controllers::QrService& qr() {
+        return qrService;
+      };
+      
 
       uint16_t connHandle();
 
@@ -89,6 +94,7 @@ namespace Pinetime {
       NavigationService navService;
       BatteryInformationService batteryInformationService;
       ImmediateAlertService immediateAlertService;
+      QrService qrService;
       HeartRateService heartRateService;
 
       uint8_t addrType; // 1 = Random, 0 = PUBLIC

src/components/ble/QrService.cpp

@@ -0,0 +1,75 @@
+#include "QrService.h"
+#include "systemtask/SystemTask.h"
+
+using namespace Pinetime::Controllers;
+
+int QRCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) {
+  auto qrService = static_cast<QrService *>(arg);
+  return qrService->OnCommand(conn_handle, attr_handle, ctxt);
+}
+
+QrService::QrService(Pinetime::System::SystemTask &system) : m_system(system) {
+  qrsTextCharUuid.value[11] = qrsTextCharId[0];
+  qrsTextCharUuid.value[12] = qrsTextCharId[1];
+
+  characteristicDefinition[0] = {.uuid = (ble_uuid_t *) (&qrsTextCharUuid),
+      .access_cb = QRCallback,
+      .arg = this,
+      .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ
+  };
+  characteristicDefinition[1] = {0};
+
+  serviceDefinition[0] = {
+      .type = BLE_GATT_SVC_TYPE_PRIMARY,
+      .uuid = (ble_uuid_t *) &qrsUuid,
+      .characteristics = characteristicDefinition
+  };
+  serviceDefinition[1] = {0};
+  
+  qrList[0].name = "Github";
+  qrList[0].text = "https://github.com/JF002/InfiniTime";
+  qrList[1].name = "Twitter";
+  qrList[1].text = "https://twitter.com/codingfield";  
+  qrList[2].name = "Mastodon";
+  qrList[2].text = "https://mastodon.codingfield.com/@JF";
+  qrList[3].name = "Donate!";
+  qrList[3].text = "https://liberapay.com/JF002";
+}
+
+void QrService::Init() {
+  int res = 0;
+  res = ble_gatts_count_cfg(serviceDefinition);
+  ASSERT(res == 0);
+
+  res = ble_gatts_add_svcs(serviceDefinition);
+  ASSERT(res == 0);
+}
+
+int QrService::OnCommand(uint16_t conn_handle, uint16_t attr_handle,
+                                                   struct ble_gatt_access_ctxt *ctxt) {
+  if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
+    size_t notifSize = OS_MBUF_PKTLEN(ctxt->om);
+    uint8_t data[notifSize + 1];
+    data[notifSize] = '\0';
+    os_mbuf_copydata(ctxt->om, 0, notifSize, data);
+    char *s = (char *) &data[0];
+    NRF_LOG_INFO("DATA : %s", s);
+    
+    const char d[2] = "|";
+    char* qrId = strtok(s, d);
+    char* qrName = strtok(NULL, d);
+    char* qrText = strtok(NULL, d);
+    
+    if (ble_uuid_cmp(ctxt->chr->uuid, (ble_uuid_t *) &qrsTextCharUuid) == 0) {
+      if (std::stoi(qrId) < MAXLISTITEMS && qrId > 0 && qrName != NULL && qrText != NULL) {
+        qrList[std::stoi(qrId)].name = qrName;
+        qrList[std::stoi(qrId)].text = qrText;
+      }
+    }
+  }
+  return 0;
+}
+
+std::array<QrService::QrInfo, 4> QrService::getQrList() {
+  return qrList;
+}

src/components/ble/QrService.h

@@ -0,0 +1,65 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+#include <array>
+#define min // workaround: nimble's min/max macros conflict with libstdc++
+#define max
+#include <host/ble_gap.h>
+#include <host/ble_uuid.h>
+#undef max
+#undef min
+
+//00030000-78fc-48fe-8e23-433b3a1942d0
+#define QR_SERVICE_UUID_BASE {0xd0, 0x42, 0x19, 0x3a, 0x3b, 0x43, 0x23, 0x8e, 0xfe, 0x48, 0xfc, 0x78, 0x00, 0x00, 0x03, 0x00}
+
+#define MAXLISTITEMS 4
+
+namespace Pinetime {
+  namespace System {
+    class SystemTask;
+  }
+  namespace Controllers {
+    class QrService {
+    public:
+      struct QrInfo {
+        std::string name;
+        std::string text;
+        bool operator==(const QrInfo &rhs) const {
+            return (rhs.name == name && rhs.text == text);
+        }
+      };
+      
+      explicit QrService(Pinetime::System::SystemTask &system);
+
+      void Init();
+
+      int OnCommand(uint16_t conn_handle, uint16_t attr_handle,
+                      struct ble_gatt_access_ctxt *ctxt);
+
+      std::array<QrInfo, 4> getQrList();      
+
+    private:
+
+      static constexpr uint8_t qrsTextCharId[2] = {0x00, 0x01};
+
+      ble_uuid128_t qrsUuid{
+          .u = {.type = BLE_UUID_TYPE_128},
+          .value = QR_SERVICE_UUID_BASE
+      };
+
+      ble_uuid128_t qrsTextCharUuid{
+          .u = {.type = BLE_UUID_TYPE_128},
+          .value = QR_SERVICE_UUID_BASE
+      };
+
+      struct ble_gatt_chr_def characteristicDefinition[2];
+      struct ble_gatt_svc_def serviceDefinition[2];
+
+      std::array<QrInfo, 4> qrList;
+
+      Pinetime::System::SystemTask &m_system;
+
+    };
+  }
+}

src/displayapp/Apps.h

@@ -21,6 +21,7 @@ namespace Pinetime {
       Navigation,
       StopWatch,
       Motion,
+      Qr,
       QuickSettings,
       Settings,
       SettingWatchFace,

src/displayapp/DisplayApp.cpp

@@ -24,7 +24,7 @@
 #include "displayapp/screens/Twos.h"
 #include "displayapp/screens/FlashLight.h"
 #include "displayapp/screens/BatteryInfo.h"
-
+#include "displayapp/screens/Qr.h"
 #include "drivers/Cst816s.h"
 #include "drivers/St7789.h"
 #include "drivers/Watchdog.h"
@@ -324,6 +324,9 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
     case Apps::Motion:
       currentScreen = std::make_unique<Screens::Motion>(this, motionController);
       break;
+    case Apps::Qr:
+      currentScreen = std::make_unique<Screens::Qr>(this, lvgl, systemTask.nimble().qr());
+      break;
   }
   currentApp = app;
 }

src/displayapp/screens/ApplicationList.cpp

@@ -62,7 +62,7 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen2() {
     {Symbols::paintbrush, Apps::Paint},
     {Symbols::paddle, Apps::Paddle},
     {"2", Apps::Twos},
-    {"", Apps::None},
+    {Symbols::qrcode, Apps::Qr},
     {"", Apps::None},
     {"", Apps::None},
   }};