Use etdevs pip lib

.gitattributes

@@ -5,6 +5,7 @@
 *.vcxproj text eol=crlf
 *.props text eol=crlf
 *.bat text eol=crlf
+*.cmd text eol=crlf
 
 # These are binary so should never be modified by git.
 *.a binary

.github/workflows/ports_psoc6.yml

@@ -0,0 +1,111 @@
+name: psoc6 port
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'shared/**'
+      - 'lib/**'
+      - 'drivers/**'
+      - 'ports/psoc6/**'
+
+jobs:
+  server-build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        board: 
+          - CY8CPROTO-062-4343W
+          - CY8CPROTO-063-BLE
+          - CY8CKIT-062S2-AI
+    outputs:
+      commit_sha: ${{ steps.commit_sha.outputs.sha_short }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install packages
+        run: source tools/ci.sh && ci_psoc6_setup
+      - name: Build
+        run: source tools/ci.sh && ci_psoc6_build ${{ matrix.board }}
+
+      # Steps only relevant for Infineon fork 
+      # with self-hosted runner available
+      - name: Gets commit SHA
+        if: success() && github.repository_owner == 'infineon'
+        id: commit_sha
+        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+      - name: Save firmware bin
+        if: success() && github.repository_owner == 'infineon'
+        uses: actions/upload-artifact@v4
+        with: 
+          name: mpy-psoc6_${{ matrix.board }}_${{ steps.commit_sha.outputs.sha_short }}
+          path: ports/psoc6/build-${{ matrix.board }}/firmware.hex
+
+  # Jobs only relevant for Infineon fork 
+  on-target-test:
+    if: github.repository_owner == 'infineon'
+    runs-on: self-hosted
+    needs: server-build
+    strategy:
+      fail-fast: false
+      matrix:
+        board:
+          - CY8CPROTO-062-4343W
+          - CY8CPROTO-063-BLE
+          - CY8CKIT-062S2-AI
+    steps:
+      - uses: actions/checkout@v4
+      - name: Download binaries
+        uses: actions/download-artifact@v4
+      - name: Container setup
+        run: |
+          echo ${{ secrets.SELF_HOSTED_PASSWORD }} | sudo -S chmod 666 /var/run/docker.sock
+          source tools/ci.sh && ci_psoc6_setup
+      - name: Setup devices
+        run: |
+          cp mpy-psoc6_${{ matrix.board }}_${{ needs.server-build.outputs.commit_sha }}/firmware.hex .
+          source tools/ci.sh && ci_psoc6_flash_multiple_devices ${{ matrix.board }} firmware.hex tests/ports/psoc6/${{ runner.name }}-devs.yml
+      - name: Run psoc6 tests
+        timeout-minutes: 20
+        env: 
+          psoc6_test_dir: ../../tests/ports/psoc6
+        run: |
+          cd lib/mpy-test-ext
+          python -u run_test_plan.py --board ${{ matrix.board }} --max-retries 2 --test-plan $psoc6_test_dir/test-plan.yml --hil-devs $psoc6_test_dir/${{ runner.name }}-devs.yml 
+
+      - name: Container teardown 
+        if: failure() || success()
+        run: |
+          source tools/ci.sh && ci_psoc6_teardown
+
+  release:
+    runs-on: ubuntu-latest
+    needs: [server-build, on-target-test]
+    strategy:
+      matrix:
+        board: 
+          - CY8CPROTO-062-4343W
+          - CY8CPROTO-063-BLE
+          - CY8CKIT-062S2-AI
+    if: startsWith(github.ref, 'refs/tags/v') && github.repository_owner == 'infineon'
+    steps:
+    - name: Download binaries
+      uses: actions/download-artifact@v4
+    - name: Prepare release assets
+      run: | 
+        cd mpy-psoc6_${{ matrix.board }}_${{ needs.server-build.outputs.commit_sha }}
+        mv firmware.hex ../mpy-psoc6_${{ matrix.board }}.hex
+    - name: Build release changelog
+      id: build_changelog
+      uses: mikepenz/release-changelog-builder-action@v3
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: Release
+      uses: softprops/action-gh-release@v1
+      with:
+        name: Micropython PSoC6 ${{  github.ref_name  }}
+        files: mpy-psoc6_${{ matrix.board }}.hex
+        body: ${{steps.build_changelog.outputs.changelog}}

.github/workflows/stale_issues.yml

@@ -0,0 +1,8 @@
+name: 'Close stale issues/PRs'
+on:
+  schedule:
+    - cron: "50 14 */2 * *"
+
+jobs:
+  call-workflow:
+    uses: Infineon/workflows/.github/workflows/epe_stale_issues.yml@master

.github/workflows/synch_upstream.yml

@@ -0,0 +1,72 @@
+name: Sync Upstream
+
+on:
+  schedule:
+    - cron: '0 0 */1 * *' # daily 00:00 
+  workflow_dispatch: # on button click
+
+jobs:
+  synch_master:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout target repo
+      uses: actions/checkout@v4
+      with:
+        ref: master
+        token: ${{ secrets.GH_ACT_SYNCH_UPSTREAM }}
+
+    - name: Sync upstream changes
+      id: sync
+      uses: aormsby/[email protected]
+      with:
+        target_sync_branch: master
+        target_repo_token: ${{ secrets.GH_ACT_SYNCH_UPSTREAM }}
+        upstream_sync_branch: master
+        upstream_sync_repo: micropython/micropython
+        git_config_pull_rebase: true
+
+
+    - name: New commits found
+      if: steps.sync.outputs.has_new_commits == 'true'
+      run: echo "New commits were found to sync."
+
+    - name: No new commits
+      if: steps.sync.outputs.has_new_commits == 'false'
+      run: echo "There were no new commits."
+
+    - name: Show value of 'has_new_commits'
+      run: echo ${{ steps.sync.outputs.has_new_commits }}
+
+  synch_port_psoc6:
+    runs-on: ubuntu-latest
+    needs: synch_master
+
+    steps:
+    - name: Checkout target repo
+      uses: actions/checkout@v4
+      with:
+        ref: ports-psoc6-main
+        token: ${{ secrets.GH_ACT_SYNCH_UPSTREAM }}
+
+    - name: Sync upstream changes
+      id: sync
+      uses: aormsby/[email protected]
+      with:
+        target_sync_branch: ports-psoc6-main
+        target_repo_token: ${{ secrets.GH_ACT_SYNCH_UPSTREAM }}
+        upstream_sync_branch: master
+        upstream_sync_repo: micropython/micropython
+        git_config_pull_rebase: true
+        target_branch_push_args: '--force'
+
+    - name: New commits found
+      if: steps.sync.outputs.has_new_commits == 'true'
+      run: echo "New commits were found to sync."
+
+    - name: No new commits
+      if: steps.sync.outputs.has_new_commits == 'false'
+      run: echo "There were no new commits."
+
+    - name: Show value of 'has_new_commits'
+      run: echo ${{ steps.sync.outputs.has_new_commits }}

.gitignore

@@ -32,3 +32,6 @@ user.props
 # Created by ci.sh esp8266 targets
 /xtensa-lx106-elf-standalone.tar.gz
 /xtensa-lx106-elf/
+
+# mtb downloadable libs
+lib/mtb_shared

.gitmodules

@@ -74,3 +74,9 @@
 [submodule "lib/alif-security-toolkit"]
 	path = lib/alif-security-toolkit
 	url = https://github.com/micropython/alif-security-toolkit.git
+[submodule "lib/mtb-psoc6-libs"]
+	path = lib/mtb-psoc6-libs
+	url = https://github.com/Infineon/mtb-micropython-psoc6-port-integration.git
+[submodule "lib/mpy-test-ext"]
+	path = lib/mpy-test-ext
+	url = https://github.com/Infineon/mpy-test-ext.git

.readthedocs.yaml

@@ -0,0 +1,22 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# We recommend specifying your dependencies to enable reproducible builds:
+# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+python:
+  install:
+  - requirements: docs/requirements.txt

README.md

@@ -1,4 +1,4 @@
-[![Unix CI badge](https://github.com/micropython/micropython/actions/workflows/ports_unix.yml/badge.svg)](https://github.com/micropython/micropython/actions?query=branch%3Amaster+event%3Apush) [![STM32 CI badge](https://github.com/micropython/micropython/actions/workflows/ports_stm32.yml/badge.svg)](https://github.com/micropython/micropython/actions?query=branch%3Amaster+event%3Apush) [![Docs CI badge](https://github.com/micropython/micropython/actions/workflows/docs.yml/badge.svg)](https://docs.micropython.org/) [![codecov](https://codecov.io/gh/micropython/micropython/branch/master/graph/badge.svg?token=I92PfD05sD)](https://codecov.io/gh/micropython/micropython)
+[![PSoC6 CI badge](https://github.com/Infineon/micropython/actions/workflows/ports_psoc6.yml/badge.svg)](https://github.com/Infineon/micropython/actions?query=branch%3Aports-psoc6-main+event%3Apush) [![Docs CI badge](https://readthedocs.org/projects/ifx-micropython/badge/?version=latest)](https://ifx-micropython.readthedocs.io/en/latest/psoc6/quickref.html) [![codecov](https://codecov.io/gh/micropython/micropython/branch/master/graph/badge.svg?token=I92PfD05sD)](https://codecov.io/gh/micropython/micropython)
 
 The MicroPython project
 =======================
@@ -35,23 +35,19 @@ DAC, PWM, SPI, I2C, CAN, Bluetooth, and USB.
 Getting started
 ---------------
 
-See the [online documentation](https://docs.micropython.org/) for the API
-reference and information about using MicroPython and information about how
+See the [online documentation (Infineon PSoC6 port ReadTheDocs fork)](https://ifx-micropython.readthedocs.io/en/latest/psoc6/quickref.html) for API
+references and information about using MicroPython and information about how
 it is implemented.
 
-We use [GitHub Discussions](https://github.com/micropython/micropython/discussions)
-as our forum, and [Discord](https://discord.gg/RB8HZSAExQ) for chat. These
-are great places to ask questions and advice from the community or to discuss your
+We use [GitHub Discussions (Infineon PSoC6 fork)](https://github.com/Infineon/micropython/discussions)
+as our forum. This
+is a great place to ask questions and advice from the community or to discuss your
 MicroPython-based projects.
 
-For bugs and feature requests, please [raise an issue](https://github.com/micropython/micropython/issues/new/choose)
+For bugs and feature requests, please [raise an issue (Infineon PSoC6 fork)](https://github.com/Infineon/micropython/issues/new/choose)
 and follow the templates there.
 
-For information about the [MicroPython pyboard](https://store.micropython.org/pyb-features),
-the officially supported board from the
-[original Kickstarter campaign](https://www.kickstarter.com/projects/214379695/micro-python-python-for-microcontrollers),
-see the [schematics and pinouts](http://github.com/micropython/pyboard) and
-[documentation](https://docs.micropython.org/en/latest/pyboard/quickref.html).
+For information about the MicroPython PSoC supported boards see the [documentation (Infineon PSoC6 port ReadTheDocs fork)](https://ifx-micropython.readthedocs.io/en/latest/psoc6/general.html#supported-boards).
 
 Contributing
 ------------
@@ -112,6 +108,7 @@ are mature and have the most active development, support and testing:
 |--------------------------|----------------------------------------------------------------------------------------|----------------------------------------------------------------------|
 | [esp32](ports/esp32)*    | Espressif ESP32 SoCs (ESP32, ESP32S2, ESP32S3, ESP32C3, ESP32C6)                       | [here](https://docs.micropython.org/en/latest/esp32/quickref.html)   |
 | [mimxrt](ports/mimxrt)   | NXP m.iMX RT                                                                           | [here](https://docs.micropython.org/en/latest/mimxrt/quickref.html)  |
+| [psoc6](ports/psoc6)     | Infineon PSOC6                                                                         | [here](https://ifx-micropython.readthedocs.io/en/latest/psoc6/quickref.html)  |                                                                                        
 | [rp2](ports/rp2)         | Raspberry Pi RP2040 and RP2350                                                         | [here](https://docs.micropython.org/en/latest/rp2/quickref.html)     |
 | [samd](ports/samd)       | Microchip (formerly Atmel) SAMD21 and SAMD51                                           | [here](https://docs.micropython.org/en/latest/samd/quickref.html)    |
 | [stm32](ports/stm32)     | STMicroelectronics STM32 MCUs (F0, F4, F7, G0, G4, H5, H7, L0, L1, L4, N6, WB, WL)     | [here](https://docs.micropython.org/en/latest/pyboard/quickref.html) |

docs/README.md

@@ -17,6 +17,7 @@ Install Sphinx and sphinx_rtd_theme, preferably in a virtualenv:
 
      pip install sphinx
      pip install sphinx_rtd_theme
+     pip install sphinx-tabs
 
 In `micropython/docs`, build the docs:
 

docs/conf.py

@@ -56,6 +56,7 @@
     "sphinx.ext.coverage",
     "sphinxcontrib.jquery",
     "sphinx_rtd_theme",
+    "sphinx_tabs.tabs",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -129,9 +130,15 @@
 
 # -- Options for HTML output ----------------------------------------------
 
-import sphinx_rtd_theme
+# on_rtd is whether we are on readthedocs.org
+try:
+    import sphinx_rtd_theme
 
-html_theme = "sphinx_rtd_theme"
+    html_theme = "sphinx_rtd_theme"
+    html_theme_path = ["."]
+except:
+    html_theme = "default"
+    html_theme_path = ["."]
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

docs/index.rst

@@ -13,6 +13,7 @@ MicroPython documentation and references
     esp32/quickref.rst
     rp2/quickref.rst
     mimxrt/quickref.rst
+    psoc6/quickref.rst
     wipy/quickref.rst
     unix/quickref.rst
     zephyr/quickref.rst