Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to Zephyr v3.6 #206

Merged
merged 8 commits into from
Feb 27, 2024
Merged

Bump to Zephyr v3.6 #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0239bd1
manifest: bump Zephyr to TiaC's v3.6-branch
rexut Feb 26, 2024
b1fd7d1
doc: change Zephyr to 3.6.0 in pick list
rexut Feb 26, 2024
3a7fd7a
doc: add more Bridle's boards, shields and snippets
rexut Feb 26, 2024
d8b4585
doc: add 3.6.0-rc1 to pick list
rexut Feb 26, 2024
7f7d8da
release: add draft notes for upcoming 3.6.0
rexut Feb 27, 2024
774237a
release: set labels in draft release notes 3.6.0-rc1
rexut Feb 26, 2024
e9b2d7e
release: bump shortcuts for upcoming 3.6.0-rc1
rexut Feb 26, 2024
e622534
release: bump version to 3.6.0-rc1
rexut Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VERSION_MAJOR = 3
VERSION_MINOR = 5
PATCHLEVEL = 99
VERSION_MINOR = 6
PATCHLEVEL = 0
VERSION_TWEAK = 0
EXTRAVERSION =
EXTRAVERSION = rc1
68 changes: 49 additions & 19 deletions doc/bridle/app_boards.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,24 @@ Also see the :ref:`boards` section in this documentation.
| +---------------------------------------+----------------------------------+
| | :ref:`seeed_xiao_samd21` | ``seeed_xiao_samd21`` |
| +---------------------------------------+----------------------------------+
| | :ref:`seeeduino_cm0` | ``seeeduino_cm0`` |
| +---------------------------------------+----------------------------------+
| | :ref:`seeeduino_lotus` | ``seeeduino_lotus`` |
+-------------------+---------------------------------------+----------------------------------+
| RP2040 | :ref:`waveshare_rp2040` | | ``waveshare_rp2040_one`` |
| RP2040 | :ref:`cytron_maker_rp2040` | | ``cytron_maker_nano_rp2040`` |
| | | | ``cytron_maker_pi_rp2040`` |
| +---------------------------------------+----------------------------------+
| | :ref:`picoboy_board` | ``picoboy`` |
| +---------------------------------------+----------------------------------+
| | :ref:`waveshare_rp2040` | | ``waveshare_rp2040_one`` |
| | | | ``waveshare_rp2040_zero`` |
| | | | ``waveshare_rp2040_matrix`` |
| | | | ``waveshare_rp2040_tiny`` |
| | | | ``waveshare_rp2040_eth`` |
| | | | ``waveshare_rp2040_lcd_0_96`` |
| | | | ``waveshare_rp2040_plus`` |
| | | | ``waveshare_rp2040_plus@16mb`` |
| | | | ``waveshare_rp2040_geek`` |
+-------------------+---------------------------------------+----------------------------------+
| STM32F777NI | :ref:`tiac_magpie_board` | ``tiac_magpie`` |
+-------------------+---------------------------------------+----------------------------------+
Expand All @@ -76,24 +84,44 @@ Shields included in tiac-bridle

The following shields are defined in the :file:`bridle/boards/shields/` folder.

+---------------------+----------------------------------+-----------------------------+
| Hardware platform | Shield name | Build target |
+=====================+==================================+=============================+
| Common for testing | :ref:`loopback_test_shield` | | ``loopback_test`` |
| | | | ``loopback_test_tmph`` |
+---------------------+----------------------------------+-----------------------------+
| :ref:`grove_shield` | :ref:`grove_base_shield_v1` | ``seeed_grove_base_v1`` |
| +----------------------------------+-----------------------------+
| | :ref:`grove_base_shield_v2` | ``seeed_grove_base_v2`` |
| +----------------------------------+-----------------------------+
| | :ref:`grove_base_shield_xiao_v1` | ``seeed_grove_xiao_v1`` |
| +----------------------------------+-----------------------------+
| | :ref:`grove_rpipico_shield_v1` | ``seeed_grove_rpipico_v1`` |
| +----------------------------------+-----------------------------+
| | :ref:`grove_button_shield` | ``grove_btn_d[0…31]`` |
| +----------------------------------+-----------------------------+
| | :ref:`x_grove_testbed_shield` | ``x_grove_testbed`` |
+---------------------+----------------------------------+-----------------------------+
+------------------------------------------+------------------------------------------+----------------------------------------+
| Hardware platform | Shield name | Build target |
+==========================================+==========================================+========================================+
| Common for testing | :ref:`loopback_test_shield` | | ``loopback_test`` |
| | | | ``loopback_test_tmph`` |
+------------------------------------------+------------------------------------------+----------------------------------------+
| :ref:`grove_shield` | :ref:`grove_base_shield_v2` | ``seeed_grove_base_v2`` |
| +------------------------------------------+----------------------------------------+
| | :ref:`grove_base_shield_v1` | ``seeed_grove_base_v1`` |
| +------------------------------------------+----------------------------------------+
| | :ref:`grove_base_shield_xiao_v1` | ``seeed_grove_xiao_v1`` |
| +------------------------------------------+----------------------------------------+
| | :ref:`grove_rpipico_shield_v1` | ``seeed_grove_rpipico_v1`` |
| +------------------------------------------+----------------------------------------+
| | :ref:`grove_button_shield` | ``grove_btn_d[0…31]`` |
| +------------------------------------------+----------------------------------------+
| | :ref:`grove_led_shield` | ``grove_led_d[0…31]`` |
| +------------------------------------------+----------------------------------------+
| | :ref:`x_grove_testbed_shield` | ``x_grove_testbed`` |
+------------------------------------------+------------------------------------------+----------------------------------------+
| :ref:`rpi_pico_lcd_shield` | |Waveshare Pico LCD 1.14| | ``waveshare_pico_lcd_1_14`` |
| +------------------------------------------+----------------------------------------+
| | |Waveshare Pico LCD 2| | ``waveshare_pico_lcd_2`` |
| +------------------------------------------+----------------------------------------+
| | |Waveshare Pico ResTouch LCD 3.5| | ``waveshare_pico_restouch_lcd_3_5`` |
+------------------------------------------+------------------------------------------+----------------------------------------+
| :ref:`rpi_pico_led_shield` | |Waveshare Pico RGB LED| | ``waveshare_pico_rgb_led`` |
+------------------------------------------+------------------------------------------+----------------------------------------+
| :ref:`rpi_pico_test_shield` | |Spotpear Pico ALL GPIO TEST| | ``spotpear_pico_test`` |
+------------------------------------------+------------------------------------------+----------------------------------------+
| :ref:`waveshare_lcd_modules` | |Waveshare 2.4 LCD| | ``waveshare_2_4_lcd`` |
+------------------------------------------+------------------------------------------+----------------------------------------+
| :ref:`waveshare_pico_10dof_imu_sensor` | |Waveshare Pico 10-DOF IMU Sensor| | ``waveshare_pico_10dof_imu_sensor_r2`` |
| | +----------------------------------------+
| | | ``waveshare_pico_10dof_imu_sensor_r1`` |
+------------------------------------------+------------------------------------------+----------------------------------------+
| :ref:`waveshare_pico_environment_sensor` | |Waveshare Pico Environment Sensor| | ``waveshare_pico_environment_sensor`` |
+------------------------------------------+------------------------------------------+----------------------------------------+


