From 124bcc8df886b78be4cf6dcd0af1629d9d554cb6 Mon Sep 17 00:00:00 2001
From: marqs <mhiienka@niksula.hut.fi>
Date: Sun, 1 Nov 2020 14:32:28 +0200
Subject: [PATCH] Fix profile import

---
 .../sys_controller/mem_init/sys_onchip_memory2_0.hex | 12 ++++++------
 software/sys_controller/ossc/firmware.h              |  4 ++--
 software/sys_controller/ossc/userdata.c              |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/software/sys_controller/mem_init/sys_onchip_memory2_0.hex b/software/sys_controller/mem_init/sys_onchip_memory2_0.hex
index 736656d..8e49ddb 100644
--- a/software/sys_controller/mem_init/sys_onchip_memory2_0.hex
+++ b/software/sys_controller/mem_init/sys_onchip_memory2_0.hex
@@ -2687,7 +2687,7 @@
 :040A7E00656564E561
 :040A7F001206C66332
 :040A800000017637C4
-:040A810005700713E2
+:040A810005800713D2
 :040A82000613468190
 :040A830045C5DA0685
 :040A8400FD05051354
@@ -3330,7 +3330,7 @@
 :040D01002503545022
 :040D02007637EAC492
 :040D030007130001D1
-:040D040046810570AF
+:040D0400468105809F
 :040D0500FF8606134C
 :040D0600051345C1CB
 :040D070020EF0905CB
@@ -4578,8 +4578,8 @@
 :0411E1002483104112
 :0411E20001131001E4
 :0411E300808210C135
-:0411E40087936795F1
-:0411E5001423600768
+:0411E40087936799ED
+:0411E5001423800748
 :0411E60007B700F156
 :0411E7008793047C6A
 :0411E800CC3E04678E
@@ -4703,7 +4703,7 @@
 :04125E009363018114
 :04125F0046830E04B0
 :0412600007130191DE
-:041261009D63056024
+:041261009D63058004
 :0412620056830CE6BD
 :0412630007130281EA
 :0412640096E30460A9
@@ -4822,7 +4822,7 @@
 :0412D50001014703C9
 :0412D6004683EF1547
 :0412D70007130111E7
-:0412D80099630570A1
+:0412D8009963058091
 :0412D900468302E660
 :0412DA0047050121A2
 :0412DB0002D764636F
diff --git a/software/sys_controller/ossc/firmware.h b/software/sys_controller/ossc/firmware.h
index 59872ea..4415121 100644
--- a/software/sys_controller/ossc/firmware.h
+++ b/software/sys_controller/ossc/firmware.h
@@ -24,10 +24,10 @@
 #include "sysconfig.h"
 
 #define FW_VER_MAJOR            0
-#define FW_VER_MINOR            87
+#define FW_VER_MINOR            88
 
 #define PROFILE_VER_MAJOR       0
-#define PROFILE_VER_MINOR       86
+#define PROFILE_VER_MINOR       88
 
 #define INITCFG_VER_MAJOR       0
 #define INITCFG_VER_MINOR       85
diff --git a/software/sys_controller/ossc/userdata.c b/software/sys_controller/ossc/userdata.c
index fc8a15c..ca0d24e 100644
--- a/software/sys_controller/ossc/userdata.c
+++ b/software/sys_controller/ossc/userdata.c
@@ -282,7 +282,7 @@ int import_userdata()
             continue;
         }
 
-        if ((header.version_major != FW_VER_MAJOR) || (header.version_minor != FW_VER_MINOR)) {
+        if ((header.version_major != PROFILE_VER_MAJOR) || (header.version_minor != PROFILE_VER_MINOR)) {
             printf("Data version %u.%u does not match fw\n", header.version_major, header.version_minor);
             continue;
         }