Skip to content

Commit

Permalink
Merge pull request #90 from MikroElektronika/new-feature/boards_cards/3
Browse files Browse the repository at this point in the history
Merge branch new-feature/boards_cards/3 into master
  • Loading branch information
StrahinjaJacimovic authored Oct 9, 2024
2 parents f13a0df + b55a69e commit e8bd4ab
Show file tree
Hide file tree
Showing 14 changed files with 379 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
if(${_MSDK_BOARD_NAME_} STREQUAL "KIT_DISCOVERY_WITH_STM32F746NG_MCU")
set(BOARD_PATH "include/boards/board_discovery_with_stm32f746ng")
set(MCU_CARD FALSE)
set(SHIELD FALSE)
endif()
98 changes: 98 additions & 0 deletions bsp/board/include/boards/board_discovery_with_stm32f746ng/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 "STM32F746NG_DISCOVERY"

#include "hal_target.h"

// Mapping
#define HEADER_CONNECTOR_CN4_D1 PC7
#define HEADER_CONNECTOR_CN4_D2 PC6
#define HEADER_CONNECTOR_CN4_D3 PG6
#define HEADER_CONNECTOR_CN4_D4 PB4
#define HEADER_CONNECTOR_CN4_D5 PG7
#define HEADER_CONNECTOR_CN4_D6 PI0
#define HEADER_CONNECTOR_CN4_D7 PH6
#define HEADER_CONNECTOR_CN4_D8 PI3

#define HEADER_CONNECTOR_CN5_D1 PA0
#define HEADER_CONNECTOR_CN5_D2 PF10
#define HEADER_CONNECTOR_CN5_D3 PF9
#define HEADER_CONNECTOR_CN5_D4 PF8
#define HEADER_CONNECTOR_CN5_D5 PF7
#define HEADER_CONNECTOR_CN5_D6 PB8

#define HEADER_CONNECTOR_CN6_D1 PI1
#define HEADER_CONNECTOR_CN6_D2 PB14
#define HEADER_CONNECTOR_CN6_D3 PB15
#define HEADER_CONNECTOR_CN6_D4 PA8
#define HEADER_CONNECTOR_CN6_D5 PA15
#define HEADER_CONNECTOR_CN6_D6 PI2
#define HEADER_CONNECTOR_CN6_D7 PI2
#define HEADER_CONNECTOR_CN6_D8 PI3

#define HEADER_CONNECTOR_CN7_D1 PI2
#define HEADER_CONNECTOR_CN7_D2 PA15
#define HEADER_CONNECTOR_CN7_D3 PA8
#define HEADER_CONNECTOR_CN7_D4 PB15
#define HEADER_CONNECTOR_CN7_D5 PB14
#define HEADER_CONNECTOR_CN7_D6 PI1
#define HEADER_CONNECTOR_CN7_D7 // Pin not routed
#define HEADER_CONNECTOR_CN7_D8 // Pin not routed
#define HEADER_CONNECTOR_CN7_D9 PB9
#define HEADER_CONNECTOR_CN7_D10 PB8

