Skip to content

Commit b6bc001

Browse files
microhobbymicrohobby
authored
Merge pull request torizon#210 from toradex/dev
Release v2.5.0
2 parents 3cb87b5 + 3ec778d commit b6bc001

File tree

117 files changed

+831
-297
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+831
-297
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ We encourage you to also contribute templates. The community supported templates
5151
| ![](assets/img/electronjs.png?raw=true) | Node.js JavaScript Electron Application | Electron | JavaScript | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) | [nodeElectron](./nodeElectron) | ![](https://avatars.githubusercontent.com/u/2633321?v=4) [@microhobby](https://www.github.com/microhobby) |
5252
| ![](assets/img/monowinforms.png?raw=true) | Mono 4.7 C# Windows Forms Application | .NET 4.7 | C# | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) | [monoCsharpForms](./monoCsharpForms) | ![](https://avatars.githubusercontent.com/u/2633321?v=4) [@microhobby](https://www.github.com/microhobby) |
5353
| ![](assets/img/unofbdrm.png?raw=true) | .NET 6 C# Uno Platform Frame Buffer | .NET 6.0 | C# | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) | [dotnetUnoFrameBuffer](./dotnetUnoFrameBuffer) | ![](https://avatars.githubusercontent.com/u/2633321?v=4) [@microhobby](https://www.github.com/microhobby) |
54-
| ![](assets/img/avaloniafbdrm.png?raw=true) | .NET 6 C# Avalonia Frame Buffer DRM | .NET 6.0 | C# | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) | [dotnetAvaloniaFrameBuffer](./dotnetAvaloniaFrameBuffer) | ![](https://avatars.githubusercontent.com/u/2633321?v=4) [@microhobby](https://www.github.com/microhobby) |
55-
| ![](assets/img/avaloniagtk.png?raw=true) | .NET 6 C# Avalonia GTK MVVM | .NET 6.0 | C# | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) | [dotnetAvalonia](./dotnetAvalonia) | ![](https://avatars.githubusercontent.com/u/2633321?v=4) [@microhobby](https://www.github.com/microhobby) |
54+
| ![](assets/img/avaloniafbdrm.png?raw=true) | .NET 8 C# Avalonia Frame Buffer DRM | .NET 8.0 | C# | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) | [dotnetAvaloniaFrameBuffer](./dotnetAvaloniaFrameBuffer) | ![](https://avatars.githubusercontent.com/u/2633321?v=4) [@microhobby](https://www.github.com/microhobby) |
55+
| ![](assets/img/avaloniagtk.png?raw=true) | .NET 8 C# Avalonia GTK MVVM | .NET 8.0 | C# | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) | [dotnetAvalonia](./dotnetAvalonia) | ![](https://avatars.githubusercontent.com/u/2633321?v=4) [@microhobby](https://www.github.com/microhobby) |
5656
| ![](assets/img/gambasform.png?raw=true) | Gambas3 Form Project | Gambas3 | Visual Basic | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) | [gambasForms](./gambasForms) | ![](https://avatars.githubusercontent.com/u/2633321?v=4) [@microhobby](https://www.github.com/microhobby) |
5757
| ![](assets/img/python3console.png?raw=true) | Python 3 Pyside 2(Qt5) QML | Pyside 2 | Python 3 | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) | [python3Pyside2QML](./python3Pyside2QML) | ![](https://avatars.githubusercontent.com/u/83607022?v=4) [@andreriesco](https://www.github.com/andreriesco) |
5858
| ![](assets/img/cconsole.png?raw=true) | C Makefile Console Application | libc | C | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) ![](assets/img/riscv64.png?raw=true&id=2) ![](assets/img/x8664.png?raw=true&id=2) | [cConsole](./cConsole) | ![](https://avatars.githubusercontent.com/u/19562097?v=4) [@hiagofranco](https://www.github.com/hiagofranco) |

‎aspnetBlazor/.conf/deps.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"packages": [
33
"openssh-client",
4-
"sshpass",
5-
"dotnet-sdk-6.0"
4+
"sshpass"
5+
],
6+
"installDepsScripts": [
7+
".conf/installDepsScripts/installDotnetSDK8.sh"
68
]
79
}

