Skip to content

Commit

Permalink
Merge branch 'master' into new-feature/boards/25
Browse files Browse the repository at this point in the history
  • Loading branch information
IvanRuzavin committed Oct 22, 2024
2 parents caf5131 + 2d77537 commit e2cab2a
Show file tree
Hide file tree
Showing 14 changed files with 321 additions and 4 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/checkIndexes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,19 @@ jobs:
- name: Check Indexed Links - Live
if: ${{ github.event.inputs.select_index == 'Live' || github.event.inputs.select_index == 'Both' }}
run: |
python -u scripts/check_indexes.py ${{ github.repository }} ${{ secrets.GITHUB_TOKEN }} ${{ secrets.ES_HOST }} ${{ secrets.ES_USER }} ${{ secrets.ES_PASSWORD }} ${{ secrets.ES_INDEX_LIVE }} "--es_regex" "${{ github.event.inputs.regex }}" "--log_only" ${{ !github.event.inputs.fix }}
FIX_ACTION=${{ github.event.inputs.fix }} # Capture the fix input
LOG_ONLY=$([[ "$FIX_ACTION" == "false" ]] && echo true || echo false) # Negate the fix input
echo "LOG_ONLY is set to $LOG_ONLY"
python -u scripts/check_indexes.py ${{ github.repository }} ${{ secrets.GITHUB_TOKEN }} ${{ secrets.ES_HOST }} ${{ secrets.ES_USER }} ${{ secrets.ES_PASSWORD }} ${{ secrets.ES_INDEX_LIVE }} "--es_regex" "${{ github.event.inputs.regex }}" "--log_only" "$LOG_ONLY"
continue-on-error: true # Ensure the workflow continues

- name: Check Indexed Links - Test
if: ${{ github.event.inputs.select_index == 'Test' || github.event.inputs.select_index == 'Both' }}
run: |
python -u scripts/check_indexes.py ${{ github.repository }} ${{ secrets.GITHUB_TOKEN }} ${{ secrets.ES_HOST }} ${{ secrets.ES_USER }} ${{ secrets.ES_PASSWORD }} ${{ secrets.ES_INDEX_TEST }} "--es_regex" "${{ github.event.inputs.regex }}" "--log_only" ${{ !github.event.inputs.fix }}
FIX_ACTION=${{ github.event.inputs.fix }} # Capture the fix input
LOG_ONLY=$([[ "$FIX_ACTION" == "false" ]] && echo true || echo false) # Negate the fix input
echo "LOG_ONLY is set to $LOG_ONLY"
python -u scripts/check_indexes.py ${{ github.repository }} ${{ secrets.GITHUB_TOKEN }} ${{ secrets.ES_HOST }} ${{ secrets.ES_USER }} ${{ secrets.ES_PASSWORD }} ${{ secrets.ES_INDEX_TEST }} "--es_regex" "${{ github.event.inputs.regex }}" "--log_only" "$LOG_ONLY"
continue-on-error: true # Ensure the workflow continues

push_to_main_run:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
if(${_MSDK_BOARD_NAME_} STREQUAL "KIT_DISCOVERY_WITH_STM32F723IE_MCU")
set(BOARD_PATH "include/boards/board_discovery_with_stm32f723ie")
set(MCU_CARD FALSE)
set(SHIELD FALSE)
endif()
89 changes: 89 additions & 0 deletions bsp/board/include/boards/board_discovery_with_stm32f723ie/board.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
/****************************************************************************
**
** Copyright (C) ${COPYRIGHT_YEAR} MikroElektronika d.o.o.
** Contact: https://www.mikroe.com/contact
**
** This file is part of the mikroSDK package
**
** Commercial License Usage
**
** Licensees holding valid commercial NECTO compilers AI licenses may use this
** file in accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The MikroElektronika Company.
** For licensing terms and conditions see
** https://www.mikroe.com/legal/software-license-agreement.
** For further information use the contact form at
** https://www.mikroe.com/contact.
**
**
** GNU Lesser General Public License Usage
**
** Alternatively, this file may be used for
** non-commercial projects under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation: https://www.gnu.org/licenses/lgpl-3.0.html.
**
** The above copyright notice and this permission notice shall be
** included in all copies or substantial portions of the Software.
**
** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
** OF MERCHANTABILITY, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
** TO THE WARRANTIES FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
** DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
** OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
** OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**
****************************************************************************/
/*!
* @file board.h
* @brief Main board pin mapping.
*/

#ifndef _BOARD_H_
#define _BOARD_H_

