Merge pull request #305 from femtofox/noon

Fix small niggling error in sysinfo cpu
This commit is contained in:
noon92 2025-02-10 01:13:35 +02:00 • committed by GitHub
commit e0a5ab1f4b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 21 deletions

View file

@ -230,25 +230,7 @@ utilities() {
;;
7) # Complete system info)
loading "Loading complete system info..."
dialog --no-collapse --colors --title "Meshtastic node info" --msgbox "\
Femtofox
CPU:
$(ingest_data "femto-utils.sh -c" 15)
Operating System:
$(ingest_data "femto-utils.sh -o" 15)
Storage:
$(ingest_data "femto-utils.sh -S" 15)
Networking (wlan0 & eth0):
$(ingest_data "femto-utils.sh -p" 15)
Peripherals:
$(ingest_data "femto-utils.sh -n" 15)
Meshtasticd:
$(ingest_data "femto-meshtasticd-config.sh -i" 15)" 0 0
dialog --no-collapse --colors --title "Meshtastic node info" --msgbox "$(ingest_data "femto-utils.sh -i" 15)" 0 0
;;
8) break ;;
esac

View file

@ -61,8 +61,8 @@ act_led() {
}
cpu_info() {
local core="$(cat /sys/firmware/devicetree/base/model | tr -d '\0')"
local cpu_model="$(dmesg | grep "soc_id" | sed -n 's/.*soc_id: //p' | tr -d '\0')"; cpu_model="${cpu_model:-$(cat /proc/device-tree/compatible | sed 's/.*,\([^,]*\)$/\1/' | tr -d '\0')}"
local core="Luckfox Pico"
local cpu_model="$(tr -d '\0' </proc/device-tree/compatible | awk -F, '{print $1, $NF}')"
local cpu_architecture="$(uname -m) ($(dpkg --print-architecture) $(python3 -c "import platform; print(platform.architecture()[0])"))"
local cpu_temp="$(echo "scale=1; $(cat /sys/class/thermal/thermal_zone0/temp) / 1000" | bc)°C"
local cpu_speed="$(lscpu | grep "CPU min MHz" | awk '{print int($4)}')-$(lscpu | grep "CPU max MHz" | awk '{print int($4)}')mhz"