[omega] 2.0.1

Omega-Numworks · Mar 27, 2022 · 8e63e2a · 8e63e2a
2 parents 27e1ac9 + f6b1754
commit 8e63e2a
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/README.fr.md b/README.fr.md
@@ -1,4 +1,4 @@
-<p align="center"><img src="https://user-images.githubusercontent.com/12123721/111199951-80bd3d00-85c1-11eb-936c-28cf590208b8.png" /></p>
+<p align="center"><img src="https://user-images.githubusercontent.com/12123721/160276449-891ac0fe-0034-45b0-b43f-0fcc81826dc0.png" /></p>
 
 <p align="center">
   <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="cc by-nc-sa 4.0" src="https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-525252.svg?labelColor=292929&logo=creative%20commons&style=for-the-badge" /></a>

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<p align="center"><img src="https://user-images.githubusercontent.com/12123721/111199951-80bd3d00-85c1-11eb-936c-28cf590208b8.png" /></p>
+<p align="center"><img src="https://user-images.githubusercontent.com/12123721/160276449-891ac0fe-0034-45b0-b43f-0fcc81826dc0.png" /></p>
 
 <p align="center">
   <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="cc by-nc-sa 4.0" src="https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-525252.svg?labelColor=292929&logo=creative%20commons&style=for-the-badge" /></a>

diff --git a/build/config.mak b/build/config.mak
@@ -5,7 +5,7 @@ DEBUG ?= 0
 
 HOME_DISPLAY_EXTERNALS ?= 1
 EPSILON_VERSION ?= 15.5.0
-OMEGA_VERSION ?= 2.0.0
+OMEGA_VERSION ?= 2.0.1
 # OMEGA_USERNAME ?= N/A
 OMEGA_STATE ?= public
 EPSILON_APPS ?= calculation rpn graph code statistics probability solver atomic sequence regression settings external

diff --git a/ion/src/device/bootloader/drivers/external_flash.cpp b/ion/src/device/bootloader/drivers/external_flash.cpp
@@ -405,7 +405,7 @@ int SectorAtAddress(uint32_t address) {
   i = address >> NumberOfAddressBitsIn32KbyteBlock;
   if (i >= 1) {
     i = Config::NumberOf4KSectors + i - 1;
-    assert(i >= 0 && i <= Config::NumberOf32KSectors);
+    assert(i >= Config::NumberOf4KSectors && i <= Config::NumberOf4KSectors + Config::NumberOf32KSectors);
     return i;
   }
   i = address >> NumberOfAddressBitsIn4KbyteBlock;

diff --git a/ion/src/device/bootloader/drivers/external_flash_tramp.cpp b/ion/src/device/bootloader/drivers/external_flash_tramp.cpp
@@ -371,13 +371,13 @@ void MassErase() {
 
 void WriteMemory(uint8_t * destination, const uint8_t * source, size_t length) {
   asm("cpsid if");
-  reinterpret_cast<void(*)(uint8_t*, const uint8_t*, size_t)>(Ion::Device::Trampoline::address(Ion::Device::Trampoline::ExternalFlashWriteMemory))(destination, source, length);
+  (*reinterpret_cast<void(**)(uint8_t*, const uint8_t*, size_t)>(Ion::Device::Trampoline::address(Ion::Device::Trampoline::ExternalFlashWriteMemory)))(destination, source, length);
   asm("cpsie if");
 }
 
 void EraseSector(int i) {
   asm("cpsid if");
-  reinterpret_cast<void(*)(int)>(Ion::Device::Trampoline::address(Ion::Device::Trampoline::ExternalFlashEraseSector))(i);
+  (*reinterpret_cast<void(**)(int)>(Ion::Device::Trampoline::address(Ion::Device::Trampoline::ExternalFlashEraseSector)))(i);
   asm("cpsie if");
 }
 

diff --git a/ion/src/device/bootloader/drivers/power.cpp b/ion/src/device/bootloader/drivers/power.cpp
@@ -79,7 +79,7 @@ void __attribute__((noinline)) internalFlashStandby() {
 }
 
 void enterLowPowerMode() {
-  reinterpret_cast<void(*)(void)>(Ion::Device::Trampoline::address(Ion::Device::Trampoline::Suspend))();
+  (*reinterpret_cast<void(**)(void)>(Ion::Device::Trampoline::address(Ion::Device::Trampoline::Suspend)))();
 }
 
 }

diff --git a/ion/src/simulator/macos/Makefile b/ion/src/simulator/macos/Makefile
@@ -15,6 +15,7 @@ ion_src += $(addprefix ion/src/simulator/shared/, \
   collect_registers.cpp \
   haptics.cpp \
   journal.cpp \
+  store_script.cpp \
 )
 
 ifeq ($(EPSILON_TELEMETRY),1)