Snippets included in tiac-bridle
Expand All @@ -107,6 +135,8 @@ Also see the :ref:`snippets` section in this documentation.
+=====================+==================================+=============================+
| Common for usage | :ref:`snippet-usb-console` | ``usb-console`` |
+---------------------+----------------------------------+-----------------------------+
| Common for usage | :ref:`snippet-pwm-servo` | ``pwm-servo`` |
+---------------------+----------------------------------+-----------------------------+
| Common for testing | :ref:`snippet-can-timing-adj` | ``can-timing-adj`` |
+---------------------+----------------------------------+-----------------------------+

Expand Down
11 changes: 6 additions & 5 deletions doc/bridle/releases/release-notes-3.6.0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ For more details, see: :ref:`repos_and_revs`.
- Tag
* - `tiac-bridle`_
-
- main
-
- v3.6-branch
- v3.6.0-rc1
* - | `tiac-ubxlib`_
| (`u-blox-ubxlib`_)
- | geographiclib
Expand Down Expand Up @@ -91,9 +91,9 @@ For more details, see: :ref:`repos_and_revs`.
| tinycrypt
| trusted-firmware-a
| trusted-firmware-m
- | tiacsys/main
| (main)
-
- | tiacsys/v3.6-branch
| (v3.6-branch)
- v3.6.0

Supported boards
****************
Expand Down Expand Up @@ -259,6 +259,7 @@ Issue Related Items

These GitHub issues were addressed since project bootstrapping:

* :github:`205` - [FCR] Bump to Zephyr v3.6
* :github:`202` - [FER] Make the u-blox library GNSS example fit for demonstration
* :github:`200` - [FCR] Support for MCUXpresso IDE (Arm GNU Toolchain)
* :github:`198` - [FCR] Support for STM32CubeCLT (GNU tools for STM32)
Expand Down
6 changes: 3 additions & 3 deletions doc/bridle/shortcuts.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.. |TIAC| replace:: TiaC Systems
.. |BRIDLE| replace:: Bridle

.. |release| replace:: v3.5.0
.. |release_tt| replace:: ``v3.5.0``
.. |release_number_tt| replace:: ``3.5.0``
.. |release| replace:: v3.6.0-rc1
.. |release_tt| replace:: ``v3.6.0-rc1``
.. |release_number_tt| replace:: ``3.6.0-rc1``

.. External References (temporary, needs local implementation)

Expand Down
14 changes: 12 additions & 2 deletions doc/versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"VERSIONS": [
"latest",
"3.6",
"3.6.0-rc1",
"3.5",
"3.5.0",
"3.4",
Expand All @@ -25,8 +27,16 @@
],
"COMPONENTS_BY_VERSION": {
"latest": {
"bridle": "3.5.0",
"zephyr": "3.5.0"
"bridle": "3.6.0-rc1",
"zephyr": "3.6.0"
},
"3.6": {
"bridle": "3.6.0-rc1",
"zephyr": "3.6.0"
},
"3.6.0-rc1": {
"bridle": "3.6.0-rc1",
"zephyr": "3.6.0"
},
"3.5": {
"bridle": "3.5.0",
Expand Down
2 changes: 1 addition & 1 deletion submanifests/zephyr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ manifest:
path: zephyr
remote: tiacsys
repo-path: zephyr
revision: tiacsys/main
revision: tiacsys/v3.6-branch
clone-depth: 5000
# import submodules from Zephyr manifest
import:
Expand Down
Loading