fixes for Always On Display and SPI flash ID

InfiniTimeOrg · Sep 16, 2024 · 06c4d1f · 06c4d1f
1 parent 1c35771
commit 06c4d1f
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 6 deletions.
diff --git a/InfiniTime b/InfiniTime
diff --git a/main.cpp b/main.cpp
@@ -376,7 +376,8 @@ Pinetime::Applications::DisplayApp displayApp(lcd,
                                               alarmController,
                                               brightnessController,
                                               touchHandler,
-                                              fs);
+                                              fs,
+                                              spiNorFlash);
 
 Pinetime::System::SystemTask systemTask(spi,
                                         spiNorFlash,

diff --git a/sim/components/brightness/BrightnessController.h b/sim/components/brightness/BrightnessController.h
@@ -6,7 +6,7 @@ namespace Pinetime {
   namespace Controllers {
     class BrightnessController {
     public:
-      enum class Levels { Off, Low, Medium, High };
+      enum class Levels { Off, AlwaysOn, Low, Medium, High };
       void Init();
 
       void Set(Levels level);

diff --git a/sim/drivers/SpiNorFlash.cpp b/sim/drivers/SpiNorFlash.cpp
@@ -26,7 +26,7 @@ SpiNorFlash::~SpiNorFlash() {
 }
 
 void SpiNorFlash::Init() {
-  device_id = ReadIdentificaion();
+  device_id = ReadIdentification();
   NRF_LOG_INFO(
     "[SpiNorFlash] Manufacturer : %d, Memory type : %d, memory density : %d", device_id.manufacturer, device_id.type, device_id.density);
 }
@@ -42,7 +42,7 @@ void SpiNorFlash::Wakeup() {
   NRF_LOG_INFO("[SpiNorFlash] Wakeup")
 }
 
-SpiNorFlash::Identification SpiNorFlash::ReadIdentificaion() {
+SpiNorFlash::Identification SpiNorFlash::ReadIdentification() {
   return {};
 }
 
@@ -91,6 +91,10 @@ bool SpiNorFlash::EraseFailed() {
   return false;
 }
 
+SpiNorFlash::Identification SpiNorFlash::GetIdentification() const {
+  return device_id;
+}
+
 void SpiNorFlash::Write(uint32_t address, const uint8_t* buffer, size_t size) {
   if (address + size * sizeof(uint8_t) > memorySize) {
     throw std::runtime_error("SpiNorFlash::Write out of bounds");

diff --git a/sim/drivers/SpiNorFlash.h b/sim/drivers/SpiNorFlash.h
@@ -21,7 +21,6 @@ namespace Pinetime {
         uint8_t density = 0;
       };
 
-      Identification ReadIdentificaion();
       uint8_t ReadStatusRegister();
       bool WriteInProgress();
       bool WriteEnabled();
@@ -34,13 +33,17 @@ namespace Pinetime {
       bool ProgramFailed();
       bool EraseFailed();
 
+      Identification GetIdentification() const;
+
       void Init();
       void Uninit();
 
       void Sleep();
       void Wakeup();
 
     private:
+      Identification ReadIdentification();
+
       enum class Commands : uint8_t {
         PageProgram = 0x02,
         Read = 0x03,

diff --git a/sim/nrfx/hal/nrf_gpio.cpp b/sim/nrfx/hal/nrf_gpio.cpp
@@ -52,4 +52,7 @@ void nrfx_gpiote_in_init(uint32_t pin_number, nrfx_gpiote_in_config_t *config, n
 void nrfx_gpiote_in_event_enable(uint32_t pin_number, bool enable) {}
 void nrf_gpio_cfg_sense_input(uint32_t pin_number, nrf_gpio_pin_pull_t pin_pull, nrf_gpio_pin_sense_t sense) {}
 
+bool nrfx_gpiote_is_init() { return true; }
+void nrfx_gpiote_init() {}
+
 void APP_GPIOTE_INIT(uint32_t max_users) {}
diff --git a/sim/nrfx/hal/nrf_gpio.h b/sim/nrfx/hal/nrf_gpio.h
@@ -145,6 +145,9 @@ void nrfx_gpiote_in_init(uint32_t pin_number, nrfx_gpiote_in_config_t *config, n
 void nrfx_gpiote_in_event_enable(uint32_t pin_number, bool enable);
 void nrf_gpio_cfg_sense_input(uint32_t pin_number, nrf_gpio_pin_pull_t pin_pull, nrf_gpio_pin_sense_t sense);
 
+bool nrfx_gpiote_is_init();
+void nrfx_gpiote_init();
+
 void APP_GPIOTE_INIT(uint32_t max_users);
 
 #endif // NRF_GPIO_H__
diff --git a/sim/portmacro_cmsis.h b/sim/portmacro_cmsis.h
@@ -29,6 +29,16 @@
 #ifndef PORTMACRO_CMSIS_H
 #define PORTMACRO_CMSIS_H
 
+// ########## macro taken from app_util.h
+/**@brief Macro for performing rounded integer division (as opposed to truncating the result).
+ *
+ * @param[in]   A   Numerator.
+ * @param[in]   B   Denominator.
+ *
+ * @return      Rounded (integer) result of dividing A by B.
+ */
+#define ROUNDED_DIV(A, B) (((A) + ((B) / 2)) / (B))
+
 #ifdef __cplusplus
 extern "C" {
 #endif