#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_STM32G431CB_MCU")
set(BOARD_PATH "include/boards/board_discovery_with_stm32g431cb")
set(MCU_CARD FALSE)
set(SHIELD FALSE)
endif()
111 changes: 111 additions & 0 deletions bsp/board/include/boards/board_discovery_with_stm32g431cb/board.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
/****************************************************************************
**
** 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 "STM32G431CB_DISCOVERY"

#include "hal_target.h"

// Mapping
#define MOTOR_CONNECTOR_D1 // Pin not routed
#define MOTOR_CONNECTOR_D2 PC13
#define MOTOR_CONNECTOR_D3 PC14
#define MOTOR_CONNECTOR_D4 PC15
#define MOTOR_CONNECTOR_D5 PF0
#define MOTOR_CONNECTOR_D6 PF1
#define MOTOR_CONNECTOR_D7 PG10
#define MOTOR_CONNECTOR_D8 PA0
#define MOTOR_CONNECTOR_D9 PA1
#define MOTOR_CONNECTOR_D10 PA2
#define MOTOR_CONNECTOR_D11 PA3
#define MOTOR_CONNECTOR_D12 PA4
#define MOTOR_CONNECTOR_D13 PA5
#define MOTOR_CONNECTOR_D14 PA6
#define MOTOR_CONNECTOR_D15 PA7
#define MOTOR_CONNECTOR_D16 PC4
#define MOTOR_CONNECTOR_D17 PB0
#define MOTOR_CONNECTOR_D18 PB1
#define MOTOR_CONNECTOR_D19 PB2
#define MOTOR_CONNECTOR_D20 // Pin not routed
#define MOTOR_CONNECTOR_D21 // Pin not routed
#define MOTOR_CONNECTOR_D22 PB10
#define MOTOR_CONNECTOR_D23 // Pin not routed
#define MOTOR_CONNECTOR_D24 PB11
#define MOTOR_CONNECTOR_D25 PB12
#define MOTOR_CONNECTOR_D26 PB13
#define MOTOR_CONNECTOR_D27 PB14
#define MOTOR_CONNECTOR_D28 PB15
#define MOTOR_CONNECTOR_D29 PC6
#define MOTOR_CONNECTOR_D30 PA8
#define MOTOR_CONNECTOR_D31 PA9
#define MOTOR_CONNECTOR_D32 PA10
#define MOTOR_CONNECTOR_D33 PA11
#define MOTOR_CONNECTOR_D34 PA12
#define MOTOR_CONNECTOR_D35 // Pin not routed
#define MOTOR_CONNECTOR_D36 PA13
#define MOTOR_CONNECTOR_D37 PA14
#define MOTOR_CONNECTOR_D38 PA15
#define MOTOR_CONNECTOR_D39 PC10
#define MOTOR_CONNECTOR_D40 PC11
#define MOTOR_CONNECTOR_D41 PB3
#define MOTOR_CONNECTOR_D42 PB4
#define MOTOR_CONNECTOR_D43 PB5
#define MOTOR_CONNECTOR_D44 PB6
#define MOTOR_CONNECTOR_D45 PB7
#define MOTOR_CONNECTOR_D46 PB8
#define MOTOR_CONNECTOR_D47 PB9


#ifdef __cplusplus
}
#endif

#endif // _BOARD_H_
// ------------------------------------------------------------------------- END
1 change: 1 addition & 0 deletions changelog/v2.11.3/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ Support added for following hardware:
+ **[2024-10-04](./new_hw/2024-10-04.md)**
+ **[2024-10-07](./new_hw/2024-10-07.md)**
+ **[2024-10-08](./new_hw/2024-10-08.md)**
+ **[2024-10-09](./new_hw/2024-10-09.md)**

---

Expand Down
31 changes: 31 additions & 0 deletions changelog/v2.11.3/new_hw/2024-10-09.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<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-09

## Changes

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

### NEW HARDWARE

Support added for following hardware:

+ [Discovery kit with STM32F746NG 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/32f746gdiscovery.html)
+ [Discovery kit with STM32G431CB 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/b-g431b-esc1.html)
+ [MCU CARD 2 for PIC PIC18F87J10](https://www.mikroe.com/mcu-card-2-for-pic-pic18f87j10)

---

**[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_STM32F746NG_MCU",
"name": "Discovery kit with STM32F746NG MCU",
"icon": "images/boards/board-kit-discovery-with-stm32f746ng-mcu.png",
"default_device": "",
"soldered_device": "STM32F746NG",
"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_STM32F746NG_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_STM32F746NG_MCU",
"tables": [
{
"BoardToDevice": {
"device_uid": "STM32F746NG"
}
},
{
"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_STM32G431CB_MCU",
"name": "Discovery kit with STM32G431CB MCU",
"icon": "images/boards/board-kit-discovery-with-stm32g431cb-mcu.png",
"default_device": "",
"soldered_device": "STM32G431CB",
"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_STM32G431CB_MCU\"}",
"necto_config": "",
"display": "NO_DISPLAY",
"package_uid": "48/LQFP"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"board_uid": "KIT_DISCOVERY_WITH_STM32G431CB_MCU",
"tables": [
{
"BoardToDevice": {
"device_uid": "STM32G431CB"
}
},
{
"BoardToSocket": {
"socket_uid": ["NONE"]
}
},
{
"SDKToBoard": {
"sdk_uid": "2.11.2+"
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"def_file":"PIC18F87J10.json",
"family_uid":"PIC18",
"flash":"128",
"icon":"images/mcu_cards/mcu-card-2-for-pic.png",
"max_speed":"40.000",
"name":"MCU CARD 2 for PIC PIC18F87J10",
"ram":"3936",
"sdk_config":"{\"MCU_NAME\":\"PIC18F87J10\",\"CORE_NAME\":\"P18\",\"_MSDK_HAL_LOW_LEVEL_TARGET_\":\"mikroe\",\"_MSDK_ETH_PHY_CHIP_\":\"NULL\",\"_MSDK_MCU_CARD_NAME_\":\"MCU_CARD_2_FOR_PIC\"}",
"necto_config":"",
"uid":"MCU_CARD_2_FOR_PIC_PIC18F87J10",
"vendor":"Microchip",
"compiler_flags":"",
"linker_flags":"",
"tft_socket":"1",
"sdk_support":"1",
"installer_package":"{\"package\":\"mcu_card_2_for_pic_pic18f87j10\"}"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"device_uid": "MCU_CARD_2_FOR_PIC_PIC18F87J10",
"tables": [
{
"BoardToDevice": {
"board_uid": [
"EASYPIC_PRO_V8",
"FUSION_FOR_PIC_V8",
"UNI_CLICKER",
"UNI_DS_V8"
]
}
},
{
"CompilerToDevice": {
"compiler_uid": [
"mchp_xc8",
"mikrocpic"
]
}
},
{
"DeviceToPackage": {
"package_uid": ["80/TQFP"]
}
},
{
"DeviceToSocket": {
"socket_uid": ["SIBRAIN_SOCKET"]
}
},
{
"SDKToDevice": {
"sdk_uid": "2.11.2+"
}
}
]
}

0 comments on commit e8bd4ab

Please sign in to comment.