From 2d04b307c21173b72a2443e8a2171904319dcda7 Mon Sep 17 00:00:00 2001 From: "ivan.ruzavin" Date: Wed, 2 Oct 2024 14:17:53 +0200 Subject: [PATCH 01/10] Added release hw to new-feature/boards_cards/4 --- .../board.cmake | 4 + .../board.h | 178 +++++++++++++++ .../board.cmake | 5 + .../mikromedia_4_pic32mz_resistive/board.h | 216 ++++++++++++++++++ changelog/v2.11.3/new_hw/new_hw.md | 31 +++ .../Boards.json | 16 ++ .../LinkerTables.json | 20 ++ .../Boards.json | 16 ++ .../LinkerTables.json | 20 ++ .../Devices.json | 18 ++ .../LinkerTables.json | 38 +++ 11 files changed, 562 insertions(+) create mode 100644 bsp/board/include/boards/mikromedia_3_pic32mz_resistive_fpi/board.cmake create mode 100644 bsp/board/include/boards/mikromedia_3_pic32mz_resistive_fpi/board.h create mode 100644 bsp/board/include/boards/mikromedia_4_pic32mz_resistive/board.cmake create mode 100644 bsp/board/include/boards/mikromedia_4_pic32mz_resistive/board.h create mode 100644 changelog/v2.11.3/new_hw/new_hw.md create mode 100644 resources/queries/boards/mikromedia_3_pic32mz_resistive_fpi/Boards.json create mode 100644 resources/queries/boards/mikromedia_3_pic32mz_resistive_fpi/LinkerTables.json create mode 100644 resources/queries/boards/mikromedia_4_pic32mz_resistive/Boards.json create mode 100644 resources/queries/boards/mikromedia_4_pic32mz_resistive/LinkerTables.json create mode 100644 resources/queries/cards/mcu_card_2_for_pic_pic18f86j11/Devices.json create mode 100644 resources/queries/cards/mcu_card_2_for_pic_pic18f86j11/LinkerTables.json diff --git a/bsp/board/include/boards/mikromedia_3_pic32mz_resistive_fpi/board.cmake b/bsp/board/include/boards/mikromedia_3_pic32mz_resistive_fpi/board.cmake new file mode 100644 index 000000000..e409d3cb5 --- /dev/null +++ b/bsp/board/include/boards/mikromedia_3_pic32mz_resistive_fpi/board.cmake @@ -0,0 +1,4 @@ +if(${_MSDK_BOARD_NAME_} STREQUAL "MIKROMEDIA3FORPIC32MZRESISTIVEFPI") + set(BOARD_PATH "include/boards/mikromedia_3_pic32mz_resistive_fpi") + set(MCU_CARD FALSE) +endif() diff --git a/bsp/board/include/boards/mikromedia_3_pic32mz_resistive_fpi/board.h b/bsp/board/include/boards/mikromedia_3_pic32mz_resistive_fpi/board.h new file mode 100644 index 000000000..3b458d18b --- /dev/null +++ b/bsp/board/include/boards/mikromedia_3_pic32mz_resistive_fpi/board.h @@ -0,0 +1,178 @@ +/**************************************************************************** +** +** Copyright (C) 2024 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 "mikrobus.h" + +// Hardware revision number +#define BOARD_REV_MAJOR (1) +#define BOARD_REV_MINOR (0) + +#define BOARD_NAME "Mikromedia 3 for PIC32MZ Resistive - FPI" + +/// Mapping +#define MIKROBUS_1 1 +#define MIKROBUS_1_AN PA0 +#define MIKROBUS_1_RST PF0 +#define MIKROBUS_1_CS PB15 +#define MIKROBUS_1_SCK PB14 +#define MIKROBUS_1_MISO PD14 +#define MIKROBUS_1_MOSI PD15 +#define MIKROBUS_1_PWM PB5 +#define MIKROBUS_1_INT PD0 +#define MIKROBUS_1_RX PE8 +#define MIKROBUS_1_TX PE9 +#define MIKROBUS_1_SCL PA2 +#define MIKROBUS_1_SDA PA3 + +#define MIKROBUS_2 2 +#define MIKROBUS_2_AN PB4 +#define MIKROBUS_2_RST PF2 +#define MIKROBUS_2_CS PB9 +#define MIKROBUS_2_SCK PF13 +#define MIKROBUS_2_MISO PB10 +#define MIKROBUS_2_MOSI PB3 +#define MIKROBUS_2_PWM PB1 +#define MIKROBUS_2_INT PD4 +#define MIKROBUS_2_RX PB0 +#define MIKROBUS_2_TX PB2 +#define MIKROBUS_2_SCL PF5 +#define MIKROBUS_2_SDA PF4 + +#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 PORT_E +#define TFT_16BIT_DATA_PORT_CH0_MASK 0x00FF + +#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 NRF_CE HAL_PIN_NC +#define NRF_CS HAL_PIN_NC +#define NRF_SCK HAL_PIN_NC +#define NRF_SDI HAL_PIN_NC +#define NRF_SDO HAL_PIN_NC +#define NRF_INT 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 ACCEL_SDA PA15 +#define ACCEL_SCL PA14 +#define ACCEL_INT2 PD11 +#define ACCEL_INT1 PD10 + +#define BUZZER HAL_PIN_NC + +#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 + +#ifdef __cplusplus +} +#endif + +#endif // _BOARD_H_ +// ------------------------------------------------------------------------- END diff --git a/bsp/board/include/boards/mikromedia_4_pic32mz_resistive/board.cmake b/bsp/board/include/boards/mikromedia_4_pic32mz_resistive/board.cmake new file mode 100644 index 000000000..030d85389 --- /dev/null +++ b/bsp/board/include/boards/mikromedia_4_pic32mz_resistive/board.cmake @@ -0,0 +1,5 @@ +if(${_MSDK_BOARD_NAME_} STREQUAL "MIKROMEDIA4FORPIC32MZRESISTIVE") + set(BOARD_PATH "include/boards/mikromedia_4_pic32mz_resistive") + set(MCU_CARD FALSE) + set(SHIELD TRUE) +endif() diff --git a/bsp/board/include/boards/mikromedia_4_pic32mz_resistive/board.h b/bsp/board/include/boards/mikromedia_4_pic32mz_resistive/board.h new file mode 100644 index 000000000..e3d3d0120 --- /dev/null +++ b/bsp/board/include/boards/mikromedia_4_pic32mz_resistive/board.h @@ -0,0 +1,216 @@ +/**************************************************************************** +** +** Copyright (C) 2024 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 4 for PIC32MZ Resistive" + +/// Mapping +#define TFT_RST PH9 +#define TFT_CS PH10 +#define TFT_D_C PH11 +#define TFT_RD PA7 +#define TFT_WR PA6 +#define TFT_TE PA4 +#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 PG0 // PMP pin +#define TFT_D9 PG1 // PMP pin +#define TFT_D10 PF1 // PMP pin +#define TFT_D11 PF0 // PMP pin +#define TFT_D12 PD12 // PMP pin +#define TFT_D13 PD13 // PMP pin +#define TFT_D14 PD2 // PMP pin +#define TFT_D15 PD3 // PMP pin + +#define TFT_8BIT_DATA_PORT_CH0 PORT_E +#define TFT_8BIT_DATA_PORT_CH0_MASK 0x00FF + +#define TFT_16BIT_DATA_PORT_CH0 PORT_E +#define TFT_16BIT_DATA_PORT_CH0_MASK 0x00FF + +#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 PB15 +#define CTP_WAKE PH14 +#define CTP_RST HAL_PIN_NC + +#define NRF_CE PH0 +#define NRF_CS PH1 +#define NRF_SCK PB14 +#define NRF_SDI PC1 +#define NRF_SDO PD10 +#define NRF_INT PD5 + +#define ETH_RXER PH4 +#define ETH_TXD0 PJ8 +#define ETH_TDD1 PJ9 +#define ETH_RXD0 PH8 +#define ETH_RXD1 PH5 +#define ETH_TXEN PD6 +#define ETH_CRS_DV PH13 +#define ETH_MDIO PJ1 +#define ETH_RST PH3 +#define ETH_CLKO PJ11 +#define ETH_MDC PD11 +#define ETH_INT 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 PJ3 + +#define SD_CS PG14 +#define SD_MOSI PG10 +#define SD_SCK PF13 +#define SD_MISO PB5 +#define SD_CD PG12 + +#define FLASH_CS PH2 +#define FLASH_MISO PB5 +#define FLASH_SCK PF13 +#define FLASH_MOSI PB10 + +#define MP3_SCLK PB14 +#define MP3_SIN PC1 +#define MP3_SOUT PD10 +#define MP3_CS PK0 +#define MP3_RST PJ13 +#define MP3_DREQ PJ14 +#define MP3_DCS PJ15 + +#define ALS_SDA PA15 +#define ALS_SCL PA14 + +#define ACCEL_SDA PA15 +#define ACCEL_SCL PA14 +#define ACCEL_INT2 PD9 +#define ACCEL_INT1 PD7 + +#define BUZZER PK2 + +#define IR_TX PJ6 + +#define LED_R PB2 +#define LED_G PB1 +#define LED_B PB0 + +#define TEMP_SENS PG15 + +#define CAN_RX PD15 +#define CAN_TX PD14 + +#define POWER_BAT_SENSE PA5 +#define POWER_STATUS PJ12 +#define POWER_DC_DETECT PJ10 + +#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 PB11 +#define SHIELD_CONNECTOR_J1_PIN5 PA1 +#define SHIELD_CONNECTOR_J1_PIN6 PB12 +#define SHIELD_CONNECTOR_J1_PIN7 PB13 +#define SHIELD_CONNECTOR_J1_PIN8 PH6 +#define SHIELD_CONNECTOR_J1_PIN9 PK4 +#define SHIELD_CONNECTOR_J1_PIN10 PK5 +#define SHIELD_CONNECTOR_J1_PIN11 PB4 +#define SHIELD_CONNECTOR_J1_PIN12 PG6 +#define SHIELD_CONNECTOR_J1_PIN13 PG7 +#define SHIELD_CONNECTOR_J1_PIN14 PG8 +#define SHIELD_CONNECTOR_J1_PIN15 PD15 +#define SHIELD_CONNECTOR_J1_PIN16 PD14 +#define SHIELD_CONNECTOR_J1_PIN17 PK1 +#define SHIELD_CONNECTOR_J1_PIN18 PD1 +#define SHIELD_CONNECTOR_J1_PIN19 PF4 +#define SHIELD_CONNECTOR_J1_PIN20 PF5 + +#define SHIELD_CONNECTOR_J2_PIN7 PF12 +#define SHIELD_CONNECTOR_J2_PIN8 PC2 +#define SHIELD_CONNECTOR_J2_PIN9 PB8 +#define SHIELD_CONNECTOR_J2_PIN10 PB3 +#define SHIELD_CONNECTOR_J2_PIN11 PB9 +#define SHIELD_CONNECTOR_J2_PIN12 HAL_PIN_NC +#define SHIELD_CONNECTOR_J2_PIN13 PC3 +#define SHIELD_CONNECTOR_J2_PIN14 PC4 +#define SHIELD_CONNECTOR_J2_PIN15 PC14 +#define SHIELD_CONNECTOR_J2_PIN16 PG9 +#define SHIELD_CONNECTOR_J2_PIN17 PA2 +#define SHIELD_CONNECTOR_J2_PIN18 PA3 +#define SHIELD_CONNECTOR_J2_PIN19 PD4 +#define SHIELD_CONNECTOR_J2_PIN20 PD0 +#define SHIELD_CONNECTOR_J2_PIN21 PE8 +#define SHIELD_CONNECTOR_J2_PIN22 PE9 +#define SHIELD_CONNECTOR_J2_PIN23 PF8 +#define SHIELD_CONNECTOR_J2_PIN24 PF2 + +#ifdef __cplusplus +} +#endif + +#endif // _BOARD_H_ +// ------------------------------------------------------------------------- END diff --git a/changelog/v2.11.3/new_hw/new_hw.md b/changelog/v2.11.3/new_hw/new_hw.md new file mode 100644 index 000000000..1cffe12ad --- /dev/null +++ b/changelog/v2.11.3/new_hw/new_hw.md @@ -0,0 +1,31 @@ +

+ MikroElektronika +

+ +--- + +**[BACK TO PREVIOUS FILE](../changelog.md)** + +--- + +# `DATE` + +## Changes + +- [`DATE`](#date) + - [Changes](#changes) + - [NEW HARDWARE](#new-hardware) + +### NEW HARDWARE + +Support added for following hardware: + ++ [MCU CARD 2 for PIC PIC18F86J11](https://www.mikroe.com/mcu-card-2-for-pic-pic18f86j11) ++ [Mikromedia 3 for PIC32MZ Resistive FPI with frame](https://www.mikroe.com/mikromedia-3-for-pic32mz-resistive-fpi-with-frame) ++ [Mikromedia 4 for PIC32MZ Resistive](https://www.mikroe.com/mikromedia-4-for-pic32mz-resistive) + +--- + +**[BACK TO PREVIOUS FILE](../changelog.md)** + +--- diff --git a/resources/queries/boards/mikromedia_3_pic32mz_resistive_fpi/Boards.json b/resources/queries/boards/mikromedia_3_pic32mz_resistive_fpi/Boards.json new file mode 100644 index 000000000..05da10b77 --- /dev/null +++ b/resources/queries/boards/mikromedia_3_pic32mz_resistive_fpi/Boards.json @@ -0,0 +1,16 @@ +{ + "uid": "MIKROMEDIA_3_FOR_PIC32MZ_RESISTIVE_FPI_WITH_FRAME", + "name": "Mikromedia 3 for PIC32MZ Resistive FPI with frame", + "icon": "images/boards/board-mikromedia-3-resistive-fpi-frame.png", + "default_device": "", + "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_\":\"MIKROMEDIA3FORPIC32MZRESISTIVEFPI\"}", + "necto_config": "", + "display": "MIKROMEDIA_3_FOR_PIC32MZ_RESISTIVE_FPI_FRAME_BUILT_IN_DISPLAY", + "package_uid": "100/TQFP" +} diff --git a/resources/queries/boards/mikromedia_3_pic32mz_resistive_fpi/LinkerTables.json b/resources/queries/boards/mikromedia_3_pic32mz_resistive_fpi/LinkerTables.json new file mode 100644 index 000000000..0a251e5e2 --- /dev/null +++ b/resources/queries/boards/mikromedia_3_pic32mz_resistive_fpi/LinkerTables.json @@ -0,0 +1,20 @@ +{ + "board_uid": "MIKROMEDIA_3_FOR_PIC32MZ_RESISTIVE_FPI_WITH_FRAME", + "tables": [ + { + "BoardToDevice": { + "device_uid": "PIC32MZ2048EFH100" + } + }, + { + "BoardToSocket": { + "socket_uid": ["NONE"] + } + }, + { + "SDKToBoard": { + "sdk_uid": "2.11.2+" + } + } + ] +} diff --git a/resources/queries/boards/mikromedia_4_pic32mz_resistive/Boards.json b/resources/queries/boards/mikromedia_4_pic32mz_resistive/Boards.json new file mode 100644 index 000000000..97b189b69 --- /dev/null +++ b/resources/queries/boards/mikromedia_4_pic32mz_resistive/Boards.json @@ -0,0 +1,16 @@ +{ + "uid": "MIKROMEDIA_4_FOR_PIC32MZ_RESISTIVE", + "name": "Mikromedia 4 for PIC32MZ Resistive", + "icon": "images/boards/board-mikromedia-4-for-pic32mz-resistive.png", + "default_device": "", + "soldered_device": "PIC32MZ2048EFH144", + "category": "mikromedia boards", + "mikrobus_count": 0, + "sort_order": 8, + "min_pin_count": 0, + "display_socket": "BUILT_IN_DISPLAY", + "sdk_config": "{\"_MSDK_BOARD_NAME_\":\"MIKROMEDIA4FORPIC32MZRESISTIVE\",\"_MSDK_ETH_PHY_CHIP_\":\"&lan8720PhyDriver\"}", + "necto_config": "", + "display": "MIKROMEDIA_4_FOR_PIC32MZ_RESISTIVE_BUILT_IN_DISPLAY", + "package_uid": "144/LQFP" +} diff --git a/resources/queries/boards/mikromedia_4_pic32mz_resistive/LinkerTables.json b/resources/queries/boards/mikromedia_4_pic32mz_resistive/LinkerTables.json new file mode 100644 index 000000000..7618d0a2b --- /dev/null +++ b/resources/queries/boards/mikromedia_4_pic32mz_resistive/LinkerTables.json @@ -0,0 +1,20 @@ +{ + "board_uid": "MIKROMEDIA_4_FOR_PIC32MZ_RESISTIVE", + "tables": [ + { + "BoardToDevice": { + "device_uid": "PIC32MZ2048EFH144" + } + }, + { + "BoardToSocket": { + "socket_uid": ["NONE"] + } + }, + { + "SDKToBoard": { + "sdk_uid": "2.11.2+" + } + } + ] +} diff --git a/resources/queries/cards/mcu_card_2_for_pic_pic18f86j11/Devices.json b/resources/queries/cards/mcu_card_2_for_pic_pic18f86j11/Devices.json new file mode 100644 index 000000000..d0db16242 --- /dev/null +++ b/resources/queries/cards/mcu_card_2_for_pic_pic18f86j11/Devices.json @@ -0,0 +1,18 @@ +{ + "def_file":"PIC18F86J11.json", + "family_uid":"PIC18", + "flash":"64", + "icon":"images/mcu_cards/mcu-card-2-for-pic.png", + "max_speed":"48.000", + "name":"MCU CARD 2 for PIC PIC18F86J11", + "ram":"3904", + "sdk_config":"{\"MCU_NAME\":\"PIC18F86J11\",\"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_PIC18F86J11", + "vendor":"Microchip", + "compiler_flags":"", + "linker_flags":"", + "tft_socket":"1", + "sdk_support":"1", + "installer_package":"{\"package\":\"mcu_card_2_for_pic_pic18f86j11\"}" +} diff --git a/resources/queries/cards/mcu_card_2_for_pic_pic18f86j11/LinkerTables.json b/resources/queries/cards/mcu_card_2_for_pic_pic18f86j11/LinkerTables.json new file mode 100644 index 000000000..f4676a6c1 --- /dev/null +++ b/resources/queries/cards/mcu_card_2_for_pic_pic18f86j11/LinkerTables.json @@ -0,0 +1,38 @@ +{ + "device_uid": "MCU_CARD_2_FOR_PIC_PIC18F86J11", + "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+" + } + } + ] +} From 36acd49c16fd8076da9f3de545967296b2e7ebb7 Mon Sep 17 00:00:00 2001 From: "ivan.ruzavin" Date: Fri, 4 Oct 2024 09:15:58 +0200 Subject: [PATCH 02/10] Added release hw to new-feature/boards_cards/4 --- changelog/new_hw.md | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 changelog/new_hw.md diff --git a/changelog/new_hw.md b/changelog/new_hw.md new file mode 100644 index 000000000..1cffe12ad --- /dev/null +++ b/changelog/new_hw.md @@ -0,0 +1,31 @@ +

+ MikroElektronika +

+ +--- + +**[BACK TO PREVIOUS FILE](../changelog.md)** + +--- + +# `DATE` + +## Changes + +- [`DATE`](#date) + - [Changes](#changes) + - [NEW HARDWARE](#new-hardware) + +### NEW HARDWARE + +Support added for following hardware: + ++ [MCU CARD 2 for PIC PIC18F86J11](https://www.mikroe.com/mcu-card-2-for-pic-pic18f86j11) ++ [Mikromedia 3 for PIC32MZ Resistive FPI with frame](https://www.mikroe.com/mikromedia-3-for-pic32mz-resistive-fpi-with-frame) ++ [Mikromedia 4 for PIC32MZ Resistive](https://www.mikroe.com/mikromedia-4-for-pic32mz-resistive) + +--- + +**[BACK TO PREVIOUS FILE](../changelog.md)** + +--- From b251191485544abbe0e7c3c3c8209355e7949fcf Mon Sep 17 00:00:00 2001 From: Ivan Ruzavin Date: Fri, 4 Oct 2024 09:24:49 +0200 Subject: [PATCH 03/10] Removed versioned new_hw --- changelog/v2.11.3/new_hw/new_hw.md | 31 ------------------------------ 1 file changed, 31 deletions(-) delete mode 100644 changelog/v2.11.3/new_hw/new_hw.md diff --git a/changelog/v2.11.3/new_hw/new_hw.md b/changelog/v2.11.3/new_hw/new_hw.md deleted file mode 100644 index 1cffe12ad..000000000 --- a/changelog/v2.11.3/new_hw/new_hw.md +++ /dev/null @@ -1,31 +0,0 @@ -

- MikroElektronika -

- ---- - -**[BACK TO PREVIOUS FILE](../changelog.md)** - ---- - -# `DATE` - -## Changes - -- [`DATE`](#date) - - [Changes](#changes) - - [NEW HARDWARE](#new-hardware) - -### NEW HARDWARE - -Support added for following hardware: - -+ [MCU CARD 2 for PIC PIC18F86J11](https://www.mikroe.com/mcu-card-2-for-pic-pic18f86j11) -+ [Mikromedia 3 for PIC32MZ Resistive FPI with frame](https://www.mikroe.com/mikromedia-3-for-pic32mz-resistive-fpi-with-frame) -+ [Mikromedia 4 for PIC32MZ Resistive](https://www.mikroe.com/mikromedia-4-for-pic32mz-resistive) - ---- - -**[BACK TO PREVIOUS FILE](../changelog.md)** - ---- From 01d9b49144be22c02b18dca7c3313eb050aed16e Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 10 Oct 2024 09:12:50 +0000 Subject: [PATCH 04/10] Remove old changelog file after moving it --- changelog/new_hw.md | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 changelog/new_hw.md diff --git a/changelog/new_hw.md b/changelog/new_hw.md deleted file mode 100644 index 1cffe12ad..000000000 --- a/changelog/new_hw.md +++ /dev/null @@ -1,31 +0,0 @@ -

- MikroElektronika -

- ---- - -**[BACK TO PREVIOUS FILE](../changelog.md)** - ---- - -# `DATE` - -## Changes - -- [`DATE`](#date) - - [Changes](#changes) - - [NEW HARDWARE](#new-hardware) - -### NEW HARDWARE - -Support added for following hardware: - -+ [MCU CARD 2 for PIC PIC18F86J11](https://www.mikroe.com/mcu-card-2-for-pic-pic18f86j11) -+ [Mikromedia 3 for PIC32MZ Resistive FPI with frame](https://www.mikroe.com/mikromedia-3-for-pic32mz-resistive-fpi-with-frame) -+ [Mikromedia 4 for PIC32MZ Resistive](https://www.mikroe.com/mikromedia-4-for-pic32mz-resistive) - ---- - -**[BACK TO PREVIOUS FILE](../changelog.md)** - ---- From 97410ffe5c75a28b533467bfe437d24adf1980c0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 10 Oct 2024 09:12:51 +0000 Subject: [PATCH 05/10] Updated changelog files with latest release info. --- changelog/v2.11.3/changelog.md | 1 + changelog/v2.11.3/new_hw/2024-10-10.md | 31 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 changelog/v2.11.3/new_hw/2024-10-10.md diff --git a/changelog/v2.11.3/changelog.md b/changelog/v2.11.3/changelog.md index 73b385bd5..7c03c231c 100644 --- a/changelog/v2.11.3/changelog.md +++ b/changelog/v2.11.3/changelog.md @@ -73,6 +73,7 @@ Support added for following hardware: + **[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)** ++ **[2024-10-10](./new_hw/2024-10-10.md)** --- diff --git a/changelog/v2.11.3/new_hw/2024-10-10.md b/changelog/v2.11.3/new_hw/2024-10-10.md new file mode 100644 index 000000000..1ceb5a5d9 --- /dev/null +++ b/changelog/v2.11.3/new_hw/2024-10-10.md @@ -0,0 +1,31 @@ +

+ MikroElektronika +

+ +--- + +**[BACK TO PREVIOUS FILE](../changelog.md)** + +--- + +# 2024-10-10 + +## Changes + +- [2024-10-10](#2024-10-10) + - [Changes](#changes) + - [NEW HARDWARE](#new-hardware) + +### NEW HARDWARE + +Support added for following hardware: + ++ [MCU CARD 2 for PIC PIC18F86J11](https://www.mikroe.com/mcu-card-2-for-pic-pic18f86j11) ++ [Mikromedia 3 for PIC32MZ Resistive FPI with frame](https://www.mikroe.com/mikromedia-3-for-pic32mz-resistive-fpi-with-frame) ++ [Mikromedia 4 for PIC32MZ Resistive](https://www.mikroe.com/mikromedia-4-for-pic32mz-resistive) + +--- + +**[BACK TO PREVIOUS FILE](../changelog.md)** + +--- From 80e2fb28508745d04a4feef705a351c784dd9e80 Mon Sep 17 00:00:00 2001 From: strahi-linux Date: Thu, 10 Oct 2024 11:17:46 +0200 Subject: [PATCH 06/10] Reverted changelog file --- changelog/v2.11.3/new_hw/{2024-10-10.md => new_hw.md} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename changelog/v2.11.3/new_hw/{2024-10-10.md => new_hw.md} (86%) diff --git a/changelog/v2.11.3/new_hw/2024-10-10.md b/changelog/v2.11.3/new_hw/new_hw.md similarity index 86% rename from changelog/v2.11.3/new_hw/2024-10-10.md rename to changelog/v2.11.3/new_hw/new_hw.md index 1ceb5a5d9..dc1833d5a 100644 --- a/changelog/v2.11.3/new_hw/2024-10-10.md +++ b/changelog/v2.11.3/new_hw/new_hw.md @@ -8,13 +8,13 @@ --- -# 2024-10-10 +# `DATE` ## Changes -- [2024-10-10](#2024-10-10) - - [Changes](#changes) - - [NEW HARDWARE](#new-hardware) ++ [`DATE`](#date) + + [Changes](#changes) + + [NEW HARDWARE](#new-hardware) ### NEW HARDWARE From d1d3e19caf956da3cb0b876edc67fcb93c293a8d Mon Sep 17 00:00:00 2001 From: strahi-linux Date: Thu, 10 Oct 2024 11:23:05 +0200 Subject: [PATCH 07/10] Removed from main changelog --- changelog/v2.11.3/changelog.md | 1 - 1 file changed, 1 deletion(-) diff --git a/changelog/v2.11.3/changelog.md b/changelog/v2.11.3/changelog.md index 7c03c231c..73b385bd5 100644 --- a/changelog/v2.11.3/changelog.md +++ b/changelog/v2.11.3/changelog.md @@ -73,7 +73,6 @@ Support added for following hardware: + **[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)** -+ **[2024-10-10](./new_hw/2024-10-10.md)** --- From c0ce9bff61a96c0610f6c291ab10dc674109bfb6 Mon Sep 17 00:00:00 2001 From: strahi-linux Date: Thu, 10 Oct 2024 11:30:19 +0200 Subject: [PATCH 08/10] Removed from main changelog --- changelog/{v2.11.3/new_hw => }/new_hw.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog/{v2.11.3/new_hw => }/new_hw.md (100%) diff --git a/changelog/v2.11.3/new_hw/new_hw.md b/changelog/new_hw.md similarity index 100% rename from changelog/v2.11.3/new_hw/new_hw.md rename to changelog/new_hw.md From b3574fa5ad6b0cf9cf02596427c6a50b04f92edf Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 10 Oct 2024 09:31:19 +0000 Subject: [PATCH 09/10] Updated changelog files with latest release info. --- changelog/v2.11.3/changelog.md | 1 + changelog/v2.11.3/new_hw/2024-10-10.md | 31 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 changelog/v2.11.3/new_hw/2024-10-10.md diff --git a/changelog/v2.11.3/changelog.md b/changelog/v2.11.3/changelog.md index 73b385bd5..7c03c231c 100644 --- a/changelog/v2.11.3/changelog.md +++ b/changelog/v2.11.3/changelog.md @@ -73,6 +73,7 @@ Support added for following hardware: + **[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)** ++ **[2024-10-10](./new_hw/2024-10-10.md)** --- diff --git a/changelog/v2.11.3/new_hw/2024-10-10.md b/changelog/v2.11.3/new_hw/2024-10-10.md new file mode 100644 index 000000000..ec001e432 --- /dev/null +++ b/changelog/v2.11.3/new_hw/2024-10-10.md @@ -0,0 +1,31 @@ +

+ MikroElektronika +

+ +--- + +**[BACK TO PREVIOUS FILE](../changelog.md)** + +--- + +# 2024-10-10 + +## Changes + ++ [2024-10-10](#2024-10-10) + + [Changes](#changes) + + [NEW HARDWARE](#new-hardware) + +### NEW HARDWARE + +Support added for following hardware: + ++ [MCU CARD 2 for PIC PIC18F86J11](https://www.mikroe.com/mcu-card-2-for-pic-pic18f86j11) ++ [Mikromedia 3 for PIC32MZ Resistive FPI with frame](https://www.mikroe.com/mikromedia-3-for-pic32mz-resistive-fpi-with-frame) ++ [Mikromedia 4 for PIC32MZ Resistive](https://www.mikroe.com/mikromedia-4-for-pic32mz-resistive) + +--- + +**[BACK TO PREVIOUS FILE](../changelog.md)** + +--- From 6306bd03b9366143b88dc073427c6ae044b5fb29 Mon Sep 17 00:00:00 2001 From: "ivan.ruzavin" Date: Thu, 10 Oct 2024 11:55:19 +0200 Subject: [PATCH 10/10] Fixed according to ARs --- .../board.h | 2 +- .../mikromedia_4_pic32mz_resistive/board.h | 2 +- .../board.h | 2 +- changelog/new_hw.md | 31 ------------------- 4 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 changelog/new_hw.md diff --git a/bsp/board/include/boards/mikromedia_3_pic32mz_resistive_fpi/board.h b/bsp/board/include/boards/mikromedia_3_pic32mz_resistive_fpi/board.h index 3b458d18b..5bd4b2058 100644 --- a/bsp/board/include/boards/mikromedia_3_pic32mz_resistive_fpi/board.h +++ b/bsp/board/include/boards/mikromedia_3_pic32mz_resistive_fpi/board.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2024 MikroElektronika d.o.o. +** Copyright (C) ${COPYRIGHT_YEAR} MikroElektronika d.o.o. ** Contact: https://www.mikroe.com/contact ** ** This file is part of the mikroSDK package diff --git a/bsp/board/include/boards/mikromedia_4_pic32mz_resistive/board.h b/bsp/board/include/boards/mikromedia_4_pic32mz_resistive/board.h index e3d3d0120..292beb7da 100644 --- a/bsp/board/include/boards/mikromedia_4_pic32mz_resistive/board.h +++ b/bsp/board/include/boards/mikromedia_4_pic32mz_resistive/board.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2024 MikroElektronika d.o.o. +** Copyright (C) ${COPYRIGHT_YEAR} MikroElektronika d.o.o. ** Contact: https://www.mikroe.com/contact ** ** This file is part of the mikroSDK package diff --git a/bsp/board/include/boards/mikromedia_5_pic32mz_resistive_fpi/board.h b/bsp/board/include/boards/mikromedia_5_pic32mz_resistive_fpi/board.h index 1f549050d..84029a830 100644 --- a/bsp/board/include/boards/mikromedia_5_pic32mz_resistive_fpi/board.h +++ b/bsp/board/include/boards/mikromedia_5_pic32mz_resistive_fpi/board.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2024 MikroElektronika d.o.o. +** Copyright (C) ${COPYRIGHT_YEAR} MikroElektronika d.o.o. ** Contact: https://www.mikroe.com/contact ** ** This file is part of the mikroSDK package diff --git a/changelog/new_hw.md b/changelog/new_hw.md deleted file mode 100644 index dc1833d5a..000000000 --- a/changelog/new_hw.md +++ /dev/null @@ -1,31 +0,0 @@ -

- MikroElektronika -

- ---- - -**[BACK TO PREVIOUS FILE](../changelog.md)** - ---- - -# `DATE` - -## Changes - -+ [`DATE`](#date) - + [Changes](#changes) - + [NEW HARDWARE](#new-hardware) - -### NEW HARDWARE - -Support added for following hardware: - -+ [MCU CARD 2 for PIC PIC18F86J11](https://www.mikroe.com/mcu-card-2-for-pic-pic18f86j11) -+ [Mikromedia 3 for PIC32MZ Resistive FPI with frame](https://www.mikroe.com/mikromedia-3-for-pic32mz-resistive-fpi-with-frame) -+ [Mikromedia 4 for PIC32MZ Resistive](https://www.mikroe.com/mikromedia-4-for-pic32mz-resistive) - ---- - -**[BACK TO PREVIOUS FILE](../changelog.md)** - ----