Merge pull request #97 from SpudGunMan/emergencyalert

EnhanceEmergencyAlert
remove Numpy
2026-03-28 17:32:36 +01:00 · 2024-12-20 14:39:31 -08:00 · 2024-12-20 12:22:01 -08:00 · 2024-12-20 02:00:36 -08:00 · 2024-12-20 01:17:47 -08:00 · 2024-12-20 00:38:59 -08:00
24 changed files with 1879 additions and 518 deletions
--- a/4
+++ b/4
@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:3.13-slim
 ENV PYTHONUNBUFFERED=1

 RUN apt-get update && apt-get install -y gettext tzdata locales && rm -rf /var/lib/apt/lists/*
@@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y gettext tzdata locales && rm -rf /var/l
 RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
    dpkg-reconfigure --frontend=noninteractive locales && \
    update-locale LANG=en_US.UTF-8
-ENV LANG en_US.UTF-8 
+ENV LANG=en_US.UTF-8 
 ENV TZ="America/Los_Angeles"

 WORKDIR /app
--- a/README.md
+++ b/README.md
@@ -1,14 +1,16 @@
 # Mesh Bot for Network Testing and BBS Activities

-Welcome to the Mesh Bot project! This feature-rich bot is designed to enhance your [Meshtastic](https://meshtastic.org/docs/introduction/) network experience with a variety of powerful tools and fun features, connectivity and utility through text-based message delivery. Whether you're looking to perform network tests, send messages, or even play games, this bot has you covered.
+Welcome to the Mesh Bot project! This feature-rich bot is designed to enhance your [Meshtastic](https://meshtastic.org/docs/introduction/) network experience with a variety of powerful tools and fun features, connectivity and utility through text-based message delivery. Whether you're looking to perform network tests, send messages, or even play games, [mesh_bot.py](mesh_bot.py) has you covered. 

 ![Example Use](etc/pong-bot.jpg "Example Use")

 ## Key Features
+![CodeQlBadge](https://github.com/SpudGunMan/meshing-around/actions/workflows/dynamic/github-code-scanning/codeql/badge.svg)

 ### Intelligent Keyword Responder
- **Automated Responses**: The bot traps keywords like "ping" and responds with "pong" in direct messages (DMs) or group channels.
+- **Automated Responses**: The bot detects keywords like "ping" and responds with "pong" in direct messages (DMs) or group channels.
 - **Customizable Triggers**: Monitor group channels for specific keywords and set custom responses.
+- **Emergency Response**: Monitor channels for keywords indicating emergencies and alert a wider audience.

 ### Network Tools
 - **Build, Test Local Mesh**: Ping allow for message delivery testing with more realistic packets vs. telemetry
@@ -23,12 +25,14 @@ Welcome to the Mesh Bot project! This feature-rich bot is designed to enhance yo
 - **Scheduler**: Schedule messages like weather updates or reminders for weekly VHF nets.
 - **Store and Forward**: Replay messages with the `messages` command, and log messages locally to disk.
 - **Send Mail**: Send mail to nodes using `bbspost @nodeNumber #message` or `bbspost @nodeShortName #message`.
- **BBS Linking**: Combine multiple bots to expand BBS reach
+- **BBS Linking**: Combine multiple bots to expand BBS reach.
+- **E-Mail/SMS**: Send mesh-messages to E-Mail or SMS expanding visability.

 ### Interactive AI and Data Lookup
- **NOAA location Data**: Get localized weather(alerts) and Tide information. Open-Meteo is used for wx only outside NOAA coverage. 
+- **NOAA location Data**: Get localized weather(alerts), River Flow, and Tide information. Open-Meteo is used for wx only outside NOAA coverage. 
 - **Wiki Integration**: Look up data using Wikipedia results.
 - **Ollama LLM AI**: Interact with the [Ollama](https://github.com/ollama/ollama/tree/main/docs) LLM AI for advanced queries and responses.
+- **Satalite Pass Info**: Get passes for satalite at your location.

 ### Proximity Alerts
 - **Location-Based Alerts**: Get notified when members arrive back at a configured lat/long, perfect for remote locations like campsites.
@@ -41,13 +45,15 @@ Welcome to the Mesh Bot project! This feature-rich bot is designed to enhance yo
 - **SNR RF Activity Alerts**: Monitor a radio frequency and get alerts when high SNR RF activity is detected.
 - **Hamlib Integration**: Use Hamlib (rigctld) to watch the S meter on a connected radio.

-### NOAA EAS Alerts
- **EAS Alerts via NOAA API**: Use an internet connected node to message Emergency Alerts from NOAA
- **EAS Alerts over the air**: Utalizing external tools to report EAS alerts offline over mesh
+### EAS Alerts
+- **FEMA iPAWS/EAS Alerts via API**: Use an internet-connected node to message Emergency Alerts from FEMA
+- **NOAA EAS Alerts via API**: Use an internet-connected node to message Emergency Alerts from NOAA.
+- **EAS Alerts over the air**: Utilizing external tools to report EAS alerts offline over mesh.
+- **UK.GOV Alerts**: Pulling data form the UK.GOV alert page

 ### File Monitor Alerts
- **File Mon**: Monitor a flat/text file for changes, brodcast the contents of the message to mesh channel.
- **News File**: on request of news the contents of the file is returned.
+- **File Monitor**: Monitor a flat/text file for changes, broadcast the contents of the message to the mesh channel.
+- **News File**: On request of news, the contents of the file are returned.

 ### Data Reporting
 - **HTML Generator**: Visualize bot traffic and data flows with a built-in HTML generator for [data reporting](logs/README.md).
@@ -56,11 +62,12 @@ Welcome to the Mesh Bot project! This feature-rich bot is designed to enhance yo
 - **Message Chunking**: Automatically chunk messages over 160 characters to ensure higher delivery success across hops.

 ## Getting Started
-This project is developed on Linux (specifically a Raspberry Pi) but should work on any platform where the [Meshtastic protobuf API](https://meshtastic.org/docs/software/python/cli/) modules are supported, and with any compatible [Meshtastic](https://meshtastic.org/docs/getting-started/) hardware.
+This project is developed on Linux (specifically a Raspberry Pi) but should work on any platform where the [Meshtastic protobuf API](https://meshtastic.org/docs/software/python/cli/) modules are supported, and with any compatible [Meshtastic](https://meshtastic.org/docs/getting-started/) hardware. For pico or low-powered devices, see projects for embedding, [buildroot](https://github.com/buildroot-meshtastic/buildroot-meshtastic), there is also [femtofox](https://github.com/noon92/femtofox). 🥔 Please use responsibly and follow local rulings for such equipment. This project captures packets, logs them, and handles over the air communications which can include PII such as GPS locations.

 ### Installation

 #### Clone the Repository
+If you dont have git you will need it `sudo apt-get install git`
 ```sh
 git clone https://github.com/spudgunman/meshing-around
 ```
@@ -73,7 +80,7 @@ The code is under active development, so make sure to pull the latest changes re
 #### Docker Installation
 If you prefer to use Docker, follow these steps:

-1. Ensure your serial port is properly shared and the GPU is configured if using LLM with [NVIDIA](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/docker-specialized.html).
+1. Ensure your serial port is properly shared and the GPU is configured if using LLM in docker with [NVIDIA](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/docker-specialized.html).
 2. Build the Docker image:
    ```sh
    cd meshing-around
@@ -122,16 +129,17 @@ enabled = False
 ```

 ### General Settings
-The following settings determine how the bot responds. By default, the bot will not spam the default channel. Setting `respond_by_dm_only` to `True` will force all messages to be sent via DM, which may not be desired. Setting it to [`False`] will allow responses in the channel for all to see. If you have no default channel you can set this value to `-1` or any unused channel index.
+The following settings determine how the bot responds. By default, the bot will not spam the default channel. Setting `respond_by_dm_only` to `True` will force all messages to be sent via DM, which may not be desired. Setting it to [`False`] will allow responses in the channel for all to see. If you have no default channel you can set this value to `-1` or any unused channel index. You can also have the bot ignore the defaultChannel for any commands, but still observe the channel.

 ```ini
 [general]
 respond_by_dm_only = True
 defaultChannel = 0
+ignoreDefaultChannel = False # ignoreDefaultChannel, the bot will ignore the default channel set above
 ```

 ### Location Settings
-The weather forecasting defaults to NOAA, for locations outside the USA, you can set `UseMeteoWxAPI` to `True`, to use a global weather API. The `lat` and `lon` are default values when a node has no location data. It is also the default used for Sentry.
+The weather forecasting defaults to NOAA, for locations outside the USA, you can set `UseMeteoWxAPI` to `True`, to use a global weather API. The `lat` and `lon` are default values when a node has no location data. It is also the default (or value when none found for user) for Sentry, all NOAA, repeater lookup, etc.

 ```ini
 [location]
@@ -139,6 +147,7 @@ enabled = True
 lat = 48.50
 lon = -123.0
 UseMeteoWxAPI = True
+riverListDefault = # NOAA Hydrology data, unique identifiers, LID or USGS ID
 ```

 ### Module Settings
@@ -167,14 +176,68 @@ Sentry Bot detects anyone coming close to the bot-node. uses the Location Lat/Lo

 ```ini
 SentryEnabled = True # detect anyone close to the bot
+emailSentryAlerts = True # if SMTP enabled send alert to sysop email list
 SentryRadius = 100 # radius in meters to detect someone close to the bot
 SentryChannel = 9 # holdoff time multiplied by seconds(20) of the watchdog
 SentryHoldoff = 2 # channel to send a message to when the watchdog is triggered
 sentryIgnoreList = # list of ignored nodes numbers ex: 2813308004,4258675309
 ```

+### E-Mail / SMS Settings
+To enable connectivity with SMTP/IMAP.
+
+```ini
+[smtp]
+# enable or disable the SMTP module, minimum required for outbound notifications
+enableSMTP = True # enable or disable the IMAP module for inbound email, not implimented yet
+enableImap = False # list of Sysop Emails seperate with commas, used only in emergemcy responder currently
+sysopEmails =
+# See config.template for all the SMTP settings
+SMTP_SERVER = smtp.gmail.com
+SMTP_AUTH = True
+EMAIL_SUBJECT = Meshtastic✉️
+```
+
+### Emergency Response Handler
+Traps the following ("emergency", "911", "112", "999", "police", "fire", "ambulance", "rescue") keywords. Responds to the user, and calls attention to the text message in logs and via another network or channel.
+
+```ini
+[emergencyHandler]
+# enable or disable the emergency response handler
+enabled = True
+# channel to send a message to when the emergency handler is triggered
+alert_channel = 2
+alert_interface = 1
+```
+
+### EAS Alerting
+To Alert on Mesh with the EAS API you can set the channels and enable, checks every 20min.
+
+#### FEMA iPAWS/EAS and UK.gov
+This uses USA: SAME, FIPS, ZIP code to locate the alerts in the feed. By default ignoring Test messages. UK.gov for England
+
+```ini
+eAlertBroadcastEnabled = False # Goverment IPAWS/CAP Alert Broadcast
+eAlertBroadcastCh = 2,3 # Goverment Emergency IPAWS/CAP Alert Broadcast Channels
+ignoreFEMAtest = True # Ignore any headline that includes the word Test
+# comma separated list of codes (e.g., SAME,FIPS,ZIP) trigger local alert.
+# find your SAME https://www.weather.gov/nwr/counties
+mySAME = 053029,053073
+enableGBalerts = False # use UK.gov for alert source
+```
+
+#### NOAA EAS
+ This uses the defined lat-long of the bot for collecting of data from the API. see [File-Monitoring](#File-Monitoring) for ideas to collect EAS alerts from a RTL-SDR.
+
+```ini
+# EAS Alert Broadcast 
+wxAlertBroadcastEnabled = True
+# EAS Alert Broadcast Channels
+wxAlertBroadcastCh = 2,4
+```
+
 ### Repeater Settings
-A repeater function for two different nodes and cross-posting messages. The [`repeater_channels`] is a list of repeater channels that will be consumed and rebroadcast on the same number channel on the other device, node, or interface. Each node should have matching channel numbers. The channel names and PSK do not need to be the same on the nodes. Use this feature responsibly to avoid creating a feedback loop.
+A repeater function for two different nodes and cross-posting messages. The `repeater_channels` is a list of repeater channels that will be consumed and rebroadcast on the same number channel on the other device, node, or interface. Each node should have matching channel numbers. The channel names and PSK do not need to be the same on the nodes. Use this feature responsibly to avoid creating a feedback loop.

 ```ini
 [repeater] # repeater module
@@ -183,7 +246,7 @@ repeater_channels = [2, 3]
 ```

 ### Ollama (LLM/AI) Settings
-For Ollama to work, the command line `ollama run 'model'` needs to work properly. Ensure you have enough RAM and your GPU is working as expected. The default model for this project is set to `gemma2:2b`. Ollama can be remote [Ollama Server](https://github.com/ollama/ollama/blob/main/docs/faq.md#how-do-i-configure-ollama-server)
+For Ollama to work, the command line `ollama run 'model'` needs to work properly. Ensure you have enough RAM and your GPU is working as expected. The default model for this project is set to `gemma2:2b`. Ollama can be remote [Ollama Server](https://github.com/ollama/ollama/blob/main/docs/faq.md#how-do-i-configure-ollama-server) works on a pi58GB with 40 second or less response time.

 ```ini
 # Enable ollama LLM see more at https://ollama.com
@@ -206,7 +269,7 @@ A module allowing a Hamlib compatible radio to connect to the bot. When function

 ```ini
 [radioMon]
-enabled = False
+enabled = True
 rigControlServerAddress = localhost:4532
 sigWatchBroadcastCh = 2 # channel to broadcast to can be 2,3
 signalDetectionThreshold = -10 # minimum SNR as reported by radio via hamlib
@@ -225,16 +288,10 @@ file_path = alert.txt
 broadcastCh = 2,4
 enable_read_news = False
 news_file_path = news.txt
+news_random_line = False # only return a single random line from the news file
 ```
-#### NOAA EAS
-To Alert on Mesh with the NOAA EAS API you can set the channels and enable, checks every 30min

-```ini
-# EAS Alert Broadcast
-wxAlertBroadcastEnabled = False
-# EAS Alert Broadcast Channels
-wxAlertBroadcastCh = 2,4
-```
+#### Offline EAS

 To Monitor EAS with no internet connection see the following notes
 - [samedec](https://crates.io/crates/samedec) rust decoder much like multimon-ng
@@ -266,7 +323,7 @@ In the config.ini enable the module
 # enable or disable the scheduler module
 enabled = True
 ```
- The actions are via code only at this time. See mesh_bot.py around line [1050](https://github.com/SpudGunMan/meshing-around/blob/e94581936530c76ea43500eebb43f32ba7ed5e19/mesh_bot.py#L1050) to edit the schedule. See [schedule documentation](https://schedule.readthedocs.io/en/stable/) for more. Recomend to backup changes so they dont get lost.
+ The actions are via code only at this time. See mesh_bot.py around line [1097](https://github.com/SpudGunMan/meshing-around/blob/e94581936530c76ea43500eebb43f32ba7ed5e19/mesh_bot.py#L1097) to edit the schedule. See [schedule documentation](https://schedule.readthedocs.io/en/stable/) for more. Recomend to backup changes so they dont get lost.

 ```python
 #Send WX every Morning at 08:00 using handle_wxc function to channel 2 on device 1
@@ -284,55 +341,11 @@ schedule.every(2).days.at("10:00").do(lambda: send_message("bbslink MeshBot look
 ```
 ```ini
 bbslink_enabled = True
-# list of whitelisted nodes numbers ex: 2813308004,4258675309 empty list allows all
-bbslink_whitelist = 
+bbslink_whitelist = # list of whitelisted nodes numbers ex: 2813308004,4258675309 empty list allows all
 ```

 ### MQTT Notes
-There is no direct support for MQTT in the code, however, reports from Discord are that using [meshtasticd](https://meshtastic.org/docs/hardware/devices/linux-native-hardware/) with no radio and attaching the bot to the software node, which is MQTT-linked, allows routing. There also seems to be a quicker way to enable MQTT by having your bot node with the enabled [serial](https://meshtastic.org/docs/configuration/module/serial/) module with echo enabled and MQTT uplink and downlink. These two methods have been mentioned as allowing MQTT routing for the project. 
-
-### Requirements
-Python 3.8? or later is needed (dev on latest). The following can be installed with `pip install -r requirements.txt` or using the [install.sh](install.sh) script for venv and automation:
-
-```sh
-pip install meshtastic
-pip install pubsub
-```
-
-Mesh-bot enhancements:
-
-```sh
-pip install pyephem
-pip install requests
-pip install geopy
-pip install maidenhead
-pip install beautifulsoup4
-pip install dadjokes
-pip install geopy
-pip install schedule
-pip install wikipedia
-```
-
-For open-meteo use:
-
-```sh
-pip install openmeteo_requests
-pip install retry_requests
-pip install numpy
-```
-
-For the Ollama LLM:
-
-```sh
-pip install ollama
-pip install googlesearch-python
-```
-
-To enable emoji in the Debian console, install the fonts:
-
-```sh
-sudo apt-get install fonts-noto-color-emoji
-```
+There is no direct support for MQTT in the code, however, reports from Discord are that using [meshtasticd](https://meshtastic.org/docs/hardware/devices/linux-native-hardware/) with no radio and attaching the bot to the software node, which is MQTT-linked, allows routing.~~There also seems to be a quicker way to enable MQTT by having your bot node with the enabled [serial](https://meshtastic.org/docs/configuration/module/serial/) module with echo enabled and MQTT uplink and downlink. These two~~ methods have been mentioned as allowing MQTT routing for the project. Tested working fully Firmware:2.5.15.79da236 with [mosquitto](https://meshtastic.org/docs/software/integrations/mqtt/mosquitto/).

 ## Full list of commands for the bot

@@ -343,9 +356,11 @@ sudo apt-get install fonts-noto-color-emoji
 | `test` | Returns like ping but also can be used to test the limits of data buffers `test 4` sends data to the maxBuffer limit (default 220) | ✅ |
 | `whereami` | Returns the address of the sender's location if known |
 | `whoami` | Returns details of the node asking, also returned when position exchanged 📍 | ✅ |
+| `whois` | Returns details known about node, more data with bbsadmin node | ✅ |
 | `motd` | Displays the message of the day or sets it. Example: `motd $New Message Of the day` | ✅ |
 | `lheard` | Returns the last 5 heard nodes with SNR. Can also use `sitrep` | ✅ |
 | `history` | Returns the last commands run by user(s) | ✅ |
+| `sysinfo` | Returns the bot node telemetry info | ✅ |
 | `cmd` | Returns the list of commands (the help message) | ✅ |

 ### Radio Propagation & Weather Forcasting
@@ -356,8 +371,10 @@ sudo apt-get install fonts-noto-color-emoji
 | `hfcond` | Returns a table of HF solar conditions | |
 | `tide` | Returns the local tides (NOAA data source) |
 | `rlist` | Returns a table of nearby repeaters from RepeaterBook | |
-| `wx` and `wxc` | Return local weather forecast (wxc is metric value), NOAA or Open Meteo for weather forecasting |
-| `wxa` and `wxalert` | Return NOAA alerts. Short title or expanded details |
+| `wx` and `wxc` | Return local weather forecast (wxc is metric value), NOAA or Open Meteo for weather forecasting | |
+| `wxa` and `wxalert` | Return NOAA alerts. Short title or expanded details | |
+| `ea` and `ealert` | Return FEMA iPAWS/EAS alerts in USA or UK. Headline or expanded details for USA | |
+| `riverflow` | Return information from NOAA for river flow info. Example: `riverflow modules/settings.py`| |

 ### Bulletin Board & Mail
 | Command | Description | |
@@ -368,7 +385,12 @@ sudo apt-get install fonts-noto-color-emoji
 | `bbspost` | Posts a message to the public board or sends a DM(Mail) Examples: `bbspost $subject #message`, `bbspost @nodeNumber #message`, `bbspost @nodeShortName #message` | ✅ |
 | `bbsdelete` | Deletes a message. Example: `bbsdelete #4` | ✅ |
 | `bbsinfo` | Provides stats on BBS delivery and messages (sysop) | ✅ |
-| `bbllink` | Links Bulletin Messages between BBS Systems | ✅ |
+| `bbslink` | Links Bulletin Messages between BBS Systems | ✅ |
+| `email:`  | Sends email to address on file for the node or `email: bob@test.net # hello from mesh` | |
+| `sms:`    | Send sms-email to multiple address on file | |
+| `setemail`| Sets the email for easy communciations | |
+| `setsms` | Adds the SMS-Email for quick communications | |
+| `clearsms` | Clears all SMS-Emails on file for node | |

 ### Data Lookup 
 | Command | Description | |
@@ -377,8 +399,7 @@ sudo apt-get install fonts-noto-color-emoji
 | `askai` and `ask:` | Ask Ollama LLM AI for a response. Example: `askai what temp do I cook chicken` | ✅ |
 | `messages` | Replays the last messages heard, like Store and Forward | ✅ |
 | `readnews` | returns the contents of a file (news.txt, by default) via the chunker on air | ✅ |
-
-
+| `satpass` | returns the pass info from API for defined NORAD ID in config or Example: `satpass 25544,33591`| |

 ### Games (via DM)
 | Command | Description | |
@@ -412,10 +433,46 @@ I used ideas and snippets from other responder bots and want to call them out!
 - **xdep**: For the reporting tools.
 - **Nestpebble**: For new ideas and enhancements.
 - **mrpatrick1991**: For Docker configurations.
+- **[https://github.com/A-c0rN](A-c0rN)**: Assistance with iPAWS and EAS
 - **Mike O'Connell/skrrt**: For [eas_alert_parser](etc/eas_alert_parser.py) enhanced by **sheer.cold**
 - **PiDiBi**: For looking at test functions and other suggestions like wxc, CPU use, and alerting ideas.
- **Cisien, bitflip, **Woof**, and Hailo1999**: For testing and feature ideas on Discord and GitHub.
+- **Cisien, bitflip, **Woof**, **propstg**, **Josh** and Hailo1999**: For testing and feature ideas on Discord and GitHub.
 - **Meshtastic Discord Community**: For tossing out ideas and testing code.

 ### Tools
 - **Node Backup Management**: [Node Slurper](https://github.com/SpudGunMan/node-slurper)
+
+### Requirements
+Python 3.8? or later is needed (dev on latest). The following can be installed with `pip install -r requirements.txt` or using the [install.sh](install.sh) script for venv and automation:
+
+```sh
+pip install meshtastic
+pip install pubsub
+```
+
+Mesh-bot enhancements:
+
+```sh
+pip install pyephem
+pip install requests
+pip install geopy
+pip install maidenhead
+pip install beautifulsoup4
+pip install dadjokes
+pip install schedule
+pip install wikipedia
+```
+
+For the Ollama LLM:
+
+```sh
+pip install googlesearch-python
+```
+
+To enable emoji in the Debian console, install the fonts:
+
+```sh
+sudo apt-get install fonts-noto-color-emoji
+```
+
+Meshtastic® is a registered trademark of Meshtastic LLC. Meshtastic software components are released under various licenses, see GitHub for details. No warranty is provided - use at your own risk.
--- a/config.template
+++ b/config.template
@@ -25,39 +25,51 @@ port = /dev/ttyUSB0
 [general]
 # if False will respond on all channels but the default channel
 respond_by_dm_only = True
+# Allows auto-ping feature in a channel, False forces to 1 ping only
+autoPingInChannel = False
 # defaultChannel is the meshtastic default public channel, e.g. LongFast (if none use -1)
 defaultChannel = 0
 # ignoreDefaultChannel, the bot will ignore the default channel set above
 ignoreDefaultChannel = False
+
 # motd is reset to this value on boot
 motd = Thanks for using MeshBOT! Have a good day!
 welcome_message = MeshBot, here for you like a friend who is not. Try sending: ping @foo or, cmd
+
 # whoami
 whoami = True
+
 # enable or disable the Joke module
 DadJokes = True
 DadJokesEmoji = False
+
 # enable or disable the Solar module
 spaceWeather = True
+
 # enable or disable the wikipedia search module
 wikipedia = True
+
 # Enable ollama LLM see more at https://ollama.com
 ollama = False
 # Ollama model to use (defaults to gemma2:2b)
 # ollamaModel = llama3.1
 # server instance to use (defaults to local machine install)
 ollamaHostName = http://localhost:11434
+
 # StoreForward Enabled and Limits
 StoreForward = True
 StoreLimit = 3
+
 # history command 
 enableCmdHistory = True
 # command history ignore list ex: 2813308004,4258675309
 lheardCmdIgnoreNodes =
+
 # 24 hour clock
 zuluTime = False
 # wait time for URL requests
 urlTimeout = 10
+
 # logging to file of the non Bot messages
 LogMessagesToFile = False
 # Logging of system messages to file
@@ -65,20 +77,17 @@ SyslogToFile = True
 # Number of log files to keep in days, 0 to keep all
 log_backup_count = 32

-[games]
-# if hop limit for the user exceeds this value, the message will be dropped
-game_hop_limit = 5
-# enable or disable the games module(s)
-dopeWars = True
-lemonade = True
-blackjack = True
-videopoker = True
-mastermind = True
-golfsim = True
+[emergencyHandler]
+# enable or disable the emergency response handler
+enabled = False
+# channel to send a message to when the emergency handler is triggered
+alert_channel = 2
+alert_interface = 1

 [sentry]
 # detect anyone close to the bot
 SentryEnabled = True
+emailSentryAlerts = False
 # radius in meters to detect someone close to the bot
 SentryRadius = 100
 # channel to send a message to when the watchdog is triggered
@@ -104,21 +113,46 @@ bbslink_whitelist =
 enabled = True
 lat = 48.50
 lon = -123.0
+
+# Default to metric units rather than imperial
+useMetric = False
+
+# repeaterList lookup location (rbook / artsci)
+repeaterLookup = rbook
+
 # NOAA weather forecast days, the first two rows are today and tonight
 NOAAforecastDuration = 4
 # number of weather alerts to display
 NOAAalertCount = 2
+
 # use Open-Meteo API for weather data not NOAA useful for non US locations
 UseMeteoWxAPI = False
-# Default to metric units rather than imperial
-useMetric = False
-# repeaterList lookup location (rbook / artsci)
-repeaterLookup = rbook
+
+# NOAA Hydrology unique identifiers, LID or USGS ID
+riverListDefault = 
+
 # EAS Alert Broadcast
 wxAlertBroadcastEnabled = False
 # EAS Alert Broadcast Channels
 wxAlertBroadcastCh = 2

+# Goverment IPAWS/CAP Alert Broadcast
+eAlertBroadcastEnabled = False
+# Goverment Emergency IPAWS/CAP Alert Broadcast Channels
+eAlertBroadcastCh = 2
+# Ignore any headline that includes the word Test
+ignoreFEMAtest = True
+# comma separated list of codes (e.g., SAME,FIPS,ZIP) trigger local alert.
+# find your SAME https://www.weather.gov/nwr/counties
+mySAME = 053029,053073
+enableGBalerts = False
+
+# Satalite Pass Prediction
+# Register for free API https://www.n2yo.com/login/
+n2yoAPIKey = 
+# NORAD list https://www.n2yo.com/satellites/
+satList = 25544,7530
+
 # repeater module
 [repeater]
 enabled = False
@@ -152,13 +186,52 @@ file_path = alert.txt
 broadcastCh = 2
 enable_read_news = False
 news_file_path = news.txt
+# only return a single random line from the news file
+news_random_line = False
+
+[smtp]
+# enable or disable the SMTP module
+enableSMTP = False
+# enable or disable the IMAP module for inbound email
+enableImap = False
+# list of Sysop Emails seperate with commas
+sysopEmails =
+SMTP_SERVER = smtp.gmail.com
+# 587 SMTP over TLS/STARTTLS, 25 legacy SMTP, 465 SMTP over SSL
+SMTP_PORT = 587
+# Sender email: be mindful of public access, don't use your personal email
+FROM_EMAIL = none@gmail.com
+SMTP_AUTH = True
+SMTP_USERNAME = none@gmail.com
+SMTP_PASSWORD = none
+EMAIL_SUBJECT = Meshtastic✉️
+
+# IMAP not implimented yet
+IMAP_SERVER = imap.gmail.com
+# 993 IMAP over TLS/SSL, 143 legacy IMAP
+IMAP_PORT = 993
+# IMAP login usually same as SMTP
+IMAP_USERNAME = none@gmail.com
+IMAP_PASSWORD = none
+IMAP_FOLDER = inbox
+
+[games]
+# if hop limit for the user exceeds this value, the message will be dropped
+game_hop_limit = 5
+# enable or disable the games module(s)
+dopeWars = True
+lemonade = True
+blackjack = True
+videopoker = True
+mastermind = True
+golfsim = True

 [messagingSettings]
 # delay in seconds for response to avoid message collision
-responseDelay = 0.7
+responseDelay = 1.2
 # delay in seconds for splits in messages to avoid message collision
 splitDelay = 0.0
-# message chunk size for sending at high success rate
+# message chunk size for sending at high success rate, chunkr allows exceeding by 3 characters
 MESSAGE_CHUNK_SIZE = 160
 # Request Acknowledgement of message OTA
 wantAck = False
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# instruction set the meshing-around docker container

 # Substitute environment variables in the config file
 envsubst < /app/config.ini > /app/config.tmp && mv /app/config.tmp /app/config.ini
--- a/etc/db_admin.py
+++ b/etc/db_admin.py
@@ -23,6 +23,27 @@ except Exception as e:
    except Exception as e:
        bbs_dm = "System: data/bbsdm.pkl not found"

+try:
+    with open('../data/email_db.pickle', 'rb') as f:
+        email_db = pickle.load(f)
+except Exception as e:
+    try:
+        with open('data/email_db.pickle', 'rb') as f:
+            email_db = pickle.load(f)
+    except Exception as e:
+        email_db = "System: data/email_db.pickle not found"
+
+try:
+    with open('../data/sms_db.pickle', 'rb') as f:
+        sms_db = pickle.load(f)
+except Exception as e:
+    try:
+        with open('data/sms_db.pickle', 'rb') as f:
+            sms_db = pickle.load(f)
+    except Exception as e:
+        sms_db = "System: data/sms_db.pickle not found"
+
+
 # Game HS tables
 try:
    with open('../data/lemonstand.pkl', 'rb') as f:
@@ -90,6 +111,10 @@ print ("System: bbs_messages")
 print (bbs_messages)
 print ("\nSystem: bbs_dm")
 print (bbs_dm)
+print ("\nSystem: email_db")
+print (email_db)
+print ("\nSystem: sms_db")
+print (sms_db)
 print (f"\n\nGame HS tables\n")
 print (f"lemon:{lemon_score}")
 print (f"dopewar:{dopewar_score}")
--- a/etc/eas_alert_parser.py
+++ b/etc/eas_alert_parser.py
@@ -11,6 +11,7 @@ seen=set()
 pattern = re.compile(r'ZCZC.*?NWS-')

 # alternate regex for parsing multimon-ng output
+# provided by https://github.com/A-c0rN
 #reg = r"^.*?(NNNN|ZCZC)(?:-([A-Za-z0-9]{3})-([A-Za-z0-9]{3})-((?:-?[0-9]{6})+)\+([0-9]{4})-([0-9]{7})-(.{8})-)?.*?$"
 #prog = re.compile(reg, re.MULTILINE)
 #groups = prog.match(sameData).groups()
--- a/etc/simulator.py
+++ b/etc/simulator.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # # Simulate meshing-around de K7MHI 2024
-from modules.log import * # Import the logger
+from modules.log import * # Import the logger; ### --> If you are reading this put the script in the project root <-- ###
 import time
 import random

--- a/install.sh
+++ b/install.sh
@@ -1,31 +1,70 @@
 #!/bin/bash
+# meshing-around install helper script

 # install.sh
 cd "$(dirname "$0")"
 program_path=$(pwd)
-cp etc/pong_bot.tmp etc/pong_bot.service
-cp etc/mesh_bot.tmp etc/mesh_bot.service
-cp etc/mesh_bot_reporting.tmp etc/mesh_bot_reporting.service
-
+printf "\n########################"
 printf "\nMeshing Around Installer\n"
-printf "\nThis script will install the Meshing Around bot and its dependencies works best in debian/ubuntu\n"
-printf "\nChecking for dependencies\n"
+printf "########################\n"
+printf "\nThis script will try and install the Meshing Around Bot and its dependencies."
+printf "Installer works best in raspian/debian/ubuntu, if there is a problem, try running the installer again.\n"
+printf "\nChecking for dependencies...\n"

+# check if running on embedded
+printf "\nAre You installing into an embedded system? (y/n)"
+read embedded
+
+if [ $embedded == "y" ]; then
+    printf "\nDetected embedded skipping dependency installation\n"
+    if [ $program_path != "/opt/meshing-around" ]; then
+        printf "\nIt is suggested to project path to /opt/meshing-around\n"
+        printf "Do you want to move the project to /opt/meshing-around? (y/n)"
+        read move
+        if [ $move == "y" ]; then
+            sudo mv $program_path /opt/meshing-around
+            cd /opt/meshing-around
+            printf "\nProject moved to /opt/meshing-around. re-run the installer\n"
+            exit 0
+        fi
+    fi
+else
+    # Check and install dependencies
+    if ! command -v python3 &> /dev/null
+    then
+        printf "python3 not found, trying 'apt-get install python3 python3-pip'\n"
+        sudo apt-get install python3 python3-pip
+    fi
+    if ! command -v pip &> /dev/null
+    then
+        printf "pip not found, trying 'apt-get install python3-pip'\n"
+        sudo apt-get install python3-pip
+    fi
+
+    # double check for python3 and pip
+    if ! command -v python3 &> /dev/null
+    then
+        printf "python3 not found, please install python3 with your OS\n"
+        exit 1
+    fi
+    if ! command -v pip &> /dev/null
+    then
+        printf "pip not found, please install pip with your OS\n"
+        exit 1
+    fi
+    printf "\nDependencies installed\n"
+fi

 # add user to groups for serial access
-printf "\nAdding user to dialout and tty groups for serial access\n"
+printf "\nAdding user to dialout, bluetooth, and tty groups for serial access\n"
 sudo usermod -a -G dialout $USER
 sudo usermod -a -G tty $USER
 sudo usermod -a -G bluetooth $USER

-# check for pip
-if ! command -v pip &> /dev/null
-then
-    printf "pip not found, please install pip with your OS\n"
-    sudo apt-get install python3-pip
-else
-    printf "python pip found\n"
-fi
+# copy service files
+cp etc/pong_bot.tmp etc/pong_bot.service
+cp etc/mesh_bot.tmp etc/mesh_bot.service
+cp etc/mesh_bot_reporting.tmp etc/mesh_bot_reporting.service

 # generate config file, check if it exists
 if [ -f config.ini ]; then
@@ -34,52 +73,65 @@ if [ -f config.ini ]; then
 fi

 cp config.template config.ini
-printf "\nConfig file generated\n"
+printf "\nConfig files generated!\n"

-
-# set virtual environment and install dependencies
-printf "\nMeshing Around Installer\n"
-
-echo "Do you want to install the bot in a virtual environment? (y/n)"
-read venv
-
-if [ $venv == "y" ]; then
-    # set virtual environment
-    if ! python3 -m venv --help &> /dev/null; then
-        printf "Python3 venv module not found, please install python3-venv with your OS\n"
-        exit 1
-    else
-        echo "Creating virtual environment..."
-        python3 -m venv venv
-        source venv/bin/activate
-
-        #check if python3 has venv module
-        if [ -f venv/bin/activate ]; then
-            printf "\nFpund virtual environment for python\n"
-        else
-            sudo apt-get install python3-venv
-            printf "\nPython3 venv module not found, please install python3-venv with your OS if not already done. re-run the script\n"
-            exit 1
-        fi
-
-        # config service files for virtual environment
-        replace="s|python3 mesh_bot.py|/usr/bin/bash launch.sh mesh|g"
-        sed -i "$replace" etc/mesh_bot.service
-        replace="s|python3 pong_bot.py|/usr/bin/bash launch.sh pong|g"
-        sed -i "$replace" etc/pong_bot.service
-
-        # install dependencies
-        pip install -U -r requirements.txt
-    fi
+# check if running on embedded
+if [ $embedded == "y" ]; then
+    printf "\nDetected embedded skipping venv\n"
 else
-    printf "\nSkipping virtual environment...\n"
-    # install dependencies
-    printf "Are you on Raspberry Pi(debian/ubuntu)?\nshould we add --break-system-packages to the pip install command? (y/n)"
-    read rpi
-    if [ $rpi == "y" ]; then
-        pip install -U -r requirements.txt --break-system-packages
+    printf "\nDo you want to install the bot in a python virtual environment? (y/n)"
+    read venv
+
+    if [ $venv == "y" ]; then
+        # set virtual environment
+        if ! python3 -m venv --help &> /dev/null; then
+            printf "Python3/venv error, please install python3-venv with your OS\n"
+            exit 1
+        else
+            echo "The Following could be messy, or take some time on slower devices."
+            echo "Creating virtual environment..."
+            #check if python3 has venv module
+            if [ -f venv/bin/activate ]; then
+                printf "\nFound virtual environment for python\n"
+                python3 -m venv venv
+                source venv/bin/activate
+            else
+                printf "\nVirtual environment not found, trying `sudo apt-get install python3-venv`\n"
+                sudo apt-get install python3-venv
+            fi
+            # create virtual environment
+            python3 -m venv venv
+
+            # double check for python3-venv
+            if [ -f venv/bin/activate ]; then
+                printf "\nFound virtual environment for python\n"
+                source venv/bin/activate
+            else
+                printf "\nPython3 venv module not found, please install python3-venv with your OS\n"
+                exit 1
+            fi
+
+            printf "\nVirtual environment created\n"
+
+            # config service files for virtual environment
+            replace="s|python3 mesh_bot.py|/usr/bin/bash launch.sh mesh|g"
+            sed -i "$replace" etc/mesh_bot.service
+            replace="s|python3 pong_bot.py|/usr/bin/bash launch.sh pong|g"
+            sed -i "$replace" etc/pong_bot.service
+
+            # install dependencies
+            pip install -U -r requirements.txt
+        fi
    else
-        pip install -U -r requirements.txt
+        printf "\nSkipping virtual environment...\n"
+        # install dependencies
+        printf "Are you on Raspberry Pi(debian/ubuntu)?\nshould we add --break-system-packages to the pip install command? (y/n)"
+        read rpi
+        if [ $rpi == "y" ]; then
+            pip install -U -r requirements.txt --break-system-packages
+        else
+            pip install -U -r requirements.txt
+        fi
    fi
 fi

@@ -105,55 +157,78 @@ sed -i $replace etc/mesh_bot_reporting.service
 sudo systemctl daemon-reload
 printf "\n service files updated\n"

-# ask if emoji font should be installed for linux
-echo "Do you want to install the emoji font for debian/ubuntu linux? (y/n)"
-read emoji
-if [ $emoji == "y" ]; then
-    sudo apt-get install -y fonts-noto-color-emoji
-    echo "Emoji font installed!, reboot to load the font"
-fi
-
 if [ $bot == "pong" ]; then
+    echo "useradd -M meshbot"
+    echo "usermod -L meshbot"
+    echo "Added user meshbot with no home directory"
    # install service for pong bot
    sudo cp etc/pong_bot.service /etc/systemd/system/
    sudo systemctl enable pong_bot.service
 fi

 if [ $bot == "mesh" ]; then
+    echo "useradd -M meshbot"
+    echo "usermod -L meshbot"
+    echo "Added user meshbot with no home directory"
    # install service for mesh bot
    sudo cp etc/mesh_bot.service /etc/systemd/system/
    sudo systemctl enable mesh_bot.service
 fi

-if [ $bot == "n" ]; then
-    if [ -f launch.sh ]; then
-        printf "\nTo run the bot, use the command: ./launch.sh\n"
-        ./launch.sh
+# check if running on embedded
+if [ $embedded == "n" ]; then
+    # ask if emoji font should be installed for linux
+    printf "\nDo you want to install the emoji font for debian/ubuntu linux? (y/n)"
+    read emoji
+    if [ $emoji == "y" ]; then
+        sudo apt-get install -y fonts-noto-color-emoji
+        echo "Emoji font installed!, reboot to load the font"
    fi
-fi

-printf "\nOptionally if you want to install the LLM Ollama compnents we will execute the following commands\n"
-printf "\ncurl -fsSL https://ollama.com/install.sh | sh\n"

-# ask if the user wants to install the LLM Ollama components
-echo "Do you want to install the LLM Ollama components? (y/n)"
-read ollama
-if [ $ollama == "y" ]; then
-    curl -fsSL https://ollama.com/install.sh | sh
+    printf "\nOptionally if you want to install the multi gig LLM Ollama compnents we will execute the following commands\n"
+    printf "\ncurl -fsSL https://ollama.com/install.sh | sh\n"

-    # ask if want to install gemma2:2b
-    printf "\n Ollama install done now we can install the Gemma2:2b components, multi GB download\n"
-    echo "Do you want to install the Gemma2:2b components? (y/n)"
-    read gemma
-    if [ $gemma == "y" ]; then
-        ollama pull gemma2:2b
+    # ask if the user wants to install the LLM Ollama components
+    printf "\nDo you want to install the LLM Ollama components? (y/n)"
+    read ollama
+    if [ $ollama == "y" ]; then
+        curl -fsSL https://ollama.com/install.sh | sh
+
+        # ask if want to install gemma2:2b
+        printf "\n Ollama install done now we can install the Gemma2:2b components, multi GB download\n"
+        echo "Do you want to install the Gemma2:2b components? (y/n)"
+        read gemma
+        if [ $gemma == "y" ]; then
+            ollama pull gemma2:2b
+        fi
    fi
+
+
+    if [ $venv == "y" ]; then
+        printf "\nFor running in virtual, launch bot with './launch.sh mesh' in path $program_path\n"
+    fi
+
+    printf "\nGood time to reboot? (y/n)"
+    read reboot
+    if [ $reboot == "y" ]; then
+        sudo reboot
+    fi
+else
+    # we are on embedded
+    # replace "type = serial" with "type = tcp" in config.ini
+    replace="s|type = serial|type = tcp|g"
+    sed -i "$replace" config.ini
+    # replace "# hostname = 192.168.0.1" with "hostname = localhost" in config.ini
+    replace="s|# hostname = 192.168.0.1|hostname = localhost|g"
+    sed -i "$replace" config.ini
+    printf "\nConfig file updated for embedded\n"
+
+    # Set up the meshing around service
+    #sudo cp /opt/meshing-around/meshing-around.service /etc/systemd/system/meshing-around.service
+    #sudo systemctl enable meshing-around.service
 fi

-echo "Good time to reboot? (y/n)"
-read reboot
-if [ $reboot == "y" ]; then
-    sudo reboot
-fi
-
+printf "\nInstallation complete!\n"
 exit 0
+
--- a/launch.sh
+++ b/launch.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# This script launches the meshing-around bot or the report generator in python virtual environment

 # launch.sh
 cd "$(dirname "$0")"
--- a/mesh_bot.py
+++ b/mesh_bot.py
@@ -14,8 +14,8 @@ restrictedCommands = ["blackjack", "videopoker", "dopewars", "lemonstand", "golf
 restrictedResponse = "🤖only available in a Direct Message📵" # "" for none

 # Global Variables
-cmdHistory = [] # list to hold the last commands
 DEBUGpacket = False # Debug print the packet rx
+DEBUGhops = False # Debug print hop info and bad hop count packets

 def auto_response(message, snr, rssi, hop, pkiStatus, message_from_id, channel_number, deviceID, isDM):
    global cmdHistory
@@ -23,7 +23,7 @@ def auto_response(message, snr, rssi, hop, pkiStatus, message_from_id, channel_n
    message_lower = message.lower()
    bot_response = "🤖I'm sorry, I'm afraid I can't do that."

-    # Command List
+    # Command List processes system.trap_list. system.messageTrap() sends any commands to here
    default_commands = {
    "ack": lambda: handle_ping(message_from_id, deviceID, message, hop, snr, rssi, isDM, channel_number),
    "ask:": lambda: handle_llm(message_from_id, channel_number, deviceID, message, publicChannel),
@@ -37,11 +37,15 @@ def auto_response(message, snr, rssi, hop, pkiStatus, message_from_id, channel_n
    "bbspost": lambda: handle_bbspost(message, message_from_id, deviceID),
    "bbsread": lambda: handle_bbsread(message),
    "blackjack": lambda: handleBlackJack(message, message_from_id, deviceID),
+    "clearsms": lambda: handle_sms(message_from_id, message),
+    "cmd": lambda: help_message,
    "cq": lambda: handle_ping(message_from_id, deviceID, message, hop, snr, rssi, isDM, channel_number),
    "cqcq": lambda: handle_ping(message_from_id, deviceID, message, hop, snr, rssi, isDM, channel_number),
    "cqcqcq": lambda: handle_ping(message_from_id, deviceID, message, hop, snr, rssi, isDM, channel_number),
-    "cmd": lambda: help_message,
    "dopewars": lambda: handleDopeWars(message, message_from_id, deviceID),
+    "ea": lambda: handle_emergency_alerts(message, message_from_id, deviceID),
+    "ealert": lambda: handle_emergency_alerts(message, message_from_id, deviceID),
+    "email:": lambda: handle_email(message_from_id, message),
    "games": lambda: gamesCmdList,
    "globalthermonuclearwar": lambda: handle_gTnW(),
    "golfsim": lambda: handleGolf(message, message_from_id, deviceID),
@@ -58,24 +62,40 @@ def auto_response(message, snr, rssi, hop, pkiStatus, message_from_id, channel_n
    "pinging": lambda: handle_ping(message_from_id, deviceID, message, hop, snr, rssi, isDM, channel_number),
    "pong": lambda: "🏓PING!!🛜",
    "readnews": lambda: read_news(),
+    "riverflow": lambda: handle_riverFlow(message, message_from_id, deviceID),
    "rlist": lambda: handle_repeaterQuery(message_from_id, deviceID, channel_number),
+    "satpass": lambda: handle_satpass(message_from_id, deviceID, channel_number, message),
+    "setemail": lambda: handle_email(message_from_id, message),
+    "setsms": lambda: handle_sms( message_from_id, message),
    "sitrep": lambda: handle_lheard(message, message_from_id, deviceID, isDM),
+    "sms:": lambda: handle_sms(message_from_id, message),
    "solar": lambda: drap_xray_conditions() + "\n" + solar_conditions(),
    "sun": lambda: handle_sun(message_from_id, deviceID, channel_number),
+    "sysinfo": lambda: sysinfo(message, message_from_id, deviceID),
    "test": lambda: handle_ping(message_from_id, deviceID, message, hop, snr, rssi, isDM, channel_number),
    "testing": lambda: handle_ping(message_from_id, deviceID, message, hop, snr, rssi, isDM, channel_number),
    "tide": lambda: handle_tide(message_from_id, deviceID, channel_number),
    "videopoker": lambda: handleVideoPoker(message, message_from_id, deviceID),
    "whereami": lambda: handle_whereami(message_from_id, deviceID, channel_number),
    "whoami": lambda: handle_whoami(message_from_id, deviceID, hop, snr, rssi, pkiStatus),
+    "whois": lambda: handle_whois(message, deviceID, channel_number, message_from_id),
    "wiki:": lambda: handle_wiki(message, isDM),
    "wiki?": lambda: handle_wiki(message, isDM),
    "wx": lambda: handle_wxc(message_from_id, deviceID, 'wx'),
-    "wxalert": lambda: handle_wxalert(message_from_id, deviceID, message),
    "wxa": lambda: handle_wxalert(message_from_id, deviceID, message),
+    "wxalert": lambda: handle_wxalert(message_from_id, deviceID, message),
    "wxc": lambda: handle_wxc(message_from_id, deviceID, 'wxc'),
    "📍": lambda: handle_whoami(message_from_id, deviceID, hop, snr, rssi, pkiStatus),
    "🔔": lambda: handle_alertBell(message_from_id, deviceID, message),
+    # any value from system.py:trap_list_emergency will trigger the emergency function
+    "112": lambda: handle_emergency(message_from_id, deviceID, message),
+    "911": lambda: handle_emergency(message_from_id, deviceID, message),
+    "999": lambda: handle_emergency(message_from_id, deviceID, message),
+    "ambulance": lambda: handle_emergency(message_from_id, deviceID, message),
+    "emergency": lambda: handle_emergency(message_from_id, deviceID, message),
+    "fire": lambda: handle_emergency(message_from_id, deviceID, message),
+    "police": lambda: handle_emergency(message_from_id, deviceID, message),
+    "rescue": lambda: handle_emergency(message_from_id, deviceID, message),
    }

    # set the command handler
@@ -152,6 +172,7 @@ def handle_ping(message_from_id, deviceID,  message, hop, snr, rssi, isDM, chann
        msg = msg + " #" + message.split("#")[1]
        type = type + " #" + message.split("#")[1]

+
    # check for multi ping request
    if " " in message:
        # if stop multi ping
@@ -161,6 +182,7 @@ def handle_ping(message_from_id, deviceID,  message, hop, snr, rssi, isDM, chann
                    multiPingList.pop(i)
                    msg = "🛑 auto-ping"

+
        # if 3 or more entries (2 or more active), throttle the multi-ping for congestion
        if len(multiPingList) > 2:
            msg = "🚫⛔️ auto-ping, service busy. ⏳Try again soon."
@@ -171,6 +193,10 @@ def handle_ping(message_from_id, deviceID,  message, hop, snr, rssi, isDM, chann
                pingCount = int(message.split(" ")[1])
                if pingCount == 123 or pingCount == 1234:
                    pingCount =  1
+                elif not autoPingInChannel and not isDM:
+                    # no autoping in channels
+                    pingCount = 1
+
                if pingCount > 51:
                    pingCount = 50
            except:
@@ -182,6 +208,10 @@ def handle_ping(message_from_id, deviceID,  message, hop, snr, rssi, isDM, chann
                msg = f"🛜Initalizing BufferTest, using chunks of about {int(maxBuffer // pingCount)}, max length {maxBuffer} in {pingCount} messages"
            else:
                msg = f"🚦Initalizing {pingCount} auto-ping"
+
+    # if not a DM add the username to the beginning of msg
+    if not useDMForResponse and not isDM:
+        msg = "@" + get_name_from_number(message_from_id, 'short', deviceID) + " " + msg
            
    return msg

@@ -189,6 +219,34 @@ def handle_alertBell(message_from_id, deviceID, message):
    msg = ["the only prescription is more 🐮🔔🐄🛎️", "what this 🤖 needs is more 🐮🔔🐄🛎️", "🎤ring my bell🛎️🔔🎶"]
    return random.choice(msg)

+def handle_emergency(message_from_id, deviceID, message):
+    # if user in bbs_ban_list return
+    if str(message_from_id) in bbs_ban_list:
+        # silent discard
+        logger.warning(f"System: {message_from_id} on spam list, no emergency responder alert sent")
+        return ''
+    # trgger alert to emergency_responder_alert_channel
+    if message_from_id != 0:
+        if deviceID == 1: rxNode = myNodeNum1 
+        elif deviceID == 2: rxNode = myNodeNum2
+        nodeLocation = get_node_location(message_from_id, deviceID)
+        # if default location is returned set to Unknown
+        if nodeLocation[0] == latitudeValue and nodeLocation[1] == longitudeValue:
+            nodeLocation = ["?", "?"]
+        nodeInfo = f"{get_name_from_number(message_from_id, 'short', deviceID)} detected by {get_name_from_number(rxNode, 'short', deviceID)} lastGPS {nodeLocation[0]}, {nodeLocation[1]}"
+        msg = f"🔔🚨Intercepted Possible Emergency Assistance needed for: {nodeInfo}"
+        # alert the emergency_responder_alert_channel
+        time.sleep(responseDelay)
+        send_message(msg, emergency_responder_alert_channel, 0, emergency_responder_alert_interface)
+        logger.warning(f"System: {message_from_id} Emergency Assistance Requested in {message}")
+        # send the message out via email/sms
+        if enableSMTP:
+            for user in sysopEmails:
+                send_email(user, f"Emergency Assistance Requested by {nodeInfo} in {message}", message_from_id)
+        # respond to the user
+        time.sleep(responseDelay + 2)
+        return EMERGENCY_RESPONSE
+
 def handle_motd(message, message_from_id, isDM):
    global MOTD
    isAdmin = False
@@ -224,9 +282,9 @@ def handle_wxalert(message_from_id, deviceID, message):
        location = get_node_location(message_from_id, deviceID)
        if "wxalert" in message:
            # Detailed weather alert
-            weatherAlert = getActiveWeatherAlertsDetail(str(location[0]), str(location[1]))
+            weatherAlert = getActiveWeatherAlertsDetailNOAA(str(location[0]), str(location[1]))
        else:
-            weatherAlert = getWeatherAlerts(str(location[0]), str(location[1]))
+            weatherAlert = getWeatherAlertsNOAA(str(location[0]), str(location[1]))
        
        if NO_ALERTS not in weatherAlert:
            weatherAlert = weatherAlert[0]
@@ -248,6 +306,34 @@ llmRunCounter = 0
 llmTotalRuntime = []
 llmLocationTable = [{'nodeID': 1234567890, 'location': 'No Location'},]

+def handle_satpass(message_from_id, deviceID, channel_number, message):
+    location = get_node_location(message_from_id, deviceID)
+    passes = ''
+    satList = satListConfig
+    message = message.lower()
+
+    # if user has a NORAD ID in the message
+    if "satpass " in message:
+        try:
+            userList = message.split("satpass ")[1].split(" ")[0]
+            #split userList and make into satList overrided the config.ini satList
+            satList = userList.split(",")
+        except:
+            return "example use:🛰️satpass 25544,33591"
+
+    # Detailed satellite pass
+    for bird in satList:
+        satPass = getNextSatellitePass(bird, str(location[0]), str(location[1]))
+        if satPass:
+            # append to passes
+            passes = passes + satPass + "\n"
+    # remove the last newline
+    passes = passes[:-1]
+
+    if passes == '':
+        passes = "No 🛰️ anytime soon"
+    return passes
+        
 def handle_llm(message_from_id, channel_number, deviceID, message, publicChannel):
    global llmRunCounter, llmLocationTable, llmTotalRuntime, cmdHistory
    location_name = 'no location provided'
@@ -560,22 +646,58 @@ def handleGolf(message, nodeID, deviceID):
    time.sleep(responseDelay + 1)
    return msg

+def handle_riverFlow(message, message_from_id, deviceID):
+    location = get_node_location(message_from_id, deviceID)
+    userRiver = message.lower()
+    
+    if "riverflow " in userRiver:
+        userRiver = userRiver.split("riverflow ")[1] if "riverflow " in userRiver else riverListDefault
+    else:
+        userRiver = userRiver.split(",") if "," in userRiver else riverListDefault
+    
+    # return river flow data
+    if use_meteo_wxApi:
+        return get_flood_openmeteo(location[0], location[1])
+    else:
+        # if userRiver a list
+        if type(userRiver) == list:
+            msg = ""
+            for river in userRiver:
+                msg += get_flood_noaa(location[0], location[1], river)
+            return msg
+        # if single river
+        msg = get_flood_noaa(location[0], location[1], userRiver)
+        return msg
+
+
 def handle_wxc(message_from_id, deviceID, cmd):
    location = get_node_location(message_from_id, deviceID)
    if use_meteo_wxApi and not "wxc" in cmd and not use_metric:
-        logger.debug("System: Bot Returning Open-Meteo API for weather imperial")
+        #logger.debug("System: Bot Returning Open-Meteo API for weather imperial")
        weather = get_wx_meteo(str(location[0]), str(location[1]))
    elif use_meteo_wxApi:
-        logger.debug("System: Bot Returning Open-Meteo API for weather metric")
+        #logger.debug("System: Bot Returning Open-Meteo API for weather metric")
        weather = get_wx_meteo(str(location[0]), str(location[1]), 1)
    elif not use_meteo_wxApi and "wxc" in cmd or use_metric:
-        logger.debug("System: Bot Returning NOAA API for weather metric")
-        weather = get_weather(str(location[0]), str(location[1]), 1)
+        #logger.debug("System: Bot Returning NOAA API for weather metric")
+        weather = get_NOAAweather(str(location[0]), str(location[1]), 1)
    else:
-        logger.debug("System: Bot Returning NOAA API for weather imperial")
-        weather = get_weather(str(location[0]), str(location[1]))
+        #logger.debug("System: Bot Returning NOAA API for weather imperial")
+        weather = get_NOAAweather(str(location[0]), str(location[1]))
    return weather

+def handle_emergency_alerts(message, message_from_id, deviceID):
+    location = get_node_location(message_from_id, deviceID)
+    if enableGBalerts:
+        # UK Alerts
+        return get_govUK_alerts(str(location[0]), str(location[1]))
+    if message.lower().startswith("ealert"):
+        # Detailed alert FEMA
+        return getIpawsAlert(str(location[0]), str(location[1]))
+    else:
+        # Headlines only FEMA
+        return getIpawsAlert(str(location[0]), str(location[1]), shortAlerts=True)
+
 def handle_bbspost(message, message_from_id, deviceID):
    if "$" in message and not "example:" in message:
        subject = message.split("$")[1].split("#")[0]
@@ -642,6 +764,12 @@ def handle_sun(message_from_id, deviceID, channel_number):
    location = get_node_location(message_from_id, deviceID, channel_number)
    return get_sun(str(location[0]), str(location[1]))

+def sysinfo(message, message_from_id, deviceID):
+    if "?" in message:
+        return "sysinfo command returns system information."
+    else:
+        return get_sysinfo(message_from_id, deviceID)
+
 def handle_lheard(message, nodeid, deviceID, isDM):
    if  "?" in message and isDM:
        return message.split("?")[0].title() + " command returns a list of the nodes that have been heard recently"
@@ -657,6 +785,9 @@ def handle_lheard(message, nodeid, deviceID, isDM):
    else:
        # trim the last \n
        bot_response = bot_response[:-1]
+    
+    # get count of nodes heard
+    bot_response += f"\n👀In Mesh: {len(seenNodes)}"

    # bot_response += getNodeTelemetry(deviceID)
    return bot_response
@@ -729,7 +860,7 @@ def handle_repeaterQuery(message_from_id, deviceID, channel_number):

 def handle_tide(message_from_id, deviceID, channel_number):
    location = get_node_location(message_from_id, deviceID, channel_number)
-    return get_tide(str(location[0]), str(location[1]))
+    return get_NOAAtide(str(location[0]), str(location[1]))

 def handle_moon(message_from_id, deviceID, channel_number):
    location = get_node_location(message_from_id, deviceID, channel_number)
@@ -760,6 +891,46 @@ def handle_whoami(message_from_id, deviceID, hop, snr, rssi, pkiStatus):
        msg = "Error in whoami"
    return msg

+def handle_whois(message, deviceID, channel_number, message_from_id):
+    #return data on a node name or number
+    if  "?" in message:
+        return message.split("?")[0].title() + " command returns information on a node."
+    else:
+        # get the nodeID from the message
+        msg = ''
+        node = ''
+        # find the requested node in db
+        if " " in message:
+            node = message.split(" ")[1]
+        if node.startswith("!") and len(node) == 9:
+            # mesh !hex
+            try:
+                node = int(node.strip("!"),16)
+            except ValueError as e:
+                node = 0
+        elif node.isalpha() or not node.isnumeric():
+            # try short name
+            node = get_num_from_short_name(node, deviceID)
+
+        # get details on the node
+        for i in range(len(seenNodes)):
+            if seenNodes[i]['nodeID'] == int(node):
+                msg = f"Node: {seenNodes[i]['nodeID']} is {get_name_from_number(seenNodes[i]['nodeID'], 'long', deviceID)}\n"
+                msg += f"Last 👀: {time.ctime(seenNodes[i]['lastSeen'])} "
+                break
+
+        if msg == '':
+            msg = "Provide a valid node number or short name"
+        else:
+            # if the user is an admin show the channel and interface and location
+            if str(message_from_id) in bbs_admin_list:
+                location = get_node_location(seenNodes[i]['nodeID'], deviceID, channel_number)
+                msg += f"Ch: {seenNodes[i]['channel']}, Int: {seenNodes[i]['rxInterface']}"
+                msg += f"Lat: {location[0]}, Lon: {location[1]}\n"
+                if location != [latitudeValue, longitudeValue]:
+                    msg += f"Loc: {where_am_i(str(location[0]), str(location[1]))}"
+        return msg
+
 def check_and_play_game(tracker, message_from_id, message_string, rxNode, channel_number, game_name, handle_game_func):
    global llm_enabled

@@ -800,6 +971,7 @@ def checkPlayingGame(message_from_id, message_string, rxNode, channel_number):
    return playingGame

 def onReceive(packet, interface):
+    global seenNodes
    # Priocess the incoming packet, handles the responses to the packet with auto_response()
    # Sends the packet to the correct handler for processing

@@ -809,6 +981,8 @@ def onReceive(packet, interface):
    # Valies assinged to the packet
    rxNode, message_from_id, snr, rssi, hop, hop_away, channel_number = 0, 0, 0, 0, 0, 0, 0
    pkiStatus = (False, 'ABC')
+    replyIDset = False
+    emojiSeen = False
    isDM = False

    if DEBUGpacket:
@@ -818,7 +992,6 @@ def onReceive(packet, interface):
        # Debug print the packet for debugging
        logger.debug(f"Packet Received\n {packet} \n END of packet \n")

-
    # set the value for the incomming interface
    if rxType == 'SerialInterface':
        rxInterface = interface.__dict__.get('devPath', 'unknown')
@@ -839,14 +1012,20 @@ def onReceive(packet, interface):
            rxNode = 1
        elif interface2_enabled and interface2_type == 'ble':
            rxNode = 2
-
+    
    # check if the packet has a channel flag use it
    if packet.get('channel'):
        channel_number = packet.get('channel', 0)

+    # set the message_from_id
+    message_from_id = packet['from']
+
+    # if message_from_id is not in the seenNodes list add it
+    if not any(node['nodeID'] == message_from_id for node in seenNodes):
+        seenNodes.append({'nodeID': message_from_id, 'rxInterface': rxNode, 'channel': channel_number, 'welcome': False, 'lastSeen': time.time()})
+
    # BBS DM MAIL CHECKER
    if bbs_enabled and 'decoded' in packet:
-        message_from_id = packet['from']
        
        msg = bbs_check_dm(message_from_id)
        if msg:
@@ -862,7 +1041,10 @@ def onReceive(packet, interface):
        if 'decoded' in packet and packet['decoded']['portnum'] == 'TEXT_MESSAGE_APP':
            message_bytes = packet['decoded']['payload']
            message_string = message_bytes.decode('utf-8')
-            message_from_id = packet['from']
+
+            # check if the packet is from us
+            if message_from_id == myNodeNum1 or message_from_id == myNodeNum2:
+                logger.warning(f"System: Packet from self {message_from_id} loop or traffic replay deteted")

            # get the signal strength and snr if available
            if packet.get('rxSnr') or packet.get('rxRssi'):
@@ -871,7 +1053,15 @@ def onReceive(packet, interface):

            # check if the packet has a publicKey flag use it
            if packet.get('publicKey'):
-                pkiStatus = (packet.get('pkiEncrypted', False), packet.get('publicKey', 'ABC'))
+                pkiStatus = packet.get('pkiEncrypted', False), packet.get('publicKey', 'ABC')
+            
+            # check if the packet has replyId flag // currently unused in the code
+            if packet.get('replyId'):
+                replyIDset = packet.get('replyId', False)
+            
+            # check if the packet has emoji flag set it // currently unused in the code
+            if packet.get('emoji'):
+                emojiSeen = packet.get('emoji', False)

            # check if the packet has a hop count flag use it
            if packet.get('hopsAway'):
@@ -887,10 +1077,18 @@ def onReceive(packet, interface):
                    hop_start = packet.get('hopStart', 0)
                else:
                    hop_start = 0
-
+            
+            if DEBUGhops:
+                logger.debug(f"System: Packet HopDebugger: hop_away:{hop_away} hop_limit:{hop_limit} hop_start:{hop_start}")
+                if hop_away == 0 and hop_limit == 0 and hop_start == 0:
+                    logger.debug(f"System: Packet HopDebugger: No hop count found in PACKET {packet} END PACKET")
+            
            if hop_start == hop_limit:
                hop = "Direct"
                hop_count = 0
+            elif hop_start == 0 and hop_limit > 0:
+                hop = "MQTT"
+                hop_count = 0
            else:
                # set hop to Direct if the message was sent directly otherwise set the hop count
                if hop_away > 0:
@@ -938,10 +1136,26 @@ def onReceive(packet, interface):
                        else:
                            # respond with welcome message on DM
                            logger.warning(f"Device:{rxNode} Ignoring DM: {message_string} From: {get_name_from_number(message_from_id, 'long', rxNode)}")
-                            send_message(welcome_message, channel_number, message_from_id, rxNode)
+                            
+                            # if seenNodes list is not marked as welcomed send welcome message
+                            if not any(node['nodeID'] == message_from_id and node['welcome'] == True for node in seenNodes):
+                                # send welcome message
+                                send_message(welcome_message, channel_number, message_from_id, rxNode)
+                                time.sleep(responseDelay)
+                                # mark the node as welcomed
+                                for node in seenNodes:
+                                    if node['nodeID'] == message_from_id:
+                                        node['welcome'] = True
+                            else:
+                                if dad_jokes_enabled:
+                                    # respond with a dad joke on DM
+                                    send_message(tell_joke(), channel_number, message_from_id, rxNode)
+                                else:
+                                    # respond with help message on DM
+                                    send_message(help_message, channel_number, message_from_id, rxNode)
+
                            time.sleep(responseDelay)
                            
-                    
                    # log the message to the message log
                    msgLogger.info(f"Device:{rxNode} Channel:{channel_number} | {get_name_from_number(message_from_id, 'long', rxNode)} | " + message_string.replace('\n', '-nl-'))
            else:
@@ -1003,7 +1217,7 @@ def onReceive(packet, interface):
                                send_message(rMsg, channel_number, 0, 1)
        else:
            # Evaluate non TEXT_MESSAGE_APP packets
-            consumeMetadata(packet, rxNode)    
+            consumeMetadata(packet, rxNode)
    except KeyError as e:
        logger.critical(f"System: Error processing packet: {e} Device:{rxNode}")
        logger.debug(f"System: Error Packet = {packet}")
@@ -1064,6 +1278,15 @@ async def start_rx():
        logger.debug(f"System: File Monitor News Reader Enabled for {news_file_path}")
    if wxAlertBroadcastEnabled:
        logger.debug(f"System: Weather Alert Broadcast Enabled on channels {wxAlertBroadcastChannel}")
+    if emergencyAlertBrodcastEnabled:
+        logger.debug(f"System: Emergency Alert Broadcast Enabled on channels {emergencyAlertBroadcastCh}")
+    if emergency_responder_enabled:
+        logger.debug(f"System: Emergency Responder Enabled on channels {emergency_responder_alert_channel} for interface {emergency_responder_alert_interface}")
+    if enableSMTP:
+        if enableImap:
+            logger.debug(f"System: SMTP Email Alerting Enabled using IMAP")
+        else:
+            logger.debug(f"System: SMTP Email Alerting Enabled")
    if scheduler_enabled:
        # Examples of using the scheduler, Times here are in 24hr format
        # https://schedule.readthedocs.io/en/stable/
@@ -1115,8 +1338,10 @@ async def main():
        hamlibTask = asyncio.create_task(handleSignalWatcher())

    await asyncio.gather(meshRxTask, watchdogTask)
-    await asyncio.gather(hamlibTask)
-    await asyncio.gather(fileMonTask)
+    if radio_detection_enabled:
+        await asyncio.gather(hamlibTask)
+    if file_monitor_enabled:
+        await asyncio.gather(fileMonTask)

    await asyncio.sleep(0.01)

--- a/modules/filemon.py
+++ b/modules/filemon.py
@@ -3,22 +3,42 @@

 from modules.log import *
 import asyncio
+import random
 import os

 trap_list_filemon = ("readnews",)

-def read_file(file_monitor_file_path):
+def read_file(file_monitor_file_path, random_line_only=False):
    try:
-        with open(file_monitor_file_path, 'r') as f:
-            content = f.read()
-        return content
+        if random_line_only:
+            # read a random line from the file
+            with open(file_monitor_file_path, 'r') as f:
+                lines = f.readlines()
+                return random.choice(lines)
+        else:
+            # read the whole file
+            with open(file_monitor_file_path, 'r') as f:
+                content = f.read()
+            return content
    except Exception as e:
        logger.warning(f"FileMon: Error reading file: {file_monitor_file_path}")
        return None
    
 def read_news():
    # read the news file on demand
-    return read_file(news_file_path)
+    return read_file(news_file_path, read_news_enabled)
+
+
+def write_news(content, append=False):
+    # write the news file on demand
+    try:
+        with open(news_file_path, 'a' if append else 'w') as f:
+            f.write(content)
+            logger.info(f"FileMon: Updated {news_file_path}")
+        return True
+    except Exception as e:
+        logger.warning(f"FileMon: Error writing file: {news_file_path}")
+        return False

 async def watch_file():
    
--- a/modules/games/dopewar.py
+++ b/modules/games/dopewar.py
@@ -159,7 +159,7 @@ def get_found_items(nodeID):
                if dwInventoryDb[i].get('userID') == nodeID:
                    dwInventoryDb[i]['inventory'] = inventory
                    dwInventoryDb[i]['amount'] = amount
-            msg = "💊You found " + str(qty) + " of " + str(my_drugs[found])
+            msg = f"💊You found {qty} {my_drugs[found].name}"
    else:
        # rolls to see how much cash the user finds
        cash_found = random.randint(1, 977)
@@ -241,6 +241,8 @@ def buy_func(nodeID, price_list, choice=0, value='0'):
        buy_amount = cash // price_list[drug_choice]
        if buy_amount > 100 - inventory:
            buy_amount = 100 - inventory
+        if buy_amount == 0:
+            return "You don\'t have any empty inventory slots.🎒"
    # set the buy amount to the max if the user enters m
    buy_amount = int(buy_amount)
    
--- a/modules/gpio.py
+++ b/modules/gpio.py
@@ -0,0 +1,73 @@
+# GPIO module for MeshLink, concept code, not implemented
+# K7MHI Kelly Keeton 2024
+
+# https://pypi.org/project/gpio/
+#import gpio
+
+# https://pythonhosted.org/RPIO/
+import RPIO
+
+from modules.log import *
+trap_list_gpio = ("gpio", "pin", "relay", "switch", "pwm")
+
+# set up input channel without pull-up
+RPIO.setup(7, RPIO.IN)
+
+# set up input channel with pull-up
+RPIO.setup(8, RPIO.IN, pull_up_down=RPIO.PUD_UP)
+
+# set up GPIO output channel
+RPIO.setup(8, RPIO.OUT)
+
+# change to BOARD numbering schema
+RPIO.setmode(RPIO.BOARD)
+
+# set up PWM channel
+RPIO.setup(12, RPIO.OUT)
+p = RPIO.PWM(12)
+
+def gpio_status():
+    # get status of GPIO pins
+    gpio_status = ""
+    gpio_status += "GPIO 7: " + str(RPIO.input(7)) + "\n"
+    gpio_status += "GPIO 8: " + str(RPIO.input(8)) + "\n"
+    gpio_status += "GPIO 12: " + str(RPIO.input(12)) + "\n"
+    return gpio_status
+
+def gpio_toggle():
+    # toggle GPIO pin 8
+    RPIO.output(8, not RPIO.input(8))
+    return "GPIO 8 toggled"
+
+def gpio_pwm():
+    # set PWM on GPIO pin 12
+    p.start(50)
+    return "PWM started"
+
+def gpio_stop():
+    # stop PWM on GPIO pin 12
+    p.stop()
+    return "PWM stopped"
+
+def gpio_shutdown():
+    # shutdown GPIO
+    RPIO.cleanup()
+    return "GPIO shutdown"
+
+def trap_gpio(message):
+    # trap for GPIO commands
+    if "status" in message:
+        return gpio_status()
+    elif "toggle" in message:
+        return gpio_toggle()
+    elif "pwm" in message:
+        return gpio_pwm()
+    elif "stop" in message:
+        return gpio_stop()
+    elif "shutdown" in message:
+        return gpio_shutdown()
+    else:
+        return "GPIO command not recognized"
+    
+
+    
--- a/modules/llm.py
+++ b/modules/llm.py
@@ -1,27 +1,32 @@
 #!/usr/bin/env python3
 # LLM Module for meshing-around
-# This module is used to interact with Ollama to generate responses to user input
+# This module is used to interact with LLM API to generate responses to user input
 # K7MHI Kelly Keeton 2024
 from modules.log import *

 # Ollama Client
 # https://github.com/ollama/ollama/blob/main/docs/faq.md#how-do-i-configure-ollama-server
-from ollama import Client as OllamaClient
+import requests
+import json
 from googlesearch import search # pip install googlesearch-python

 # This is my attempt at a simple RAG implementation it will require some setup
 # you will need to have the RAG data in a folder named rag in the data directory (../data/rag)
 # This is lighter weight and can be used in a standalone environment, needs chromadb
 # "chat with a file" is the use concept here, the file is the RAG data
+# is anyone using this please let me know if you are Dec62024 -kelly
 ragDEV = False

 if ragDEV:
    import os
    import ollama # pip install ollama
    import chromadb # pip install chromadb
+    from ollama import Client as OllamaClient
+    ollamaClient = OllamaClient(host=ollamaHostName)

 # LLM System Variables
-ollamaClient = OllamaClient(host=ollamaHostName)
+ollamaAPI = ollamaHostName + "/api/generate"
+openaiAPI = "https://api.openai.com/v1/completions" # not used, if you do push a enhancement!
 llmEnableHistory = True # enable last message history for the LLM model
 llmContext_fromGoogle = True # enable context from google search results adds to compute time but really helps with responses accuracy
 googleSearchResults = 3 # number of google search results to include in the context more results = more compute time
@@ -193,20 +198,26 @@ def llm_query(input, nodeID=0, location_name=None):
            modelPrompt = meshBotAI.format(input=input, context=ragContext, location_name=location_name, llmModel=llmModel, history=history)
            # Query the model with RAG context
            result = ollamaClient.generate(model=llmModel, prompt=modelPrompt)
+            # Condense the result to just needed
+            if isinstance(result, dict):
+                result = result.get("response")
        else:
            # Build the query from the template
            modelPrompt = meshBotAI.format(input=input, context='\n'.join(googleResults), location_name=location_name, llmModel=llmModel, history=history)
-            # Query the model without RAG context
-            result = ollamaClient.generate(model=llmModel, prompt=modelPrompt)
-    
-        # Condense the result to just needed
-        if isinstance(result, dict):
-            result = result.get("response")
+            llmQuery = {"model": llmModel, "prompt": modelPrompt, "stream": False}
+            # Query the model via Ollama web API
+            result = requests.post(ollamaAPI, data=json.dumps(llmQuery))
+            # Condense the result to just needed
+            if result.status_code == 200:
+                result_json = result.json()
+                result = result_json.get("response", "")
+            else:
+                raise Exception(f"HTTP Error: {result.status_code}")

        #logger.debug(f"System: LLM Response: " + result.strip().replace('\n', ' '))
    except Exception as e:
        logger.warning(f"System: LLM failure: {e}")
-        return "I am having trouble processing your request, please try again later."
+        return "⛔️I am having trouble processing your request, please try again later."
    
    # cleanup for message output
    response = result.strip().replace('\n', ' ')
@@ -217,15 +228,3 @@ def llm_query(input, nodeID=0, location_name=None):
        llmChat_history[nodeID] = [input, response]

    return response
-
-# import subprocess
-# def get_ollama_cpu():
-#     try:
-#         psOutput = subprocess.run(['ollama', 'ps'], capture_output=True, text=True)
-#         if "GPU" in psOutput.stdout:
-#             logger.debug(f"System: Ollama process with GPU")
-#         else:
-#             logger.debug(f"System: Ollama process with CPU, query time will be slower")
-#     except Exception as e:
-#         logger.debug(f"System: Ollama process not found, {e}")
-#         return False
--- a/modules/locationdata.py
+++ b/modules/locationdata.py
@@ -1,4 +1,4 @@
-# helper functions to use location data like NOAA weather
+# helper functions to use location data for the API for NOAA weather, FEMA iPAWS, and repeater data
 # K7MHI Kelly Keeton 2024

 import json # pip install json
@@ -9,7 +9,7 @@ import bs4 as bs # pip install beautifulsoup4
 import xml.dom.minidom 
 from modules.log import *

-trap_list_location = ("whereami", "tide", "moon", "wx", "wxc", "wxa", "wxalert", "rlist")
+trap_list_location = ("whereami", "tide", "wx", "wxc", "wxa", "wxalert", "rlist", "ea", "ealert", "riverflow")

 def where_am_i(lat=0, lon=0, short=False, zip=False):
    whereIam = ""
@@ -154,9 +154,8 @@ def getArtSciRepeaters(lat=0, lon=0):
    else:
        msg = f"no results.. sorry"
    return msg
-    

-def get_tide(lat=0, lon=0):
+def get_NOAAtide(lat=0, lon=0):
    station_id = ""
    if float(lat) == 0 and float(lon) == 0:
        logger.error("Location:No GPS data, try sending location for tide")
@@ -172,7 +171,7 @@ def get_tide(lat=0, lon=0):
        
        if station_json['stationList'] == [] or station_json['stationList'] is None:
            logger.error("Location:No tide station found")
-            return ERROR_FETCHING_DATA
+            return "No tide station found with info provided"
        
        station_id = station_json['stationList'][0]['stationId']

@@ -219,7 +218,7 @@ def get_tide(lat=0, lon=0):
    tide_table = tide_table[:-1]
    return tide_table
    
-def get_weather(lat=0, lon=0, unit=0):
+def get_NOAAweather(lat=0, lon=0, unit=0):
    # get weather report from NOAA for forecast detailed
    weather = ""
    if float(lat) == 0 and float(lon) == 0:
@@ -255,7 +254,7 @@ def get_weather(lat=0, lon=0, unit=0):
    # extract data from rows
    for row in rows:
        # shrink the text
-        line = abbreviate_weather(row.text)
+        line = abbreviate_noaa(row.text)
        # only grab a few days of weather
        if len(weather.split("\n")) < forecastDuration:
            weather += line + "\n"
@@ -263,7 +262,7 @@ def get_weather(lat=0, lon=0, unit=0):
    weather = weather[:-1]

    # get any alerts and return the count
-    alerts = getWeatherAlerts(lat, lon)
+    alerts = getWeatherAlertsNOAA(lat, lon)

    if alerts == ERROR_FETCHING_DATA or alerts == NO_DATA_NOGPS or alerts == NO_ALERTS:
        alert = ""
@@ -278,23 +277,23 @@ def get_weather(lat=0, lon=0, unit=0):

    return weather

-def abbreviate_weather(row):
+def abbreviate_noaa(row):
    # replace long strings with shorter ones for display
    replacements = {
-        "Monday": "Mon ",
-        "Tuesday": "Tue ",
-        "Wednesday": "Wed ",
-        "Thursday": "Thu ",
-        "Friday": "Fri ",
-        "Saturday": "Sat ",
-        "Sunday": "Sunday ",
-        "Today": "Today ",
-        "Night": "Night ",
-        "Tonight": "Tonight ",
-        "Tomorrow": "Tomorrow ",
-        "Day": "Day ",
-        "This Afternoon": "Afternoon ",
-        "Overnight": "Overnight ",
+        "monday": "Mon ",
+        "tuesday": "Tue ",
+        "wednesday": "Wed ",
+        "thursday": "Thu ",
+        "friday": "Fri ",
+        "saturday": "Sat ",
+        "sunday": "Sun ",
+        "today": "Today ",
+        "night": "Night ",
+        "tonight": "Tonight ",
+        "tomorrow": "Tomorrow ",
+        "day": "Day ",
+        "this afternoon": "Afternoon ",
+        "overnight": "Overnight ",
        "northwest": "NW",
        "northeast": "NE",
        "southwest": "SW",
@@ -303,29 +302,37 @@ def abbreviate_weather(row):
        "south": "S",
        "east": "E",
        "west": "W",
-        "Northwest": "NW",
-        "Northeast": "NE",
-        "Southwest": "SW",
-        "Southeast": "SE",
-        "North": "N",
-        "South": "S",
-        "East": "E",
-        "West": "W",
        "precipitation": "precip",
        "showers": "shwrs",
        "thunderstorms": "t-storms",
        "thunderstorm": "t-storm",
        "quarters": "qtrs",
-        "quarter": "qtr"
+        "quarter": "qtr",
+        "january": "Jan",
+        "february": "Feb",
+        "march": "Mar",
+        "april": "Apr",
+        "may": "May",
+        "june": "Jun",
+        "july": "Jul",
+        "august": "Aug",
+        "september": "Sep",
+        "october": "Oct",
+        "november": "Nov",
+        "december": "Dec",
+        "degrees": "°",
+        "percent": "%",
+        "department": "Dept.",
    }

    line = row
    for key, value in replacements.items():
-        line = line.replace(key, value)
+        # case insensitive replace
+        line = line.replace(key, value).replace(key.capitalize(), value).replace(key.upper(), value)
                    
    return line

-def getWeatherAlerts(lat=0, lon=0, useDefaultLatLon=False):
+def getWeatherAlertsNOAA(lat=0, lon=0, useDefaultLatLon=False):
    # get weather alerts from NOAA limited to ALERT_COUNT with the total number of alerts found
    alerts = ""
    if float(lat) == 0 and float(lon) == 0 and not useDefaultLatLon:
@@ -367,32 +374,33 @@ def getWeatherAlerts(lat=0, lon=0, useDefaultLatLon=False):
    alert_num = 0
    alert_num = len(alerts.split("\n"))

-    alerts = abbreviate_weather(alerts)
+    alerts = abbreviate_noaa(alerts)

    # return the first ALERT_COUNT alerts
    data = "\n".join(alerts.split("\n")[:numWxAlerts]), alert_num
    return data

-wxAlertCache = ""
-def alertBrodcast():
+wxAlertCacheNOAA = ""
+def alertBrodcastNOAA():
    # get the latest weather alerts and broadcast them if there are any
-    global wxAlertCache
-    currentAlert = getWeatherAlerts(latitudeValue, longitudeValue)
+    global wxAlertCacheNOAA
+    currentAlert = getWeatherAlertsNOAA(latitudeValue, longitudeValue)
    # check if any reason to discard the alerts
    if currentAlert == ERROR_FETCHING_DATA or currentAlert == NO_DATA_NOGPS:
        return False
    elif currentAlert == NO_ALERTS:
-        wxAlertCache = ""
+        wxAlertCacheNOAA = ""
        return False
    # broadcast the alerts send to wxBrodcastCh
-    elif currentAlert[0] != wxAlertCache:
+    elif currentAlert[0] not in wxAlertCacheNOAA:
+        # Check if the current alert is not in the weather alert cache
        logger.debug("Location:Broadcasting weather alerts")
-        wxAlertCache = currentAlert[0]
+        wxAlertCacheNOAA = currentAlert[0]
        return currentAlert
    
    return False

-def getActiveWeatherAlertsDetail(lat=0, lon=0):
+def getActiveWeatherAlertsDetailNOAA(lat=0, lon=0):
    # get the latest details of weather alerts from NOAA
    alerts = ""
    if float(lat) == 0 and float(lon) == 0:
@@ -427,7 +435,7 @@ def getActiveWeatherAlertsDetail(lat=0, lon=0):
            "\n***\n"
        )

-    alerts = abbreviate_weather(alerts)
+    alerts = abbreviate_noaa(alerts)

    # trim the alerts to the first ALERT_COUNT
    alerts = alerts.split("\n***\n")[:numWxAlerts]
@@ -442,3 +450,163 @@ def getActiveWeatherAlertsDetail(lat=0, lon=0):
    alerts = "\n".join(alerts)
    
    return alerts
+
+def getIpawsAlert(lat=0, lon=0, shortAlerts = False):
+    # get the latest IPAWS alert from FEMA
+    alert = ''
+    alerts = []
+    
+    # set the API URL for IPAWS
+    namespace = "urn:oasis:names:tc:emergency:cap:1.2"
+    alert_url = "https://apps.fema.gov/IPAWSOPEN_EAS_SERVICE/rest/feed"
+    if ipawsPIN != "000000":
+        alert_url += "?pin=" + ipawsPIN
+
+    # get the alerts from FEMA
+    try:
+        alert_data = requests.get(alert_url, timeout=urlTimeoutSeconds)
+        if not alert_data.ok:
+            logger.warning("System: iPAWS fetching IPAWS alerts from FEMA")
+            return ERROR_FETCHING_DATA
+    except (requests.exceptions.RequestException):
+        logger.warning("System: iPAWS fetching IPAWS alerts from FEMA")
+        return ERROR_FETCHING_DATA
+    
+    # main feed bulletins
+    alertxml = xml.dom.minidom.parseString(alert_data.text)
+
+    # extract alerts from main feed
+    for entry in alertxml.getElementsByTagName("entry"):
+        link = entry.getElementsByTagName("link")[0].getAttribute("href")
+        try:
+            #pin check
+            if ipawsPIN != "000000":
+                link += "?pin=" + ipawsPIN
+            # get the linked alert data from FEMA
+            linked_data = requests.get(link, timeout=urlTimeoutSeconds)
+            if not linked_data.ok:
+                #logger.warning(f"System: iPAWS Error fetching linked alert data from {link}")
+                continue
+        except (requests.exceptions.RequestException):
+            logger.warning(f"System: iPAWS Error fetching embedded alert data from {link}")
+            continue
+        
+        # this alert is a full CAP alert
+        linked_xml = xml.dom.minidom.parseString(linked_data.text)
+
+        for info in linked_xml.getElementsByTagName("info"):
+            # extract values from XML
+            sameVal = "NONE"
+            geocode_value = "NONE"
+            description = ""
+            try:
+                eventCode_table = info.getElementsByTagName("eventCode")[0]
+                alertType = eventCode_table.getElementsByTagName("valueName")[0].childNodes[0].nodeValue
+                alertCode = eventCode_table.getElementsByTagName("value")[0].childNodes[0].nodeValue
+                headline = info.getElementsByTagName("headline")[0].childNodes[0].nodeValue
+                # use headline if no description
+                if info.getElementsByTagName("description") and info.getElementsByTagName("description")[0].childNodes:
+                    description = info.getElementsByTagName("description")[0].childNodes[0].nodeValue
+                else:
+                    logger.debug(f"System: report this to discord - iPAWS No description for alert: {headline}")
+                    description = headline
+
+                area_table = info.getElementsByTagName("area")[0]
+                areaDesc = area_table.getElementsByTagName("areaDesc")[0].childNodes[0].nodeValue
+                
+                geocode_table = area_table.getElementsByTagName("geocode")[0]
+                geocode_type = geocode_table.getElementsByTagName("valueName")[0].childNodes[0].nodeValue
+                geocode_value = geocode_table.getElementsByTagName("value")[0].childNodes[0].nodeValue
+                if geocode_type == "SAME":
+                    sameVal = geocode_value
+            except Exception as e:
+                logger.warning(f"System: iPAWS Error extracting alert data: {link}")
+                #print(f"DEBUG: {info.toprettyxml()}")
+                continue
+
+            # check if the alert is for the current location, if wanted keep alert
+            if (sameVal in mySAME) or (geocode_value in mySAME):
+                # ignore the FEMA test alerts
+                if ignoreFEMAtest:
+                    if "Test" in headline:
+                        logger.debug(f"System: Ignoring FEMA Test Alert: {headline} for {areaDesc}")
+                        continue
+
+                # add to alerts list
+                alerts.append({
+                    'alertType': alertType,
+                    'alertCode': alertCode,
+                    'headline': headline,
+                    'areaDesc': areaDesc,
+                    'geocode_type': geocode_type,
+                    'geocode_value': geocode_value,
+                    'description': description
+                })
+            else:
+                # these are discarded some day but logged for debugging currently
+                logger.debug(f"Debug iPAWS: Type:{alertType} Code:{alertCode} Desc:{areaDesc} GeoType:{geocode_type} GeoVal:{geocode_value}, Headline:{headline}")
+    
+    # return the numWxAlerts of alerts
+    if len(alerts) > 0:
+        for alertItem in alerts[:numWxAlerts]:
+            if shortAlerts:
+                alert += abbreviate_noaa(f"🚨FEMA Alert: {alertItem['headline']}")
+            else:
+                alert += abbreviate_noaa(f"🚨FEMA Alert: {alertItem['headline']}\n{alertItem['description']}")
+            # add a newline if not the last alert    
+            if alertItem != alerts[:numWxAlerts][-1]:
+                alert += "\n"
+    else:
+        alert = NO_ALERTS
+
+    return alert
+
+def get_flood_noaa(lat=0, lon=0, uid=0):
+    # get the latest flood alert from NOAA
+    api_url = "https://api.water.noaa.gov/nwps/v1/gauges/"
+    headers = {'accept': 'application/json'}
+    if uid == 0:
+        return "No flood gauge data found"
+    try:
+        response = requests.get(api_url + str(uid), headers=headers, timeout=urlTimeoutSeconds)
+        if not response.ok:
+            logger.warning("Location:Error fetching flood gauge data from NOAA for " + str(uid))
+            return ERROR_FETCHING_DATA
+    except (requests.exceptions.RequestException):
+        logger.warning("Location:Error fetching flood gauge data from NOAA for " + str(uid))
+        return ERROR_FETCHING_DATA
+    
+    data = response.json()
+    if not data:
+        return "No flood gauge data found"
+    
+    # extract values from JSON
+    try:
+        name = data['name']
+        status_observed_primary = data['status']['observed']['primary']
+        status_observed_primary_unit = data['status']['observed']['primaryUnit']
+        status_observed_secondary = data['status']['observed']['secondary']
+        status_observed_secondary_unit = data['status']['observed']['secondaryUnit']
+        status_observed_floodCategory = data['status']['observed']['floodCategory']
+        status_forecast_primary = data['status']['forecast']['primary']
+        status_forecast_primary_unit = data['status']['forecast']['primaryUnit']
+        status_forecast_secondary = data['status']['forecast']['secondary']
+        status_forecast_secondary_unit = data['status']['forecast']['secondaryUnit']
+        status_forecast_floodCategory = data['status']['forecast']['floodCategory']
+
+        # except KeyError as e:
+        #     print(f"Missing key in data: {e}")
+        # except TypeError as e:
+        #     print(f"Type error in data: {e}")
+    except Exception as e:
+        logger.warning("Location:Error extracting flood gauge data from NOAA for " + str(uid))
+        return ERROR_FETCHING_DATA
+    
+    # format the flood data
+    logger.debug(f"System: NOAA Flood data for {str(uid)}")
+    flood_data = f"Flood Data {name}:\n"
+    flood_data += f"Observed: {status_observed_primary}{status_observed_primary_unit}({status_observed_secondary}{status_observed_secondary_unit}) risk: {status_observed_floodCategory}"
+    flood_data += f"\nForecast: {status_forecast_primary}{status_forecast_primary_unit}({status_forecast_secondary}{status_forecast_secondary_unit}) risk: {status_forecast_floodCategory}"
+
+    return flood_data
+
--- a/modules/locationdata_eu.py
+++ b/modules/locationdata_eu.py
@@ -0,0 +1,60 @@
+# helper functions to use location data for data outside US/north america
+# K7MHI Kelly Keeton 2024
+
+import json # pip install json
+from geopy.geocoders import Nominatim # pip install geopy
+import maidenhead as mh # pip install maidenhead
+import requests # pip install requests
+import bs4 as bs # pip install beautifulsoup4
+import xml.dom.minidom 
+from modules.log import *
+
+trap_list_location_eu = ("ukalert", "ukwx", "ukflood")
+
+def get_govUK_alerts(shortAlerts=False):
+    try:
+        # get UK.gov alerts
+        url = 'https://www.gov.uk/alerts'
+        response = requests.get(url)
+        soup = bs.BeautifulSoup(response.text, 'html.parser')
+        # the alerts are in <h2 class="govuk-heading-m" id="alert-status">
+        alert = soup.find('h2', class_='govuk-heading-m', id='alert-status')
+    except Exception as e:
+        logger.warning("Error getting UK alerts: " + str(e))
+        return NO_ALERTS
+    
+    if alert:
+        return "🚨" + alert.get_text(strip=True)
+    else:
+        return NO_ALERTS
+    
+
+def get_wxUKgov():
+    # get UK weather warnings
+    url = 'https://www.metoffice.gov.uk/weather/guides/rss'
+    url = 'https://www.metoffice.gov.uk/public/data/PWSCache/WarningsRSS/Region/nw'
+    try:
+        # get UK weather warnings
+        url = 'https://www.metoffice.gov.uk/weather/guides/rss'
+        response = requests.get(url)
+        soup = bs.BeautifulSoup(response.content, 'xml')
+        
+        items = soup.find_all('item')
+        alerts = []
+        
+        for item in items:
+            title = item.find('title').get_text(strip=True)
+            description = item.find('description').get_text(strip=True)
+            alerts.append(f"🚨 {title}: {description}")
+        
+        return "\n".join(alerts) if alerts else NO_ALERTS
+    except Exception as e:
+        logger.warning("Error getting UK weather warnings: " + str(e))
+        return NO_ALERTS
+    
+    
+def get_floodUKgov():
+    # get UK flood warnings
+    url = 'https://environment.data.gov.uk/flood-widgets/rss/feed-England.xml'
+    
+    return NO_ALERTS
--- a/modules/log.py
+++ b/modules/log.py
@@ -74,4 +74,22 @@ if log_messages_to_file:
    file_handler = TimedRotatingFileHandler('logs/messages.log', when='midnight', backupCount=log_backup_count)
    file_handler.setLevel(logging.INFO) # INFO used for messages to disk
    file_handler.setFormatter(logging.Formatter(msgLogFormat))
-    msgLogger.addHandler(file_handler)
+    msgLogger.addHandler(file_handler)
+
+# Pretty Timestamp
+def getPrettyTime(seconds):
+    # convert unix time to minutes, hours, or days, or years for simple display
+    designator = "s"
+    if seconds > 0:
+        seconds = round(seconds / 60)
+        designator = "m"
+    if seconds > 60:
+        seconds = round(seconds / 60)
+        designator = "h"
+    if seconds > 24:
+        seconds = round(seconds / 24)
+        designator = "d"
+    if seconds > 365:
+        seconds = round(seconds / 365)
+        designator = "y"
+    return str(seconds) + designator
--- a/modules/settings.py
+++ b/modules/settings.py
@@ -6,8 +6,9 @@ import configparser
 NO_DATA_NOGPS = "No location data: does your device have GPS?"
 ERROR_FETCHING_DATA = "error fetching data"
 WELCOME_MSG = 'MeshBot, here for you like a friend who is not. Try sending: ping @foo  or, CMD? for more'
+EMERGENCY_RESPONSE = "MeshBot detected a possible request for Emergency Assistance and alerted a wider audience."
 MOTD = 'Thanks for using MeshBOT! Have a good day!'
-NO_ALERTS = "No weather alerts found."
+NO_ALERTS = "No alerts found."

 # setup the global variables
 SITREP_NODE_COUNT = 3 # number of nodes to report in the sitrep
@@ -27,6 +28,8 @@ retry_int2 = False
 wiki_return_limit = 3 # limit the number of sentences returned off the first paragraph first hit
 playingGame = False
 GAMEDELAY = 28800 # 8 hours in seconds for game mode holdoff
+cmdHistory = [] # list to hold the last commands
+seenNodes = [] # list to hold the last seen nodes

 # Read the config file, if it does not exist, create basic config file
 config = configparser.ConfigParser() 
@@ -40,46 +43,53 @@ except Exception as e:
 if config.sections() == []:
    print(f"System: Error reading config file: {config_file} is empty or does not exist.")
    config['interface'] = {'type': 'serial', 'port': "/dev/ttyACM0", 'hostname': '', 'mac': ''}
-    config['general'] = {'respond_by_dm_only': 'True', 'defaultChannel': '0', 'motd': MOTD,
-                         'welcome_message': WELCOME_MSG, 'zuluTime': 'False'}
+    config['general'] = {'respond_by_dm_only': 'True', 'defaultChannel': '0', 'motd': MOTD, 'welcome_message': WELCOME_MSG, 'zuluTime': 'False'}
    config.write(open(config_file, 'w'))
    print (f"System: Config file created, check {config_file} or review the config.template")

 if 'sentry' not in config:
-        config['sentry'] = {'SentryEnabled': 'False', 'SentryChannel': '2', 'SentryHoldoff': '9', 'sentryIgnoreList': '', 'SentryRadius': '100'}
-        config.write(open(config_file, 'w'))
+    config['sentry'] = {'SentryEnabled': 'False', 'SentryChannel': '2', 'SentryHoldoff': '9', 'sentryIgnoreList': '', 'SentryRadius': '100'}
+    config.write(open(config_file, 'w'))

 if 'location' not in config:
-        config['location'] = {'enabled': 'True', 'lat': '48.50', 'lon': '-123.0', 'UseMeteoWxAPI': 'False', 'useMetric': 'False', 'NOAAforecastDuration': '4', 'NOAAalertCount': '2', 'NOAAalertsEnabled': 'True', 'wxAlertBroadcastEnabled': 'False', 'wxAlertBroadcastChannel': '2', 'repeaterLookup': 'rbook'}
-        config.write(open(config_file, 'w'))
+    config['location'] = {'enabled': 'True', 'lat': '48.50', 'lon': '-123.0', 'UseMeteoWxAPI': 'False', 'useMetric': 'False', 'NOAAforecastDuration': '4', 'NOAAalertCount': '2', 'NOAAalertsEnabled': 'True', 'wxAlertBroadcastEnabled': 'False', 'wxAlertBroadcastChannel': '2', 'repeaterLookup': 'rbook'}
+    config.write(open(config_file, 'w'))

 if 'bbs' not in config:
-        config['bbs'] = {'enabled': 'False', 'bbsdb': 'data/bbsdb.pkl', 'bbs_ban_list': '', 'bbs_admin_list': ''}
-        config.write(open(config_file, 'w'))
+    config['bbs'] = {'enabled': 'False', 'bbsdb': 'data/bbsdb.pkl', 'bbs_ban_list': '', 'bbs_admin_list': ''}
+    config.write(open(config_file, 'w'))

 if 'repeater' not in config:
-        config['repeater'] = {'enabled': 'False', 'repeater_channels': ''}
-        config.write(open(config_file, 'w'))
+    config['repeater'] = {'enabled': 'False', 'repeater_channels': ''}
+    config.write(open(config_file, 'w'))

 if 'radioMon' not in config:
-        config['radioMon'] = {'enabled': 'False', 'rigControlServerAddress': 'localhost:4532', 'sigWatchBrodcastCh': '2', 'signalDetectionThreshold': '-10', 'signalHoldTime': '10', 'signalCooldown': '5', 'signalCycleLimit': '5'}
-        config.write(open(config_file, 'w'))
+    config['radioMon'] = {'enabled': 'False', 'rigControlServerAddress': 'localhost:4532', 'sigWatchBrodcastCh': '2', 'signalDetectionThreshold': '-10', 'signalHoldTime': '10', 'signalCooldown': '5', 'signalCycleLimit': '5'}
+    config.write(open(config_file, 'w'))

 if 'games' not in config:
-        config['games'] = {'dopeWars': 'True', 'lemonade': 'True', 'blackjack': 'True', 'videoPoker': 'True'}
-        config.write(open(config_file, 'w'))
+    config['games'] = {'dopeWars': 'True', 'lemonade': 'True', 'blackjack': 'True', 'videoPoker': 'True'}
+    config.write(open(config_file, 'w'))

 if 'messagingSettings' not in config:
-        config['messagingSettings'] = {'responseDelay': '0.7', 'splitDelay': '0', 'MESSAGE_CHUNK_SIZE': '160'}
-        config.write(open(config_file, 'w'))
+    config['messagingSettings'] = {'responseDelay': '0.7', 'splitDelay': '0', 'MESSAGE_CHUNK_SIZE': '160'}
+    config.write(open(config_file, 'w'))

 if 'fileMon' not in config:
-        config['fileMon'] = {'enabled': 'False', 'file_path': 'alert.txt', 'broadcastCh': '2'}
-        config.write(open(config_file, 'w'))
+    config['fileMon'] = {'enabled': 'False', 'file_path': 'alert.txt', 'broadcastCh': '2'}
+    config.write(open(config_file, 'w'))

 if 'scheduler' not in config:
-        config['scheduler'] = {'enabled': 'False'}
-        config.write(open(config_file, 'w'))
+    config['scheduler'] = {'enabled': 'False'}
+    config.write(open(config_file, 'w'))
+
+if 'emergencyHandler' not in config:
+    config['emergencyHandler'] = {'enabled': 'False', 'alert_channel': '2', 'alert_interface': '1', 'email': ''}
+    config.write(open(config_file, 'w'))
+
+if 'smtp' not in config:
+    config['smtp'] = {'sysopEmails': '', 'enableSMTP': 'False', 'enableImap': 'False'}
+    config.write(open(config_file, 'w'))

 # interface1 settings
 interface1_type = config['interface'].get('type', 'serial')
@@ -97,7 +107,7 @@ if 'interface2' in config:
 else:
    interface2_enabled = False

-# variables
+# variables from the config.ini file
 try:
    # general
    useDMForResponse = config['general'].getboolean('respond_by_dm_only', True)
@@ -114,6 +124,7 @@ try:
    welcome_message = (f"{welcome_message}").replace('\\n', '\n') # allow for newlines in the welcome message
    motd_enabled = config['general'].getboolean('motdEnabled', True)
    MOTD = config['general'].get('motd', MOTD)
+    autoPingInChannel = config['general'].getboolean('autoPingInChannel', False)
    enableCmdHistory = config['general'].getboolean('enableCmdHistory', True)
    lheardCmdIgnoreNode = config['general'].get('lheardCmdIgnoreNode', '').split(',')
    whoami_enabled = config['general'].getboolean('whoami', True)
@@ -125,12 +136,19 @@ try:
    llmModel = config['general'].get('ollamaModel', 'gemma2:2b') # default gemma2:2b
    ollamaHostName = config['general'].get('ollamaHostName', 'http://localhost:11434') # default localhost

+    # emergency response
+    emergency_responder_enabled = config['emergencyHandler'].getboolean('enabled', False)
+    emergency_responder_alert_channel = config['emergencyHandler'].getint('alert_channel', 2) # default 2
+    emergency_responder_alert_interface = config['emergencyHandler'].getint('alert_interface', 1) # default 1
+    emergency_responder_email = config['emergencyHandler'].get('email', '').split(',')
+
    # sentry
    sentry_enabled = config['sentry'].getboolean('SentryEnabled', False) # default False
    secure_channel = config['sentry'].getint('SentryChannel', 2) # default 2
    sentry_holdoff = config['sentry'].getint('SentryHoldoff', 9) # default 9
    sentryIgnoreList = config['sentry'].get('sentryIgnoreList', '').split(',')
    sentry_radius = config['sentry'].getint('SentryRadius', 100) # default 100 meters
+    email_sentry_alerts = config['sentry'].getboolean('emailSentryAlerts', False) # default False

    # location
    location_enabled = config['location'].getboolean('enabled', True)
@@ -138,19 +156,23 @@ try:
    longitudeValue = config['location'].getfloat('lon', -123.0)
    use_meteo_wxApi = config['location'].getboolean('UseMeteoWxAPI', False) # default False use NOAA
    use_metric = config['location'].getboolean('useMetric', False) # default Imperial units
+    repeater_lookup = config['location'].get('repeaterLookup', 'rbook') # default repeater lookup source
+    n2yoAPIKey = config['location'].get('n2yoAPIKey', '') # default empty
+    satListConfig = config['location'].get('satList', '25544').split(',') # default 25544 ISS
+    riverListDefault = config['location'].get('riverList', '').split(',') # default 12061500 Skagit River
+    # location alerts
+    emergencyAlertBrodcastEnabled = config['location'].getboolean('eAlertBroadcastEnabled', False) # default False
+    wxAlertBroadcastEnabled = config['location'].getboolean('wxAlertBroadcastEnabled', False) # default False
+    enableGBalerts = config['location'].getboolean('enableGBalerts', False) # default False
+    wxAlertsEnabled = config['location'].getboolean('NOAAalertsEnabled', True) # default True
+    mySAME = config['location'].get('mySAME', '').split(',') # default empty
    forecastDuration = config['location'].getint('NOAAforecastDuration', 4) # NOAA forcast days
    numWxAlerts = config['location'].getint('NOAAalertCount', 2) # default 2 alerts
-    wxAlertsEnabled = config['location'].getboolean('NOAAalertsEnabled', True) # default True not enabled yet
-    repeater_lookup = config['location'].get('repeaterLookup', 'rbook') # default repeater lookup source
-    wxAlertBroadcastEnabled = config['location'].getboolean('wxAlertBroadcastEnabled', False) # default False
-    # brodcast channel for weather alerts
-    wxAlertBroadcastChannel = config['location'].get('wxAlertBroadcastCh')
-    if wxAlertBroadcastChannel:
-        if ',' in wxAlertBroadcastChannel:
-            wxAlertBroadcastChannel = config['location'].get('wxAlertBroadcastCh').split(',')
-        else:
-            wxAlertBroadcastChannel = config['location'].getint('wxAlertBroadcastCh', 2) # default 2
-   
+    ipawsPIN = config['location'].get('ipawsPIN', '000000') # default 000000
+    ignoreFEMAtest = config['location'].getboolean('ignoreFEMAtest', True) # default True
+    wxAlertBroadcastChannel = config['location'].get('wxAlertBroadcastCh', '2').split(',') # default Channel 2
+    emergencyAlertBroadcastCh = config['location'].get('eAlertBroadcastCh', '2').split(',') # default Channel 2
+    
    # bbs
    bbs_enabled = config['bbs'].getboolean('enabled', False)
    bbsdb = config['bbs'].get('bbsdb', 'data/bbsdb.pkl')
@@ -159,6 +181,23 @@ try:
    bbs_link_enabled = config['bbs'].getboolean('bbslink_enabled', False)
    bbs_link_whitelist = config['bbs'].get('bbslink_whitelist', '').split(',')

+    # E-Mail Settings
+    sysopEmails = config['smtp'].get('sysopEmails', '').split(',')
+    enableSMTP = config['smtp'].getboolean('enableSMTP', False)
+    enableImap = config['smtp'].getboolean('enableImap', False)
+    SMTP_SERVER = config['smtp'].get('SMTP_SERVER', 'smtp.gmail.com')
+    SMTP_PORT = config['smtp'].getint('SMTP_PORT', 587)
+    FROM_EMAIL = config['smtp'].get('FROM_EMAIL', 'none@gmail.com')
+    SMTP_AUTH = config['smtp'].getboolean('SMTP_AUTH', True)
+    SMTP_USERNAME = config['smtp'].get('SMTP_USERNAME', FROM_EMAIL)
+    SMTP_PASSWORD = config['smtp'].get('SMTP_PASSWORD', 'password')
+    EMAIL_SUBJECT = config['smtp'].get('EMAIL_SUBJECT', 'Meshtastic✉️')
+    IMAP_SERVER = config['smtp'].get('IMAP_SERVER', 'imap.gmail.com')
+    IMAP_PORT = config['smtp'].getint('IMAP_PORT', 993)
+    IMAP_USERNAME = config['smtp'].get('IMAP_USERNAME', SMTP_USERNAME)
+    IMAP_PASSWORD = config['smtp'].get('IMAP_PASSWORD', SMTP_PASSWORD)
+    IMAP_FOLDER = config['smtp'].get('IMAP_FOLDER', 'inbox')
+
    # repeater
    repeater_enabled = config['repeater'].getboolean('enabled', False)
    repeater_channels = config['repeater'].get('repeater_channels', '').split(',')
@@ -181,6 +220,7 @@ try:
    file_monitor_broadcastCh = config['fileMon'].getint('broadcastCh', 2) # default 2
    read_news_enabled = config['fileMon'].getboolean('enable_read_news', False) # default disabled
    news_file_path = config['fileMon'].get('news_file_path', 'news.txt') # default news.txt
+    news_random_line_only = config['fileMon'].getboolean('news_random_line', False) # default False

    # games
    game_hop_limit = config['messagingSettings'].getint('game_hop_limit', 5) # default 3 hops
--- a/modules/smtp.py
+++ b/modules/smtp.py
@@ -0,0 +1,266 @@
+# SMTP module for the meshing-around bot
+# 2024 Idea and code bits from https://github.com/tremmert81
+# https://avtech.com/articles/138/list-of-email-to-sms-addresses/
+# 2024 Kelly Keeton K7MHI
+
+from modules.log import *
+import pickle
+import time
+import smtplib
+from email.mime.text import MIMEText
+from email.mime.multipart import MIMEMultipart
+
+# System variables
+trap_list_smtp = ("email:", "setemail", "sms:", "setsms", "clearsms")
+smtpThrottle = {}
+SMTP_TIMEOUT = 10
+
+if enableImap:
+    # Import IMAP library
+    import imaplib
+    import email
+
+# Send email
+def send_email(to_email, message, nodeID=0):
+    global smtpThrottle
+    
+    # Clean up email address
+    to_email = to_email.strip()
+    
+    # Basic email validation
+    if "@" not in to_email or "." not in to_email:
+        logger.warning(f"System: Invalid email address format: {to_email}")
+        return False
+        
+    # throttle email to prevent abuse
+    if to_email in smtpThrottle:
+        if smtpThrottle[to_email] > time.time() - 120:
+            logger.warning("System: Email throttled for " + to_email[:-6])
+            return "⛔️Email throttled, try again later"
+    smtpThrottle[to_email] = time.time()
+
+    # check if email is in the ban list
+    if nodeID in bbs_ban_list:
+        logger.warning("System: Email blocked for " + str(nodeID))
+        return "⛔️Email throttled, try again later"
+    # Send email
+    try:
+        # Create message
+        msg = MIMEMultipart()
+        msg['From'] = FROM_EMAIL
+        msg['To'] = to_email
+        msg['Subject'] = EMAIL_SUBJECT
+        msg.attach(MIMEText(message, 'plain'))
+
+        # Connect to SMTP server
+        server = smtplib.SMTP(SMTP_SERVER, SMTP_PORT, timeout=SMTP_TIMEOUT)
+        try:
+            # login /auth
+            if SMTP_PORT == 587:
+                server.starttls()
+            if SMTP_AUTH:
+                server.login(SMTP_USERNAME, SMTP_PASSWORD)
+        except Exception as e:
+            logger.warning(f"System: Failed to login to SMTP server: {str(e)}")
+            return
+
+        # Send email; this command will hold the program until the email is sent
+        server.send_message(msg)
+        server.quit()
+
+        logger.info("System: Email sent to: " + to_email[:-6])
+        return True
+    except Exception as e:
+        logger.warning(f"System: Failed to send email: {str(e)}")
+        return False
+
+def check_email(nodeID, sysop=False):
+    if not enableImap:
+        return
+
+    try:
+        # Connect to IMAP server
+        mail = imaplib.IMAP4_SSL(IMAP_SERVER, IMAP_PORT, timeout=SMTP_TIMEOUT)
+        mail.login(IMAP_USERNAME, IMAP_PASSWORD)
+        mail.select(IMAP_FOLDER)
+
+        # Search for new emails
+        status, data = mail.search(None, 'UNSEEN')
+        if status == 'OK':
+            for num in data[0].split():
+                status, data = mail.fetch(num, '(RFC822)')
+                if status == 'OK':
+                    email_message = email.message_from_bytes(data[0][1])
+                    email_from = email_message['from']
+                    email_subject = email_message['subject']
+                    email_body = ""
+
+                    if not sysop:
+                        # Check if email is whitelisted by particpant in the mesh
+                        for address in sms_db[nodeID]:
+                            if address in email_from:
+                                email_body = email_message.get_payload()
+                                logger.info("System: Email received from: " + email_from[:-6] + " for " + str(nodeID))
+                                return email_body.strip()
+                    else:
+                        # Check if email is from sysop
+                        for address in sysopEmails:
+                            if address in email_from:
+                                email_body = email_message.get_payload()
+                                logger.info("System: SysOp Email received from: " + email_from[:-6] + " for sysop")
+                                return email_body.strip()
+                        
+    except Exception as e:
+        logger.warning("System: Failed to check email: " + str(e))
+        return False
+
+# initalize email db
+email_db = {}
+try:
+    with open('data/email_db.pickle', 'rb') as f:
+        email_db = pickle.load(f)
+except:
+    logger.warning("System: Email db not found, creating a new one")
+    with open('data/email_db.pickle', 'wb') as f:
+        pickle.dump(email_db, f)
+
+def store_email(nodeID, email):
+    global email_db
+
+    # if not in db, add it
+    logger.debug("System: Setting E-Mail for " + str(nodeID))
+    email_db[nodeID] = email
+
+    # save to a pickle for persistence, this is a simple db, be mindful of risk
+    with open('data/email_db.pickle', 'wb') as f:
+        pickle.dump(email_db, f)
+    f.close()
+    return True
+
+
+# initalize SMS db
+sms_db = [{'nodeID': 0, 'sms':[]}]
+try:
+    with open('data/sms_db.pickle', 'rb') as f:
+        sms_db = pickle.load(f)
+except:
+    logger.warning("System: SMS db not found, creating a new one")
+    with open('data/sms_db.pickle', 'wb') as f:
+        pickle.dump(sms_db, f)
+
+def store_sms(nodeID, sms):
+    global sms_db
+    try:
+        logger.debug("System: Setting SMS for " + str(nodeID))
+        # if not in db, add it
+        if nodeID not in sms_db:
+            sms_db.append({'nodeID': nodeID, 'sms': sms})
+        else:
+            # if in db, update it
+            for item in sms_db:
+                if item['nodeID'] == nodeID:
+                    item['sms'].append(sms)
+
+        # save to a pickle for persistence, this is a simple db, be mindful of risk
+        with open('data/sms_db.pickle', 'wb') as f:
+            pickle.dump(sms_db, f)
+        f.close()
+        return True
+    except Exception as e:
+        logger.warning("System: Failed to store SMS: " + str(e))
+        return False
+
+def handle_sms(nodeID, message):
+    global sms_db
+    # if clearsms, remove all sms for node
+    if message.lower().startswith("clearsms"):
+        if any(item['nodeID'] == nodeID for item in sms_db):
+            # remove record from db for nodeID
+            sms_db = [item for item in sms_db if item['nodeID'] != nodeID]
+            # update the pickle
+            with open('data/sms_db.pickle', 'wb') as f:
+                pickle.dump(sms_db, f)
+            f.close()
+            return "📲 address cleared"
+        return "📲No address to clear"
+    
+    # send SMS to SMS in db. if none ask for one
+    if message.lower().startswith("setsms"):
+        message = message.split(" ", 1)
+        if len(message[1]) < 5:
+            return "?📲setsms: example@phone.co"
+        if "@" not in message[1] and "." not in message[1]:
+            return "📲Please provide a valid email address"
+        if store_sms(nodeID, message[1]):
+            return "📲SMS address set 📪"
+        else:
+            return "⛔️Failed to set address"
+        
+    if message.lower().startswith("sms:"):
+        message = message.split(" ", 1)
+        if any(item['nodeID'] == nodeID for item in sms_db):
+            count = 0
+            # for all dict items maching nodeID in sms_db send sms
+            for item in sms_db:
+                if item['nodeID'] == nodeID:
+                    smsEmail = item['sms']
+                    logger.info("System: Sending SMS for " + str(nodeID) + " to " + smsEmail[:-6])
+                    if send_email(smsEmail, message[1], nodeID):
+                        count += 1
+                    else: 
+                        return "⛔️Failed to send SMS"
+            return "📲SMS sent " + str(count) + " addresses 📤"
+        else:
+            return "📲No address set, use 📲setsms"
+    
+    return "Error: ⛔️ not understood. use:setsms example@phone.co"
+
+def handle_email(nodeID, message):
+    global email_db
+    try:
+        # send email to email in db. if none ask for one
+        if message.lower().startswith("setemail"):
+            message = message.split(" ", 1)
+            if len(message) < 2:
+                return "📧Please provide an email address"
+            email_addr = message[1].strip()
+            if "@" not in email_addr or "." not in email_addr:
+                return "📧Please provide a valid email address"
+            if store_email(nodeID, email_addr):
+                return "📧Email address set 📪"
+            return "Error: ⛔️ Failed to set email address"
+            
+        if message.lower().startswith("email:"):
+            parts = message.split(" ", 1)
+            if len(parts) < 2:
+                return "Error: ⛔️ format should be: email: message  or, email: address@example.com #message"
+                
+            content = parts[1].strip()
+            
+            # Check if this is a direct email with address
+            if "@" in content and "#" in content:
+                # Split into email and message
+                addr_msg = content.split("#", 1)
+                if len(addr_msg) != 2:
+                    return "Error: ⛔️ Message format should be: email: address@example.com #message"
+                    
+                to_email = addr_msg[0].strip()
+                message_body = addr_msg[1].strip()
+                
+                logger.info(f"System: Sending email for {nodeID} to {to_email}")
+                if send_email(to_email, message_body, nodeID): 
+                    return "📧Email-sent 📤"
+                return "⛔️Failed to send email"
+                
+            # Using stored email address
+            elif nodeID in email_db:
+                logger.info(f"System: Sending email for {nodeID} to stored address")
+                if send_email(email_db[nodeID], content, nodeID):
+                    return "📧Email-sent 📤"
+                return "⛔️Failed to send email"
+        
+        return "Error: ⛔️ no email on file. use: setemail"
+            
+    except Exception as e:
+        logger.error(f"System: Email handling error: {str(e)}")
+        return "⛔️Failed to process email command"
--- a/modules/solarconditions.py
+++ b/modules/solarconditions.py
@@ -9,7 +9,7 @@ import ephem # pip install pyephem
 from datetime import timedelta
 from modules.log import *

-trap_list_solarconditions = ("sun", "solar", "hfcond")
+trap_list_solarconditions = ("sun", "moon", "solar", "hfcond", "satpass")

 def hf_band_conditions():
    # ham radio HF band conditions
@@ -140,3 +140,43 @@ def get_moon(lat=0, lon=0):
        + "\nFullMoon:" + moon_table['next_full_moon'] + "\nNewMoon:" + moon_table['next_new_moon']
    
    return moon_data
+
+def getNextSatellitePass(satellite, lat=0, lon=0):
+    pass_data = ''
+    # get the next satellite pass for a given satellite
+    visualPassAPI = "https://api.n2yo.com/rest/v1/satellite/visualpasses/"
+    if lat == 0 and lon == 0:
+        lat = latitudeValue
+        lon = longitudeValue
+    # API URL
+    if n2yoAPIKey == '':
+        logger.error("System: Missing API key free at https://www.n2yo.com/login/")
+        return "not configured, bug your sysop"
+    url = visualPassAPI + str(satellite) + "/" + str(lat) + "/" + str(lon) + "/0/2/300/" + "&apiKey=" + n2yoAPIKey
+    # get the next pass data
+    try:
+        if not int(satellite):
+            raise Exception("Invalid satellite number")
+        next_pass_data = requests.get(url, timeout=urlTimeoutSeconds)
+        if(next_pass_data.ok):
+            pass_json = next_pass_data.json()
+            if 'info' in pass_json and 'passescount' in pass_json['info'] and pass_json['info']['passescount'] > 0:
+                satname = pass_json['info']['satname']
+                pass_time = pass_json['passes'][0]['startUTC']
+                pass_duration = pass_json['passes'][0]['duration']
+                pass_maxEl = pass_json['passes'][0]['maxEl']
+                pass_rise_time = datetime.fromtimestamp(pass_time).strftime('%a %d %I:%M%p')
+                pass_startAzCompass = pass_json['passes'][0]['startAzCompass']
+                pass_set_time = datetime.fromtimestamp(pass_time + pass_duration).strftime('%a %d %I:%M%p')
+                pass__endAzCompass = pass_json['passes'][0]['endAzCompass']
+                pass_data = f"{satname} @{pass_rise_time} Az:{pass_startAzCompass} for{getPrettyTime(pass_duration)}, MaxEl:{pass_maxEl}° Set@{pass_set_time} Az:{pass__endAzCompass}"
+            elif pass_json['info']['passescount'] == 0:
+                satname = pass_json['info']['satname']
+                pass_data = f"{satname} has no upcoming passes"
+        else:
+            logger.error(f"System: Error fetching satellite pass data {satellite}")
+            pass_data = ERROR_FETCHING_DATA
+    except Exception as e:
+        logger.warning(f"System: User supplied value {satellite} unknown or invalid")
+        pass_data = "Provide NORAD# example use:🛰️satpass 25544,33591"
+    return pass_data
--- a/modules/system.py
+++ b/modules/system.py
@@ -13,12 +13,11 @@ from modules.log import *

 # Global Variables
 trap_list = ("cmd","cmd?") # default trap list
-help_message = "Bot CMD?:\n"
+help_message = "Bot CMD?:"
 asyncLoop = asyncio.new_event_loop()
 games_enabled = False
 multiPingList = [{'message_from_id': 0, 'count': 0, 'type': '', 'deviceID': 0, 'channel_number': 0, 'startCount': 0}]

-
 # Ping Configuration
 if ping_enabled:
    # ping, pinging, ack, testing, test, pong
@@ -28,9 +27,9 @@ if ping_enabled:

 # Sitrep Configuration
 if sitrep_enabled:
-    trap_list_sitrep = ("sitrep", "lheard")
+    trap_list_sitrep = ("sitrep", "lheard", "sysinfo")
    trap_list = trap_list + trap_list_sitrep
-    help_message = help_message + ", sitrep"
+    help_message = help_message + ", sitrep, sysinfo"

 # MOTD Configuration
 if motd_enabled:
@@ -38,17 +37,30 @@ if motd_enabled:
    trap_list = trap_list + trap_list_motd
    help_message = help_message + ", motd"

+# SMTP Configuration
+if enableSMTP:
+    from modules.smtp import * # from the spudgunman/meshing-around repo
+    trap_list = trap_list + trap_list_smtp
+    help_message = help_message + ", email:, sms:"
+
+# Emergency Responder Configuration
+if emergency_responder_enabled:
+    trap_list_emergency = ("emergency", "911", "112", "999", "police", "fire", "ambulance", "rescue")
+    trap_list = trap_list + trap_list_emergency
+    
 # whoami Configuration
 if whoami_enabled:
-    trap_list_whoami = ("whoami", "📍")
+    trap_list_whoami = ("whoami", "📍", "whois")
    trap_list = trap_list + trap_list_whoami
    help_message = help_message + ", whoami"

 # Solar Conditions Configuration
 if solar_conditions_enabled:
-    from modules.solarconditions import * # from the spudgunman/meshing-around repo
+    from modules.space import * # from the spudgunman/meshing-around repo
    trap_list = trap_list + trap_list_solarconditions # items hfcond, solar, sun, moon
    help_message = help_message + ", sun, hfcond, solar, moon"
+    if n2yoAPIKey != "":
+        help_message = help_message + ", satpass"
 else:
    hf_band_conditions = False

@@ -62,13 +74,17 @@ if location_enabled:
    from modules.locationdata import * # from the spudgunman/meshing-around repo
    trap_list = trap_list + trap_list_location # items tide, whereami, wxc, wx
    help_message = help_message + ", whereami, wx, wxc, rlist"
+    if enableGBalerts:
+        from modules.locationdata_eu import * # from the spudgunman/meshing-around repo
+        trap_list = trap_list + trap_list_location_eu
+        #help_message = help_message + ", ukalert, ukwx, ukflood"
    
    # Open-Meteo Configuration for worldwide weather
    if use_meteo_wxApi:
        from modules.wx_meteo import * # from the spudgunman/meshing-around repo
    else:
        # NOAA only features
-        help_message = help_message + ", wxa, tide"
+        help_message = help_message + ", wxa, tide, ealert"
        
 # BBS Configuration
 if bbs_enabled:
@@ -178,7 +194,15 @@ if file_monitor_enabled or read_news_enabled:
    from modules.filemon import * # from the spudgunman/meshing-around repo
    if read_news_enabled:
        trap_list = trap_list + trap_list_filemon # items readnews
-        help_message = help_message + ", readmail"
+        help_message = help_message + ", readnews"
+
+# clean up the help message
+help_message = help_message.split(", ")
+help_message.sort()
+if len(help_message) > 20:
+    # split in half for formatting
+    help_message = help_message[:len(help_message)//2] + ["\nCMD?"] + help_message[len(help_message)//2:]
+help_message = ", ".join(help_message)

 # BLE dual interface prevention
 if interface1_type == 'ble' and interface2_type == 'ble':
@@ -427,22 +451,39 @@ def messageChunker(message):
            else:
                # split the part into chunks
                current_chunk = ''
-                sentences = part.split('. ')
+                sentences = []
+                sentence = ''
+                for char in part:
+                    sentence += char
+                    if char in '.!?':
+                        sentences.append(sentence.strip())
+                        sentence = ''
+                if sentence:
+                    sentences.append(sentence.strip())
+
                for sentence in sentences:
-                    sentence = sentence.strip()
                    sentence = sentence.replace('  ', ' ')
                    # remove empty sentences
                    if not sentence:
                        continue
+                    # remove junk sentences and append to the previous sentence this may exceed the MESSAGE_CHUNK_SIZE by 3
+                    if len(sentence) < 4:
+                        if current_chunk:
+                            current_chunk += sentence
+                        else:
+                            current_chunk = sentence
+                        continue

                    # if sentence is too long, split it by words
                    if len(current_chunk) + len(sentence) > MESSAGE_CHUNK_SIZE:
-                        message_list.append(current_chunk)
+                        if current_chunk:
+                            message_list.append(current_chunk)
                        current_chunk = sentence
                    else:
                        if current_chunk:
-                            current_chunk += ' '
-                        current_chunk += sentence
+                            current_chunk += ' ' + sentence
+                        else:
+                            current_chunk = sentence
                if current_chunk:
                    message_list.append(current_chunk)

@@ -485,7 +526,7 @@ def send_message(message, ch, nodeid=0, nodeInt=1, bypassChuncking=False):
            if nodeid == 0:
                # Send to channel
                if wantAck:
-                    logger.info(f"Device:{nodeInt} Channel:{ch} " + CustomFormatter.red + f"req.ACK " + "Chunker{chunkOf} SendingChannel: " + CustomFormatter.white + m.replace('\n', ' '))
+                    logger.info(f"Device:{nodeInt} Channel:{ch} " + CustomFormatter.red + f"req.ACK " + f"Chunker{chunkOf} SendingChannel: " + CustomFormatter.white + m.replace('\n', ' '))
                    interface.sendText(text=m, channelIndex=ch, wantAck=True)
                else:
                    logger.info(f"Device:{nodeInt} Channel:{ch} " + CustomFormatter.red + f"Chunker{chunkOf} SendingChannel: " + CustomFormatter.white + m.replace('\n', ' '))
@@ -556,23 +597,6 @@ def get_wikipedia_summary(search_term):
    
    return summary

-def getPrettyTime(seconds):
-    # convert unix time to minutes, hours, or days, or years for simple display
-    designator = "s"
-    if seconds > 0:
-        seconds = round(seconds / 60)
-        designator = "m"
-    if seconds > 60:
-        seconds = round(seconds / 60)
-        designator = "h"
-    if seconds > 24:
-        seconds = round(seconds / 24)
-        designator = "d"
-    if seconds > 365:
-        seconds = round(seconds / 365)
-        designator = "y"
-    return str(seconds) + designator
-
 def messageTrap(msg):
    # Check if the message contains a trap word, this is the first filter for listning to messages
    # after this the message is passed to the command_handler in the bot.py which is switch case filter for applying word to function
@@ -641,7 +665,7 @@ def handleMultiPing(nodeID=0, deviceID=1):
                            break


-def handleWxBroadcast(deviceID=1):
+def handleAlertBroadcast(deviceID=1):
    # only allow API call every 20 minutes
    # the watchdog will call this function 3 times, seeing possible throttling on the API
    clock = datetime.now()
@@ -651,15 +675,50 @@ def handleWxBroadcast(deviceID=1):
        return False
    
    # check for alerts
-    alert = alertBrodcast()
-    if alert:
-        msg = f"🚨 {alert[1]} EAS ALERTs: {alert[0]}"
-        if isinstance(wxAlertBroadcastChannel, list):
-            for channel in wxAlertBroadcastChannel:
-                send_message(msg, int(channel), 0, deviceID)
-        else:
-            send_message(msg, wxAlertBroadcastChannel, 0, deviceID)
-        return True
+    alertWx = alertBrodcastNOAA()
+    alertFema = getIpawsAlert(latitudeValue,longitudeValue, shortAlerts=True)
+
+    if enableGBalerts:
+        alertUk = get_govUK_alerts()
+    else:
+        alertUk = NO_ALERTS
+
+    # format alert
+    if alertWx:
+        wxAlert = f"🚨 {alertWx[1]} EAS WX ALERT: {alertWx[0]}"
+    else:
+        wxAlert = False
+
+    femaAlert = alertFema
+    ukAlert = alertUk
+
+    if emergencyAlertBrodcastEnabled:
+        if NO_ALERTS not in femaAlert:
+            if isinstance(emergencyAlertBroadcastCh, list):
+                for channel in emergencyAlertBroadcastCh:
+                    send_message(femaAlert, int(channel), 0, deviceID)
+            else:
+                send_message(femaAlert, emergencyAlertBroadcastCh, 0, deviceID)
+            return True
+        if NO_ALERTS not in ukAlert:
+            if isinstance(emergencyAlertBroadcastCh, list):
+                for channel in emergencyAlertBroadcastCh:
+                    send_message(ukAlert, int(channel), 0, deviceID)
+            else:
+                send_message(ukAlert, emergencyAlertBroadcastCh, 0, deviceID)
+            return True
+        
+    # pause for 10 seconds
+    time.sleep(10)
+
+    if wxAlertBroadcastEnabled:
+        if wxAlert:
+            if isinstance(wxAlertBroadcastChannel, list):
+                for channel in wxAlertBroadcastChannel:
+                    send_message(wxAlert, int(channel), 0, deviceID)
+            else:
+                send_message(wxAlert, wxAlertBroadcastChannel, 0, deviceID)
+            return True

 def onDisconnect(interface):
    global retry_int1, retry_int2
@@ -722,7 +781,7 @@ def getNodeFirmware(nodeID=0, nodeInt=1):
    # this is a workaround because .localNode.getMetadata spits out a lot of debug info which cant be suppressed
    # Create a StringIO object to capture the 
    output_capture = io.StringIO()
-    with contextlib.redirect_stdout(output_capture):
+    with contextlib.redirect_stdout(output_capture), contextlib.redirect_stderr(output_capture):
        interface.localNode.getMetadata()
    console_output = output_capture.getvalue()
    if "firmware_version" in console_output:
@@ -730,22 +789,22 @@ def getNodeFirmware(nodeID=0, nodeInt=1):
        return fwVer
    return -1

-def displayNodeTelemetry(nodeID=0, rxNode=0):
+def displayNodeTelemetry(nodeID=0, rxNode=0, userRequested=False):
    interface = interface1 if rxNode == 1 else interface2
    global telemetryData

    # throttle the telemetry requests to prevent spamming the device
    if rxNode == 1:
-        if time.time() - telemetryData[0]['interface1'] < 600:
+        if time.time() - telemetryData[0]['interface1'] < 600 and not userRequested:
            return -1
        telemetryData[0]['interface1'] = time.time()
    elif rxNode == 2:
-        if time.time() - telemetryData[0]['interface2'] < 600:
+        if time.time() - telemetryData[0]['interface2'] < 600 and not userRequested:
            return -1
        telemetryData[0]['interface2'] = time.time()

    # some telemetry data is not available in python-meshtastic?
-    # bring in values from the last telemetry request for the node
+    # bring in values from the last telemetry dump for the node
    numPacketsTx = telemetryData[rxNode]['numPacketsTx']
    numPacketsRx = telemetryData[rxNode]['numPacketsRx']
    numPacketsTxErr = telemetryData[rxNode]['numPacketsTxErr']
@@ -880,7 +939,20 @@ def consumeMetadata(packet, rxNode=0):
        if debugMetadata: print(f"DEBUG REMOTE_HARDWARE_APP: {packet}\n\n")
        # get the remote hardware data
        remote_hardware_data = packet['decoded']['remoteHardware']
-    
+
+def get_sysinfo(nodeID=0, deviceID=1):
+    # Get the system telemetry data for return on the sysinfo command
+    sysinfo = ''
+    stats = str(displayNodeTelemetry(nodeID, deviceID, userRequested=True)) + " 🤖👀" + str(len(seenNodes))
+    if "numPacketsRx:0" in stats or stats == -1:
+        return "Gathering Telemetry try again later⏳"
+    # replace Telemetry with Int in string
+    stats = stats.replace("Telemetry", "Int")
+    sysinfo += f"📊{stats}"
+    if interface2_enabled:
+        sysinfo += f"📊{stats}"
+
+    return sysinfo

 async def BroadcastScheduler():
    # handle schedule checks for the broadcast of messages
@@ -1015,14 +1087,16 @@ async def handleSentinel(deviceID=1):
    
    if handleSentinel_loop >= sentry_holdoff and handleSentinel_spotted != enemySpotted:
        # check the positionMetadata for nodeID and get metadata
-        if positionMetadata and closest_nodes[0]['id'] in positionMetadata:
+        if closest_nodes and positionMetadata and closest_nodes[0]['id'] in positionMetadata:
            metadata = positionMetadata[closest_nodes[0]['id']]
            if metadata.get('precisionBits') is not None:
                resolution = metadata.get('precisionBits')
                
-
        logger.warning(f"System: {enemySpotted} is close to your location on Interface1 Accuracy is {resolution}bits")
        send_message(f"Sentry{deviceID}: {enemySpotted}", secure_channel, 0, deviceID)
+        if enableSMTP and email_sentry_alerts:
+            for email in sysopEmails:
+                send_email(email, f"Sentry{deviceID}: {enemySpotted}")
        handleSentinel_loop = 0
        handleSentinel_spotted = enemySpotted
    else:
@@ -1051,8 +1125,10 @@ async def watchdog():
                # multiPing handler
                handleMultiPing(0,1)

-                if wxAlertBroadcastEnabled:
-                    handleWxBroadcast(1)
+                # Alert Broadcast
+                if wxAlertBroadcastEnabled or emergencyAlertBrodcastEnabled:
+                    # weather alerts
+                    handleAlertBroadcast(1)

                # Telemetry data
                int1Data = displayNodeTelemetry(0, 1)
@@ -1081,10 +1157,12 @@ async def watchdog():
                        await handleSentinel(2)

                    # multiPing handler
-                    handleMultiPing(0,2)
+                    handleMultiPing(0,1)

-                    if wxAlertBroadcastEnabled:
-                        handleWxBroadcast(2)
+                    # Alert Broadcast
+                    if wxAlertBroadcastEnabled or emergencyAlertBrodcastEnabled:
+                        # weather alerts
+                        handleAlertBroadcast(1)

                # Telemetry data
                int2Data = displayNodeTelemetry(0, 2)
@@ -1098,4 +1176,3 @@ async def watchdog():
                except Exception as e:
                    logger.error(f"System: retrying interface2: {e}")

-
--- a/modules/wx_meteo.py
+++ b/modules/wx_meteo.py
@@ -1,18 +1,19 @@
-import openmeteo_requests # pip install openmeteo-requests
-from retry_requests import retry # pip install retry_requests
-#import requests_cache
+#import openmeteo_requests # pip install openmeteo-requests
+#from retry_requests import retry # pip install retry_requests
+
+import requests
+import json
 from modules.log import *

+def get_weather_data(api_url, params):
+    response = requests.get(api_url, params=params)
+    response.raise_for_status()  # Raise an error for bad status codes
+    return response.json()
+
 def get_wx_meteo(lat=0, lon=0, unit=0):
 	# set forcast days 1 or 3
 	forecastDays = 3

-	# Setup the Open-Meteo API client with cache and retry on error
-	#cache_session = requests_cache.CachedSession('.cache', expire_after = 3600)
-	#retry_session = retry(cache_session, retries = 5, backoff_factor = 0.2)
-	retry_session = retry(retries = 3, backoff_factor = 0.2)
-	openmeteo = openmeteo_requests.Client(session = retry_session)
-
 	# Make sure all required weather variables are listed here
 	# The order of variables in hourly or daily is important to assign them correctly below
 	url = "https://api.open-meteo.com/v1/forecast"
@@ -34,27 +35,29 @@ def get_wx_meteo(lat=0, lon=0, unit=0):

 	try:
 		# Fetch the weather data
-		responses = openmeteo.weather_api(url, params=params)
+		weather_data = get_weather_data(url, params)
 	except Exception as e:
 		logger.error(f"Error fetching meteo weather data: {e}")
 		return ERROR_FETCHING_DATA

 	# Check if we got a response
 	try:
-		# Process location 
-		response = responses[0]
-		logger.debug(f"Got wx data from Open-Meteo in {response.Timezone()} {response.TimezoneAbbreviation()}")
-
+		# Process location
+		logger.debug(f"System: Pulled from Open-Meteo in {weather_data['timezone']} {weather_data['timezone_abbreviation']}")
+		
+		# Ensure response is defined
+		response = weather_data
+		
 		# Process daily data. The order of variables needs to be the same as requested.
-		daily = response.Daily()
-		daily_weather_code = daily.Variables(0).ValuesAsNumpy()
-		daily_temperature_2m_max = daily.Variables(1).ValuesAsNumpy()
-		daily_temperature_2m_min = daily.Variables(2).ValuesAsNumpy()
-		daily_precipitation_hours = daily.Variables(3).ValuesAsNumpy()
-		daily_precipitation_probability_max = daily.Variables(4).ValuesAsNumpy()
-		daily_wind_speed_10m_max = daily.Variables(5).ValuesAsNumpy()
-		daily_wind_gusts_10m_max = daily.Variables(6).ValuesAsNumpy()
-		daily_wind_direction_10m_dominant = daily.Variables(7).ValuesAsNumpy()
+		daily = response['daily']
+		daily_weather_code = daily['weather_code']
+		daily_temperature_2m_max = daily['temperature_2m_max']
+		daily_temperature_2m_min = daily['temperature_2m_min']
+		daily_precipitation_hours = daily['precipitation_hours']
+		daily_precipitation_probability_max = daily['precipitation_probability_max']
+		daily_wind_speed_10m_max = daily['wind_speed_10m_max']
+		daily_wind_gusts_10m_max = daily['wind_gusts_10m_max']
+		daily_wind_direction_10m_dominant = daily['wind_direction_10m_dominant']
 	except Exception as e:
 		logger.error(f"Error processing meteo weather data: {e}")
 		return ERROR_FETCHING_DATA
@@ -191,3 +194,46 @@ def get_wx_meteo(lat=0, lon=0, unit=0):

 	return weather_report

+def get_flood_openmeteo(lat=0, lon=0):
+	# set forcast days 1 or 3
+	forecastDays = 3
+
+	# Flood data
+	url = "https://flood-api.open-meteo.com/v1/flood"
+	params = {
+		"latitude": {lat},
+		"longitude": {lon},
+		"timezone": "auto",
+		"daily": "river_discharge",
+		"forecast_days": forecastDays
+	}
+
+	try:
+		# Fetch the flood data
+		flood_data = get_weather_data(url, params)
+	except Exception as e:
+		logger.error(f"Error fetching meteo flood data: {e}")
+		return ERROR_FETCHING_DATA
+	
+	# Check if we got a response
+	try:
+		# Process location
+		logger.debug(f"System: Pulled River FLow Data from Open-Meteo {flood_data['timezone_abbreviation']}")
+		
+		# Ensure response is defined
+		response = flood_data
+		
+		# Process daily data. The order of variables needs to be the same as requested.
+		daily = response['daily']
+		daily_river_discharge = daily['river_discharge']
+		# check if none
+
+	except Exception as e:
+		logger.error(f"Error processing meteo flood data: {e}")
+		return ERROR_FETCHING_DATA
+	
+	# create a flood report
+	flood_report = ""
+	flood_report += "River Discharge: " + str(daily_river_discharge) + "m3/s"
+
+	return flood_report
--- a/pong_bot.py
+++ b/pong_bot.py
@@ -8,24 +8,30 @@ from pubsub import pub # pip install pubsub
 from modules.log import *
 from modules.system import *

+# Global Variables
 DEBUGpacket = False # Debug print the packet rx

-def auto_response(message, snr, rssi, hop, message_from_id, channel_number, deviceID):
+def auto_response(message, snr, rssi, hop, pkiStatus, message_from_id, channel_number, deviceID, isDM):
    # Auto response to messages
    message_lower = message.lower()
    bot_response = "I'm sorry, I'm afraid I can't do that."

    command_handler = {
-        "ping": lambda: handle_ping(message, hop, snr, rssi),
-        "pong": lambda: "🏓Ping!!",
-        "motd": lambda: handle_motd(message, MOTD),
+        # Command List processes system.trap_list. system.messageTrap() sends any commands to here
+        "ack": lambda: handle_ping(message_from_id, deviceID, message, hop, snr, rssi, isDM, channel_number),
        "cmd": lambda: help_message,
        "cmd?": lambda: help_message,
+        "cq": lambda: handle_ping(message_from_id, deviceID, message, hop, snr, rssi, isDM, channel_number),
+        "cqcq": lambda: handle_ping(message_from_id, deviceID, message, hop, snr, rssi, isDM, channel_number),
+        "cqcqcq": lambda: handle_ping(message_from_id, deviceID, message, hop, snr, rssi, isDM, channel_number),
        "lheard": lambda: handle_lheard(interface1, interface2_enabled, myNodeNum1, myNodeNum2),
+        "motd": lambda: handle_motd(message, MOTD),
+        "ping": lambda: handle_ping(message_from_id, deviceID, message, hop, snr, rssi, isDM, channel_number),
+        "pong": lambda: "🏓PING!!🛜",
        "sitrep": lambda: handle_lheard(interface1, interface2_enabled, myNodeNum1, myNodeNum2),
-        "ack": lambda: handle_ack(hop, snr, rssi),
-        "testing": lambda: handle_testing(hop, snr, rssi),
-        "test": lambda: handle_testing(hop, snr, rssi),
+        "sysinfo": lambda: sysinfo(message, message_from_id, deviceID),
+        "test": lambda: handle_ping(message_from_id, deviceID, message, hop, snr, rssi, isDM, channel_number),
+        "testing": lambda: handle_ping(message_from_id, deviceID, message, hop, snr, rssi, isDM, channel_number),
    }
    cmds = [] # list to hold the commands found in the message
    for key in command_handler:
@@ -44,17 +50,89 @@ def auto_response(message, snr, rssi, hop, message_from_id, channel_number, devi
    
    return bot_response

-def handle_ping(message, hop, snr, rssi):
-    if "@" in message:
-        if hop == "Direct":
-            return "🏓PONG, " + f"SNR:{snr} RSSI:{rssi}" + " and copy: " + message.split("@")[1]
-        else:
-            return "🏓PONG, " + hop + " and copy: " + message.split("@")[1]
+def handle_ping(message_from_id, deviceID,  message, hop, snr, rssi, isDM, channel_number):
+    global multiPing
+    if  "?" in message and isDM:
+        return message.split("?")[0].title() + " command returns SNR and RSSI, or hopcount from your message. Try adding e.g. @place or #tag"
+    
+    msg = ""
+    type = ''
+
+    if "ping" in message.lower():
+        msg = "🏓PONG\n"
+        type = "🏓PING"
+    elif "test" in message.lower() or "testing" in message.lower():
+        msg = random.choice(["🎙Testing 1,2,3\n", "🎙Testing\n",\
+                             "🎙Testing, testing\n",\
+                             "🎙Ah-wun, ah-two...\n", "🎙Is this thing on?\n",\
+                             "🎙Roger that!\n",])
+        type = "🎙TEST"
+    elif "ack" in message.lower():
+        msg = random.choice(["✋ACK-ACK!\n", "✋Ack to you!\n"])
+        type = "✋ACK"
+    elif "cqcq" in message.lower() or "cq" in message.lower() or "cqcqcq" in message.lower():
+        if deviceID == 1:
+            myname = get_name_from_number(myNodeNum1, 'short', 1)
+        elif deviceID == 2:
+            myname = get_name_from_number(myNodeNum2, 'short', 2)
+        msg = f"QSP QSL OM DE  {myname}   K\n"
    else:
-        if hop == "Direct":
-            return "🏓PONG, " + f"SNR:{snr} RSSI:{rssi}"
+        msg = "🔊 Can you hear me now?"
+
+    if hop == "Direct":
+        msg = msg + f"SNR:{snr} RSSI:{rssi}"
+    else:
+        msg = msg + hop
+
+    if "@" in message:
+        msg = msg + " @" + message.split("@")[1]
+        type = type + " @" + message.split("@")[1]
+    elif "#" in message:
+        msg = msg + " #" + message.split("#")[1]
+        type = type + " #" + message.split("#")[1]
+
+
+    # check for multi ping request
+    if " " in message:
+        # if stop multi ping
+        if "stop" in message.lower():
+            for i in range(0, len(multiPingList)):
+                if multiPingList[i].get('message_from_id') == message_from_id:
+                    multiPingList.pop(i)
+                    msg = "🛑 auto-ping"
+
+
+        # if 3 or more entries (2 or more active), throttle the multi-ping for congestion
+        if len(multiPingList) > 2:
+            msg = "🚫⛔️ auto-ping, service busy. ⏳Try again soon."
+            pingCount = -1
        else:
-            return "🏓PONG, " + hop
+            # set inital pingCount
+            try:
+                pingCount = int(message.split(" ")[1])
+                if pingCount == 123 or pingCount == 1234:
+                    pingCount =  1
+                elif not autoPingInChannel and not isDM:
+                    # no autoping in channels
+                    pingCount = 1
+
+                if pingCount > 51:
+                    pingCount = 50
+            except:
+                pingCount = -1
+    
+        if pingCount > 1:
+            multiPingList.append({'message_from_id': message_from_id, 'count': pingCount + 1, 'type': type, 'deviceID': deviceID, 'channel_number': channel_number, 'startCount': pingCount})
+            if type == "🎙TEST":
+                msg = f"🛜Initalizing BufferTest, using chunks of about {int(maxBuffer // pingCount)}, max length {maxBuffer} in {pingCount} messages"
+            else:
+                msg = f"🚦Initalizing {pingCount} auto-ping"
+
+    # if not a DM add the username to the beginning of msg
+    if not useDMForResponse and not isDM:
+        msg = "@" + get_name_from_number(message_from_id, 'short', deviceID) + " " + msg
+            
+    return msg

 def handle_motd(message):
    global MOTD
@@ -64,65 +142,44 @@ def handle_motd(message):
        return "MOTD Set to: " + MOTD
    else:
        return MOTD
+    
+def sysinfo(message, message_from_id, deviceID):
+    if "?" in message:
+        return "sysinfo command returns system information."
+    else:
+        return get_sysinfo(message_from_id, deviceID)

-def handle_lheard(interface1, interface2_enabled, myNodeNum1, myNodeNum2):
-    bot_response = "Last heard:\n" + str(get_node_list(1))
-    chutil1 = interface1.nodes.get(decimal_to_hex(myNodeNum1), {}).get("deviceMetrics", {}).get("channelUtilization", 0)
-    chutil1 = "{:.2f}".format(chutil1)
-    if interface2_enabled:
-        bot_response += "Port2:\n" + str(get_node_list(2))
-        chutil2 = interface2.nodes.get(decimal_to_hex(myNodeNum2), {}).get("deviceMetrics", {}).get("channelUtilization", 0)
-        chutil2 = "{:.2f}".format(chutil2)
+def handle_lheard(message, nodeid, deviceID, isDM):
+    if  "?" in message and isDM:
+        return message.split("?")[0].title() + " command returns a list of the nodes that have been heard recently"
+
+    # display last heard nodes add to response
+    bot_response = "Last Heard\n"
+    bot_response += str(get_node_list(1))
+
+    # show last users of the bot with the cmdHistory list
+    history = handle_history(message, nodeid, deviceID, isDM, lheard=True)
+    if history:
+        bot_response += f'LastSeen\n{history}'
+    else:
+        # trim the last \n
+        bot_response = bot_response[:-1]
+
+    # bot_response += getNodeTelemetry(deviceID)
    return bot_response

-def handle_ack(hop, snr, rssi):
-    if hop == "Direct":
-        return "✋ACK-ACK! " + f"SNR:{snr} RSSI:{rssi}"
-    else:
-        return "✋ACK-ACK! " + hop
-
-def handle_testing(hop, snr, rssi):
-    if hop == "Direct":
-        return "🎙Testing 1,2,3 " + f"SNR:{snr} RSSI:{rssi}"
-    else:
-        return "🎙Testing 1,2,3 " + hop
-
-def onDisconnect(interface):
-    global retry_int1, retry_int2
-    rxType = type(interface).__name__
-    if rxType == 'SerialInterface':
-        rxInterface = interface.__dict__.get('devPath', 'unknown')
-        logger.critical(f"System: Lost Connection to Device {rxInterface}")
-        if port1 in rxInterface:
-            retry_int1 = True
-        elif interface2_enabled and port2 in rxInterface:
-            retry_int2 = True
-
-    if rxType == 'TCPInterface':
-        rxHost = interface.__dict__.get('hostname', 'unknown')
-        logger.critical(f"System: Lost Connection to Device {rxHost}")
-        if hostname1 in rxHost and interface1_type == 'tcp':
-            retry_int1 = True
-        elif interface2_enabled and hostname2 in rxHost and interface2_type == 'tcp':
-            retry_int2 = True
-
-    if rxType == 'BLEInterface':
-        logger.critical(f"System: Lost Connection to Device BLE")
-        if interface1_type == 'ble':
-            retry_int1 = True
-        elif interface2_enabled and interface2_type == 'ble':
-            retry_int2 = True
-
 def onReceive(packet, interface):
-    # extract interface  defailts from interface object
+    # Priocess the incoming packet, handles the responses to the packet with auto_response()
+    # Sends the packet to the correct handler for processing
+
+    # extract interface details from inbound packet
    rxType = type(interface).__name__
-    rxNode = 0
-    message_from_id = 0
-    snr = 0
-    rssi = 0
-    hop = 0
-    hop_away = 0
-    
+
+    # Valies assinged to the packet
+    rxNode, message_from_id, snr, rssi, hop, hop_away, channel_number = 0, 0, 0, 0, 0, 0, 0
+    pkiStatus = (False, 'ABC')
+    isDM = False
+
    if DEBUGpacket:
        # Debug print the interface object
        for item in interface.__dict__.items(): intDebug = f"{item}\n"
@@ -130,6 +187,7 @@ def onReceive(packet, interface):
        # Debug print the packet for debugging
        logger.debug(f"Packet Received\n {packet} \n END of packet \n")

+    # set the value for the incomming interface
    if rxType == 'SerialInterface':
        rxInterface = interface.__dict__.get('devPath', 'unknown')
        if port1 in rxInterface:
@@ -150,42 +208,53 @@ def onReceive(packet, interface):
        elif interface2_enabled and interface2_type == 'ble':
            rxNode = 2

-    # check for a message packet and process it
+    # set the message_from_id
+    message_from_id = packet['from']
+
+    # check if the packet has a channel flag use it
+    if packet.get('channel'):
+        channel_number = packet.get('channel', 0)
+
+    # handle TEXT_MESSAGE_APP
    try:
        if 'decoded' in packet and packet['decoded']['portnum'] == 'TEXT_MESSAGE_APP':
            message_bytes = packet['decoded']['payload']
            message_string = message_bytes.decode('utf-8')
-            message_from_id = packet['from']
-            try:
-                snr = packet['rxSnr']
-                rssi = packet['rxRssi']
-            except KeyError:
-                snr = 0
-                rssi = 0

-            if packet.get('channel'):
-                channel_number = packet['channel']
-            else:
-                channel_number = publicChannel
-        
+            # check if the packet is from us
+            if message_from_id == myNodeNum1 or message_from_id == myNodeNum2:
+                logger.warning(f"System: Packet from self {message_from_id} loop or traffic replay deteted")
+
+            # get the signal strength and snr if available
+            if packet.get('rxSnr') or packet.get('rxRssi'):
+                snr = packet.get('rxSnr', 0)
+                rssi = packet.get('rxRssi', 0)
+
+            # check if the packet has a publicKey flag use it
+            if packet.get('publicKey'):
+                pkiStatus = (packet.get('pkiEncrypted', False), packet.get('publicKey', 'ABC'))
+
            # check if the packet has a hop count flag use it
            if packet.get('hopsAway'):
-                hop_away = packet['hopsAway']
+                hop_away = packet.get('hopsAway', 0)
            else:
                # if the packet does not have a hop count try other methods
-                hop_away = 0
                if packet.get('hopLimit'):
-                    hop_limit = packet['hopLimit']
+                    hop_limit = packet.get('hopLimit', 0)
                else:
                    hop_limit = 0
                
                if packet.get('hopStart'):
-                    hop_start = packet['hopStart']
+                    hop_start = packet.get('hopStart', 0)
                else:
                    hop_start = 0

            if hop_start == hop_limit:
                hop = "Direct"
+                hop_count = 0
+            elif hop_start == 0 and hop_limit > 0:
+                hop = "MQTT"
+                hop_count = 0
            else:
                # set hop to Direct if the message was sent directly otherwise set the hop count
                if hop_away > 0:
@@ -196,46 +265,53 @@ def onReceive(packet, interface):

                hop = f"{hop_count} hops"
            
-            if message_string == help_message or message_string == welcome_message or "CMD?:" in message_string:
+            if help_message in message_string or welcome_message in message_string or "CMD?:" in message_string:
                # ignore help and welcome messages
                logger.warning(f"Got Own Welcome/Help header. From: {get_name_from_number(message_from_id, 'long', rxNode)}")
                return
-
+        
            # If the packet is a DM (Direct Message) respond to it, otherwise validate its a message for us on the channel
            if packet['to'] == myNodeNum1 or packet['to'] == myNodeNum2:
                # message is DM to us
-
+                isDM = True
                # check if the message contains a trap word, DMs are always responded to
-                if messageTrap(message_string):
+                if (messageTrap(message_string) and not llm_enabled) or messageTrap(message_string.split()[0]):
+                    # log the message to the message log
                    logger.info(f"Device:{rxNode} Channel: {channel_number} " + CustomFormatter.green + f"Received DM: " + CustomFormatter.white + f"{message_string} " + CustomFormatter.purple +\
                                "From: " + CustomFormatter.white + f"{get_name_from_number(message_from_id, 'long', rxNode)}")
                    # respond with DM
-                    send_message(auto_response(message_string, snr, rssi, hop, message_from_id, channel_number, rxNode), channel_number, message_from_id, rxNode)
-                else: 
-                    # respond with welcome message on DM
+                    send_message(auto_response(message_string, snr, rssi, hop, pkiStatus, message_from_id, channel_number, rxNode, isDM), channel_number, message_from_id, rxNode)
+                else:
                    logger.warning(f"Device:{rxNode} Ignoring DM: {message_string} From: {get_name_from_number(message_from_id, 'long', rxNode)}")
                    send_message(welcome_message, channel_number, message_from_id, rxNode)
-                    msgLogger.info(f"Device:{rxNode} Channel:{channel_number} | {get_name_from_number(message_from_id, 'long', rxNode)} | {message_string}")
+                    time.sleep(responseDelay)
+                    
+                    # log the message to the message log
+                    msgLogger.info(f"Device:{rxNode} Channel:{channel_number} | {get_name_from_number(message_from_id, 'long', rxNode)} | " + message_string.replace('\n', '-nl-'))
            else:
                # message is on a channel
                if messageTrap(message_string):
-                    # message is for bot to respond to
-                    logger.info(f"Device:{rxNode} Channel:{channel_number} " + CustomFormatter.green + "Received: " + CustomFormatter.white + f"{message_string} " + CustomFormatter.purple +\
-                                 "From: " + CustomFormatter.white + f"{get_name_from_number(message_from_id, 'long', rxNode)}")
-                    if useDMForResponse:
-                        # respond to channel message via direct message
-                        send_message(auto_response(message_string, snr, rssi, hop, message_from_id, channel_number, rxNode), channel_number, message_from_id, rxNode)
+                    if ignoreDefaultChannel and channel_number == publicChannel:
+                        logger.debug(f"System: ignoreDefaultChannel CMD:{message_string} From: {get_name_from_number(message_from_id, 'short', rxNode)}")
                    else:
-                        # or respond to channel message on the channel itself
-                        if channel_number == publicChannel and antiSpam:
-                            # warning user spamming default channel
-                            logger.error(f"System: AntiSpam protection, sending DM to: {get_name_from_number(message_from_id, 'long', rxNode)}")
-                        
+                        # message is for bot to respond to
+                        logger.info(f"Device:{rxNode} Channel:{channel_number} " + CustomFormatter.green + "ReceivedChannel: " + CustomFormatter.white + f"{message_string} " + CustomFormatter.purple +\
+                                    "From: " + CustomFormatter.white + f"{get_name_from_number(message_from_id, 'long', rxNode)}")
+                        if useDMForResponse:
                            # respond to channel message via direct message
-                            send_message(auto_response(message_string, snr, rssi, hop, message_from_id, channel_number, rxNode), channel_number, message_from_id, rxNode)
+                            send_message(auto_response(message_string, snr, rssi, hop, pkiStatus, message_from_id, channel_number, rxNode, isDM), channel_number, message_from_id, rxNode)
                        else:
-                            # respond to channel message on the channel itself
-                            send_message(auto_response(message_string, snr, rssi, hop, message_from_id, channel_number, rxNode), channel_number, 0, rxNode)
+                            # or respond to channel message on the channel itself
+                            if channel_number == publicChannel and antiSpam:
+                                # warning user spamming default channel
+                                logger.warning(f"System: AntiSpam protection, sending DM to: {get_name_from_number(message_from_id, 'long', rxNode)}")
+                            
+                                # respond to channel message via direct message
+                                send_message(auto_response(message_string, snr, rssi, hop, pkiStatus, message_from_id, channel_number, rxNode, isDM), channel_number, message_from_id, rxNode)
+                            else:
+                                # respond to channel message on the channel itself
+                                send_message(auto_response(message_string, snr, rssi, hop, pkiStatus, message_from_id, channel_number, rxNode, isDM), channel_number, 0, rxNode)
+
                else:
                    # message is not for bot to respond to
                    # ignore the message but add it to the message history list
@@ -269,10 +345,12 @@ def onReceive(packet, interface):
                            elif rxNode == 2:
                                logger.debug(f"Repeating message on Device1 Channel:{channel_number}")
                                send_message(rMsg, channel_number, 0, 1)
+        else:
+            # Evaluate non TEXT_MESSAGE_APP packets
+            consumeMetadata(packet, rxNode)
    except KeyError as e:
        logger.critical(f"System: Error processing packet: {e} Device:{rxNode}")
-        print(packet) # print the packet for debugging
-        print("END of packet \n")
+        logger.debug(f"System: Error Packet = {packet}")

 async def start_rx():
    print (CustomFormatter.bold_white + f"\nMeshtastic Autoresponder Bot CTL+C to exit\n" + CustomFormatter.reset)
@@ -286,16 +364,32 @@ async def start_rx():
                    f"{get_name_from_number(myNodeNum2, 'short', 2)}. NodeID: {myNodeNum2}, {decimal_to_hex(myNodeNum2)}")
    if log_messages_to_file:
        logger.debug("System: Logging Messages to disk")
+    if syslog_to_file:
+        logger.debug("System: Logging System Logs to disk")
+    if solar_conditions_enabled:
+        logger.debug("System: Celestial Telemetry Enabled")
+    if motd_enabled:
+        logger.debug(f"System: MOTD Enabled using {MOTD}")
    if sentry_enabled:
-        logger.debug("System: Sentry Enabled")
+        logger.debug(f"System: Sentry Mode Enabled {sentry_radius}m radius reporting to channel:{secure_channel}")
    if store_forward_enabled:
        logger.debug(f"System: Store and Forward Enabled using limit: {storeFlimit}")
    if useDMForResponse:
-        logger.debug("System: Respond by DM only")
+        logger.debug(f"System: Respond by DM only")
    if repeater_enabled and interface2_enabled:
        logger.debug(f"System: Repeater Enabled for Channels: {repeater_channels}")
-    if radio_detection_enabled:
-        logger.debug(f"System: Radio Detection Enabled using rigctld at {rigControlServerAddress} brodcasting to channels: {sigWatchBroadcastCh} for {get_freq_common_name(get_hamlib('f'))}")
+    if file_monitor_enabled:
+        logger.debug(f"System: File Monitor Enabled for {file_monitor_file_path}, broadcasting to channels: {file_monitor_broadcastCh}")
+    if read_news_enabled:
+        logger.debug(f"System: File Monitor News Reader Enabled for {news_file_path}")
+    if scheduler_enabled:
+        # Examples of using the scheduler, Times here are in 24hr format
+        # https://schedule.readthedocs.io/en/stable/
+        
+        # Reminder Scheduler is enabled every Monday at noon send a log message
+        schedule.every().monday.at("12:00").do(lambda: logger.info("System: Scheduled Broadcast Reminder"))
+        logger.debug("System: Starting the broadcast scheduler")
+        await BroadcastScheduler()

    # here we go loopty loo
    while True:
@@ -306,14 +400,19 @@ async def start_rx():
 async def main():
    meshRxTask = asyncio.create_task(start_rx())
    watchdogTask = asyncio.create_task(watchdog())
-    await asyncio.wait([meshRxTask, watchdogTask])
+    if file_monitor_enabled:
+        fileMonTask: asyncio.Task = asyncio.create_task(handleFileWatcher())
+
+    await asyncio.gather(meshRxTask, watchdogTask)
+    if file_monitor_enabled:
+        await asyncio.gather(fileMonTask)
+
+    await asyncio.sleep(0.01)

 try:
-    asyncLoop = asyncio.new_event_loop()
    if __name__ == "__main__":
        asyncio.run(main())
 except KeyboardInterrupt:
    exit_handler()
    pass
-
 # EOF
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,15 +3,10 @@ pubsub
 datetime
 pyephem
 requests
-geopy
 maidenhead
 beautifulsoup4
 dadjokes
-openmeteo_requests
-retry_requests
-numpy
 geopy
 schedule
 wikipedia
-ollama
 googlesearch-python
Author	SHA1	Message	Date
Kelly	b8d33cc270	Merge pull request #97 from SpudGunMan/emergencyalert EnhanceEmergencyAlert	2024-12-20 14:39:31 -08:00
SpudGunMan	a6ce9e9211	remove Numpy	2024-12-20 12:22:01 -08:00
SpudGunMan	60bdabdd1b	embedded	2024-12-20 02:00:36 -08:00
SpudGunMan	9c5c2080cf	Update locationdata_eu.py	2024-12-20 01:17:47 -08:00
SpudGunMan	8f758229cb	Update install.sh	2024-12-20 00:38:59 -08:00
SpudGunMan	8ac9c53f1a	enhance groupPing	2024-12-19 18:29:35 -08:00
SpudGunMan	98cbf5528c	fixEmbedded	2024-12-19 17:46:26 -08:00
SpudGunMan	6296150677	Update pong_bot.py	2024-12-19 17:40:10 -08:00
SpudGunMan	13cb1e8df9	Update mesh_bot.py	2024-12-19 17:39:15 -08:00
SpudGunMan	e26e876ccf	Update system.py	2024-12-19 17:21:33 -08:00
SpudGunMan	550b50f74e	Update settings.py	2024-12-19 17:06:24 -08:00
SpudGunMan	ac5aa1a201	Update system.py	2024-12-19 17:03:53 -08:00
SpudGunMan	19700f54c5	Update system.py	2024-12-19 16:55:26 -08:00
SpudGunMan	7e5626cd30	Update system.py	2024-12-19 16:27:09 -08:00
SpudGunMan	c27b6ed8a1	enhanceEmergency Alerting	2024-12-19 16:18:38 -08:00
SpudGunMan	717181bcd0	Update locationdata_eu.py	2024-12-19 16:07:07 -08:00
SpudGunMan	4d5916df29	Update settings.py	2024-12-18 19:58:34 -08:00
SpudGunMan	93b7a1d613	enableGBalerts	2024-12-18 19:58:21 -08:00
SpudGunMan	35cc029984	Update README.md	2024-12-18 19:54:47 -08:00
SpudGunMan	589d44c152	Update locationdata_eu.py	2024-12-18 19:52:49 -08:00
SpudGunMan	06a14d875f	enableUKalerts	2024-12-18 19:39:55 -08:00
SpudGunMan	454f823ad7	england.GovAlert	2024-12-18 19:33:11 -08:00
SpudGunMan	6974c4ef66	Update locationdata_eu.py	2024-12-18 19:24:33 -08:00
SpudGunMan	bd956dfebc	locationEnhance	2024-12-18 15:09:38 -08:00
SpudGunMan	4aaac5ba49	Update README.md	2024-12-18 13:57:58 -08:00
SpudGunMan	2ae792dd8d	Update README.md	2024-12-18 10:55:53 -08:00
SpudGunMan	ca033f024e	enhanceNews returns a random line from the file	2024-12-18 10:53:44 -08:00
SpudGunMan	ad11f787de	Update locationdata_eu.py	2024-12-17 23:12:52 -08:00
SpudGunMan	e3d1607c86	enhance EU	2024-12-17 23:11:05 -08:00
SpudGunMan	b68461cbc8	move the moon	2024-12-17 22:57:14 -08:00
SpudGunMan	ddad35aa1e	Update README.md	2024-12-17 22:42:15 -08:00
SpudGunMan	35f4aad6f8	riverFlow	2024-12-17 22:16:02 -08:00
SpudGunMan	f08f98e040	Update locationdata.py	2024-12-17 21:55:12 -08:00
SpudGunMan	467376d9c7	Update mesh_bot.py	2024-12-17 21:47:05 -08:00
SpudGunMan	1cbdc93632	riverFlowAlpha	2024-12-17 20:32:07 -08:00
SpudGunMan	2323015617	riverFlood	2024-12-17 20:06:16 -08:00
SpudGunMan	51de0dee8a	riverFlow	2024-12-17 13:32:08 -08:00
SpudGunMan	b74c0ebd36	Update wx_meteo.py	2024-12-17 13:29:15 -08:00
SpudGunMan	0a4c54a5a2	Update locationdata.py	2024-12-17 12:14:00 -08:00
SpudGunMan	481809493c	Update wx_meteo.py	2024-12-16 20:56:28 -08:00
SpudGunMan	c3914e0423	Update mesh_bot.py	2024-12-16 20:54:57 -08:00
SpudGunMan	ac40254bc4	refactor Openmeteo wx eliminate requirement for modules and use requests native	2024-12-16 20:43:52 -08:00
SpudGunMan	b6540a1d20	🚨improve EAS duplicates	2024-12-16 09:05:59 -08:00
Kelly	87d29d123f	Merge pull request #96 from todd2982/patch-1	2024-12-16 08:05:24 -08:00
todd2982	0aa6f8cc07	Patch CVE found in base python image Patches the following CVE: CVE-2024-6345 CVE-2023-5752	2024-12-16 08:21:01 -06:00
SpudGunMan	e2bb480f5f	output fix femtofox Python 3.10.12 had issues	2024-12-15 01:04:34 -08:00
SpudGunMan	920f951e47	Update Dockerfile	2024-12-14 23:00:18 -08:00
SpudGunMan	215fe76f2a	CodeQLBadge	2024-12-13 23:27:14 -08:00
SpudGunMan	1740bbf666	Update install.sh	2024-12-13 21:35:10 -08:00
SpudGunMan	f9370d47b4	Update install.sh	2024-12-13 21:34:01 -08:00
SpudGunMan	91072cb47d	Update install.sh	2024-12-13 21:29:09 -08:00
SpudGunMan	c30be37f02	femtofox	2024-12-13 21:27:35 -08:00
SpudGunMan	d51dadba04	Update install.sh	2024-12-13 21:20:57 -08:00
SpudGunMan	99c404f479	moveThisShakeThat	2024-12-13 20:12:40 -08:00
SpudGunMan	659ee2959c	cleanup	2024-12-13 20:10:59 -08:00
SpudGunMan	1ac9f3b0d6	loop detector	2024-12-13 20:04:20 -08:00
SpudGunMan	d0dc737863	Update README.md	2024-12-13 14:57:14 -08:00
SpudGunMan	e438c82a11	enhance	2024-12-13 14:19:22 -08:00
SpudGunMan	9d7d4601dc	Update system.py	2024-12-13 13:29:10 -08:00
SpudGunMan	fdd741446c	Update system.py	2024-12-13 13:15:11 -08:00
SpudGunMan	fdbab1685f	Update locationdata.py	2024-12-13 13:06:05 -08:00
SpudGunMan	ed0940b126	🧀	2024-12-13 13:03:41 -08:00
SpudGunMan	a087c7bb3a	Update system.py	2024-12-13 13:02:06 -08:00
SpudGunMan	0439db2ec0	sysinfo returns telemetry info	2024-12-13 12:59:12 -08:00
SpudGunMan	c1a5d4d336	Create gpio.py	2024-12-13 12:30:49 -08:00
SpudGunMan	eeffc6361a	enhance@🏓	2024-12-13 11:45:50 -08:00
SpudGunMan	e2be3c20b7	enhance🏓	2024-12-13 10:30:18 -08:00
SpudGunMan	b43c21fc98	emergency responder block list	2024-12-13 10:22:33 -08:00
SpudGunMan	e115f33d47	pingEnhancments🏓 added autoPingInChannel = False # Allows auto-ping feature in a channel, False forces DM also added node short name to all channel ping	2024-12-13 10:07:14 -08:00
SpudGunMan	b8016aafc9	Update mesh_bot.py	2024-12-12 23:53:11 -08:00
SpudGunMan	743b0ab10b	Update mesh_bot.py	2024-12-12 23:49:44 -08:00
SpudGunMan	e06b2a3581	Update mesh_bot.py	2024-12-12 23:45:02 -08:00
SpudGunMan	582e00402a	enhance satpass for user list	2024-12-12 23:36:10 -08:00
SpudGunMan	82551e0b4a	Update space.py	2024-12-12 22:50:13 -08:00
SpudGunMan	a9c2660ec1	MQTT Logic for ping	2024-12-12 22:44:24 -08:00
SpudGunMan	fa802ba313	Update README.md	2024-12-12 22:16:08 -08:00
SpudGunMan	874d56045e	Update README.md	2024-12-12 22:15:56 -08:00
SpudGunMan	8204cbe60f	Update README.md	2024-12-12 22:14:00 -08:00
SpudGunMan	a50c06206c	Update locationdata.py	2024-12-12 14:48:35 -08:00
SpudGunMan	895e5a2b07	typos	2024-12-12 14:45:15 -08:00
SpudGunMan	2012986aff	Update locationdata.py	2024-12-12 14:25:46 -08:00
SpudGunMan	63d1f84887	Update system.py	2024-12-12 14:25:40 -08:00
SpudGunMan	d8233bc9e2	Update locationdata.py	2024-12-12 12:55:27 -08:00
SpudGunMan	bdea3d6036	Update install.sh	2024-12-12 12:26:35 -08:00
SpudGunMan	2fe2009b97	Update install.sh	2024-12-12 12:12:59 -08:00
SpudGunMan	dcad12935f	Update install.sh	2024-12-12 12:11:09 -08:00
SpudGunMan	0e2f6343a2	Update install.sh	2024-12-12 12:03:26 -08:00
SpudGunMan	56bd6f9ea7	iPAWS pin if you have a PIN otherwise ignore this	2024-12-12 11:49:14 -08:00
SpudGunMan	5718a43d20	Update locationdata.py	2024-12-12 11:42:58 -08:00
SpudGunMan	f759e2e7e5	Update locationdata.py	2024-12-12 11:26:34 -08:00
SpudGunMan	1e97554cbf	Update locationdata.py	2024-12-12 11:25:51 -08:00
SpudGunMan	04d4a2f5a7	Update locationdata.py	2024-12-12 11:22:23 -08:00
SpudGunMan	fb47756deb	Update locationdata.py	2024-12-12 11:15:13 -08:00
SpudGunMan	a33fed711d	Update install.sh	2024-12-12 11:12:13 -08:00
SpudGunMan	bcb741102d	Update install.sh	2024-12-12 11:06:29 -08:00
SpudGunMan	8b2d933fd1	Update install.sh	2024-12-12 11:06:17 -08:00
SpudGunMan	f8d6419551	Update install.sh	2024-12-12 11:05:03 -08:00
SpudGunMan	cf518aeff5	Update install.sh	2024-12-12 11:00:04 -08:00
SpudGunMan	95eebcde2b	Update install.sh	2024-12-12 10:49:31 -08:00
SpudGunMan	5cd7dca9b0	Update install.sh	2024-12-12 10:47:53 -08:00
SpudGunMan	eb87cf1bc8	Update install.sh	2024-12-12 10:45:09 -08:00
SpudGunMan	8a510a7b11	Update install.sh	2024-12-12 10:38:09 -08:00
SpudGunMan	e2631407e8	Update install.sh	2024-12-12 10:35:38 -08:00
SpudGunMan	eb86fa911c	Update README.md	2024-12-12 10:30:39 -08:00
SpudGunMan	448ad65c67	Update install.sh	2024-12-12 10:15:25 -08:00
SpudGunMan	bb8d2167ce	Update install.sh	2024-12-12 10:14:31 -08:00
SpudGunMan	a2bf33d71d	Update install.sh	2024-12-12 10:08:19 -08:00
SpudGunMan	e287bdeaef	Update system.py	2024-12-12 03:01:45 -08:00
SpudGunMan	16e5acbd27	Update README.md	2024-12-12 02:25:29 -08:00
SpudGunMan	1ea6961393	🛰️satpass get the next passes needs a API key	2024-12-12 02:14:26 -08:00
SpudGunMan	bd2bce0029	Update mesh_bot.py	2024-12-11 21:57:36 -08:00
SpudGunMan	33c8d4c0ad	Update mesh_bot.py	2024-12-11 21:14:46 -08:00
SpudGunMan	d453c3cac1	Update README.md	2024-12-11 20:33:23 -08:00
SpudGunMan	187fc7c2e4	Update README.md	2024-12-11 20:32:21 -08:00
SpudGunMan	33154626e5	enhance CMD Help	2024-12-11 20:07:01 -08:00
SpudGunMan	cfdbf1836f	Update system.py	2024-12-11 19:52:03 -08:00
SpudGunMan	054692adf0	whois 🦉	2024-12-11 19:50:24 -08:00
SpudGunMan	ce33421b16	Update launch.sh	2024-12-11 17:14:38 -08:00
SpudGunMan	d2cde424fc	Update install.sh	2024-12-11 17:14:32 -08:00
SpudGunMan	517ae5d4b4	Update entrypoint.sh	2024-12-11 17:14:28 -08:00
SpudGunMan	e69ee5c1a8	Update simulator.py	2024-12-11 17:08:11 -08:00
SpudGunMan	b2eae85cc2	`ea` and `ealert` It's in the Bot, not a game, its FEMA. 🦺	2024-12-11 16:15:40 -08:00
SpudGunMan	0749df04e5	Update locationdata.py	2024-12-11 15:38:34 -08:00
SpudGunMan	a66ea58d24	Update config.template	2024-12-11 14:45:48 -08:00
SpudGunMan	13738d1042	Update README.md	2024-12-11 14:43:02 -08:00
SpudGunMan	695d510b9f	Update config.template	2024-12-11 14:42:35 -08:00
SpudGunMan	f5e80c31b1	Update README.md	2024-12-11 13:15:00 -08:00
SpudGunMan	572a15fbab	Update config.template	2024-12-11 13:03:10 -08:00
SpudGunMan	8dc9a5de3f	enhanceing ipaws pin allowance be it hidden still better SAME detector alert test ignore	2024-12-11 12:57:48 -08:00
SpudGunMan	c8643b7ce9	Update README.md	2024-12-11 12:24:54 -08:00
SpudGunMan	786dcab420	ealert live for testing progress on https://github.com/SpudGunMan/meshing-around/issues/90	2024-12-10 18:01:38 -08:00
SpudGunMan	ab2f9a9846	FEMA config.ini	2024-12-10 17:58:25 -08:00
SpudGunMan	daf43f306b	ealert FEMA alerting this code is still very early	2024-12-10 17:48:40 -08:00
SpudGunMan	53adb4be70	Update locationdata.py	2024-12-10 17:22:35 -08:00
SpudGunMan	2458a4d141	Update locationdata.py	2024-12-10 17:14:22 -08:00
SpudGunMan	1c78a8f593	Update locationdata.py	2024-12-10 16:59:48 -08:00
SpudGunMan	6077eef26e	change to abbreviate_weather	2024-12-10 16:54:23 -08:00
SpudGunMan	8f3aaaba25	Update locationdata.py	2024-12-10 16:26:11 -08:00
SpudGunMan	b1cd0ca44f	Update locationdata.py	2024-12-10 16:24:08 -08:00
SpudGunMan	879555915f	Update locationdata.py	2024-12-10 16:17:02 -08:00
SpudGunMan	f61ba7c1af	testSAME logic	2024-12-10 16:03:42 -08:00
SpudGunMan	7cb2ea33c7	Update locationdata.py progress on https://github.com/SpudGunMan/meshing-around/issues/90	2024-12-10 15:33:43 -08:00
SpudGunMan	855a9ac0d0	Update locationdata.py	2024-12-10 15:28:48 -08:00
SpudGunMan	3e2e1de8ce	Update locationdata.py getting functional iPAWS	2024-12-10 15:01:53 -08:00
SpudGunMan	372f49d6ef	Update config.template	2024-12-10 14:11:19 -08:00
Kelly	a31b3e1c79	Merge pull request #92 from turnrye/patch-1 Fix typo on README	2024-12-10 14:04:05 -08:00
SpudGunMan	d3ecef9216	Update config.template	2024-12-10 02:24:56 -08:00
SpudGunMan	1175e23525	Update smtp.py	2024-12-09 21:56:35 -08:00
SpudGunMan	08e3e21306	Update smtp.py	2024-12-09 21:56:09 -08:00
SpudGunMan	7e3de5e490	Update mesh_bot.py	2024-12-09 21:53:45 -08:00
SpudGunMan	abc3eccf4e	Update smtp.py	2024-12-09 21:53:41 -08:00
SpudGunMan	80751f9cfc	Update README.md	2024-12-09 21:40:20 -08:00
SpudGunMan	7209992887	Update README.md	2024-12-09 21:38:51 -08:00
SpudGunMan	6c18d97f27	Update README.md	2024-12-09 20:35:19 -08:00
SpudGunMan	cdd7d6e766	Update README.md	2024-12-09 20:32:31 -08:00
SpudGunMan	8d5334126f	emailSentryAlerts	2024-12-09 20:29:16 -08:00
SpudGunMan	bcd23ebb83	Update smtp.py	2024-12-09 20:15:04 -08:00
SpudGunMan	5d581c2319	Update README.md	2024-12-09 20:14:38 -08:00
SpudGunMan	8e3b449c42	Update smtp.py	2024-12-09 20:11:08 -08:00
SpudGunMan	0975b3235a	Update smtp.py	2024-12-09 20:03:56 -08:00
SpudGunMan	9a2a4f1b77	enhanceSMTP	2024-12-09 19:55:00 -08:00
SpudGunMan	5df17b5905	fixSMTPAuth	2024-12-09 19:45:03 -08:00
SpudGunMan	894c5f155f	Update README.md	2024-12-09 19:20:51 -08:00
SpudGunMan	f848e12571	Update smtp.py	2024-12-09 19:10:51 -08:00
SpudGunMan	7adf6e7a1d	Update smtp.py	2024-12-09 19:06:47 -08:00
SpudGunMan	c6958c7c69	Update smtp.py	2024-12-09 18:55:08 -08:00
Ryan Turner	05c6e56a4f	Fix typo on README	2024-12-09 20:00:56 -06:00
SpudGunMan	c45cf5d207	Update smtp.py	2024-12-09 17:52:12 -08:00
SpudGunMan	a3995f7cce	Update mesh_bot.py	2024-12-09 17:51:09 -08:00
SpudGunMan	fb3652a954	Update smtp.py	2024-12-09 17:51:03 -08:00
SpudGunMan	b385001db2	hopDebug	2024-12-09 16:10:22 -08:00
SpudGunMan	ac96ca9e2f	Update mesh_bot.py	2024-12-09 15:07:02 -08:00
SpudGunMan	02ffe0eb3a	Update mesh_bot.py	2024-12-09 14:56:32 -08:00
SpudGunMan	389945e023	Update smtp.py	2024-12-09 14:47:53 -08:00
SpudGunMan	446fa0c049	timeout	2024-12-09 14:27:04 -08:00
SpudGunMan	8b4409c115	Update smtp.py	2024-12-09 14:19:14 -08:00
SpudGunMan	5684a75c65	Update smtp.py	2024-12-09 14:13:05 -08:00
SpudGunMan	1c6a98fea5	Update smtp.py	2024-12-09 14:08:52 -08:00
SpudGunMan	7c1b886c3d	Update README.md	2024-12-09 13:13:30 -08:00
SpudGunMan	75bbd1a0cd	enhanceWecomeMessage When there is no LLM the meshbot will now respond with more IQ also added the awareness of some extra bits and added a new tracker for all nodes seenNodes	2024-12-09 12:37:31 -08:00
SpudGunMan	a53f5a033b	Update mesh_bot.py	2024-12-09 00:27:44 -08:00
SpudGunMan	ea37405149	Update mesh_bot.py	2024-12-08 19:48:54 -08:00
SpudGunMan	e16ecbe1b7	Update README.md	2024-12-08 19:44:51 -08:00
SpudGunMan	db6f20dd3b	SMTPConfig	2024-12-08 19:38:58 -08:00
SpudGunMan	9fa60d0c84	Update config.template	2024-12-08 19:27:10 -08:00
SpudGunMan	2fdad79dbb	SMTP module work	2024-12-08 19:23:54 -08:00
SpudGunMan	20342fb58c	Update smtp.py	2024-12-08 14:39:50 -08:00
SpudGunMan	b7e815cf85	Update smtp.py	2024-12-08 14:36:55 -08:00
SpudGunMan	8e3d1c432e	Update smtp.py	2024-12-08 14:34:53 -08:00
SpudGunMan	1a8ed573a8	Update smtp.py	2024-12-08 14:34:04 -08:00
SpudGunMan	63516b36e4	sentMultipleSMS	2024-12-08 14:33:01 -08:00
SpudGunMan	d17b05a40a	Update smtp.py	2024-12-08 14:29:26 -08:00
SpudGunMan	e4cefa2264	Update smtp.py	2024-12-08 14:28:22 -08:00
SpudGunMan	90bf3459c9	typeSetCommands	2024-12-08 14:21:51 -08:00
SpudGunMan	0983259117	banList	2024-12-08 14:16:45 -08:00
SpudGunMan	377e5a9825	multipleSMS clearSMS	2024-12-08 14:11:43 -08:00
SpudGunMan	7edcb4457a	Update smtp.py	2024-12-08 13:51:23 -08:00
SpudGunMan	3fec7867d9	Update filemon.py	2024-12-08 13:28:23 -08:00
SpudGunMan	7e447616d9	IMAP all untested still	2024-12-08 13:06:56 -08:00
SpudGunMan	e59c3de0aa	Update smtp.py	2024-12-08 12:54:09 -08:00
SpudGunMan	db808568cb	Update settings.py	2024-12-08 11:32:54 -08:00
SpudGunMan	0615733445	enhance emergencyResponder	2024-12-08 11:32:30 -08:00
SpudGunMan	402c58c111	emergencyResponder	2024-12-08 11:27:34 -08:00
SpudGunMan	dde6c2ed32	Update README.md	2024-12-08 09:46:45 -08:00
SpudGunMan	766ff0a195	SMTP Module inital idea	2024-12-07 21:18:46 -08:00
SpudGunMan	d614cbcff5	Update README.md	2024-12-07 16:06:05 -08:00
SpudGunMan	81798c1fc2	Update locationdata.py	2024-12-07 15:11:05 -08:00
SpudGunMan	210a75671f	FEMAipaws not functioning yet	2024-12-07 14:50:25 -08:00
SpudGunMan	f3e113dcc1	Update README.md	2024-12-07 00:27:24 -08:00
SpudGunMan	145664a42f	Update llm.py	2024-12-07 00:04:01 -08:00
SpudGunMan	acc770732e	Update config.template	2024-12-07 00:03:52 -08:00
Kelly	ded4c79911	Merge pull request #87 from propstg/game-fixes	2024-12-06 23:26:59 -08:00
propstg	ad0c9c710f	Add error message when trying to buy max when inventory full, instead of sending usage message	2024-12-07 01:54:47 -05:00
propstg	259c4991f9	Show name property instead of object's tostring	2024-12-07 01:20:00 -05:00
SpudGunMan	5fe185ab7f	Update README.md	2024-12-06 13:42:16 -08:00
SpudGunMan	974caaff42	Update system.py	2024-12-06 13:18:52 -08:00
SpudGunMan	41d8758969	enhanceChunkr better logic?	2024-12-06 12:59:46 -08:00
SpudGunMan	92e1e3168e	Update pong_bot.py	2024-12-06 11:35:06 -08:00
SpudGunMan	a608e29911	Update mesh_bot.py	2024-12-06 11:34:57 -08:00
SpudGunMan	015b72c8c6	Update requirements.txt	2024-12-06 11:14:56 -08:00
SpudGunMan	74cf5841ff	Update README.md	2024-12-06 11:14:40 -08:00
SpudGunMan	9ba7b1c972	remove Ollama Requirement remove and replace with API call to web only	2024-12-06 10:09:07 -08:00
SpudGunMan	5bf0417203	Update README.md	2024-12-05 23:23:50 -08:00
SpudGunMan	2b7a20f8d9	Update pong_bot.py	2024-12-05 23:19:55 -08:00
SpudGunMan	2afb49cbc7	Update README.md	2024-12-05 23:16:18 -08:00
SpudGunMan	17008b7711	Update README.md	2024-12-05 23:14:36 -08:00
SpudGunMan	36ff328380	Update eas_alert_parser.py	2024-12-05 17:18:48 -08:00