summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt6
-rw-r--r--src/Components/FirmwareValidator/FirmwareValidator.cpp20
-rw-r--r--src/Components/FirmwareValidator/FirmwareValidator.h18
-rw-r--r--src/DisplayApp/DisplayApp.cpp1
-rw-r--r--src/DisplayApp/DisplayApp.h2
-rw-r--r--src/DisplayApp/Screens/FirmwareValidation.cpp91
-rw-r--r--src/DisplayApp/Screens/FirmwareValidation.h42
-rw-r--r--src/SystemTask/SystemTask.cpp8
8 files changed, 179 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b1c45ffa..c4487afe 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -337,6 +337,7 @@ list(APPEND SOURCE_FILES
DisplayApp/Screens/Label.cpp
DisplayApp/Screens/FirmwareUpdate.cpp
DisplayApp/Screens/Music.cpp
+ DisplayApp/Screens/FirmwareValidation.cpp
DisplayApp/Screens/ApplicationList.cpp
main.cpp
drivers/St7789.cpp
@@ -359,6 +360,7 @@ list(APPEND SOURCE_FILES
Components/Ble/CurrentTimeService.cpp
Components/Ble/AlertNotificationService.cpp
Components/Ble/MusicService.cpp
+ Components/FirmwareValidator/FirmwareValidator.cpp
drivers/Cst816s.cpp
FreeRTOS/port.c
FreeRTOS/port_cmsis_systick.c
@@ -417,6 +419,7 @@ set(INCLUDE_FILES
DisplayApp/Screens/ScreenList.h
DisplayApp/Screens/Label.h
DisplayApp/Screens/FirmwareUpdate.h
+ DisplayApp/Screens/FirmwareValidation.h
DisplayApp/Screens/ApplicationList.h
DisplayApp/Apps.h
drivers/St7789.h
@@ -436,7 +439,8 @@ set(INCLUDE_FILES
Components/Ble/CurrentTimeClient.h
Components/Ble/AlertNotificationClient.h
Components/Ble/DfuService.h
- drivers/Cst816s.h
+ Components/FirmwareValidator/FirmwareValidator.h
+ drivers/Cst816s.h
FreeRTOS/portmacro.h
FreeRTOS/portmacro_cmsis.h
libs/date/includes/date/tz.h
diff --git a/src/Components/FirmwareValidator/FirmwareValidator.cpp b/src/Components/FirmwareValidator/FirmwareValidator.cpp
new file mode 100644
index 00000000..244d5c06
--- /dev/null
+++ b/src/Components/FirmwareValidator/FirmwareValidator.cpp
@@ -0,0 +1,20 @@
+#include <drivers/InternalFlash.h>
+#include <hal/nrf_rtc.h>
+
+#include "FirmwareValidator.h"
+
+using namespace Pinetime::Controllers;
+
+bool FirmwareValidator::IsValidated() const {
+ auto* imageOkPtr = reinterpret_cast<uint32_t *>(validBitAdress);
+ return (*imageOkPtr) == validBitValue;
+}
+
+void FirmwareValidator::Validate() {
+ if(!IsValidated())
+ Pinetime::Drivers::InternalFlash::WriteWord(validBitAdress, validBitValue);
+}
+
+void FirmwareValidator::Reset() {
+ NVIC_SystemReset();
+}
diff --git a/src/Components/FirmwareValidator/FirmwareValidator.h b/src/Components/FirmwareValidator/FirmwareValidator.h
new file mode 100644
index 00000000..aa576d88
--- /dev/null
+++ b/src/Components/FirmwareValidator/FirmwareValidator.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <cstdint>
+
+namespace Pinetime {
+ namespace Controllers {
+ class FirmwareValidator {
+ public:
+ void Validate();
+ bool IsValidated() const;
+
+ void Reset();
+ private:
+ static constexpr uint32_t validBitAdress {0x7BFE8};
+ static constexpr uint32_t validBitValue {1};
+ };
+ }
+}
diff --git a/src/DisplayApp/DisplayApp.cpp b/src/DisplayApp/DisplayApp.cpp
index 1a530467..bbd99a3d 100644
--- a/src/DisplayApp/DisplayApp.cpp
+++ b/src/DisplayApp/DisplayApp.cpp
@@ -16,6 +16,7 @@
#include <Components/Ble/NotificationManager.h>
#include <DisplayApp/Screens/FirmwareUpdate.h>
#include <DisplayApp/Screens/ApplicationList.h>
+#include <DisplayApp/Screens/FirmwareValidation.h>
#include "../SystemTask/SystemTask.h"
using namespace Pinetime::Applications;
diff --git a/src/DisplayApp/DisplayApp.h b/src/DisplayApp/DisplayApp.h
index 6bf020bb..a6df95c1 100644
--- a/src/DisplayApp/DisplayApp.h
+++ b/src/DisplayApp/DisplayApp.h
@@ -17,6 +17,7 @@
#include <drivers/Watchdog.h>
#include <DisplayApp/Screens/Modal.h>
#include <Components/Ble/NotificationManager.h>
+#include <Components/FirmwareValidator/FirmwareValidator.h>
#include "TouchEvents.h"
#include "Apps.h"
@@ -80,6 +81,7 @@ namespace Pinetime {
Controllers::BrightnessController brightnessController;
std::unique_ptr<Screens::Modal> modal;
Pinetime::Controllers::NotificationManager& notificationManager;
+ Pinetime::Controllers::FirmwareValidator validator;
};
}
}
diff --git a/src/DisplayApp/Screens/FirmwareValidation.cpp b/src/DisplayApp/Screens/FirmwareValidation.cpp
new file mode 100644
index 00000000..70d32575
--- /dev/null
+++ b/src/DisplayApp/Screens/FirmwareValidation.cpp
@@ -0,0 +1,91 @@
+#include <libs/lvgl/lvgl.h>
+#include "FirmwareValidation.h"
+#include "../DisplayApp.h"
+#include "../../Version.h"
+#include "../../Components/FirmwareValidator/FirmwareValidator.h"
+
+using namespace Pinetime::Applications::Screens;
+extern lv_font_t jetbrains_mono_extrabold_compressed;
+extern lv_font_t jetbrains_mono_bold_20;
+
+namespace {
+ static void ButtonEventHandler(lv_obj_t * obj, lv_event_t event)
+ {
+ FirmwareValidation* screen = static_cast<FirmwareValidation *>(obj->user_data);
+ screen->OnButtonEvent(obj, event);
+ }
+
+}
+
+FirmwareValidation::FirmwareValidation(Pinetime::Applications::DisplayApp *app,
+ Pinetime::Controllers::FirmwareValidator &validator)
+ : Screen{app}, validator{validator} {
+ labelVersionInfo = lv_label_create(lv_scr_act(), NULL);
+ lv_obj_align(labelVersionInfo, NULL, LV_ALIGN_IN_TOP_LEFT, 0, 0);
+ lv_label_set_text(labelVersionInfo, "Version : ");
+ lv_label_set_align(labelVersionInfo, LV_LABEL_ALIGN_LEFT);
+
+
+ labelVersionValue = lv_label_create(lv_scr_act(), NULL);
+ lv_obj_align(labelVersionValue, labelVersionInfo, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
+ lv_label_set_recolor(labelVersionValue, true);
+ sprintf(version, "%d.%d.%d", Version::Major(), Version::Minor(), Version::Patch());
+ lv_label_set_text(labelVersionValue, version);
+
+ labelIsValidated = lv_label_create(lv_scr_act(), NULL);
+ lv_obj_align(labelIsValidated, NULL, LV_ALIGN_IN_TOP_LEFT, 0, 50);
+ lv_label_set_recolor(labelIsValidated, true);
+ lv_label_set_long_mode(labelIsValidated, LV_LABEL_LONG_BREAK);
+ lv_obj_set_width(labelIsValidated, 240);
+
+ if(validator.IsValidated())
+ lv_label_set_text(labelIsValidated, "You have already\n#00ff00 validated# this firmware#");
+ else {
+ lv_label_set_text(labelIsValidated,
+ "Please #00ff00 Validate# this version or\n#ff0000 Reset# to rollback to the previous version.");
+
+ buttonValidate = lv_btn_create(lv_scr_act(), NULL);
+ lv_obj_align(buttonValidate, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
+ buttonValidate->user_data = this;
+ lv_obj_set_event_cb(buttonValidate, ButtonEventHandler);
+
+ labelButtonValidate = lv_label_create(buttonValidate, NULL);
+ lv_label_set_recolor(labelButtonValidate, true);
+ lv_label_set_text(labelButtonValidate, "#00ff00 Validate#");
+
+ buttonReset = lv_btn_create(lv_scr_act(), NULL);
+ buttonReset->user_data = this;
+ lv_obj_align(buttonReset, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
+ lv_obj_set_event_cb(buttonReset, ButtonEventHandler);
+
+ labelButtonReset = lv_label_create(buttonReset, NULL);
+ lv_label_set_recolor(labelButtonReset, true);
+ lv_label_set_text(labelButtonReset, "#ff0000 Reset#");
+ }
+}
+
+
+FirmwareValidation::~FirmwareValidation() {
+ lv_obj_clean(lv_scr_act());
+}
+
+bool FirmwareValidation::Refresh() {
+ return running;
+}
+
+bool FirmwareValidation::OnButtonPushed() {
+ running = false;
+ return true;
+}
+
+void FirmwareValidation::OnButtonEvent(lv_obj_t *object, lv_event_t event) {
+ if(object == buttonValidate && event == LV_EVENT_PRESSED) {
+ validator.Validate();
+ running = false;
+ } else if(object == buttonReset && event == LV_EVENT_PRESSED) {
+ validator.Reset();
+ }
+
+}
+
+
diff --git a/src/DisplayApp/Screens/FirmwareValidation.h b/src/DisplayApp/Screens/FirmwareValidation.h
new file mode 100644
index 00000000..947f5575
--- /dev/null
+++ b/src/DisplayApp/Screens/FirmwareValidation.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include <cstdint>
+#include "Screen.h"
+#include <bits/unique_ptr.h>
+#include <libs/lvgl/src/lv_core/lv_style.h>
+#include <libs/lvgl/src/lv_core/lv_obj.h>
+
+namespace Pinetime {
+ namespace Controllers {
+ class FirmwareValidator;
+ }
+
+ namespace Applications {
+ namespace Screens {
+
+ class FirmwareValidation : public Screen{
+ public:
+ FirmwareValidation(DisplayApp* app, Pinetime::Controllers::FirmwareValidator& validator);
+ ~FirmwareValidation() override;
+
+ bool Refresh() override;
+ bool OnButtonPushed() override;
+
+ void OnButtonEvent(lv_obj_t *object, lv_event_t event);
+
+ private:
+ Pinetime::Controllers::FirmwareValidator& validator;
+
+ lv_obj_t* labelVersionInfo;
+ lv_obj_t* labelVersionValue;
+ char version[9];
+ lv_obj_t* labelIsValidated;
+ lv_obj_t* buttonValidate;
+ lv_obj_t* labelButtonValidate;
+ lv_obj_t* buttonReset;
+ lv_obj_t* labelButtonReset;
+ bool running = true;
+ };
+ }
+ }
+}
diff --git a/src/SystemTask/SystemTask.cpp b/src/SystemTask/SystemTask.cpp
index 9f57f6f6..d4b78187 100644
--- a/src/SystemTask/SystemTask.cpp
+++ b/src/SystemTask/SystemTask.cpp
@@ -58,14 +58,6 @@ void SystemTask::Work() {
spi.Init();
spiNorFlash.Init();
-
- // Write the 'image OK' flag if it's not already done
- // TODO implement a better verification mecanism for the image (ask for user confirmation via UI/BLE ?)
- uint32_t* imageOkPtr = reinterpret_cast<uint32_t *>(0x7BFE8);
- uint32_t imageOk = *imageOkPtr;
- if(imageOk != 1)
- Pinetime::Drivers::InternalFlash::WriteWord(0x7BFE8, 1);
-
nimbleController.Init();
nimbleController.StartAdvertising();
lcd.Init();
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 18:47:09 +0000