#ifdef __cplusplus
extern "C"
{
#endif

#define BOARD_NAME "STM32F723IE_DISCOVERY"

#include "hal_target.h"

// Mapping
#define HEADER_CONNECTOR_CN11_D1 PE4
#define HEADER_CONNECTOR_CN11_D2 PH6
#define HEADER_CONNECTOR_CN11_D3 PA1
#define HEADER_CONNECTOR_CN11_D4 PB5
#define HEADER_CONNECTOR_CN11_D5 PA4
#define HEADER_CONNECTOR_CN11_D6 PA5
#define HEADER_CONNECTOR_CN11_D7 // Pin not routed
#define HEADER_CONNECTOR_CN11_D8 // Pin not routed
#define HEADER_CONNECTOR_CN11_D9 PH5
#define HEADER_CONNECTOR_CN11_D10 PH4

#define HEADER_CONNECTOR_CN13_D1 PA3
#define HEADER_CONNECTOR_CN13_D2 PA2
#define HEADER_CONNECTOR_CN13_D3 PC5
#define HEADER_CONNECTOR_CN13_D4 PE5
#define HEADER_CONNECTOR_CN13_D5 PH3
#define HEADER_CONNECTOR_CN13_D6 PB0
#define HEADER_CONNECTOR_CN13_D7 PE6
#define HEADER_CONNECTOR_CN13_D8 PE3

#define HEADER_CONNECTOR_CN15_D1 PA6
#define HEADER_CONNECTOR_CN15_D2 PA4
#define HEADER_CONNECTOR_CN15_D3 PC4
#define HEADER_CONNECTOR_CN15_D4 PF10
#define HEADER_CONNECTOR_CN15_D5 PC0
#define HEADER_CONNECTOR_CN15_D6 PC1

#ifdef __cplusplus
}
#endif

#endif // _BOARD_H_
// ------------------------------------------------------------------------- END
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
if(${_MSDK_BOARD_NAME_} STREQUAL "KIT_DISCOVERY_WITH_STM32F769NI_MCU")
set(BOARD_PATH "include/boards/board_discovery_with_stm32f769ni")
set(MCU_CARD FALSE)
set(SHIELD FALSE)
endif()
98 changes: 98 additions & 0 deletions bsp/board/include/boards/board_discovery_with_stm32f769ni/board.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
/****************************************************************************
**
** Copyright (C) ${COPYRIGHT_YEAR} MikroElektronika d.o.o.
** Contact: https://www.mikroe.com/contact
**
** This file is part of the mikroSDK package
**
** Commercial License Usage
**
** Licensees holding valid commercial NECTO compilers AI licenses may use this
** file in accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The MikroElektronika Company.
** For licensing terms and conditions see
** https://www.mikroe.com/legal/software-license-agreement.
** For further information use the contact form at
** https://www.mikroe.com/contact.
**
**
** GNU Lesser General Public License Usage
**
** Alternatively, this file may be used for
** non-commercial projects under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation: https://www.gnu.org/licenses/lgpl-3.0.html.
**
** The above copyright notice and this permission notice shall be
** included in all copies or substantial portions of the Software.
**
** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
** OF MERCHANTABILITY, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
** TO THE WARRANTIES FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
** DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
** OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
** OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**
****************************************************************************/
/*!
* @file board.h
* @brief Main board pin mapping.
*/

#ifndef _BOARD_H_
#define _BOARD_H_

#ifdef __cplusplus
extern "C"
{
#endif

#define BOARD_NAME "STM32F769NI_DISCOVERY"

#include "hal_target.h"

// Mapping
#define HEADER_CONNECTOR_CN9_D1 PJ4
#define HEADER_CONNECTOR_CN9_D2 PH6
#define HEADER_CONNECTOR_CN9_D3 PA11
#define HEADER_CONNECTOR_CN9_D4 PB15
#define HEADER_CONNECTOR_CN9_D5 PB14
#define HEADER_CONNECTOR_CN9_D6 PA12
#define HEADER_CONNECTOR_CN9_D7 // Pin not routed
#define HEADER_CONNECTOR_CN9_D8 // Pin not routed
#define HEADER_CONNECTOR_CN9_D9 PB9
#define HEADER_CONNECTOR_CN9_D10 PB8

#define HEADER_CONNECTOR_CN11_D1 PA12
#define HEADER_CONNECTOR_CN11_D2 PB14
#define HEADER_CONNECTOR_CN11_D3 PB15
#define HEADER_CONNECTOR_CN11_D4 PA11
#define HEADER_CONNECTOR_CN11_D5 PH6
#define HEADER_CONNECTOR_CN11_D6 PJ4
#define HEADER_CONNECTOR_CN11_D7 PJ4
#define HEADER_CONNECTOR_CN11_D8 PJ3

#define HEADER_CONNECTOR_CN13_D1 PC7
#define HEADER_CONNECTOR_CN13_D2 PC6
#define HEADER_CONNECTOR_CN13_D3 PJ1
#define HEADER_CONNECTOR_CN13_D4 PF6
#define HEADER_CONNECTOR_CN13_D5 PJ0
#define HEADER_CONNECTOR_CN13_D6 PC8
#define HEADER_CONNECTOR_CN13_D7 PF7
#define HEADER_CONNECTOR_CN13_D8 PJ3

#define HEADER_CONNECTOR_CN14_D1 PA6
#define HEADER_CONNECTOR_CN14_D2 PA4
#define HEADER_CONNECTOR_CN14_D3 PC2
#define HEADER_CONNECTOR_CN14_D4 PF10
#define HEADER_CONNECTOR_CN14_D5 PF8
#define HEADER_CONNECTOR_CN14_D6 PB8

#ifdef __cplusplus
}
#endif

