A lot of tweaks and supports pi 5 now too

FixedBit · FixedBit · commit 8a15f16a4f1d · 2025-01-24T23:21:17.000-05:00
diff --git a/README.md b/README.md
@@ -37,53 +37,43 @@ This project contains a collection of scripts designed to streamline the setup a
 ## Setup Instructions
 
 ### Raspberry Pi LoRa HAT Configuration
-If you prefer not to use the live script, you can manually configure the LoRa HAT:
-1. Clone this repository:
-   ```bash
-   git clone https://github.com/FixedBit/meshtastic_scripts.git
-   cd meshtastic_scripts
-   ```
-
-2. Run the LoRa HAT configuration script:
-   ```bash
-   sudo ./lora_hat_setup.sh
-   ```
-   - This script will enable SPI and I2C, configure the necessary device overlays, and ensure your Raspberry Pi is ready for the LoRaWAN/GNSS HAT.
-   - The script will prompt for a reboot to apply changes.
+To configure the LoRa HAT, run the following one-liner command:
+```bash
+curl -sL https://raw.githubusercontent.com/FixedBit/meshtastic_scripts/refs/heads/main/lora_hat_setup.sh -o /tmp/lora_hat_setup.sh; sudo bash /tmp/lora_hat_setup.sh; rm /tmp/lora_hat_setup.sh
+```
+- This script will enable SPI and I2C, configure the necessary device overlays, and ensure your Raspberry Pi is ready for the LoRaWAN/GNSS HAT.
+- The script will prompt for a reboot to apply changes.
 
 ---
 
 ### Meshtastic Setup
-1. Run the Meshtastic setup script:
-   ```bash
-   sudo ./meshtastic_setup.sh
-   ```
-   - The script will:
-     - Check and install required dependencies.
-     - Set up a Python virtual environment for the Meshtastic CLI.
-     - Install or update the `meshtasticd` service.
-     - Back up existing Meshtastic configurations.
-     - Start and optionally enable the Meshtasticd service.
-
-2. Follow the prompts to install the latest Meshtastic CLI and configure the `meshtasticd` service.
+To install or update Meshtastic CLI and Meshtasticd, run the following command:
+```bash
+curl -sL https://raw.githubusercontent.com/FixedBit/meshtastic_scripts/refs/heads/main/meshtastic_setup.sh -o /tmp/meshtastic_setup.sh; sudo bash /tmp/meshtastic_setup.sh; rm /tmp/meshtastic_setup.sh
+```
+- The script will:
+  - Check and install required dependencies.
+  - Set up a Python virtual environment for the Meshtastic CLI.
+  - Install or update the `meshtasticd` service.
+  - Back up existing Meshtastic configurations.
+  - Start and optionally enable the Meshtasticd service.
 
 ---
 
 ### NC Mesh Device Configuration
-1. Run the NC Mesh configuration script:
-   ```bash
-   sudo ./ncmesh_connect.sh
-   ```
-   - This script will:
-     - Prompt for the device owner name and short name.
-     - Allow selection of the device mode (Client, Router, etc.).
-     - Configure LoRa, GPS, MQTT, and channel settings specific to the NC Mesh network.
-   - Ensure your device is properly configured for use with NC Mesh.
+To configure a device for the NC Mesh network, run the following command:
+```bash
+curl -sL https://raw.githubusercontent.com/FixedBit/meshtastic_scripts/refs/heads/main/ncmesh_connect.sh -o /tmp/ncmesh_connect.sh; sudo bash /tmp/ncmesh_connect.sh; rm /tmp/ncmesh_connect.sh
+```
+- This script will:
+  - Prompt for the device owner name and short name.
+  - Allow selection of the device mode (Client, Router, etc.).
+  - Configure LoRa, GPS, MQTT, and channel settings specific to the NC Mesh network.
 
 ---
 
 ## Example Configuration
