Skip to content

Commit

Permalink
Merge branch 'master' into new-feature/xc8-rework
Browse files Browse the repository at this point in the history
  • Loading branch information
StrahinjaJacimovic committed Dec 10, 2024
2 parents ee9686f + 3b1d88f commit 81e0c56
Show file tree
Hide file tree
Showing 438 changed files with 7,182 additions and 26 deletions.
17 changes: 10 additions & 7 deletions .github/workflows/checkIndexes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
regex:
type: string
description: Regex to use when searching for indexed items
default: "images_sdk|templates|mikrosdk|mcucard|mcu_card|click|mikromedia|pim|queries|sibrain|kit|board"
default: "images_sdk|templates|mikrosdk|easy|flip|mcucard|mcu_card|click|mikromedia|pim|queries|sibrain|kit|board"
fix:
type: boolean
description: Fix the broken links with new ones?
Expand All @@ -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|easy|flip|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
13 changes: 11 additions & 2 deletions .github/workflows/index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,17 @@ jobs:
index:
runs-on: ubuntu-latest
steps:
- name: Authorize Mikroe Actions App
uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ vars.MIKROE_ACTIONS }}
private-key: ${{ secrets.MIKROE_ACTIONS_KEY_AUTHORIZE }}

- name: Checkout code
uses: actions/checkout@v4
with:
token: ${{ steps.app-token.outputs.token }}

