Skip to content

Commit

Permalink
Merge branch 'master' into new-feature/boards/40
Browse files Browse the repository at this point in the history
  • Loading branch information
IvanRuzavin committed Nov 18, 2024
2 parents ccfdc7c + 7342b6d commit 44ced0d
Show file tree
Hide file tree
Showing 17 changed files with 482 additions and 11 deletions.
15 changes: 9 additions & 6 deletions .github/workflows/checkIndexes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ on:
schedule:
- cron: "0/30 7-16 * * 1-5" # Every 30 minutes, between 07:00 AM and 04:59 PM, Monday through Friday

env:
GLOBAL_REGEX: "images_sdk|templates|mikrosdk|mcucard|mcu_card|click|mikromedia|pim|queries|sibrain|kit|board"

jobs:
manual_run:
if: ${{ github.event_name == 'workflow_dispatch' }}
Expand All @@ -51,7 +54,7 @@ jobs:
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"
python -u scripts/check_indexes.py ${{ github.repository }} ${{ secrets.GITHUB_TOKEN }} ${{ secrets.ES_HOST }} ${{ secrets.ES_USER }} ${{ secrets.ES_PASSWORD }} ${{ secrets.ME_ES_HOST }} ${{ secrets.ME_ES_USER }} ${{ secrets.ME_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
Expand All @@ -60,7 +63,7 @@ jobs:
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"
python -u scripts/check_indexes.py ${{ github.repository }} ${{ secrets.GITHUB_TOKEN }} ${{ secrets.ES_HOST }} ${{ secrets.ES_USER }} ${{ secrets.ES_PASSWORD }} ${{ secrets.ME_ES_HOST }} ${{ secrets.ME_ES_USER }} ${{ secrets.ME_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 All @@ -83,12 +86,12 @@ jobs:
- name: Check Indexed Links - Live
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" "images_sdk|templates|mikrosdk|mcucard|mcu_card|click|mikromedia|pim|queries|sibrain|kit|board"
python -u scripts/check_indexes.py ${{ github.repository }} ${{ secrets.GITHUB_TOKEN }} ${{ secrets.ES_HOST }} ${{ secrets.ES_USER }} ${{ secrets.ES_PASSWORD }} ${{ secrets.ME_ES_HOST }} ${{ secrets.ME_ES_USER }} ${{ secrets.ME_ES_PASSWORD }} ${{ secrets.ES_INDEX_LIVE }} "--es_regex" "$GLOBAL_REGEX"
continue-on-error: true # Ensure the workflow continues

- name: Check Indexed Links - Test
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" "images_sdk|templates|mikrosdk|mcucard|mcu_card|click|mikromedia|pim|queries|sibrain|kit|board"
python -u scripts/check_indexes.py ${{ github.repository }} ${{ secrets.GITHUB_TOKEN }} ${{ secrets.ES_HOST }} ${{ secrets.ES_USER }} ${{ secrets.ES_PASSWORD }} ${{ secrets.ME_ES_HOST }} ${{ secrets.ME_ES_USER }} ${{ secrets.ME_ES_PASSWORD }} ${{ secrets.ES_INDEX_TEST }} "--es_regex" "$GLOBAL_REGEX"
continue-on-error: true # Ensure the workflow continues

scheduled_run:
Expand All @@ -111,10 +114,10 @@ jobs:
- name: Check Indexed Links - Live
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" "images_sdk|templates|mikrosdk|mcucard|mcu_card|click|mikromedia|pim|queries|sibrain|kit|board"
python -u scripts/check_indexes.py ${{ github.repository }} ${{ secrets.GITHUB_TOKEN }} ${{ secrets.ES_HOST }} ${{ secrets.ES_USER }} ${{ secrets.ES_PASSWORD }} ${{ secrets.ME_ES_HOST }} ${{ secrets.ME_ES_USER }} ${{ secrets.ME_ES_PASSWORD }} ${{ secrets.ES_INDEX_LIVE }} "--es_regex" "$GLOBAL_REGEX"
continue-on-error: true # Ensure the workflow continues

- name: Check Indexed Links - Test
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" "images_sdk|templates|mikrosdk|mcucard|mcu_card|click|mikromedia|pim|queries|sibrain|kit|board"
python -u scripts/check_indexes.py ${{ github.repository }} ${{ secrets.GITHUB_TOKEN }} ${{ secrets.ES_HOST }} ${{ secrets.ES_USER }} ${{ secrets.ES_PASSWORD }} ${{ secrets.ME_ES_HOST }} ${{ secrets.ME_ES_USER }} ${{ secrets.ME_ES_PASSWORD }} ${{ secrets.ES_INDEX_TEST }} "--es_regex" "$GLOBAL_REGEX"
continue-on-error: true # Ensure the workflow continues
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
if(${_MSDK_BOARD_NAME_} STREQUAL "AUDIO_FOR_PIC32_MCUS_DEVELOPMENT_BOARD")
set(BOARD_PATH "include/boards/board_audio_development_for_pic32")
set(MCU_CARD FALSE)
set(SHIELD FALSE)
endif()
120 changes: 120 additions & 0 deletions bsp/board/include/boards/board_audio_development_for_pic32/board.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
/****************************************************************************
**
** 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 "PIC32 Audio Development Board"

#include "hal_target.h"

// Mapping
#define HEADER_CONNECTOR_CN1_D1 PD0
#define HEADER_CONNECTOR_CN1_D2 PC13
#define HEADER_CONNECTOR_CN1_D3 PC14
#define HEADER_CONNECTOR_CN1_S1 PD3
#define HEADER_CONNECTOR_CN1_S2 PD2
#define HEADER_CONNECTOR_CN1_S3 PD1
#define HEADER_CONNECTOR_CN1_S4 PD12
#define HEADER_CONNECTOR_CN1_MCLR // Pin not routed
#define HEADER_CONNECTOR_CN1_SELECT PE9
#define HEADER_CONNECTOR_CN1_ACC PB4
#define HEADER_CONNECTOR_CN1_OVERCURRENT PB0
#define HEADER_CONNECTOR_CN1_PGC PB6
#define HEADER_CONNECTOR_CN1_PGD PB7
#define HEADER_CONNECTOR_CN1_RXD PF13
#define HEADER_CONNECTOR_CN1_TXD PF12
#define HEADER_CONNECTOR_CN1_VBUS // Pin not routed
#define HEADER_CONNECTOR_CN1_D_NEG PG3
#define HEADER_CONNECTOR_CN1_D_POS PG2
#define HEADER_CONNECTOR_CN1_VCAP // Pin not routed
#define HEADER_CONNECTOR_CN1_ACC_PWR PE8
#define HEADER_CONNECTOR_CN1_ACC_ID_SEL0 PB3
#define HEADER_CONNECTOR_CN1_ACC_ID_SEL1 PB2
#define HEADER_CONNECTOR_CN1_SDA PF2
#define HEADER_CONNECTOR_CN1_SCL PF8
#define HEADER_CONNECTOR_CN1_SCL2 PA2
#define HEADER_CONNECTOR_CN1_SDA2 PA3
#define HEADER_CONNECTOR_CN1_C_RESET PD14
#define HEADER_CONNECTOR_CN1_IPOD_DETECT PD15

// LCD
#define LCD_DB5 PE5
#define LCD_DB6 PE6
#define LCD_DB7 PE7
#define LCD_RESET PC1
#define LCD_D_C PB15
#define LCD_CS PD11
#define LCD_WR PD4
#define LCD_RD PD5
#define LCD_DB0 PE0
#define LCD_DB1 PE1
#define LCD_DB2 PE2
#define LCD_DB3 PE3
#define LCD_DB4 PE4

// CODEC
#define CODEC_BCLK PG6
#define CODEC_ADCDAT PG7
#define CODEC_DACDAT PG8
#define CODEC_DACLRC PG9

// USB
#define USB_OVERCURRENT PB1
#define USB_VBUSON PB5

// COMM
#define USB_UART_RX PF4
#define USB_UART_TX PF5

#ifdef __cplusplus
}
#endif

#endif // _BOARD_H_
// ------------------------------------------------------------------------- END
5 changes: 5 additions & 0 deletions bsp/board/include/boards/board_chipkit_max32/board.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
if(${_MSDK_BOARD_NAME_} STREQUAL "CHIPKIT_MAX32_DEVELOPMENT_BOARD")
set(BOARD_PATH "include/boards/board_chipkit_max32")
set(MCU_CARD FALSE)
set(SHIELD FALSE)
endif()
157 changes: 157 additions & 0 deletions bsp/board/include/boards/board_chipkit_max32/board.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
/****************************************************************************
**
** 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 "chipKIT Max32 Development Board"

#include "hal_target.h"

// Mapping
#define HEADER_CONNECTOR_CN3_D1 PD12
#define HEADER_CONNECTOR_CN3_D2 PG1
#define HEADER_CONNECTOR_CN3_D3 PD3
#define HEADER_CONNECTOR_CN3_D4 PG0
#define HEADER_CONNECTOR_CN3_D5 PD4
#define HEADER_CONNECTOR_CN3_D6 PA6
#define HEADER_CONNECTOR_CN3_D7 PC4
#define HEADER_CONNECTOR_CN3_D8 PA7
#define HEADER_CONNECTOR_CN3_D9 PA2
#define HEADER_CONNECTOR_CN3_D10 PG14
#define HEADER_CONNECTOR_CN3_D11 PA3
#define HEADER_CONNECTOR_CN3_D12 PG12
#define HEADER_CONNECTOR_CN3_D13 // Pin not routed
#define HEADER_CONNECTOR_CN3_D14 PG13
#define HEADER_CONNECTOR_CN3_D15 // Pin not routed
#define HEADER_CONNECTOR_CN3_D16 PA9

#define HEADER_CONNECTOR_CN4_D1 PA14
#define HEADER_CONNECTOR_CN4_D2 PA15
#define HEADER_CONNECTOR_CN4_D3 PD14
#define HEADER_CONNECTOR_CN4_D4 PD15
#define HEADER_CONNECTOR_CN4_D5 PF4
#define HEADER_CONNECTOR_CN4_D6 PF5
#define HEADER_CONNECTOR_CN4_D7 PF12
#define HEADER_CONNECTOR_CN4_D8 PF13

#define HEADER_CONNECTOR_CN5_D1 PB0
#define HEADER_CONNECTOR_CN5_D2 PB1
#define HEADER_CONNECTOR_CN5_D3 PB2
#define HEADER_CONNECTOR_CN5_D4 PB3
#define HEADER_CONNECTOR_CN5_D5 PB4
#define HEADER_CONNECTOR_CN5_D6 PB5
#define HEADER_CONNECTOR_CN5_D7 PB6
#define HEADER_CONNECTOR_CN5_D8 PB7

#define HEADER_CONNECTOR_CN7_D1 PB8
#define HEADER_CONNECTOR_CN7_D2 PB9
#define HEADER_CONNECTOR_CN7_D3 PB10
#define HEADER_CONNECTOR_CN7_D4 PB11
#define HEADER_CONNECTOR_CN7_D6 PB13
#define HEADER_CONNECTOR_CN7_D5 PB12
#define HEADER_CONNECTOR_CN7_D7 PB14
#define HEADER_CONNECTOR_CN7_D8 PB15

#define HEADER_CONNECTOR_CN8_D1 PG9
#define HEADER_CONNECTOR_CN8_D2 PG6
#define HEADER_CONNECTOR_CN8_D3 PG8
#define HEADER_CONNECTOR_CN8_D4 PG7
#define HEADER_CONNECTOR_CN8_D5 PD11
#define HEADER_CONNECTOR_CN8_D6 PD8
#define HEADER_CONNECTOR_CN8_D7 PD6
#define HEADER_CONNECTOR_CN8_D8 PF1
#define HEADER_CONNECTOR_CN8_D9 PF0
#define HEADER_CONNECTOR_CN8_D10 PA10
#define HEADER_CONNECTOR_CN8_D11 PG8
#define HEADER_CONNECTOR_CN8_D12 PB12
#define HEADER_CONNECTOR_CN8_D13 PB13
#define HEADER_CONNECTOR_CN8_D14 PB11
#define HEADER_CONNECTOR_CN8_D15 PD5
#define HEADER_CONNECTOR_CN8_D16 PD10

#define HEADER_CONNECTOR_CN9_D1 PE0
#define HEADER_CONNECTOR_CN9_D2 PE1
#define HEADER_CONNECTOR_CN9_D3 PE2
#define HEADER_CONNECTOR_CN9_D4 PE3
#define HEADER_CONNECTOR_CN9_D5 PE4
#define HEADER_CONNECTOR_CN9_D6 PE5
#define HEADER_CONNECTOR_CN9_D7 PE6
#define HEADER_CONNECTOR_CN9_D8 PE7
#define HEADER_CONNECTOR_CN9_D9 PG7
#define HEADER_CONNECTOR_CN9_D10 PG15
#define HEADER_CONNECTOR_CN9_D11 PG2
#define HEADER_CONNECTOR_CN9_D12 PG3
#define HEADER_CONNECTOR_CN9_D13 PF3
#define HEADER_CONNECTOR_CN9_D14 // Pin not routed
#define HEADER_CONNECTOR_CN9_D15 PC3
#define HEADER_CONNECTOR_CN9_D16 PC2

#define HEADER_CONNECTOR_CN14_D1 PF2
#define HEADER_CONNECTOR_CN14_D2 PA0
#define HEADER_CONNECTOR_CN14_D3 PF8
#define HEADER_CONNECTOR_CN14_D4 PA1
#define HEADER_CONNECTOR_CN14_D5 PE8
#define HEADER_CONNECTOR_CN14_D6 PA4
#define HEADER_CONNECTOR_CN14_D7 PD0
#define HEADER_CONNECTOR_CN14_D8 PA5
#define HEADER_CONNECTOR_CN14_D9 PC14
#define HEADER_CONNECTOR_CN14_D10 PD9
#define HEADER_CONNECTOR_CN14_D11 PD1
#define HEADER_CONNECTOR_CN14_D12 PC13
#define HEADER_CONNECTOR_CN14_D13 PD2
#define HEADER_CONNECTOR_CN14_D14 PD13
#define HEADER_CONNECTOR_CN14_D15 PE9
#define HEADER_CONNECTOR_CN14_D16 PD7

#ifdef __cplusplus
}
#endif

#endif // _BOARD_H_
// ------------------------------------------------------------------------- END
1 change: 1 addition & 0 deletions changelog/v2.12.0/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ Support added for following hardware:
+ **[2024-11-12](./new_hw/2024-11-12.md)**
+ **[2024-11-13](./new_hw/2024-11-13.md)**
+ **[2024-11-14](./new_hw/2024-11-14.md)**
+ **[2024-11-15](./new_hw/2024-11-15.md)**

---

Expand Down
31 changes: 31 additions & 0 deletions changelog/v2.12.0/new_hw/2024-11-15.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-11-15

## Changes

- [2024-11-15](#2024-11-15)
- [Changes](#changes)
- [NEW HARDWARE](#new-hardware)

### NEW HARDWARE

Support added for following hardware:

+ [Audio Development Board For PIC32 MCUs](https://mplab-discover.microchip.com/v2/item/com.microchip.portal.evalboard/com.microchip.subcategories.modules-and-peripherals.communication.can.Others/mcu08.dm320011/1.0.0?view=about)
+ [ChipKit MAX32 Development Board](https://mplab-discover.microchip.com/v2/item/com.microchip.portal.evalboard/com.microchip.subcategories.modules-and-peripherals.communication.can.Others/mcu08.tdgl003/1.0.0?view=about)
+ [MCU CARD 11 for PIC PIC18F56K42](https://www.mikroe.com/mcu-card-11-for-pic-pic18f56k42)

---

**[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.
Binary file added resources/images/boards/board-chipkit-max32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 44ced0d

Please sign in to comment.