-An example configuration file for the Waveshare LoRaWAN/GNSS HAT is available online. The live script fetches it automatically, but if needed, you can manually download and apply it:
+This is an example configuration file for the Waveshare LoRaWAN/GNSS HAT that I am using on my Pi.
 
 1. Download the example configuration:
    ```bash
@@ -100,6 +90,11 @@ An example configuration file for the Waveshare LoRaWAN/GNSS HAT is available on
    sudo systemctl restart meshtasticd
    ```
 
+NOTE: To check on what the service is doing, you can verify with this command to follow the service output:
+```bash
+journalctl -u meshtasticd -b
+```
+
 ---
 
 ## Credits
diff --git a/example_config/config.yaml b/example_config/config.yaml
@@ -13,6 +13,7 @@ Lora:
   Reset: 18
 
 GPS:
+# For Pi 5, change the path to this: /dev/ttyAMA0
   SerialPath: /dev/ttyS0
 
 Logging:
diff --git a/lora_hat_setup.sh b/lora_hat_setup.sh
@@ -27,6 +27,10 @@ if [[ ! -f "$CONFIG_FILE" ]]; then
     exit 1
 fi
 
+# Detect Raspberry Pi model
+MODEL=$(grep -o "Raspberry Pi [0-9]" /proc/device-tree/model)
+echo "Detected Raspberry Pi model: $MODEL"
+
 echo "Configuring SPI and I2C support on your Raspberry Pi..."
 
 # Enable SPI
@@ -37,21 +41,30 @@ sudo raspi-config nonint set_config_var dtparam=spi on "${CONFIG_FILE}"
 echo "Enabling I2C support..."
 sudo raspi-config nonint set_config_var dtparam=i2c_arm on "${CONFIG_FILE}"
 
-# Ensure dtoverlay=spi0-0cs is set in /boot/firmware/config.txt without altering dtoverlay=vc4-kms-v3d or dtparam=uart0
-echo "Configuring dtoverlay for SPI..."
-sudo sed -i -e '/^\s*#\?\s*dtoverlay\s*=\s*vc4-kms-v3d/! s/^\s*#\?\s*(dtoverlay|dtparam\s*=\s*uart0)\s*=.*/dtoverlay=spi0-0cs/' "${CONFIG_FILE}"
-
-# Insert dtoverlay=spi0-0cs after dtparam=spi=on if not already present
-if ! sudo grep -q '^\s*dtoverlay=spi0-0cs' "${CONFIG_FILE}"; then
-    sudo sed -i '/^\s*dtparam=spi=on/a dtoverlay=spi0-0cs' "${CONFIG_FILE}"
+# Configure for Raspberry Pi 5 specific settings
+if [[ "$MODEL" == "Raspberry Pi 5" ]]; then
+    echo "Applying Raspberry Pi 5-specific configurations..."
+    if ! sudo grep -q '^dtoverlay=spi0-0cs' "${CONFIG_FILE}"; then
+        echo "Adding dtoverlay=spi0-0cs for SPI..."
+        sudo sed -i '/^\s*dtparam=spi=on/a dtoverlay=spi0-0cs' "${CONFIG_FILE}"
+    fi
+    echo "Enabling UART for Pi 5..."
+    sudo raspi-config nonint set_config_var enable_uart 1 "${CONFIG_FILE}"
+    if ! sudo grep -q '^dtoverlay=uart0' "${CONFIG_FILE}"; then
+        echo "Adding dtoverlay=uart0 for UART on Pi 5..."
+        echo "dtoverlay=uart0" | sudo tee -a "${CONFIG_FILE}" > /dev/null
+    fi
+    echo "UART port for GPS on Pi 5 will be /dev/ttyAMA0."
+else
+    # Default configurations for Raspberry Pi 4 and earlier
+    echo "Applying configurations for Raspberry Pi 4 or earlier..."
+    if ! sudo grep -q '^dtoverlay=spi0-0cs' "${CONFIG_FILE}"; then
+        echo "Adding dtoverlay=spi0-0cs for SPI..."
+        sudo sed -i '/^\s*dtparam=spi=on/a dtoverlay=spi0-0cs' "${CONFIG_FILE}"
+    fi
+    echo "UART port for GPS on Pi 4 and earlier will be /dev/ttyS0."
 fi
 