#endif // _BOARD_H_
// ------------------------------------------------------------------------- END
1 change: 1 addition & 0 deletions changelog/v2.11.4/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
Support added for following hardware:

+ **[2024-10-18](./new_hw/2024-10-18.md)**
+ **[2024-10-21](./new_hw/2024-10-21.md)**

---

Expand Down
30 changes: 30 additions & 0 deletions changelog/v2.11.4/new_hw/2024-10-21.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<p align="center">
<img src="http://www.mikroe.com/img/designs/beta/logo_small.png?raw=true" alt="MikroElektronika"/>
</p>

---

**[BACK TO PREVIOUS FILE](../changelog.md)**

---

# 2024-10-21

## Changes

- [2024-10-21](#2024-10-21)
- [Changes](#changes)
- [NEW HARDWARE](#new-hardware)

### NEW HARDWARE

Support added for following hardware:

+ [Discovery kit with STM32F723IE MCU](https://www.st.com/content/st_com/en/products/evaluation-tools/product-evaluation-tools/mcu-mpu-eval-tools/stm32-mcu-mpu-eval-tools/stm32-discovery-kits/32f723ediscovery.html)
+ [Discovery kit with STM32F769NI MCU](https://www.st.com/content/st_com/en/products/evaluation-tools/product-evaluation-tools/mcu-mpu-eval-tools/stm32-mcu-mpu-eval-tools/stm32-discovery-kits/32f769idiscovery.html)

---

**[BACK TO PREVIOUS FILE](../changelog.md)**

---
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"uid": "KIT_DISCOVERY_WITH_STM32F723IE_MCU",
"name": "Discovery kit with STM32F723IE MCU",
"icon": "images/boards/board-kit-discovery-with-stm32f723ie-mcu.png",
"default_device": "",
"soldered_device": "STM32F723IE",
"category": "Starter boards",
"mikrobus_count": 0,
"sort_order": 7,
"min_pin_count": 0,
"display_socket": "NO_DISPLAY",
"sdk_config": "{\"_MSDK_BOARD_NAME_\":\"KIT_DISCOVERY_WITH_STM32F723IE_MCU\"}",
"necto_config": "",
"display": "NO_DISPLAY",
"package_uid": "176/LQFP"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"board_uid": "KIT_DISCOVERY_WITH_STM32F723IE_MCU",
"tables": [
{
"BoardToDevice": {
"device_uid": "STM32F723IE"
}
},
{
"BoardToSocket": {
"socket_uid": ["NONE"]
}
},
{
"SDKToBoard": {
"sdk_uid": "2.11.2+"
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"uid": "KIT_DISCOVERY_WITH_STM32F769NI_MCU",
"name": "Discovery kit with STM32F769NI MCU",
"icon": "images/boards/board-kit-discovery-with-stm32f769ni-mcu.png",
"default_device": "",
"soldered_device": "STM32F769NI",
"category": "Starter boards",
"mikrobus_count": 0,
"sort_order": 7,
"min_pin_count": 0,
"display_socket": "NO_DISPLAY",
"sdk_config": "{\"_MSDK_BOARD_NAME_\":\"KIT_DISCOVERY_WITH_STM32F769NI_MCU\"}",
"necto_config": "",
"display": "NO_DISPLAY",
"package_uid": "216/TFBGA"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"board_uid": "KIT_DISCOVERY_WITH_STM32F769NI_MCU",
"tables": [
{
"BoardToDevice": {
"device_uid": "STM32F769NI"
}
},
{
"BoardToSocket": {
"socket_uid": ["NONE"]
}
},
{
"SDKToBoard": {
"sdk_uid": "2.11.2+"
}
}
]
}
15 changes: 13 additions & 2 deletions scripts/check_indexes.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@
import classes.class_es as es

if __name__ == "__main__":
# First, check for arguments passed
def str2bool(v):
if isinstance(v, bool):
return v
if v.lower() in ('yes', 'true', 't', 'y', '1'):
return True
elif v.lower() in ('no', 'false', 'f', 'n', '0'):
return False
else:
raise argparse.ArgumentTypeError('Boolean value expected.')

# Get arguments
parser = argparse.ArgumentParser(description="Upload directories as release assets.")
parser.add_argument("gh_repo", help="Github repository name, e.g., 'username/repo'", type=str)
Expand All @@ -13,8 +24,8 @@
parser.add_argument("es_password", help="ES instance password value", type=str)
parser.add_argument("es_index", help="ES instance index value", type=str)
parser.add_argument("--es_regex", help="Regex to use to fetch indexed items", type=str, default=".+")
parser.add_argument("--log_only", help="If True, will not fix broken links, just log them to std out", type=bool, default=False)
parser.add_argument("--index_package_names", help="If True, will add \"gh_package_name\" to indexed item", type=bool, default=True)
parser.add_argument("--log_only", help="If True, will not fix broken links, just log them to std out", type=str2bool, default=False)
parser.add_argument("--index_package_names", help="If True, will add \"gh_package_name\" to indexed item", type=str2bool, default=True)
args = parser.parse_args()

es_instance = es.index(
Expand Down

0 comments on commit e2cab2a

Please sign in to comment.