From 54abb477fba10f38a074e133be690ca62e2af81c Mon Sep 17 00:00:00 2001 From: Ivan Ruzavin Date: Fri, 23 Aug 2024 15:15:36 +0200 Subject: [PATCH 1/2] release-20240823 --- .../board.cmake | 5 + .../mikromedia_3_pic32mz_resistive/board.h | 189 ++++++++++++++++++ changelog/v2.11.2/changelog.md | 31 +++ .../Boards.json | 16 ++ .../LinkerTables.json | 20 ++ .../boards}/Boards.json | 0 .../boards}/LinkerTables.json | 0 7 files changed, 261 insertions(+) create mode 100644 bsp/board/include/boards/mikromedia_3_pic32mz_resistive/board.cmake create mode 100644 bsp/board/include/boards/mikromedia_3_pic32mz_resistive/board.h create mode 100644 changelog/v2.11.2/changelog.md create mode 100644 resources/queries/boards/mikromedia_3_pic32mz_resistive/Boards.json create mode 100644 resources/queries/boards/mikromedia_3_pic32mz_resistive/LinkerTables.json rename resources/queries/{boards/board_test_1 => templates/boards}/Boards.json (100%) rename resources/queries/{boards/board_test_1 => templates/boards}/LinkerTables.json (100%) diff --git a/bsp/board/include/boards/mikromedia_3_pic32mz_resistive/board.cmake b/bsp/board/include/boards/mikromedia_3_pic32mz_resistive/board.cmake new file mode 100644 index 000000000..5e057e857 --- /dev/null +++ b/bsp/board/include/boards/mikromedia_3_pic32mz_resistive/board.cmake @@ -0,0 +1,5 @@ +if(${_MSDK_BOARD_NAME_} STREQUAL "MIKROMEDIA3FORPIC32MZRESISTIVE") + set(BOARD_PATH "include/boards/mikromedia_3_pic32mz_resistive") + set(MCU_CARD FALSE) + set(SHIELD TRUE) +endif() diff --git a/bsp/board/include/boards/mikromedia_3_pic32mz_resistive/board.h b/bsp/board/include/boards/mikromedia_3_pic32mz_resistive/board.h new file mode 100644 index 000000000..328b5cd89 --- /dev/null +++ b/bsp/board/include/boards/mikromedia_3_pic32mz_resistive/board.h @@ -0,0 +1,189 @@ +/**************************************************************************** +** +** 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 + +#include "hal_target.h" +#include "shield.h" + +// Hardware revision number +#define BOARD_REV_MAJOR (1) +#define BOARD_REV_MINOR (02) + +#define BOARD_NAME "Mikromedia 3 for PIC32MZ Resistive" + +/// Mapping +#define TFT_RST PG14 +#define TFT_CS PG12 +#define TFT_D_C PG13 +#define TFT_RD PC4 +#define TFT_WR PC3 +#define TFT_TE PD13 +#define TFT_BPWM HAL_PIN_NC +#define TFT_D0 PE0 +#define TFT_D1 PE1 +#define TFT_D2 PE2 +#define TFT_D3 PE3 +#define TFT_D4 PE4 +#define TFT_D5 PE5 +#define TFT_D6 PE6 +#define TFT_D7 PE7 +#define TFT_D8 HAL_PIN_NC +#define TFT_D9 HAL_PIN_NC +#define TFT_D10 HAL_PIN_NC +#define TFT_D11 HAL_PIN_NC +#define TFT_D12 HAL_PIN_NC +#define TFT_D13 HAL_PIN_NC +#define TFT_D14 HAL_PIN_NC +#define TFT_D15 HAL_PIN_NC + +#define TFT_8BIT_DATA_PORT_CH0 PORT_E +#define TFT_8BIT_DATA_PORT_CH0_MASK 0x00FF + +#define TFT_16BIT_DATA_PORT_CH0 HAL_PORT_NC +#define TFT_16BIT_DATA_PORT_CH0_MASK 0x0000 + +#define TFT_16BIT_DATA_PORT_CH1 HAL_PORT_NC +#define TFT_16BIT_DATA_PORT_CH1_MASK 0x0000 + +#define CTP_SDA PA15 +#define CTP_SCL PA14 +#define CTP_INT PF1 +#define CTP_WAKE HAL_PIN_NC +#define CTP_RST HAL_PIN_NC + +#define USB_SW_ID PF3 +#define USB_VBUS HAL_PIN_NC +#define USB_N HAL_PIN_NC +#define USB_P HAL_PIN_NC +#define USB_PSW PB13 + +#define SD_CS PA4 +#define SD_MOSI PG8 +#define SD_SCK PG6 +#define SD_MISO PG7 +#define SD_CD PF8 + +#define FLASH_CS PD9 +#define FLASH_MISO PG7 +#define FLASH_SCK PG6 +#define FLASH_MOSI PG8 + +#define MP3_SCLK PD1 +#define MP3_SIN PD3 +#define MP3_SOUT PD2 +#define MP3_CS PG1 +#define MP3_RST PG0 +#define MP3_DREQ PA6 +#define MP3_DCS PA7 + +#define ALS_SDA PA15 +#define ALS_SCL PA14 + +#define ACCEL_SDA PA15 +#define ACCEL_SCL PA14 +#define ACCEL_INT2 PD11 +#define ACCEL_INT1 PD10 + +#define TEMP_SENS PG15 + +#define POWER_BAT_SENSE PA5 +#define POWER_STATUS PB11 +#define POWER_DC_DETECT HAL_PIN_NC + +#define USB_UART_TX HAL_PIN_NC +#define USB_UART_RX HAL_PIN_NC + +#define SHIELD_CONNECTOR_J1_PIN3 PA0 +#define SHIELD_CONNECTOR_J1_PIN4 PB4 +#define SHIELD_CONNECTOR_J1_PIN5 PA1 +#define SHIELD_CONNECTOR_J1_PIN6 PF13 +#define SHIELD_CONNECTOR_J1_PIN7 PF12 +#define SHIELD_CONNECTOR_J1_PIN8 PB12 +#define SHIELD_CONNECTOR_J1_PIN9 PB3 +#define SHIELD_CONNECTOR_J1_PIN10 PB2 +#define SHIELD_CONNECTOR_J1_PIN11 PG9 +#define SHIELD_CONNECTOR_J1_PIN12 PG6 +#define SHIELD_CONNECTOR_J1_PIN13 PG7 +#define SHIELD_CONNECTOR_J1_PIN14 PG8 +#define SHIELD_CONNECTOR_J1_PIN15 PB15 +#define SHIELD_CONNECTOR_J1_PIN16 PC2 +#define SHIELD_CONNECTOR_J1_PIN17 PD12 +#define SHIELD_CONNECTOR_J1_PIN18 PD1 +#define SHIELD_CONNECTOR_J1_PIN19 PD2 +#define SHIELD_CONNECTOR_J1_PIN20 PD3 +#define SHIELD_CONNECTOR_J1_PIN21 PC1 +#define SHIELD_CONNECTOR_J1_PIN22 PB14 +#define SHIELD_CONNECTOR_J1_PIN23 PD14 +#define SHIELD_CONNECTOR_J1_PIN24 PD15 + +#define SHIELD_CONNECTOR_J2_PIN7 PB5 +#define SHIELD_CONNECTOR_J2_PIN8 PB1 +#define SHIELD_CONNECTOR_J2_PIN9 PB0 +#define SHIELD_CONNECTOR_J2_PIN10 PB8 +#define SHIELD_CONNECTOR_J2_PIN11 PB9 +#define SHIELD_CONNECTOR_J2_PIN12 PB10 +#define SHIELD_CONNECTOR_J2_PIN13 PD0 +#define SHIELD_CONNECTOR_J2_PIN14 PD4 +#define SHIELD_CONNECTOR_J2_PIN15 PD5 +#define SHIELD_CONNECTOR_J2_PIN16 PF0 +#define SHIELD_CONNECTOR_J2_PIN17 PA2 +#define SHIELD_CONNECTOR_J2_PIN18 PA3 +#define SHIELD_CONNECTOR_J2_PIN19 PF4 +#define SHIELD_CONNECTOR_J2_PIN20 PF5 +#define SHIELD_CONNECTOR_J2_PIN21 PE8 +#define SHIELD_CONNECTOR_J2_PIN22 PE9 +#define SHIELD_CONNECTOR_J2_PIN23 PA14 +#define SHIELD_CONNECTOR_J2_PIN24 PA15 + +#ifdef __cplusplus +} +#endif + +#endif // _BOARD_H_ +// ------------------------------------------------------------------------- END diff --git a/changelog/v2.11.2/changelog.md b/changelog/v2.11.2/changelog.md new file mode 100644 index 000000000..484740a23 --- /dev/null +++ b/changelog/v2.11.2/changelog.md @@ -0,0 +1,31 @@ +

+ MikroElektronika +

+ +--- + +**[BACK TO MAIN FILE](../../CHANGELOG.md)** + +--- + +# `v2.11.2` + ++ released: 2024-08-23 + +## Changes + +- [`v2.11.2`](#v2112) + - [Changes](#changes) + - [NEW HARDWARE](#new-hardware) + +### NEW HARDWARE + +Support added for following hardware: + ++ [Mikromedia 3 for PIC32MZ RESISTIVE](https://www.mikroe.com/mikromedia-3-for-pic32mz-resistive) + +--- + +**[BACK TO MAIN FILE](../../CHANGELOG.md)** + +--- diff --git a/resources/queries/boards/mikromedia_3_pic32mz_resistive/Boards.json b/resources/queries/boards/mikromedia_3_pic32mz_resistive/Boards.json new file mode 100644 index 000000000..1ffe32d5b --- /dev/null +++ b/resources/queries/boards/mikromedia_3_pic32mz_resistive/Boards.json @@ -0,0 +1,16 @@ +{ + "uid": "MIKROMEDIA_3_FOR_PIC32MZ_RESISTIVE", + "name": "Mikromedia 3 for PIC32MZ Resistive", + "icon": "images/boards/board-mikromedia-3-for-pic32mz-resistive.png", + "default_device": "NULL", + "soldered_device": "PIC32MZ2048EFH100", + "category": "mikromedia boards", + "mikrobus_count": 0, + "sort_order": 8, + "min_pin_count": 0, + "display_socket": "BUILT_IN_DISPLAY", + "sdk_config": "{\"_MSDK_BOARD_NAME_\":\"MIKROMEDIA3FORPIC32MZRESISTIVE\"}", + "necto_config": "NULL", + "display": "MIKROMEDIA_3_FOR_PIC32MZ_RESISTIVE_BUILT_IN_DISPLAY", + "package_uid": "100/TQFP" +} diff --git a/resources/queries/boards/mikromedia_3_pic32mz_resistive/LinkerTables.json b/resources/queries/boards/mikromedia_3_pic32mz_resistive/LinkerTables.json new file mode 100644 index 000000000..b93c75e60 --- /dev/null +++ b/resources/queries/boards/mikromedia_3_pic32mz_resistive/LinkerTables.json @@ -0,0 +1,20 @@ +{ + "board_uid": "MIKROMEDIA_3_FOR_PIC32MZ_RESISTIVE", + "tables": [ + { + "BoardToDevice": { + "device_uid": "PIC32MZ2048EFH100" + } + }, + { + "BoardToSocket": { + "socket_uid": ["NONE"] + } + }, + { + "SDKToBoard": { + "sdk_uid": "2.11.2+" + } + } + ] +} diff --git a/resources/queries/boards/board_test_1/Boards.json b/resources/queries/templates/boards/Boards.json similarity index 100% rename from resources/queries/boards/board_test_1/Boards.json rename to resources/queries/templates/boards/Boards.json diff --git a/resources/queries/boards/board_test_1/LinkerTables.json b/resources/queries/templates/boards/LinkerTables.json similarity index 100% rename from resources/queries/boards/board_test_1/LinkerTables.json rename to resources/queries/templates/boards/LinkerTables.json From 17cdb2b4b94b48226e0abaaf58ad13bb74c7b085 Mon Sep 17 00:00:00 2001 From: Ivan Ruzavin Date: Mon, 26 Aug 2024 08:42:30 +0200 Subject: [PATCH 2/2] Moved cards queries to templates --- .../queries/{cards/card_test_1 => templates/cards}/Devices.json | 0 .../{cards/card_test_1 => templates/cards}/LinkerTables.json | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename resources/queries/{cards/card_test_1 => templates/cards}/Devices.json (100%) rename resources/queries/{cards/card_test_1 => templates/cards}/LinkerTables.json (100%) diff --git a/resources/queries/cards/card_test_1/Devices.json b/resources/queries/templates/cards/Devices.json similarity index 100% rename from resources/queries/cards/card_test_1/Devices.json rename to resources/queries/templates/cards/Devices.json diff --git a/resources/queries/cards/card_test_1/LinkerTables.json b/resources/queries/templates/cards/LinkerTables.json similarity index 100% rename from resources/queries/cards/card_test_1/LinkerTables.json rename to resources/queries/templates/cards/LinkerTables.json