-echo "Enable GPS if installed on your HAT."
-sudo raspi-config nonint do_serial_hw 0
-
-echo "Disable serial console."
-sudo raspi-config nonint do_serial_cons 1
-
 # Offer to fetch and copy the Meshtasticd configuration
 read -p "Would you like to fetch the Meshtasticd configuration for the Waveshare LoRa HAT? (yes/no) [Default: yes]: " config_choice
 config_choice=${config_choice:-yes}
@@ -73,6 +86,17 @@ if [[ "$config_choice" == "yes" ]]; then
 
     if [[ $? -eq 0 ]]; then
         echo "Configuration fetched and saved successfully to ${TARGET_CONFIG_FILE}."
+
+        # Modify the config for Raspberry Pi 5 if detected
+        if [[ "$MODEL" == "Raspberry Pi 5" ]]; then
+            echo "Updating config.yaml for Raspberry Pi 5..."
+            sudo sed -i 's|SerialPath: /dev/ttyS0|SerialPath: /dev/ttyAMA0|' "${TARGET_CONFIG_FILE}"
+            if [[ $? -eq 0 ]]; then
+                echo "Config.yaml updated for Raspberry Pi 5 successfully."
+            else
+                echo "Failed to update config.yaml for Raspberry Pi 5."
+            fi
+        fi
     else
         echo "Failed to fetch the configuration. Please check your internet connection and try again."
     fi
diff --git a/meshtastic_setup.sh b/meshtastic_setup.sh
@@ -105,7 +105,51 @@ get_release_url() {
         jq -r ".assets[] | select(.name | contains(\"${platform}.deb\")) | .browser_download_url"
 }
 