- name: Set up Python
uses: actions/setup-python@v5
Expand Down Expand Up @@ -63,13 +72,13 @@ jobs:
run: |
if [[ ${{ github.event.inputs.select_index }} == "Live" ]]; then
echo "Indexing to Live."
python -u scripts/index.py ${{ github.repository }} ${{ secrets.GITHUB_TOKEN }} ${{ github.event.inputs.release_version }} ${{ secrets.ES_INDEX_LIVE }} ${{ github.event.inputs.set_as_latest }}
python -u scripts/index.py ${{ github.repository }} ${{ steps.app-token.outputs.token }} ${{ github.event.inputs.release_version }} ${{ secrets.ES_INDEX_LIVE }} ${{ github.event.inputs.set_as_latest }}
else
echo "Indexing to Test."
if [[ ${{ github.event.inputs.set_as_latest }} ]]; then
echo "Promote to latest requested, but ignored. Only available for LIVE updates."
fi
python -u scripts/index.py ${{ github.repository }} ${{ secrets.GITHUB_TOKEN }} ${{ github.event.inputs.release_version }} ${{ secrets.ES_INDEX_TEST }} "False"
python -u scripts/index.py ${{ github.repository }} ${{ steps.app-token.outputs.token }} ${{ github.event.inputs.release_version }} ${{ secrets.ES_INDEX_TEST }} "False"
fi
- name: Trigger database update in Core repo
Expand Down
5 changes: 5 additions & 0 deletions bsp/board/include/boards/board_32_bit_multimedia/board.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
if(${_MSDK_BOARD_NAME_} STREQUAL "32_BIT_MULTIMEDIA_BOARD")
set(BOARD_PATH "include/boards/board_32_bit_multimedia")
set(MCU_CARD FALSE)
set(SHIELD FALSE)
endif()
172 changes: 172 additions & 0 deletions bsp/board/include/boards/board_32_bit_multimedia/board.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
/****************************************************************************
**
** 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 "32-bit Multimedia Board"

#include "hal_target.h"

// Mapping
#define HEADER_CONNECTOR_HDR1_D1 // Pin not routed
#define HEADER_CONNECTOR_HDR1_D2 // Pin not routed
#define HEADER_CONNECTOR_HDR1_D3 PE0
#define HEADER_CONNECTOR_HDR1_D4 PE1
#define HEADER_CONNECTOR_HDR1_D5 PE2
#define HEADER_CONNECTOR_HDR1_D6 PE3
#define HEADER_CONNECTOR_HDR1_D7 PE4
#define HEADER_CONNECTOR_HDR1_D8 PE5
#define HEADER_CONNECTOR_HDR1_D9 PE6
#define HEADER_CONNECTOR_HDR1_D10 PE7
#define HEADER_CONNECTOR_HDR1_D11 PG0
#define HEADER_CONNECTOR_HDR1_D12 PG1
#define HEADER_CONNECTOR_HDR1_D13 PF1
#define HEADER_CONNECTOR_HDR1_D14 PF0
#define HEADER_CONNECTOR_HDR1_D15 PD12
#define HEADER_CONNECTOR_HDR1_D16 PD13
#define HEADER_CONNECTOR_HDR1_D17 PD6
#define HEADER_CONNECTOR_HDR1_D18 PD7
#define HEADER_CONNECTOR_HDR1_D19 PD5
#define HEADER_CONNECTOR_HDR1_D20 PD4
#define HEADER_CONNECTOR_HDR1_D21 PB3
#define HEADER_CONNECTOR_HDR1_D22 PB2
#define HEADER_CONNECTOR_HDR1_D23 PB1
#define HEADER_CONNECTOR_HDR1_D24 PB0
#define HEADER_CONNECTOR_HDR1_D25 PA10
#define HEADER_CONNECTOR_HDR1_D26 PA9
#define HEADER_CONNECTOR_HDR1_D27 PB4
#define HEADER_CONNECTOR_HDR1_D28 PB5
#define HEADER_CONNECTOR_HDR1_D29 // Pin not routed
#define HEADER_CONNECTOR_HDR1_D30 // Pin not routed

#define HEADER_CONNECTOR_HDR2_D1 // Pin not routed
#define HEADER_CONNECTOR_HDR2_D2 // Pin not routed
#define HEADER_CONNECTOR_HDR2_D3 PB9
#define HEADER_CONNECTOR_HDR2_D4 PB14
#define HEADER_CONNECTOR_HDR2_D5 PB3
#define HEADER_CONNECTOR_HDR2_D6 PD11
#define HEADER_CONNECTOR_HDR2_D7 PE9
#define HEADER_CONNECTOR_HDR2_D8 PG12
#define HEADER_CONNECTOR_HDR2_D9 PG13
#define HEADER_CONNECTOR_HDR2_D10 PG14
#define HEADER_CONNECTOR_HDR2_D11 PG15
#define HEADER_CONNECTOR_HDR2_D12 PF2
#define HEADER_CONNECTOR_HDR2_D13 PF8
#define HEADER_CONNECTOR_HDR2_D14 PD14
#define HEADER_CONNECTOR_HDR2_D15 PD15
#define HEADER_CONNECTOR_HDR2_D16 PF4
#define HEADER_CONNECTOR_HDR2_D17 PF5
#define HEADER_CONNECTOR_HDR2_D18 // Pin not routed
#define HEADER_CONNECTOR_HDR2_D19 PA14
#define HEADER_CONNECTOR_HDR2_D20 PA15
#define HEADER_CONNECTOR_HDR2_D21 PA2
#define HEADER_CONNECTOR_HDR2_D22 PA3
#define HEADER_CONNECTOR_HDR2_D23 PC4
#define HEADER_CONNECTOR_HDR2_D24 PD0
#define HEADER_CONNECTOR_HDR2_D25 PD10
#define HEADER_CONNECTOR_HDR2_D26 PG7
#define HEADER_CONNECTOR_HDR2_D27 PG8
#define HEADER_CONNECTOR_HDR2_D28 PG6
#define HEADER_CONNECTOR_HDR2_D29 // Pin not routed
#define HEADER_CONNECTOR_HDR2_D30 // Pin not routed

// TFT
#define TFT_LED_A1 // Pin not routed
#define TFT_LED_A2 // Pin not routed
#define TFT_LED_A3 // Pin not routed
#define TFT_LED_A4 // Pin not routed
#define TFT_IM0 // Pin not routed
#define TFT_IM1 // Pin not routed
#define TFT_IM2 // Pin not routed
#define TFT_IM3 // Pin not routed
#define TFT_RESET RB15
#define TFT_VSYNC // Pin not routed
#define TFT_HSYNC // Pin not routed
#define TFT_DOTCLK // Pin not routed
#define TFT_ENABLE // Pin not routed
#define TFT_DB17 PD7
#define TFT_DB16 PD6
#define TFT_DB15 PD13
#define TFT_DB14 PD12
#define TFT_DB13 RF0
#define TFT_DB12 RF1
#define TFT_DB11 RG1
#define TFT_DB10 RG0
#define TFT_DB9 // Pin not routed
#define TFT_DB8 RE7
#define TFT_DB7 RE6
#define TFT_DB6 RE5
#define TFT_DB5 RE4
#define TFT_DB4 RE3
#define TFT_DB3 RE2
#define TFT_DB2 RE1
#define TFT_DB1 RE0
#define TFT_DB0 // Pin not routed
#define TFT_SDO // Pin not routed
#define TFT_SDI // Pin not routed
#define TFT_RD RD5
#define TFT_WR_SCL RD4
#define TFT_RS RB15
#define TFT_CS RF12
#define TFT_FMARK // Pin not routed
#define TFT_VCC_IO // Pin not routed
#define TFT_VCC // Pin not routed
#define TFT_VCC_I // Pin not routed
#define TFT_GND // Pin not routed
#define TFT_XR RB11
#define TFT_YD RB10
#define TFT_XL RB13
#define TFT_YU RB12

#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 "AUDIO_FOR_PIC32_MCUS_DEVELOPMENT_BOARD")
set(BOARD_PATH "include/boards/board_audio_development_for_pic32")
set(MCU_CARD FALSE)
set(SHIELD FALSE)
endif()
Loading

0 comments on commit 81e0c56

Please sign in to comment.