From 67415cf85380810204fe1d33081118382bbc6bc5 Mon Sep 17 00:00:00 2001 From: Frank Voorburg Date: Thu, 9 Jan 2020 09:30:38 +0000 Subject: [PATCH] Refs #966. Updated version numbers and host binaries in preparation for the next stable release. git-svn-id: https://svn.code.sf.net/p/openblt/code/trunk@728 5dc33758-31d5-4daf-9ae8-b24bf3d40d73 --- Doc/doxygen/DoxyfileLibOpenBLT | 2 +- Doc/doxygen/DoxyfileOpenBLT | 2 +- Host/MicroBoot.exe | Bin 1940992 -> 1940992 bytes .../LibOpenBLT/bindings/python/setup.py | 2 +- Host/Source/LibOpenBLT/openblt.c | 4 ++-- Host/Source/MicroBoot/MicroBoot.lps | 3 ++- Host/Source/MicroBoot/mainunit.lfm | 16 ++++++++-------- Host/Source/MicroBoot/mainunit.pas | 2 +- Host/libopenblt.dll | Bin 194048 -> 194048 bytes Target/Source/boot.h | 2 +- Target/Source/readme.dox | 2 +- 11 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Doc/doxygen/DoxyfileLibOpenBLT b/Doc/doxygen/DoxyfileLibOpenBLT index 1edc691b..a4d6ed31 100644 --- a/Doc/doxygen/DoxyfileLibOpenBLT +++ b/Doc/doxygen/DoxyfileLibOpenBLT @@ -38,7 +38,7 @@ PROJECT_NAME = "OpenBLT Host Library - Reference Manual" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.3.3 +PROJECT_NUMBER = 1.3.4 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/Doc/doxygen/DoxyfileOpenBLT b/Doc/doxygen/DoxyfileOpenBLT index 58352115..fe394c1f 100644 --- a/Doc/doxygen/DoxyfileOpenBLT +++ b/Doc/doxygen/DoxyfileOpenBLT @@ -38,7 +38,7 @@ PROJECT_NAME = "OpenBLT Bootloader - Reference Manual" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.8.0 +PROJECT_NUMBER = 1.9.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/Host/MicroBoot.exe b/Host/MicroBoot.exe index 497a5daef4f614658510e945c73a51f538ca7ad1..7b1f8785c616d019b617335af12316b65f524b1a 100644 GIT binary patch delta 591 zcmZqJQ`WGjYy%G?(}O+JKbDFaZFXQZU}SvIT*%a3$ixW5AetG7S%8=oh}nRc9f&!A zm=lP(fS4PId4QM~i1~n+ABY8jSP+PXfLIuaMSxfoh{d)SGKmYuFq%wnjuTI3G--bw zCl16CKr9KwQa~)d{dJto#J+l8X$Ckr^Iw)hm<7&dc)%>j&?AW8=ZMNNEaFD+1r+5N z*trmV32ixsWy}cv0X;c}8A$vHBRK{aB>o&zxq1c>gnEVzrgA9!BWU~^X#6*5dQ*-WTPS*T#v_VzegN5<_(<7Lh50K>^< A9RL6T delta 585 zcmZqJQ`WGjYy%G?)15ujKbDFaZFXQZU}U`0T*%a3$ixW5AetG7S%8=oh}nRc9f&!A zm=lP(fS4PId4QM~i1~n+ABY8jSP+PXfLIuaMSxfoh{d)SGKmYuFd9#9juTI3G;V(# zCl16CKr9KwQa~)d{dJto#J+kTX$Ckr@n4ofm<7&dxWg>R&?AW8XNbx%EaFD+c@*Us z*trmV5p6k!Wy}cv9z8jR8A$vPBRK{aB>oIjxq1c>gnEWGrgA9!18Dp!X#5vw{6A=X z0W(zdRM7YqX8x!Oe9#mmpz%x4_#J5cIonUZlbM>t&(9o^U%Bv>SqZM`zZzxv7_FxZ#K~qtRmej1C2jABlXYa=ekNYl#BQPi3jhZ@W#9k+ diff --git a/Host/Source/LibOpenBLT/bindings/python/setup.py b/Host/Source/LibOpenBLT/bindings/python/setup.py index 0caeeb38..6123873f 100644 --- a/Host/Source/LibOpenBLT/bindings/python/setup.py +++ b/Host/Source/LibOpenBLT/bindings/python/setup.py @@ -40,7 +40,7 @@ from setuptools import setup # *************************************************************************************** setup ( \ name = 'openblt', - version = '1.3.3', + version = '1.3.4', description = 'Python wrapper for the OpenBLT host library (LibOpenBLT).', long_description = open('README.rst', 'r').read(), author = 'Frank Voorburg', diff --git a/Host/Source/LibOpenBLT/openblt.c b/Host/Source/LibOpenBLT/openblt.c index 59bef6b0..dc6c9ea8 100644 --- a/Host/Source/LibOpenBLT/openblt.c +++ b/Host/Source/LibOpenBLT/openblt.c @@ -51,10 +51,10 @@ * for major-, minor-, and patch-version. Version 1.05.12 would for example be * 10512. */ -#define BLT_VERSION_NUMBER (10303u) +#define BLT_VERSION_NUMBER (10304u) /** \brief The version number of the library as a null-terminated string. */ -#define BLT_VERSION_STRING "1.03.03" +#define BLT_VERSION_STRING "1.03.04" /**************************************************************************************** diff --git a/Host/Source/MicroBoot/MicroBoot.lps b/Host/Source/MicroBoot/MicroBoot.lps index da01f221..637179c4 100644 --- a/Host/Source/MicroBoot/MicroBoot.lps +++ b/Host/Source/MicroBoot/MicroBoot.lps @@ -19,6 +19,7 @@ + @@ -109,12 +110,12 @@ - + diff --git a/Host/Source/MicroBoot/mainunit.lfm b/Host/Source/MicroBoot/mainunit.lfm index 50c335d1..10b5c8aa 100644 --- a/Host/Source/MicroBoot/mainunit.lfm +++ b/Host/Source/MicroBoot/mainunit.lfm @@ -146,9 +146,9 @@ object MainForm: TMainForm end object LblFirmwareUpdateInfo: TLabel Left = 16 - Height = 15 + Height = 17 Top = 14 - Width = 124 + Width = 135 Caption = 'LblFirmwareUpdateInfo' ParentColor = False end @@ -199,9 +199,9 @@ object MainForm: TMainForm end object LblElapsedTime: TLabel Left = 16 - Height = 15 + Height = 17 Top = 14 - Width = 83 + Width = 91 Caption = 'LblElapsedTime' ParentColor = False end @@ -302,9 +302,9 @@ object MainForm: TMainForm end object LblProgramName: TLabel Left = 8 - Height = 15 + Height = 17 Top = 8 - Width = 59 + Width = 64 Caption = 'MicroBoot' Font.Style = [fsBold] ParentColor = False @@ -312,9 +312,9 @@ object MainForm: TMainForm end object LblProgramConfig: TLabel Left = 16 - Height = 15 + Height = 17 Top = 29 - Width = 98 + Width = 106 Caption = 'LblProgramConfig' ParentColor = False end diff --git a/Host/Source/MicroBoot/mainunit.pas b/Host/Source/MicroBoot/mainunit.pas index 86378984..43d0f848 100644 --- a/Host/Source/MicroBoot/mainunit.pas +++ b/Host/Source/MicroBoot/mainunit.pas @@ -48,7 +48,7 @@ uses //*************************************************************************************** const PROGRAM_NAME_STR = 'MicroBoot'; - PROGRAM_VERSION_STR = 'v2.03'; + PROGRAM_VERSION_STR = 'v2.04'; //*************************************************************************************** diff --git a/Host/libopenblt.dll b/Host/libopenblt.dll index 9652c8cc89db26ab3f420b05bd8350f6ab322c19..4fdbe0c2d3d24c57013a55e8fb3f7052b6e5fc20 100644 GIT binary patch delta 126 zcmZp8!`<+Pd%_Qv)o;b(HvV~G!syWa)O7n(Q%3s)1&|m65HJC;D-fsbV`NBK#|RQ) z0Lg84na0?}#Avep_zcE{q5@A2|DLb$GTCivpwsO23HP+OSFB^y;Rc($eZ@}3Q*w+Z U)4i`VR<^&n!MOd+4JHv;0MVN;+5i9m delta 126 zcmZp8!`<+Pd%_Qv_+9s7H~x8H!f4<8)O7n(Q%3s)1&|m65HJC;D-fsbV`NBK#|RQ) z0Lg84na0?}#Av+z_zcE{q5?kW@~@ix+v+*pD)Q1AhTi1u73&yvxLM*rDp%}eJSE3y VJl*>`V`clB8;slE++Y%s1pos=F-!me diff --git a/Target/Source/boot.h b/Target/Source/boot.h index c2f1c8cb..3abbe32c 100644 --- a/Target/Source/boot.h +++ b/Target/Source/boot.h @@ -34,7 +34,7 @@ /** \brief Main version number of the bootloader core. */ #define BOOT_VERSION_CORE_MAIN (1u) /** \brief Minor version number of the bootloader core. */ -#define BOOT_VERSION_CORE_MINOR (8u) +#define BOOT_VERSION_CORE_MINOR (9u) /** \brief Patch number of the bootloader core. */ #define BOOT_VERSION_CORE_PATCH (0u) diff --git a/Target/Source/readme.dox b/Target/Source/readme.dox index 2dc7b574..6fe98ad9 100644 --- a/Target/Source/readme.dox +++ b/Target/Source/readme.dox @@ -28,7 +28,7 @@ https://www.feaser.com/openblt/doku.php?id=manual:design. ---------------------------------------------------------------------------------------- C O P Y R I G H T ---------------------------------------------------------------------------------------- - Copyright (c) by Feaser 2011-2019 http://www.feaser.com All rights reserved + Copyright (c) by Feaser 2011-2020 http://www.feaser.com All rights reserved ---------------------------------------------------------------------------------------- L I C E N S E