‎aspnetBlazor/.vscode/settings.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"torizon_psswd": "",
33
"torizon_login": "",
44
"torizon_ip": "",
5+
"torizon_ssh_port": "",
56
"host_ip": "",
67
"torizon_workspace": "${workspaceFolder}",
78
"torizon_debug_port": "",

‎assets/tasks/common.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,8 @@
499499
"-p",
500500
"${config:torizon_psswd}",
501501
"scp",
502+
"-P",
503+
"${config:torizon_ssh_port}",
502504
"-o",
503505
"UserKnownHostsFile=/dev/null",
504506
"-o",
@@ -1110,6 +1112,8 @@
11101112
"-p",
11111113
"${config:torizon_psswd}",
11121114
"ssh",
1115+
"-p",
1116+
"${config:torizon_ssh_port}",
11131117
"-o",
11141118
"UserKnownHostsFile=/dev/null",
11151119
"-o",
@@ -1137,6 +1141,8 @@
11371141
"-p",
11381142
"${config:torizon_psswd}",
11391143
"ssh",
1144+
"-p",
1145+
"${config:torizon_ssh_port}",
11401146
"-o",
11411147
"UserKnownHostsFile=/dev/null",
11421148
"-o",
@@ -1164,6 +1170,8 @@
11641170
"-p",
11651171
"${config:torizon_psswd}",
11661172
"ssh",
1173+
"-p",
1174+
"${config:torizon_ssh_port}",
11671175
"-o",
11681176
"UserKnownHostsFile=/dev/null",
11691177
"-o",
@@ -1191,6 +1199,8 @@
11911199
"-p",
11921200
"${config:torizon_psswd}",
11931201
"ssh",
1202+
"-p",
1203+
"${config:torizon_ssh_port}",
11941204
"-o",
11951205
"UserKnownHostsFile=/dev/null",
11961206
"-o",
@@ -1594,6 +1604,8 @@
15941604
"-p",
15951605
"${config:torizon_psswd}",
15961606
"ssh",
1607+
"-p",
1608+
"${config:torizon_ssh_port}",
15971609
"-o",
15981610
"UserKnownHostsFile=/dev/null",
15991611
"-o",
@@ -1621,6 +1633,8 @@
16211633
"-p",
16221634
"${config:torizon_psswd}",
16231635
"ssh",
1636+
"-p",
1637+
"${config:torizon_ssh_port}",
16241638
"-o",
16251639
"UserKnownHostsFile=/dev/null",
16261640
"-o",
@@ -1648,6 +1662,8 @@
16481662
"-p",
16491663
"${config:torizon_psswd}",
16501664
"ssh",
1665+
"-p",
1666+
"${config:torizon_ssh_port}",
16511667
"-o",
16521668
"UserKnownHostsFile=/dev/null",
16531669
"-o",
@@ -1675,6 +1691,8 @@
16751691
"-p",
16761692
"${config:torizon_psswd}",
16771693
"ssh",
1694+
"-p",
1695+
"${config:torizon_ssh_port}",
16781696
"-o",
16791697
"UserKnownHostsFile=/dev/null",
16801698
"-o",

‎cConsole/.gitignore‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,8 @@ dkms.conf
7272
# Compiled Static libraries
7373
*.lai
7474

75-
/bin
76-
/obj
77-
/debug
75+
#Build directories
76+
build-*
7877

7978
# End of https://www.gitignore.io/api/c,c++,cmake
8079

