Skip to content

Commit

Permalink
Version 1.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
MicroEJ GitHub Delivery committed Jun 29, 2023
1 parent 2a350e5 commit bef472f
Show file tree
Hide file tree
Showing 27 changed files with 69 additions and 39 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,17 @@
Changelog
===========

----------------------
[1.6.1] - 2023-06-29
----------------------

Fixed
=====

- Invalid HIL client message when simulation used
- Packaged VEE Port zip file size too big when ``skip.publish=false``
- ECOM-COMM Asbtraction Layer initialization issue

----------------------
[1.6.0] - 2023-04-20
----------------------
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile_KUVW3
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// Define ant_properties

def ant_properties = ""
ant_properties += " -Declipse.home=c:/jenkinsTools/common/microej/eclipse/microej-sdk-21.11/win64"
ant_properties += " -Declipse.home=c:/jenkinsTools/common/microej/eclipse/microej-sdk-21.11-5.7.0/win64"
ant_properties += " -Dcom.microej.platformbuilder.architecture.usage=prod"
ant_properties += " -Dcom.microej.platformbuilder.bsp.build.enabled=true"
ant_properties += " -Dcom.microej.platformbuilder.module.multi.enabled=false"
Expand All @@ -20,7 +20,7 @@ buildWithMMM{
LABEL = "stm32cubeide && iar8.50.6 && public" // The label where build must be run. Default value is : public. Set it if yours is different.
DOCKER_IMAGE = ''

//MMM_VERSION = '' // The version of MMM to use. Default value is 5.5.0.
//MMM_VERSION = '' // The version of MMM to use. Default value is 5.7.0.
ANT_PROPERTIES = "${ant_properties}" // The properties run with ant. Default value is already set. Add specific properties if necessary. As ('-DnameOfProperties=valueofProperty').
//ANT_VERBOSE = '' // Default value is : false. Set true if you want the verbose mode.
//ARTIFACTS_DOMAIN = '' // The artifacts domain to use. The default value is cross5.
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile_M5QNX
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// Define ant_properties

def ant_properties = ""
ant_properties += " -Declipse.home=c:/jenkinsTools/common/microej/eclipse/microej-sdk-21.11/win64"
ant_properties += " -Declipse.home=c:/jenkinsTools/common/microej/eclipse/microej-sdk-21.11-5.7.0/win64"
ant_properties += " -Dcom.microej.platformbuilder.architecture.usage=prod"
ant_properties += " -Dcom.microej.platformbuilder.bsp.build.enabled=true"
ant_properties += " -Dcom.microej.platformbuilder.module.multi.enabled=false"
Expand All @@ -20,7 +20,7 @@ buildWithMMM{
LABEL = "stm32cubeide && iar8.50.6 && public" // The label where build must be run. Default value is : public. Set it if yours is different.
DOCKER_IMAGE = ''

//MMM_VERSION = '' // The version of MMM to use. Default value is 5.5.0.
//MMM_VERSION = '' // The version of MMM to use. Default value is 5.7.0.
ANT_PROPERTIES = "${ant_properties}" // The properties run with ant. Default value is already set. Add specific properties if necessary. As ('-DnameOfProperties=valueofProperty').
//ANT_VERBOSE = '' // Default value is : false. Set true if you want the verbose mode.
//ARTIFACTS_DOMAIN = '' // The artifacts domain to use. The default value is cross5.
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile_R0OUY
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// Define ant_properties

def ant_properties = ""
ant_properties += " -Declipse.home=c:/jenkinsTools/common/microej/eclipse/microej-sdk-21.11/win64"
ant_properties += " -Declipse.home=c:/jenkinsTools/common/microej/eclipse/microej-sdk-21.11-5.7.0/win64"
ant_properties += " -Dcom.microej.platformbuilder.architecture.usage=prod"
ant_properties += " -Dcom.microej.platformbuilder.bsp.build.enabled=true"
ant_properties += " -Dcom.microej.platformbuilder.module.multi.enabled=true"
Expand All @@ -20,7 +20,7 @@ buildWithMMM{
LABEL = "stm32cubeide && iar8.50.6 && public" // The label where build must be run. Default value is : public. Set it if yours is different.
DOCKER_IMAGE = ''

//MMM_VERSION = '' // The version of MMM to use. Default value is 5.5.0.
//MMM_VERSION = '' // The version of MMM to use. Default value is 5.7.0.
ANT_PROPERTIES = "${ant_properties}" // The properties run with ant. Default value is already set. Add specific properties if necessary. As ('-DnameOfProperties=valueofProperty').
//ANT_VERBOSE = '' // Default value is : false. Set true if you want the verbose mode.
//ARTIFACTS_DOMAIN = '' // The artifacts domain to use. The default value is cross5.
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile_R5S8K
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// Define ant_properties

def ant_properties = ""
ant_properties += " -Declipse.home=c:/jenkinsTools/common/microej/eclipse/microej-sdk-21.11/win64"
ant_properties += " -Declipse.home=c:/jenkinsTools/common/microej/eclipse/microej-sdk-21.11-5.7.0/win64"
ant_properties += " -Dcom.microej.platformbuilder.architecture.usage=prod"
ant_properties += " -Dcom.microej.platformbuilder.bsp.build.enabled=true"
ant_properties += " -Dcom.microej.platformbuilder.module.multi.enabled=true"
Expand All @@ -20,7 +20,7 @@ buildWithMMM{
LABEL = "stm32cubeide && iar8.50.6 && public" // The label where build must be run. Default value is : public. Set it if yours is different.
DOCKER_IMAGE = ''

//MMM_VERSION = '' // The version of MMM to use. Default value is 5.5.0.
//MMM_VERSION = '' // The version of MMM to use. Default value is 5.7.0.
ANT_PROPERTIES = "${ant_properties}" // The properties run with ant. Default value is already set. Add specific properties if necessary. As ('-DnameOfProperties=valueofProperty').
//ANT_VERBOSE = '' // Default value is : false. Set true if you want the verbose mode.
//ARTIFACTS_DOMAIN = '' // The artifacts domain to use. The default value is cross5.
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Use of this source code is governed by a BSD-style license that can be found with this software.
.. |BOARD_NAME| replace:: STM32F7508-DK
.. |PLATFORM_VER| replace:: 1.6.0
.. |PLATFORM_VER| replace:: 1.6.1
.. |RCP| replace:: MICROEJ SDK
.. |PLATFORM| replace:: MicroEJ Platform
.. |PLATFORMS| replace:: MicroEJ Platforms
Expand Down
2 changes: 1 addition & 1 deletion RELEASE_NOTES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Use of this source code is governed by a BSD-style license that can be found with this software.
.. |BOARD_NAME| replace:: STM32F7508-DK
.. |PLATFORM_VER| replace:: 1.6.0
.. |PLATFORM_VER| replace:: 1.6.1
.. |MANUFACTURER| replace:: STMicroelectronics
.. |PLATFORM| replace:: MicroEJ Platform
.. |STM_IDE.PRINTABLENAME| replace:: STM32CubeIDE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>STM32F7508-Platform-CM7hardfp_GCC48-1.6.0</name>
<name>STM32F7508-Platform-CM7hardfp_GCC48-1.6.1</name>
<comment></comment>
<projects>
</projects>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>STM32F7508-Platform-CM7hardfp_IAR83-1.6.0</name>
<name>STM32F7508-Platform-CM7hardfp_IAR83-1.6.1</name>
<comment></comment>
<projects>
</projects>
Expand Down
2 changes: 1 addition & 1 deletion stm32f7508_freertos-bsp/projects/microej/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Use of this source code is governed by a BSD-style license that can be found with this software.
.. |BOARD_NAME| replace:: STM32F7508-DK
.. |PLATFORM_VER| replace:: 1.6.0
.. |PLATFORM_VER| replace:: 1.6.1
.. |RCP| replace:: MICROEJ SDK
.. |PLATFORM| replace:: MicroEJ Platform
.. |PLATFORMS| replace:: MicroEJ Platforms
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ SECTIONS
. = ALIGN(4);

/* Map in FLASH the startup code (mandatory) */
*main.o(.text.startup.main .text.main .text.init .text.CPU_CACHE_Enable .text.SystemClock_Config)
*main.o(.text.startup.main .text.main .text.init .text.CPU_CACHE_Enable .text.SCB_EnableDCache .text.SCB_EnableICache .text.SystemClock_Config)
*memory_msp.o(.text.QSPI_MspInit)
*qspi.o(.text .text.*)
*startup_stm32f750xx.o(.text .text.*)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#include "usbh_core.h"
#include "main.h"

#define USE_USB_HS

HCD_HandleTypeDef hhcd;

/*******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion stm32f7508_freertos-configuration/STM32F7508.platform
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Copyright 2020-2023 MicroEJ Corp. All rights reserved.
Use of this source code is governed by a BSD-style license that can be found with this software.
-->
<platform hardwarePartNumber="STM32F7508" name="Platform" version="1.6.0" provider="MicroEJ" vendorUrl="http://developer.microej.com/4.0/sdk/license" workbenchMinVersion="1.7.0">
<platform hardwarePartNumber="STM32F7508" name="Platform" version="1.6.1" provider="MicroEJ" vendorUrl="http://developer.microej.com/4.0/sdk/license" workbenchMinVersion="1.7.0">
<environment architecture="CM7" baseline="14" hardwarePartNumber="CM7" toolchain="CM7hardfp_GCC48" name="flopi7G26" techVersion="1.6" version="7.18.1" level="eval" provider="MicroEJ" licenseTag="IS2T_J8F5C"/>
<group name="device"/>
<group name="frontPanel"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,15 @@
<!-- Copy BSP into the platform -->
<target name="module-bsp:preparePublication" extensionOf="abstract-compile:compile" depends="module-platform:preparePublication" if="bsp.root.dir" unless="${skip.publish}">

<property name="bsp.copy.includes.pattern" value="**/*"/>
<property name="bsp.copy.excludes.pattern" value=""/>

<echo message="Included paths from BSP copy : ${bsp.copy.includes.pattern}"/>
<echo message="Excluded paths from BSP copy : ${bsp.copy.excludes.pattern}"/>

<!-- Copy BSP unless it exists already (to prevent a recompilation) -->
<copy todir="${platform.publish.dir}/${platform.project.name}/source/bsp" overwrite="false" >
<fileset dir="${bsp.root.dir}" includes="**/*"/>
<fileset dir="${bsp.root.dir}" includes="${bsp.copy.includes.pattern}" excludes="${bsp.copy.excludes.pattern}"/>
</copy>

<!-- BSP root dir option becomes useless (and disturbing) -->
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion stm32f7508_freertos-configuration/module.ivy
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org" xmlns:m="http://ant.apache.org/ivy/extra" xmlns:ej="https://developer.microej.com" ej:version="2.0.0">

<info organisation="com.microej.platform.st.stm32f7508-dk" module="Platform" status="integration" revision="1.6.0">
<info organisation="com.microej.platform.st.stm32f7508-dk" module="Platform" status="integration" revision="1.6.1">
<ea:build organisation="com.is2t.easyant.buildtypes" module="build-custom" revision="1.+"/>
<ea:plugin org="com.is2t.easyant.plugins" module="eclipse-antRunner" revision="1.+"/>
<ea:plugin org="com.is2t.easyant.plugins" module="mam" revision="1.+"/>
Expand Down
11 changes: 11 additions & 0 deletions stm32f7508_freertos-configuration/module.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,14 @@ com.microej.platformbuilder.platform.filename=STM32F7508.platform
# WARNING: this option requires MicroEJ SDK version '5.3.0' or higher. On lower versions, the Platform is always published.
# Expected values: 'true' (default) | 'false'
skip.publish=true

# Enable Multi-Sandbox capabilites
# Expected values: 'false' (default) | 'true'
com.microej.platformbuilder.module.multi.enabled=false

# Includes directories in the BSP copy during the Vee Port build
# Expected values: '<path_to_directory' | **/* (default)
bsp.copy.includes.pattern=**/*

# Excludes directories in the BSP copy during the Vee Port build (useful to remove ST github repository)
bsp.copy.excludes.pattern=**/STM32746G-Discovery/, **/STM32756G_EVAL/, **/STM32F722ZE-Nucleo/, **/STM32F723E-Discovery/, **/STM32F7308-DISCO/, **/STM32F746ZG-Nucleo/, **/STM32F767ZI-Nucleo/, **/STM32F769I_EVAL/, **/STM32F769I-Discovery/, **/WIN32/, **/Utilities/Media/, **/Drivers/CMSIS/Lib/ARM/, **/Drivers/CMSIS/docs/, **/microej/EWARM/Debug/, **/microej/EWARM/Release/, **/microej/SW4STM32/Debug/, **/microej/SW4STM32/Release/, **/microej/cdt_workspace/.metadata/, **/STM32F7508-DISCO/Demonstrations/
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
# Target Platform [required]
###############################################################################

target.platform.dir=${easyant.module.dir}/../../../../STM32F7508-Platform-CM7hardfp_GCC48-1.6.0/source
#target.platform.dir=${easyant.module.dir}/../../../../STM32F7508-Platform-CM7hardfp_IAR83-1.6.0/source
target.platform.dir=${easyant.module.dir}/../../../../STM32F7508-Platform-CM7hardfp_GCC48-1.6.1/source
#target.platform.dir=${easyant.module.dir}/../../../../STM32F7508-Platform-CM7hardfp_IAR83-1.6.1/source

###############################################################################
# BSP Connection [required]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
# Target Platform [required]
###############################################################################

target.platform.dir=${easyant.module.dir}/../../../../STM32F7508-Platform-CM7hardfp_GCC48-1.6.0/source
#target.platform.dir=${easyant.module.dir}/../../../../STM32F7508-Platform-CM7hardfp_IAR83-1.6.0/source
target.platform.dir=${easyant.module.dir}/../../../../STM32F7508-Platform-CM7hardfp_GCC48-1.6.1/source
#target.platform.dir=${easyant.module.dir}/../../../../STM32F7508-Platform-CM7hardfp_IAR83-1.6.1/source

###############################################################################
# BSP Connection [required]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
# Target Platform [required]
###############################################################################

target.platform.dir=${easyant.module.dir}/../../../../STM32F7508-Platform-CM7hardfp_GCC48-1.6.0/source
#target.platform.dir=${easyant.module.dir}/../../../../STM32F7508-Platform-CM7hardfp_IAR83-1.6.0/source
target.platform.dir=${easyant.module.dir}/../../../../STM32F7508-Platform-CM7hardfp_GCC48-1.6.1/source
#target.platform.dir=${easyant.module.dir}/../../../../STM32F7508-Platform-CM7hardfp_IAR83-1.6.1/source

###############################################################################
# BSP Connection [required]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
# Target Platform [required]
###############################################################################

target.platform.dir=${easyant.module.dir}/../../../../STM32F7508-Platform-CM7hardfp_GCC48-1.6.0/source
#target.platform.dir=${easyant.module.dir}/../../../../STM32F7508-Platform-CM7hardfp_IAR83-1.6.0/source
target.platform.dir=${easyant.module.dir}/../../../../STM32F7508-Platform-CM7hardfp_GCC48-1.6.1/source
#target.platform.dir=${easyant.module.dir}/../../../../STM32F7508-Platform-CM7hardfp_IAR83-1.6.1/source

###############################################################################
# BSP Connection [required]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
# Target Platform [required]
###############################################################################

target.platform.dir=${easyant.module.dir}/../../../../STM32F7508-Platform-CM7hardfp_GCC48-1.6.0/source
#target.platform.dir=${easyant.module.dir}/../../../../STM32F7508-Platform-CM7hardfp_IAR83-1.6.0/source
target.platform.dir=${easyant.module.dir}/../../../../STM32F7508-Platform-CM7hardfp_GCC48-1.6.1/source
#target.platform.dir=${easyant.module.dir}/../../../../STM32F7508-Platform-CM7hardfp_IAR83-1.6.1/source

###############################################################################
# BSP Connection [required]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
# Target Platform [required]
###############################################################################

target.platform.dir=${easyant.module.dir}/../../../../../STM32F7508-Platform-CM7hardfp_GCC48-1.6.0/source
#target.platform.dir=${easyant.module.dir}/../../../../../STM32F7508-Platform-CM7hardfp_IAR83-1.6.0/source
target.platform.dir=${easyant.module.dir}/../../../../../STM32F7508-Platform-CM7hardfp_GCC48-1.6.1/source
#target.platform.dir=${easyant.module.dir}/../../../../../STM32F7508-Platform-CM7hardfp_IAR83-1.6.1/source

###############################################################################
# BSP Connection [required]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
<stringAttribute key="com.is2t.microej.workbench.stdMicroEJLaunchConfigurationPlatformName" value="Platform"/>
<stringAttribute key="com.is2t.microej.workbench.stdMicroEJLaunchConfigurationPlatformProvider" value="MicroEJ"/>
<stringAttribute key="com.is2t.microej.workbench.stdMicroEJLaunchConfigurationPlatformToolchain" value="CM7hardfp_GCC48"/>
<stringAttribute key="com.is2t.microej.workbench.stdMicroEJLaunchConfigurationPlatformVersion" value="1.6.0"/>
<stringAttribute key="com.is2t.microej.workbench.stdMicroEJLaunchConfigurationPlatformVersion" value="1.6.1"/>
<stringAttribute key="com.is2t.microej.workbench.stdMicroEJLaunchConfigurationProject" value="java-testsuite-runner-ui3"/>
<booleanAttribute key="com.is2t.microej.workbench.stdMicroEJLaunchConfigurationVerbose" value="false"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
Expand Down

0 comments on commit bef472f

Please sign in to comment.