-# Function to create Python virtual environment and install the meshtastic CLI
+# Function to locate and verify the Meshtastic CLI
+check_meshtastic_cli() {
+    # Attempt to find meshtastic in the PATH or common installation paths
+    MESHTASTIC_CMD=$(command -v meshtastic)
+
+    # Check common paths if not found in PATH
+    if [[ -z "$MESHTASTIC_CMD" ]]; then
+        local paths=(
+            "/opt/meshtastic-venv/bin/meshtastic"
+            "/usr/local/bin/meshtastic"
+            "/usr/bin/meshtastic"
+            "$HOME/.local/bin/meshtastic"
+        )
+        for path in "${paths[@]}"; do
+            if [[ -x "$path" ]]; then
+                MESHTASTIC_CMD="$path"
+                break
+            fi
+        done
+    fi
+
+    # If still not found, prompt to install
+    if [[ -z "$MESHTASTIC_CMD" ]]; then
+        echo "Meshtastic CLI is not installed or not in the expected paths."
+        read -p "Do you want to install it? (yes/no): [Default: yes] " choice
+        choice=${choice:-yes}
+        if [[ "$choice" == "yes" ]]; then
+            install_meshtastic_cli
+        else
+            echo "Meshtastic CLI installation skipped. Exiting."
+            exit 1
+        fi
+    fi
+
+    # Verify the Meshtastic CLI works
+    if ! "$MESHTASTIC_CMD" --help >/dev/null 2>&1; then
+        echo "Error: Meshtastic CLI is installed but not functioning correctly."
+        echo "Please check your installation or reinstall the Meshtastic CLI."
+        exit 1
+    fi
+
+    echo "Meshtastic CLI is installed and functioning correctly: $MESHTASTIC_CMD"
+}
+
+# Function to install Meshtastic CLI
 install_meshtastic_cli() {
     local venv_path="/opt/meshtastic-venv"
 
@@ -114,23 +158,31 @@ install_meshtastic_cli() {
         sudo python3 -m venv "$venv_path"
     fi
 
-    echo "Installing meshtastic Python library in virtual environment..."
+    echo "Installing Meshtastic Python library in virtual environment..."
     sudo "$venv_path/bin/pip" install meshtastic
 
-    echo "Adding meshtastic command to global PATH..."
+    echo "Adding Meshtastic command to global PATH if not already present..."
     local profile_script="/etc/profile.d/meshtastic.sh"
-    sudo bash -c "cat > $profile_script" <<EOL
-export PATH="$venv_path/bin:\$PATH"
-EOL
-    sudo chmod 0755 "$profile_script"
-
-    if [[ -n "$BASH_SOURCE" ]]; then
-        echo "source $profile_script" >> "$HOME/.bashrc"
-        source "$profile_script"
-    elif [[ -n "$ZSH_NAME" ]]; then
-        echo "source $profile_script" >> "$HOME/.zshrc"
+    local export_line="export PATH=\"$venv_path/bin:\$PATH\""
+
+    if ! grep -qF "$export_line" "$profile_script" 2>/dev/null; then
+        sudo bash -c "echo '$export_line' > $profile_script"
+        sudo chmod 0755 "$profile_script"
+        echo "Added Meshtastic to global PATH via $profile_script."
+    else
+        echo "Global PATH already includes Meshtastic command."
     fi
 
+    # Add to user's shell configuration files
+    for shell_rc in "$HOME/.bashrc" "$HOME/.zshrc"; do
+        if [[ -f "$shell_rc" ]] && ! grep -qF "$export_line" "$shell_rc"; then
+            echo "$export_line" >> "$shell_rc"
+            echo "Added Meshtastic to PATH in $shell_rc."
+        fi
+    done
+
+    # Source the changes for the current session
+    export PATH="$venv_path/bin:$PATH"
     echo "Meshtastic CLI installation completed successfully."
 }
 
@@ -247,18 +299,7 @@ echo "-= Meshtastic Setup and Install Script =-"
 # Main script logic
 check_and_install_packages
 
-# Check and offer to install meshtastic CLI
-if check_command "meshtastic"; then
-    echo "Meshtastic CLI is already installed."
-else
-    echo "Meshtastic CLI is not installed."
-    read -p "Do you want to install it? (yes/no): [Default: yes]" choice
-    if [[ "$choice" == "no" ]]; then
-        echo "Meshtastic CLI installation skipped."
-    else
-        install_meshtastic_cli
-    fi
-fi
+check_meshtastic_cli
 
 # Always ask to install or update meshtasticd
 install_or_update_meshtasticd
diff --git a/ncmesh_connect.sh b/ncmesh_connect.sh
@@ -8,6 +8,48 @@ echo "-=          Shoutout to the North Carolina Meshtastic Community!
 echo "-=    Website https://ncmesh.net | Discord: https://discord.gg/xUzRAjHZk8    =-"
 echo "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-"
 
+
+# Function to locate and verify the Meshtastic CLI
+find_and_verify_meshtastic() {
+    # Attempt to find meshtastic in the PATH
+    MESHTASTIC_CMD=$(command -v meshtastic)
+
+    # Check common installation paths if not found in PATH
+    if [[ -z "$MESHTASTIC_CMD" ]]; then
+        local paths=(
+            "/opt/meshtastic-venv/bin/meshtastic"
+            "/usr/local/bin/meshtastic"
+            "/usr/bin/meshtastic"
+            "$HOME/.local/bin/meshtastic"
+        )
+        for path in "${paths[@]}"; do
+            if [[ -x "$path" ]]; then
+                MESHTASTIC_CMD="$path"
+                break
+            fi
+        done
+    fi
+
+    # Exit if Meshtastic CLI is still not found
+    if [[ -z "$MESHTASTIC_CMD" ]]; then
+        echo "Error: Meshtastic CLI not found."
+        echo "Ensure it is installed and its path is added to your environment."
+        exit 1
+    fi
+
+    # Verify the Meshtastic CLI works
+    if ! "$MESHTASTIC_CMD" --help >/dev/null 2>&1; then
+        echo "Error: Meshtastic CLI is installed but not working properly."
+        echo "Please check your installation or reinstall the Meshtastic CLI."
+        exit 1
+    fi
+
+    echo "Meshtastic CLI located and verified: $MESHTASTIC_CMD"
+}
+
+# Locate and verify Meshtastic CLI
+find_and_verify_meshtastic
+
 # Function to execute and check commands
 run_command() {
     echo "Executing: $1"
@@ -50,28 +92,27 @@ esac
 
 # Configure device owner, short name, and role
 echo "Configuring device owner, short name, and role..."
-run_command "meshtastic --host localhost --set-owner '$owner_name' --set-owner-short '$short_name' --set device.role $device_role"
+run_command "${MESHTASTIC_CMD} --host localhost --set-owner '$owner_name' --set-owner-short '$short_name' --set device.role $device_role"
 
 # Configure LoRa settings
 echo "Configuring LoRa settings..."
-run_command "meshtastic --host localhost --set lora.region US --set lora.tx_power 30 --set lora.hop_limit 4"
+run_command "${MESHTASTIC_CMD} --host localhost --set lora.region US --set lora.tx_power 30 --set lora.hop_limit 4"
 
 # Configure position settings
 echo "Configuring position settings..."
-run_command "meshtastic --host localhost --set position.gps_mode ENABLED --set position.gps_update_interval 1800 --set position.position_broadcast_secs 3600 --set position.broadcast_smart_minimum_interval_secs 1800 --set position.broadcast_smart_minimum_distance 100"
+run_command "${MESHTASTIC_CMD} --host localhost --set position.gps_mode ENABLED --set position.gps_update_interval 1800 --set position.position_broadcast_secs 3600 --set position.broadcast_smart_minimum_interval_secs 1800 --set position.broadcast_smart_minimum_distance 100"
 
 # Configure MQTT settings
 echo "Configuring MQTT settings..."
-run_command "meshtastic --host localhost --set mqtt.enabled true --set mqtt.address mqtt.ncmesh.net --set mqtt.username meshdev --set mqtt.password large4cats --set mqtt.proxy_to_client_enabled true --set mqtt.map_reporting_enabled true"
+run_command "${MESHTASTIC_CMD} --host localhost --set mqtt.enabled true --set mqtt.address mqtt.ncmesh.net --set mqtt.username meshdev --set mqtt.password large4cats --set mqtt.proxy_to_client_enabled true --set mqtt.map_reporting_enabled true"
 
 # Configure primary channel
 echo "Configuring primary channel (LongFast)..."
-run_command "meshtastic --host localhost --ch-set name 'LongFast' --ch-index 0 --ch-set uplink_enabled true --ch-set downlink_enabled true --ch-set module_settings.position_precision 1 --ch-index 0"
+run_command "${MESHTASTIC_CMD} --host localhost --ch-set name 'LongFast' --ch-index 0 --ch-set uplink_enabled true --ch-set downlink_enabled true --ch-set module_settings.position_precision 14 --ch-index 0"
 
 # Add and configure secondary channel
 echo "Adding and configuring secondary channel (NCMesh)..."
-run_command "meshtastic --host localhost --ch-add 1"
-run_command "meshtastic --host localhost --ch-set name 'NCMesh' --ch-index 1 --ch-set uplink_enabled true --ch-set downlink_enabled true --ch-set module_settings.position_precision 1 --ch-index 1 --ch-set psk 'default' --ch-index 1"
-
+run_command "${MESHTASTIC_CMD} --host localhost --ch-add 1"
+run_command "${MESHTASTIC_CMD} --host localhost --ch-set name 'NCMesh' --ch-index 1 --ch-set uplink_enabled true --ch-set downlink_enabled true --ch-set module_settings.position_precision 14 --ch-index 1 --ch-set psk 'default' --ch-index 1"
 # Final Confirmation
 echo "Meshtastic device setup completed successfully!"