‎cConsole/.vscode/launch.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"cwd": "${config:torizon_app_root}",
3838
"environment": [],
3939
"externalConsole": false,
40+
"internalConsoleOptions": "openOnSessionStart",
4041
"sourceFileMap": {
4142
"${config:torizon_app_root}": "${workspaceFolder}"
4243
},
@@ -82,6 +83,7 @@
8283
"cwd": "${config:torizon_app_root}",
8384
"environment": [],
8485
"externalConsole": false,
86+
"internalConsoleOptions": "openOnSessionStart",
8587
"sourceFileMap": {
8688
"${config:torizon_app_root}": "${workspaceFolder}"
8789
},
@@ -127,6 +129,7 @@
127129
"cwd": "${config:torizon_app_root}",
128130
"environment": [],
129131
"externalConsole": false,
132+
"internalConsoleOptions": "openOnSessionStart",
130133
"sourceFileMap": {
131134
"${config:torizon_app_root}": "${workspaceFolder}"
132135
},
@@ -172,6 +175,7 @@
172175
"cwd": "${config:torizon_app_root}",
173176
"environment": [],
174177
"externalConsole": false,
178+
"internalConsoleOptions": "openOnSessionStart",
175179
"sourceFileMap": {
176180
"${config:torizon_app_root}": "${workspaceFolder}"
177181
},

‎cConsole/.vscode/settings.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,20 @@
22
"torizon_psswd": "",
33
"torizon_login": "",
44
"torizon_ip": "",
5+
"torizon_ssh_port": "",
56
"host_ip": "",
67
"torizon_workspace": "${workspaceFolder}",
78
"torizon_debug_port": "",
89
"torizon_debug_ssh_port": "2230",
910
"torizon_debug_port2": "",
10-
"terminal.integrated.defaultProfile.linux": "bash",
1111
"torizon_debug_port3": "",
1212
"torizon_gpu": "",
1313
"torizon_arch": "",
1414
"wait_sync": "1",
1515
"torizon_run_as": "torizon",
1616
"torizon_app_root": "/home/torizon/app",
1717
"tcb.packageName": "__change__",
18-
"tcb.version": "3.8.1"
18+
"tcb.version": "3.8.1",
19+
"torizon.gpuPrefixRC": false,
20+
"terminal.integrated.defaultProfile.linux": "bash"
1921
}

‎cConsole/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG CROSS_SDK_BASE_TAG=3.2.1-bookworm
2-
ARG BASE_VERSION=3.2.1-bookworm
1+
ARG CROSS_SDK_BASE_TAG=3.3.0-bookworm
2+
ARG BASE_VERSION=3.3.0-bookworm
33
##
44
# Board architecture
55
# arm or arm64

‎cConsole/Dockerfile.debug‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ARG IMAGE_ARCH=
99
##
1010
# Base container version
1111
##
12-
ARG BASE_VERSION=3.2.1-bookworm
12+
ARG BASE_VERSION=3.3.0-bookworm
1313

1414
##
1515
# Debug port
@@ -90,8 +90,8 @@ RUN mkdir /var/run/sshd && \
9090
RUN rm -r /etc/ssh/ssh*key && \
9191
dpkg-reconfigure openssh-server
9292

93-
# Copy the compiled application to the $APP_ROOT directory path inside the
94-
# container, where $APP_ROOT is the torizon_app_root configuration defined
93+
# Copy the compiled application to the $APP_ROOT directory path inside the
94+
# container, where $APP_ROOT is the torizon_app_root configuration defined
9595
# in settings.json
9696
COPY --chown=$SSHUSERNAME:$SSHUSERNAME ./build-${IMAGE_ARCH}/debug ${APP_ROOT}
9797

‎cConsole/Dockerfile.sdk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ARGUMENTS --------------------------------------------------------------------
2-
ARG CROSS_SDK_BASE_TAG=3.2.1-bookworm
2+
ARG CROSS_SDK_BASE_TAG=3.3.0-bookworm
33

44
##
55
# Board architecture

0 commit comments

Comments
 (0)