Skip to content

Commit

Permalink
Merge pull request #279 from LinjingZhang/DESMAKERS-3492-xmc4ino-upda…
Browse files Browse the repository at this point in the history
…te-xmclib-to-be-in-sync-with-mtb

Desmakers 3492 xmc4ino update xmclib to be in sync with mtb
  • Loading branch information
LinjingZhang committed Jun 7, 2024
2 parents 7015b8f + 21b6e19 commit cc380a7
Show file tree
Hide file tree
Showing 137 changed files with 16,607 additions and 17,831 deletions.
4 changes: 2 additions & 2 deletions .github/scripts/release.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

import argparse, copy, hashlib, json, re, requests, os, shutil

version = '0.2.0'
version = '0.2.1'

xmc_ino_root_path = os.path.relpath(os.path.join(os.path.join(os.getcwd(), os.pardir), os.pardir))
build_dir_name = 'pkg_build'
Expand Down Expand Up @@ -79,7 +79,7 @@ def set_new_platform_data_fields(platform_data_index, pkg_name, version, reposit
platform_data['size'] = str(get_package_size(os.path.join(pkg_assets_build_path, archive_file_name)))

def add_platform_to_package_index(pkg_index, platform):
pkg_index['packages'][0]['platforms'].insert(1, platform)
pkg_index['packages'][0]['platforms'].extend(platform)

def make_package_index_file(pkg_index):
pkg_index_json_obj = json.dumps(pkg_index, indent=2)
Expand Down
2 changes: 1 addition & 1 deletion boards.txt
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ XMC1400_XMC2GO.serial.disableRTS=true
XMC1400_XMC2GO.build.mcu=cortex-m0
XMC1400_XMC2GO.build.f_cpu=48000000L
XMC1400_XMC2GO.build.board=ARM_XMC
XMC1400_XMC2GO.build.board.version=1402
XMC1400_XMC2GO.build.board.version=1404
XMC1400_XMC2GO.build.board.type=Q040x0200
XMC1400_XMC2GO.build.board.v=0200
XMC1400_XMC2GO.build.core=./
Expand Down
2 changes: 1 addition & 1 deletion cores/Arduino.h
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ extern "C" {
IRQn_Type irq_num;
uint32_t irq_service_request;
#if (UC_SERIES == XMC14)
XMC_SCU_IRQCTRL_t protocol_irq_source;
XMC_SCU_IRQCTRL_t irq_source;
#endif
} XMC_ARD_CAN_t;
#endif
Expand Down
38 changes: 25 additions & 13 deletions cores/xmc_lib/XMCLib/License.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,31 @@
License Terms and Copyright Information
=======================================

Copyright (c) 2015-2016, Infineon Technologies AG All rights reserved.
Copyright (c) 2015-2023, Infineon Technologies AG All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
- Neither the name of the copyright holders nor the names of its contributors may be used to endorse or promote products derived from this software
without specific prior written permission.
Boost Software License - Version 1.0 - August 17th, 2003

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:

To improve the quality of the software, users are encouraged to share modifications, enhancements or bug fixes with Infineon Technologies AG ([email protected]).
The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

To improve the quality of the software, users are encouraged to share modifications,
enhancements or bug fixes with Infineon Technologies AG at [email protected].
80 changes: 0 additions & 80 deletions cores/xmc_lib/XMCLib/Readme.txt

This file was deleted.

Loading

0 comments on commit cc380a7

Please sign in to comment.