Merge pull request #14 from devdotnetorg/dev-0.4.1

Dev 0.4.1 => Master

Author: devdotnetorg

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.4.1 (27-05-2024)
+
+- Added templates for RISC-V devices.
+- Updated package Libgpiod.
+- Bugs fixed.
+
 ## v0.4.0 (30-05-2023)
 
 - Added command to discover devices on the local network.

CHANGELOG_ru.md

@@ -1,5 +1,11 @@
 # Список изменений
 
+## v0.4.1 (27-05-2024)
+
+- Добавлены шаблоны для RISC-V устройств.
+- Обновлен пакет Libgpiod.
+- Исправлены ошибки.
+
 ## v0.4.0 (30-05-2023)
 
 - Добавлена команда обнаружения устройств в локальной сети.

README.md

@@ -1,12 +1,12 @@
-[![Version](https://vsmarketplacebadges.dev/version-short/devdotnetorg.vscode-extension-dotnet-fastiot.svg)](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot) [![License](https://img.shields.io/badge/License-LGPL3.0-blue.svg)](LICENSE) [![Github Issues](https://img.shields.io/github/issues/devdotnetorg/vscode-extension-dotnet-fastiot.svg)](https://github.com/devdotnetorg/vscode-extension-dotnet-fastiot/issues) [![GitHub last commit](https://img.shields.io/github/last-commit/devdotnetorg/vscode-extension-dotnet-fastiot/dev)](https://github.com/devdotnetorg/vscode-extension-dotnet-fastiot/) [![GitHub Repo stars](https://img.shields.io/github/stars/devdotnetorg/vscode-extension-dotnet-fastiot)](https://github.com/devdotnetorg/vscode-extension-dotnet-fastiot/) [![Installs](https://img.shields.io/visual-studio-marketplace/i/devdotnetorg.vscode-extension-dotnet-fastiot)](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot) [![Downloads](https://img.shields.io/visual-studio-marketplace/d/devdotnetorg.vscode-extension-dotnet-fastiot)](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot) [![Visual Studio Marketplace Last Updated](https://img.shields.io/visual-studio-marketplace/last-updated/devdotnetorg.vscode-extension-dotnet-fastiot)](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot) [![Rating](https://img.shields.io/visual-studio-marketplace/stars/devdotnetorg.vscode-extension-dotnet-fastiot)](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot)
+[![Version](https://img.shields.io/visual-studio-marketplace/v/devdotnetorg.vscode-extension-dotnet-fastiot)](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot) [![License](https://img.shields.io/badge/License-LGPL3.0-blue.svg)](LICENSE) [![Github Issues](https://img.shields.io/github/issues/devdotnetorg/vscode-extension-dotnet-fastiot.svg)](https://github.com/devdotnetorg/vscode-extension-dotnet-fastiot/issues) [![GitHub last commit](https://img.shields.io/github/last-commit/devdotnetorg/vscode-extension-dotnet-fastiot/dev)](https://github.com/devdotnetorg/vscode-extension-dotnet-fastiot/) [![GitHub Repo stars](https://img.shields.io/github/stars/devdotnetorg/vscode-extension-dotnet-fastiot)](https://github.com/devdotnetorg/vscode-extension-dotnet-fastiot/) [![Installs](https://img.shields.io/visual-studio-marketplace/i/devdotnetorg.vscode-extension-dotnet-fastiot)](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot) [![Downloads](https://img.shields.io/visual-studio-marketplace/d/devdotnetorg.vscode-extension-dotnet-fastiot)](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot) [![Visual Studio Marketplace Last Updated](https://img.shields.io/visual-studio-marketplace/last-updated/devdotnetorg.vscode-extension-dotnet-fastiot)](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot) [![Rating](https://img.shields.io/visual-studio-marketplace/stars/devdotnetorg.vscode-extension-dotnet-fastiot)](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot)
 
 # .NET FastIoT VS Code Extension
 
 [.NET FastIoT Extension](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot ".NET FastIoT Extension") in Visual Studio Code Marketplace.
 
 [README](README.md "README") in English | [README](README_ru.md "README") на русском языке | DevDotNet.ORG (Russian) - [latest news](https://devdotnet.org/tag/fastiot/ "devdotnet.org/tag/fastiot") | Habr.com (Russian) - [Easy development of IoT applications in C # for Raspberry Pi and other SBCs, on Linux](https://habr.com/ru/company/timeweb/blog/597601/ "Easy development of IoT applications in C # for Raspberry Pi and other SBCs, on Linux").
 
-This extension allows you configures an ARMv7 or ARMv8 Linux embedded device to run .NET applications, and configures `*.csproj` projects for remote debugging via an ssh-tunnel. This has been tested on Windows (64 bits).
+This extension allows you configures an ARMv7, ARMv8 or RISC-V, Linux embedded device to run .NET applications, and configures `*.csproj` projects for remote debugging via an ssh-tunnel. This has been tested on Windows (64 bits).
 
 Devices supported: Raspberry Pi, Banana Pi, Orange Pi, Radxa, Tinkerboard, Odroid, Khadas VIM, NanoPi, Pine.
 
@@ -42,8 +42,9 @@ Recommended additional extensions that improve the development process and inter
 
 ## System requirements for the device
 
-- **Processor.** ARMv7 or ARMv8;
+- **Processor.** ARMv7, ARMv8 or RISC-V;
 - **OS version.** Linux distribution based on Ubuntu 20.04 LTS or later (Focal Fossa), or Debian 10.11 or later (Buster). It is recommended to use the distribution kit [Armbian](https://www.armbian.com/ "Armbian - Linux for ARM development boards").
+- **Software.** OpenSSH SSH server.
 
 ## Getting started
 

README_ru.md

@@ -1,12 +1,12 @@
-[![Version](https://vsmarketplacebadges.dev/version-short/devdotnetorg.vscode-extension-dotnet-fastiot.svg)](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot) [![License](https://img.shields.io/badge/License-LGPL3.0-blue.svg)](LICENSE) [![Github Issues](https://img.shields.io/github/issues/devdotnetorg/vscode-extension-dotnet-fastiot.svg)](https://github.com/devdotnetorg/vscode-extension-dotnet-fastiot/issues) [![GitHub last commit](https://img.shields.io/github/last-commit/devdotnetorg/vscode-extension-dotnet-fastiot/dev)](https://github.com/devdotnetorg/vscode-extension-dotnet-fastiot/) [![GitHub Repo stars](https://img.shields.io/github/stars/devdotnetorg/vscode-extension-dotnet-fastiot)](https://github.com/devdotnetorg/vscode-extension-dotnet-fastiot/) [![Installs](https://img.shields.io/visual-studio-marketplace/i/devdotnetorg.vscode-extension-dotnet-fastiot)](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot) [![Downloads](https://img.shields.io/visual-studio-marketplace/d/devdotnetorg.vscode-extension-dotnet-fastiot)](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot) [![Visual Studio Marketplace Last Updated](https://img.shields.io/visual-studio-marketplace/last-updated/devdotnetorg.vscode-extension-dotnet-fastiot)](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot) [![Rating](https://img.shields.io/visual-studio-marketplace/stars/devdotnetorg.vscode-extension-dotnet-fastiot)](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot)
+[![Version](https://img.shields.io/visual-studio-marketplace/v/devdotnetorg.vscode-extension-dotnet-fastiot)](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot) [![License](https://img.shields.io/badge/License-LGPL3.0-blue.svg)](LICENSE) [![Github Issues](https://img.shields.io/github/issues/devdotnetorg/vscode-extension-dotnet-fastiot.svg)](https://github.com/devdotnetorg/vscode-extension-dotnet-fastiot/issues) [![GitHub last commit](https://img.shields.io/github/last-commit/devdotnetorg/vscode-extension-dotnet-fastiot/dev)](https://github.com/devdotnetorg/vscode-extension-dotnet-fastiot/) [![GitHub Repo stars](https://img.shields.io/github/stars/devdotnetorg/vscode-extension-dotnet-fastiot)](https://github.com/devdotnetorg/vscode-extension-dotnet-fastiot/) [![Installs](https://img.shields.io/visual-studio-marketplace/i/devdotnetorg.vscode-extension-dotnet-fastiot)](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot) [![Downloads](https://img.shields.io/visual-studio-marketplace/d/devdotnetorg.vscode-extension-dotnet-fastiot)](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot) [![Visual Studio Marketplace Last Updated](https://img.shields.io/visual-studio-marketplace/last-updated/devdotnetorg.vscode-extension-dotnet-fastiot)](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot) [![Rating](https://img.shields.io/visual-studio-marketplace/stars/devdotnetorg.vscode-extension-dotnet-fastiot)](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot)
 
 # .NET FastIoT VS Code Extension
 
 Расширение [.NET FastIoT](https://marketplace.visualstudio.com/items?itemName=devdotnetorg.vscode-extension-dotnet-fastiot ".NET FastIoT Extension") в Visual Studio Code Marketplace.
 
 [README](README.md "README") in English | [README](README_ru.md "README") на русском языке | DevDotNet.ORG (Russian) - [последние новости](https://devdotnet.org/tag/fastiot/ "devdotnet.org/tag/fastiot") | Habr.com (Russian) - [Простая разработка IoT приложений на C# для Raspberry Pi и других одноплатников, на Linux](https://habr.com/ru/company/timeweb/blog/597601/ "Простая разработка IoT приложений на C# для Raspberry Pi и других одноплатников, на Linux").
 
-Расширение настраивает встраиваемое устройство на архитектуре ARMv7 или ARMv8, работающее под Linux, для запуска .NET приложений, и конфигурирует проекты `*.csproj` для удаленной отладки по ssh-туннелю. Работает только на Windows (64 бит).
+Расширение настраивает встраиваемое устройство на архитектуре ARMv7, ARMv8 или RISC-V, работающее под Linux, для запуска .NET приложений, и конфигурирует проекты `*.csproj` для удаленной отладки по ssh-туннелю. Работает только на Windows (64 бит).
 
 Поддерживаются устройства: Raspberry Pi, Banana Pi, Orange Pi, Radxa, Tinkerboard, Odroid, Khadas VIM, NanoPi, Pine.
 
@@ -42,8 +42,9 @@
 
 ## Системные требования для устройства
 
-- **Процессор.** ARMv7 или ARMv8;
-- **Версия ОС.** Linux дистрибутив построенный на основе Ubuntu версии не ниже 20.04 LTS (Focal Fossa), или на основе Debian версии не ниже 10.11 (Buster). Рекомендуется использовать дистрибутив [Armbian](https://www.armbian.com/ "Armbian – Linux for ARM development boards").
+- **Процессор.** ARMv7, ARMv8 или RISC-V;
+- **Версия ОС.** Linux дистрибутив построенный на основе Ubuntu версии не ниже 20.04 LTS (Focal Fossa), или на основе Debian версии не ниже 10.11 (Buster). Рекомендуется использовать дистрибутив [Armbian](https://www.armbian.com/ "Armbian – Linux for ARM development boards");
+- **ПО.** SSH-сервер OpenSSH.
 
 ## Быстрый старт
 

bashscript/installpackagedotnetsdk.sh

@@ -20,23 +20,61 @@ if [ -z $INSTALLPATH ]; then
 	INSTALLPATH=/usr/share/dotnet
 fi
 
+# **************** definition of variables ****************
+declare ARCH_OS=$(uname -m) #aarch64, armv7l, x86_64 or riscv64
+declare ID_OS=("$(cat /etc/*release | grep '^ID=' | sed 's/.*=\s*//')") # ubuntu, debian, alpine
+declare VERSION_OS=("$(cat /etc/*release | grep '^VERSION_ID=' | sed 's/.*=\s*//')")
+VERSION_OS=("$(echo ${VERSION_OS} | sed 's/\"//g')")
+# get only type XX.YY
+VERSION_OS=("$(cut -d '.' -f 1 <<< "$VERSION_OS")"."$(cut -d '.' -f 2 <<< "$VERSION_OS")")
+
+# requirements check
+if [ $ARCH_OS != "aarch64" ] && [ $ARCH_OS != "armv7l" ] \
+ && [ $ARCH_OS != "x86_64" ]&& [ $ARCH_OS != "riscv64" ]; then
+	echo "ERROR. Current OS architecture ${ARCH_OS} is not supported."
+	exit 1;
+fi
+
+if [ $ID_OS != "ubuntu" ] && [ $ID_OS != "debian" ] && [ $ID_OS != "alpine" ]; then
+	echo "ERROR. Current OS ${ID_OS} not supported."
+	exit 1;
+fi
+
 export DEBIAN_FRONTEND="noninteractive"
 
 sudo apt-get update
 sudo apt-get install -y wget
 
-#install
-wget https://dot.net/v1/dotnet-install.sh
-sudo chmod +x dotnet-install.sh
-export DOTNET_CLI_TELEMETRY_OPTOUT=true
-sudo ./dotnet-install.sh --channel $NETSDK_CHANNEL --install-dir $INSTALLPATH
+#for aarch64, armv7l, x86_64
+if [ $ARCH_OS == "aarch64" ] && [ $ARCH_OS == "armv7l" ] \
+ && [ $ARCH_OS == "x86_64" ]; then
+	#install
+	wget https://dot.net/v1/dotnet-install.sh
+	sudo chmod +x dotnet-install.sh
+	export DOTNET_CLI_TELEMETRY_OPTOUT=true
+	sudo ./dotnet-install.sh --channel $NETSDK_CHANNEL --install-dir $INSTALLPATH
+	rm dotnet-install.sh
+fi
+
+#for riscv64
+if [ $ARCH_OS == "riscv64" ]; then
+	if [ $NETSDK_CHANNEL != "8.0" ]; then
+		echo "ERROR. You can only install dotnet sdk 8.0 for riscv64."
+		exit 1;
+	fi
+	sudo apt-get install -y tar
+	wget -O dotnet-sdk-riscv64.tar.gz "https://github.com/dkurt/dotnet_riscv/releases/download/v8.0.100/dotnet-sdk-8.0.100-linux-riscv64.tar.gz"
+	sudo mkdir -p $INSTALLPATH
+	sudo tar -xf dotnet-sdk-riscv64.tar.gz -C "$INSTALLPATH" --checkpoint=.100
+	echo ""
+	rm dotnet-sdk-riscv64.tar.gz
+fi
+
 if [ -h /usr/bin/dotnet ]; then
 	sudo rm /usr/bin/dotnet
 fi
 sudo ln -s $INSTALLPATH/dotnet /usr/bin/dotnet
 
-rm dotnet-install.sh
-
 #Disabled telemetry in .NET
 #Telemetry is collected when using any of the .NET CLI commands, such as:
 #    dotnet build

bashscript/installpackagelibgpiod.sh

@@ -1,57 +1,27 @@
 #!/bin/bash
 # Run: 
 # chmod +x installpackagelibgpiod.sh
-# ./installpackagelibgpiod.sh 1.6.3 /usr/share/libgpiod
-
-# '1.6.3', 'checkinrepository','installfromrepository'
+# ./installpackagelibgpiod.sh options
 
 set -e #Exit immediately if a comman returns a non-zero status
 
 echo "Run: installpackagelibgpiod.sh"
 #
-LIBGPIOD_VERSION="$1"
-INSTALLPATH="$2"
-
-#
-#Check the version of Libgpiod in the repository
-if [ $LIBGPIOD_VERSION == "checkinrepository" ]; then
-	echo "Check the version of Libgpiod in the repository"
-	sudo apt-get update
-	sudo apt list libgpiod-dev
-	echo "Successfully"	
-	exit 0
-fi
-
-#Install Libgpiod from repository
-if [ $LIBGPIOD_VERSION == "installfromrepository" ]; then
-	echo "Install Libgpiod from repository"
-	sudo apt-get update
-	sudo apt-get install -y libgpiod-dev gpiod
-	gpiodetect --version
-	echo "Successfully"	
-	exit 0
-fi
-
-#Install Libgpiod from source
-if [ -z $LIBGPIOD_VERSION ]; then
-	echo "Error: library version not specified"
-	exit 1;
-fi
-
-if [ -z $INSTALLPATH ]; then
-	INSTALLPATH=/usr/share/libgpiod
-fi
+OP1="$1"
+OP2="$2"
+OP3="$3"
+OP4="$4"
+OP5="$5"
+OP6="$6"
+OP7="$7"
 
 export DEBIAN_FRONTEND="noninteractive"
 
 sudo apt-get update
 sudo apt-get install -y curl
-
 #install
-curl -SL --output setup-libgpiod.sh https://raw.githubusercontent.com/devdotnetorg/docker-libgpiod/master/setup-libgpiod.sh
+curl -SL --output setup-libgpiod.sh https://raw.githubusercontent.com/devdotnetorg/docker-libgpiod/fastiot/setup-libgpiod.sh
 chmod +x setup-libgpiod.sh
-sudo ./setup-libgpiod.sh $LIBGPIOD_VERSION $INSTALLPATH
-
-gpiodetect --version
+sudo ./setup-libgpiod.sh $OP1 $OP2 $OP3 $OP4 $OP5 $OP6 $OP7
 
 echo "Successfully"