Compare commits
274 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eb93ba49bd | ||
|
|
3804a52fda | ||
|
|
ee0577c504 | ||
|
|
72fbbb82a1 | ||
|
|
5b3769769d | ||
|
|
6be18b5bde | ||
|
|
7619caffc4 | ||
|
|
85596c3882 | ||
|
|
6a00ab85d9 | ||
|
|
2ff47dc877 | ||
|
|
d2a3eafaa1 | ||
|
|
6706b22f21 | ||
|
|
ffe13d3639 | ||
|
|
7b324f8ab8 | ||
|
|
ad0f83ce71 | ||
|
|
928c1a1d4e | ||
|
|
24cb96e9a9 | ||
|
|
e2f765de8a | ||
|
|
cb98e38a3e | ||
|
|
4fe79ad112 | ||
|
|
b869ac3e9e | ||
|
|
c09fa3ca72 | ||
|
|
79d9be2c85 | ||
|
|
903dcce2d7 | ||
|
|
425a89de3f | ||
|
|
8f88eae575 | ||
|
|
ffead8597a | ||
|
|
196176667f | ||
|
|
87ddb76e39 | ||
|
|
dbe6c71d33 | ||
|
|
537abb682e | ||
|
|
8d74e3e678 | ||
|
|
5849190220 | ||
|
|
408ab767e1 | ||
|
|
2949c78b56 | ||
|
|
c83f8396aa | ||
|
|
ecd59e537e | ||
|
|
83d854b596 | ||
|
|
a0f8b4b8eb | ||
|
|
8d0507852a | ||
|
|
6e17f39a2c | ||
|
|
5a2b3bb19d | ||
|
|
5bffec10a1 | ||
|
|
e0e8a4cefe | ||
|
|
d5b2e9c6c3 | ||
|
|
7ab06f3413 | ||
|
|
794b86fb9b | ||
|
|
7479344df7 | ||
|
|
98b5b43190 | ||
|
|
1298e79688 | ||
|
|
7a7d1c0c3f | ||
|
|
7c30ccd8f7 | ||
|
|
bc2aec7946 | ||
|
|
6b8d0c18c9 | ||
|
|
b65e9571dc | ||
|
|
e8cef5b593 | ||
|
|
36d4bac0a5 | ||
|
|
a208540093 | ||
|
|
02687f6d74 | ||
|
|
8c55798e34 | ||
|
|
cf502abfef | ||
|
|
e659696044 | ||
|
|
d086a440dd | ||
|
|
86c2d1eb41 | ||
|
|
aa1b90e3d5 | ||
|
|
f1d716d900 | ||
|
|
248732bac9 | ||
|
|
7b0fb0650a | ||
|
|
3e5ee9c77e | ||
|
|
8106af624f | ||
|
|
30bc04b89e | ||
|
|
198836fa13 | ||
|
|
ea2642685c | ||
|
|
f8f5300b9b | ||
|
|
b88d2bc1d9 | ||
|
|
88680f07b0 | ||
|
|
20c6a12251 | ||
|
|
e20bb0b8fc | ||
|
|
50a8cdd938 | ||
|
|
dc1739e033 | ||
|
|
544eebd715 | ||
|
|
6bdaef8c24 | ||
|
|
98cb1ea517 | ||
|
|
4ed185de0c | ||
|
|
3d61ce22d3 | ||
|
|
3a6b529cba | ||
|
|
3c8558ea1d | ||
|
|
49a4623d85 | ||
|
|
d3d72410c1 | ||
|
|
fcfbe4f2d4 | ||
|
|
53e7c77322 | ||
|
|
20ba897cde | ||
|
|
15e43513f4 | ||
|
|
a5717df182 | ||
|
|
8aaed1b93f | ||
|
|
1fa7a2d695 | ||
|
|
80bc16fb26 | ||
|
|
042b2efa93 | ||
|
|
80fcd8bf37 | ||
|
|
b60f044105 | ||
|
|
eeaaeca4a7 | ||
|
|
91a4e7c841 | ||
|
|
8291475e36 | ||
|
|
994bbf7a8d | ||
|
|
e5770b09dc | ||
|
|
79d7f61e4a | ||
|
|
d593449171 | ||
|
|
c571bbd408 | ||
|
|
5742cc7e49 | ||
|
|
4c552e4a31 | ||
|
|
5777b35770 | ||
|
|
13445d574c | ||
|
|
10f84f0c1b | ||
|
|
4f1b140a75 | ||
|
|
a3b2bef5c1 | ||
|
|
f679732591 | ||
|
|
857d590b8f | ||
|
|
141dd68716 | ||
|
|
79a9217307 | ||
|
|
fe604791f0 | ||
|
|
624fb4abbc | ||
|
|
163d60bf34 | ||
|
|
906eaa851d | ||
|
|
954680ef6e | ||
|
|
1f4d38257e | ||
|
|
a38ce79555 | ||
|
|
62ef47aa67 | ||
|
|
ca7533a344 | ||
|
|
403c57bf18 | ||
|
|
129b2de68e | ||
|
|
d2c88e0d18 | ||
|
|
fba5af53cb | ||
|
|
04fbf81798 | ||
|
|
65beead82b | ||
|
|
26ee893a96 | ||
|
|
5cf37c3cee | ||
|
|
3ecc27fd3e | ||
|
|
072fca72cc | ||
|
|
c038084343 | ||
|
|
6069ab04cf | ||
|
|
79f3ede17f | ||
|
|
9de903f2db | ||
|
|
77fcdaa08e | ||
|
|
1fca3091eb | ||
|
|
d0b49bf30c | ||
|
|
4779f426d9 | ||
|
|
9aab95edb6 | ||
|
|
fe61b56b5b | ||
|
|
25c5a7a65a | ||
|
|
4d512685a0 | ||
|
|
44b2e2189d | ||
|
|
74fc3baece | ||
|
|
0539cb67af | ||
|
|
98115ab22b | ||
|
|
2989a7a9ed | ||
|
|
aa458fbac4 | ||
| 707dffd6f8 | |||
| c917131b2d | |||
|
|
057dc7d87b | ||
|
|
fcc30243f5 | ||
|
|
75774cea62 | ||
|
|
3731c2b7cf | ||
|
|
1240ebf6cd | ||
|
|
e27f2430b7 | ||
|
|
ebdc4ae353 | ||
|
|
6cd5191138 | ||
|
|
8d989de425 | ||
|
|
381cf85336 | ||
|
|
caf5488b06 | ||
|
|
5d4f7225b0 | ||
|
|
6d997ff550 | ||
|
|
aa71e359bb | ||
|
|
7bd1d81bf9 | ||
|
|
4bc0dc2acc | ||
|
|
694edfaf27 | ||
|
|
93d77db853 | ||
|
|
122763a4e5 | ||
|
|
c6a8b02c38 | ||
|
|
b93f205fd4 | ||
|
|
8fdd1d6ac5 | ||
|
|
6796aa95bb | ||
|
|
020594e065 | ||
|
|
5a1a4e0d81 | ||
|
|
3cd5b13c25 | ||
|
|
5a0f1c0745 | ||
|
|
2516a3bd1c | ||
|
|
1b8dc54fe0 | ||
|
|
2bd74ca91a | ||
|
|
f40c105abf | ||
|
|
fdef8e2df0 | ||
|
|
386ad6fb03 | ||
|
|
a7c138e93f | ||
|
|
4e4832b128 | ||
|
|
11463b175c | ||
|
|
c06741b11d | ||
|
|
b1352261e7 | ||
|
|
376ff454bf | ||
|
|
932fdf83a2 | ||
|
|
1ca3e2ada2 | ||
|
|
fd1d32a62b | ||
|
|
61b302fe35 | ||
|
|
2aaa229e82 | ||
|
|
fd28069b0c | ||
|
|
b17c996f2f | ||
|
|
8273307cab | ||
|
|
a73eb30d32 | ||
|
|
ba889feee9 | ||
|
|
12c7a0b6af | ||
|
|
08c5ed8841 | ||
|
|
7f5eb7608c | ||
|
|
44f44c3361 | ||
|
|
a8350332ac | ||
|
|
6c6eed1ad6 | ||
|
|
ee71c28d33 | ||
|
|
6d3220665e | ||
|
|
98e5a239f5 | ||
|
|
17f4ce46dd | ||
|
|
338b8a049f | ||
|
|
1e9e80ae55 | ||
|
|
9d280c6e37 | ||
|
|
d4c1178b3d | ||
|
|
f7f6fccd60 | ||
|
|
afceb34c1b | ||
|
|
7a958d5c8e | ||
|
|
8fd76001f2 | ||
|
|
e320a3bc2b | ||
|
|
8a4e184699 | ||
|
|
e61b0a76da | ||
|
|
970a36598c | ||
|
|
e75caff929 | ||
|
|
e82d75a4d6 | ||
|
|
dc27e5f139 | ||
|
|
4bc05091be | ||
|
|
29f9ec445a | ||
|
|
7b398d0d6d | ||
|
|
76336d0073 | ||
|
|
46a8e21e64 | ||
|
|
2129d45ef6 | ||
|
|
6312cd8d72 | ||
|
|
7c17ec82f5 | ||
|
|
b7a6f4c907 | ||
|
|
6b3329b9b8 | ||
|
|
e9b1e0e88e | ||
|
|
2db732ebb3 | ||
|
|
d5302f78ba | ||
|
|
5b7de91d50 | ||
|
|
4d15076d4b | ||
|
|
809742b6d5 | ||
|
|
bca975b0c5 | ||
|
|
dfba956685 | ||
|
|
d07314262e | ||
|
|
dffa639574 | ||
|
|
1fd5a3e75c | ||
|
|
e674b21eaa | ||
|
|
efc94ba5e1 | ||
|
|
26328dec99 | ||
|
|
ec3e81e99e | ||
|
|
1c6af36313 | ||
|
|
f1d6f595ac | ||
|
|
cfc2e0c47f | ||
|
|
1037207df3 | ||
|
|
14044a8856 | ||
|
|
d57a47ef68 | ||
|
|
5e7375cd4e | ||
|
|
c42b16ddb6 | ||
|
|
283a46eb0b | ||
|
|
33b24a9f53 | ||
|
|
10c4348e54 | ||
|
|
072f98ef95 | ||
|
|
7b4ff011ec | ||
|
|
ab2124f50d | ||
|
|
b493d30a41 | ||
|
|
659effb7c4 | ||
|
|
ebb0fd0a2b |
21
.claude/README.md
Normal file
21
.claude/README.md
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
# Claude Code Settings
|
||||||
|
|
||||||
|
This directory contains configuration for Claude Code.
|
||||||
|
|
||||||
|
## Files
|
||||||
|
|
||||||
|
- **settings.json**: Project-wide default settings (tracked in git)
|
||||||
|
- **settings.local.json**: Local user-specific overrides (not tracked in git)
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
The `settings.json` file contains the default configuration that applies to all developers/devices. If you need to customize settings for your local environment, create a `settings.local.json` file which will override the defaults.
|
||||||
|
|
||||||
|
### Example: Create local overrides
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cp .claude/settings.json .claude/settings.local.json
|
||||||
|
# Edit settings.local.json with your preferences
|
||||||
|
```
|
||||||
|
|
||||||
|
Your local changes will not be committed to git.
|
||||||
9
.claude/settings.json
Normal file
9
.claude/settings.json
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"permissions": {
|
||||||
|
"allow": [
|
||||||
|
"Bash(python3:*)"
|
||||||
|
],
|
||||||
|
"deny": []
|
||||||
|
},
|
||||||
|
"enableAllProjectMcpServers": false
|
||||||
|
}
|
||||||
5
.gitignore
vendored
5
.gitignore
vendored
@@ -14,4 +14,9 @@ NPM/data/*.txt
|
|||||||
NPM/data/*.json
|
NPM/data/*.json
|
||||||
*.lock
|
*.lock
|
||||||
sqlite/*.db
|
sqlite/*.db
|
||||||
|
sqlite/*.sql
|
||||||
|
|
||||||
tests/
|
tests/
|
||||||
|
|
||||||
|
# Claude Code local settings
|
||||||
|
.claude/settings.local.json
|
||||||
26
.update-exclude
Normal file
26
.update-exclude
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
# NebuleAir Pro 4G - Fichiers exclus lors de la mise à jour par upload
|
||||||
|
# Ce fichier est versionné dans le repo et voyage avec chaque release.
|
||||||
|
# Quand on ajoute un nouveau capteur avec du cache local, mettre à jour cette liste.
|
||||||
|
|
||||||
|
# Base de données (données capteur, config locale)
|
||||||
|
sqlite/sensors.db
|
||||||
|
sqlite/*.db-journal
|
||||||
|
sqlite/*.db-wal
|
||||||
|
|
||||||
|
# Logs applicatifs
|
||||||
|
logs/
|
||||||
|
|
||||||
|
# Historique git (pour que git pull fonctionne toujours après)
|
||||||
|
.git/
|
||||||
|
|
||||||
|
# Fichiers de configuration locale
|
||||||
|
config.json
|
||||||
|
deviceID.txt
|
||||||
|
wifi_list.csv
|
||||||
|
|
||||||
|
# Données capteurs en cache
|
||||||
|
envea/data/
|
||||||
|
NPM/data/
|
||||||
|
|
||||||
|
# Verrous
|
||||||
|
*.lock
|
||||||
270
CLAUDE.md
Normal file
270
CLAUDE.md
Normal file
@@ -0,0 +1,270 @@
|
|||||||
|
# CLAUDE.md
|
||||||
|
|
||||||
|
This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
|
||||||
|
|
||||||
|
## Project Overview
|
||||||
|
|
||||||
|
NebuleAir Pro 4G is an environmental monitoring system running on Raspberry Pi 4/CM4. It collects air quality and environmental data from multiple sensors and transmits it via 4G cellular modem. The system includes a self-hosted web interface for configuration and monitoring.
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
|
||||||
|
### Data Flow
|
||||||
|
1. **Data Collection**: Sensors are polled by individual Python scripts triggered by systemd timers
|
||||||
|
2. **Local Storage**: All sensor data is stored in SQLite database (`sqlite/sensors.db`)
|
||||||
|
3. **Data Transmission**: Main loop script reads aggregated data from SQLite and transmits via SARA R4/R5 4G modem
|
||||||
|
4. **Web Interface**: Apache serves PHP pages that interact with SQLite and execute Python scripts
|
||||||
|
|
||||||
|
### Key Components
|
||||||
|
|
||||||
|
**Sensors & Hardware:**
|
||||||
|
- NextPM (NPM): Particulate matter sensor via Modbus (ttyAMA0)
|
||||||
|
- Envea CAIRSENS: Gas sensors (NO2, H2S, NH3, CO, O3) via serial (ttyAMA2-5)
|
||||||
|
- BME280: Temperature, humidity, pressure via I2C (0x76)
|
||||||
|
- NSRT MK4: Noise sensor via I2C (0x48)
|
||||||
|
- SARA R4/R5: 4G cellular modem (ttyAMA2)
|
||||||
|
- Wind meter: via ADS1115 ADC
|
||||||
|
- MPPT: Solar charger monitoring
|
||||||
|
|
||||||
|
**Software Stack:**
|
||||||
|
- OS: Raspberry Pi OS (Linux)
|
||||||
|
- Web server: Apache2
|
||||||
|
- Database: SQLite3
|
||||||
|
- Languages: Python 3, PHP, Bash
|
||||||
|
- Network: NetworkManager (nmcli)
|
||||||
|
|
||||||
|
### Directory Structure
|
||||||
|
- `NPM/`: NextPM sensor scripts
|
||||||
|
- `envea/`: Envea sensor scripts
|
||||||
|
- `BME280/`: BME280 sensor scripts
|
||||||
|
- `sound_meter/`: Noise sensor code (C program)
|
||||||
|
- `SARA/`: 4G modem communication (AT commands)
|
||||||
|
- `windMeter/`: Wind sensor scripts
|
||||||
|
- `MPPT/`: Solar charger scripts
|
||||||
|
- `RTC/`: DS3231 real-time clock module scripts
|
||||||
|
- `sqlite/`: Database scripts (create, read, write, config)
|
||||||
|
- `loop/`: Main data transmission script
|
||||||
|
- `html/`: Web interface files
|
||||||
|
- `services/`: Systemd service/timer configuration
|
||||||
|
- `logs/`: Application logs
|
||||||
|
|
||||||
|
## Common Development Commands
|
||||||
|
|
||||||
|
### Database Operations
|
||||||
|
```bash
|
||||||
|
# Initialize database
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/create_db.py
|
||||||
|
|
||||||
|
# Set configuration
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/set_config.py
|
||||||
|
|
||||||
|
# Read data from specific table
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/read.py <table_name> <limit>
|
||||||
|
```
|
||||||
|
|
||||||
|
### Systemd Services
|
||||||
|
The system uses systemd timers for scheduling sensor data collection:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# View all NebuleAir timers
|
||||||
|
systemctl list-timers | grep nebuleair
|
||||||
|
|
||||||
|
# Check specific service status
|
||||||
|
systemctl status nebuleair-npm-data.service
|
||||||
|
systemctl status nebuleair-sara-data.service
|
||||||
|
|
||||||
|
# View service logs
|
||||||
|
journalctl -u nebuleair-npm-data.service
|
||||||
|
journalctl -u nebuleair-sara-data.service -f # follow
|
||||||
|
|
||||||
|
# Restart services
|
||||||
|
systemctl restart nebuleair-npm-data.timer
|
||||||
|
systemctl restart nebuleair-sara-data.timer
|
||||||
|
|
||||||
|
# Setup all services
|
||||||
|
sudo /var/www/nebuleair_pro_4g/services/setup_services.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
**Service Schedule:**
|
||||||
|
- `nebuleair-npm-data.timer`: Every 10 seconds (NextPM sensor)
|
||||||
|
- `nebuleair-envea-data.timer`: Every 10 seconds (Envea sensors)
|
||||||
|
- `nebuleair-sara-data.timer`: Every 60 seconds (4G data transmission)
|
||||||
|
- `nebuleair-bme280-data.timer`: Every 120 seconds (BME280 sensor)
|
||||||
|
- `nebuleair-mppt-data.timer`: Every 120 seconds (MPPT charger)
|
||||||
|
- `nebuleair-noise-data.timer`: Every 60 seconds (Noise sensor)
|
||||||
|
- `nebuleair-db-cleanup-data.timer`: Daily (database cleanup)
|
||||||
|
|
||||||
|
### Sensor Testing
|
||||||
|
```bash
|
||||||
|
# Test NextPM sensor
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/NPM/get_data_modbus_v3.py
|
||||||
|
|
||||||
|
# Test Envea sensors (read reference/ID)
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/envea/read_ref_v2.py
|
||||||
|
|
||||||
|
# Test Envea sensor values
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/envea/read_value_v2.py
|
||||||
|
|
||||||
|
# Test BME280
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/BME280/get_data_v2.py
|
||||||
|
|
||||||
|
# Test noise sensor
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/sound_meter/NSRT_mk4_get_data.py
|
||||||
|
|
||||||
|
# Test RTC module
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/RTC/read.py
|
||||||
|
|
||||||
|
# Test MPPT charger
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/MPPT/read.py
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4G Modem (SARA R4/R5)
|
||||||
|
```bash
|
||||||
|
# Send AT command
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 "AT+CSQ" 5
|
||||||
|
|
||||||
|
# Check network connection
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/sara_connectNetwork.py ttyAMA2 <networkID> 120
|
||||||
|
|
||||||
|
# Set server URL (HTTP profile 0 for AirCarto)
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/sara_setURL.py ttyAMA2 data.nebuleair.fr 0
|
||||||
|
|
||||||
|
# Check modem status
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/check_running.py
|
||||||
|
```
|
||||||
|
|
||||||
|
### Network Configuration
|
||||||
|
```bash
|
||||||
|
# Scan WiFi networks (saved to wifi_list.csv)
|
||||||
|
nmcli device wifi list ifname wlan0
|
||||||
|
|
||||||
|
# Connect to WiFi
|
||||||
|
sudo nmcli device wifi connect "SSID" password "PASSWORD"
|
||||||
|
|
||||||
|
# Create hotspot (done automatically at boot if no connection)
|
||||||
|
sudo nmcli device wifi hotspot ifname wlan0 ssid nebuleair_pro password nebuleaircfg
|
||||||
|
|
||||||
|
# Check connection status
|
||||||
|
nmcli device show wlan0
|
||||||
|
nmcli device show eth0
|
||||||
|
```
|
||||||
|
|
||||||
|
### Permissions & Serial Ports
|
||||||
|
```bash
|
||||||
|
# Grant serial port access (run at boot via cron)
|
||||||
|
chmod 777 /dev/ttyAMA* /dev/i2c-1
|
||||||
|
|
||||||
|
# Check I2C devices
|
||||||
|
sudo i2cdetect -y 1
|
||||||
|
```
|
||||||
|
|
||||||
|
### Logs
|
||||||
|
```bash
|
||||||
|
# View main application log
|
||||||
|
tail -f /var/www/nebuleair_pro_4g/logs/app.log
|
||||||
|
|
||||||
|
# View SARA transmission log
|
||||||
|
tail -f /var/www/nebuleair_pro_4g/logs/sara_service.log
|
||||||
|
|
||||||
|
# View service-specific logs
|
||||||
|
tail -f /var/www/nebuleair_pro_4g/logs/npm_service.log
|
||||||
|
tail -f /var/www/nebuleair_pro_4g/logs/envea_service.log
|
||||||
|
|
||||||
|
# Clear logs (done daily via cron)
|
||||||
|
find /var/www/nebuleair_pro_4g/logs -name "*.log" -type f -exec truncate -s 0 {} \;
|
||||||
|
```
|
||||||
|
|
||||||
|
## Configuration System
|
||||||
|
|
||||||
|
Configuration is stored in SQLite database (`sqlite/sensors.db`) in the `config_table`:
|
||||||
|
|
||||||
|
**Key Configuration Parameters:**
|
||||||
|
- `deviceID`: Unique device identifier (string)
|
||||||
|
- `modem_config_mode`: When true, disables data transmission loop (bool)
|
||||||
|
- `modem_version`: SARA R4 or R5 (string)
|
||||||
|
- `SaraR4_baudrate`: Modem baudrate, usually 115200 or 9600 (int)
|
||||||
|
- `SARA_R4_neworkID`: Cellular network ID for connection (int)
|
||||||
|
- `send_miotiq`: Enable UDP transmission to Miotiq server (bool)
|
||||||
|
- `send_aircarto`: Enable HTTP transmission to AirCarto server (bool)
|
||||||
|
- `send_uSpot`: Enable HTTPS transmission to uSpot server (bool)
|
||||||
|
- `npm_5channel`: Enable 5-channel particle size distribution (bool)
|
||||||
|
- `envea`: Enable Envea gas sensors (bool)
|
||||||
|
- `windMeter`: Enable wind meter (bool)
|
||||||
|
- `BME280`: Enable BME280 sensor (bool)
|
||||||
|
- `MPPT`: Enable MPPT charger monitoring (bool)
|
||||||
|
- `NOISE`: Enable noise sensor (bool)
|
||||||
|
- `latitude_raw`, `longitude_raw`: GPS coordinates (float)
|
||||||
|
|
||||||
|
Configuration can be updated via web interface (launcher.php) or Python scripts in `sqlite/`.
|
||||||
|
|
||||||
|
## Data Transmission Protocols
|
||||||
|
|
||||||
|
### 1. UDP to Miotiq (Binary Protocol)
|
||||||
|
- 100-byte fixed binary payload via UDP socket
|
||||||
|
- Server: 192.168.0.20:4242
|
||||||
|
- Format: Device ID (8 bytes) + signal quality + sensor data (all packed as binary)
|
||||||
|
|
||||||
|
### 2. HTTP POST to AirCarto
|
||||||
|
- CSV payload sent as file attachment
|
||||||
|
- URL: `data.nebuleair.fr/pro_4G/data.php?sensor_id={id}&datetime={timestamp}`
|
||||||
|
- Uses SARA HTTP client (AT+UHTTPC profile 0)
|
||||||
|
|
||||||
|
### 3. HTTPS POST to uSpot
|
||||||
|
- JSON payload with SSL/TLS
|
||||||
|
- URL: `api-prod.uspot.probesys.net/nebuleair?token=2AFF6dQk68daFZ` (port 443)
|
||||||
|
- Uses SARA HTTPS client with certificate validation (AT+UHTTPC profile 1)
|
||||||
|
|
||||||
|
## Important Implementation Notes
|
||||||
|
|
||||||
|
### SARA R4/R5 Modem Communication
|
||||||
|
- The main transmission script (`loop/SARA_send_data_v2.py`) handles complex error recovery
|
||||||
|
- Error codes from AT+UHTTPER command trigger specific recovery actions:
|
||||||
|
- Error 4: Invalid hostname → Reset HTTP profile URL
|
||||||
|
- Error 11: Server connection error → Hardware modem reboot
|
||||||
|
- Error 22: PDP connection issue → Reset PSD/CSD connection (R5 only)
|
||||||
|
- Error 26/44: Timeout/connection lost → Send WiFi notification
|
||||||
|
- Error 73: SSL error → Re-import certificate and reset HTTPS profile
|
||||||
|
- Modem hardware reboot uses GPIO 16 (transistor control to cut power)
|
||||||
|
- Script waits 2 minutes after system boot before executing
|
||||||
|
|
||||||
|
### Serial Communication
|
||||||
|
- All UART ports must be enabled in `/boot/firmware/config.txt`
|
||||||
|
- Permissions reset after reboot, must be re-granted via cron @reboot
|
||||||
|
- Read functions use custom timeout logic to handle slow modem responses
|
||||||
|
- Special handling for multi-line AT command responses using `wait_for_lines` parameter
|
||||||
|
|
||||||
|
### Time Synchronization
|
||||||
|
- DS3231 RTC module maintains time when no network available
|
||||||
|
- RTC timestamp stored in SQLite (`timestamp_table`)
|
||||||
|
- Script compares server datetime (from HTTP headers) with RTC
|
||||||
|
- Auto-updates RTC if difference > 60 seconds
|
||||||
|
- Handles RTC reset condition (year 2000) and disconnection
|
||||||
|
|
||||||
|
### LED Indicators
|
||||||
|
- GPIO 23 (blue LED): Successful data transmission
|
||||||
|
- GPIO 24 (red LED): Transmission errors
|
||||||
|
- Uses thread locking to prevent GPIO conflicts
|
||||||
|
|
||||||
|
### Web Interface
|
||||||
|
- Apache DocumentRoot set to `/var/www/nebuleair_pro_4g`
|
||||||
|
- `html/launcher.php` provides REST-like API for all operations
|
||||||
|
- Uses shell_exec() to run Python scripts with proper sudo permissions
|
||||||
|
- Configuration updates modify SQLite database, not JSON files
|
||||||
|
|
||||||
|
### Security Considerations
|
||||||
|
- www-data user has sudo access to specific commands (defined in /etc/sudoers)
|
||||||
|
- Terminal command execution in launcher.php has whitelist of allowed commands
|
||||||
|
- No sensitive credentials should be committed (all in database/config files)
|
||||||
|
|
||||||
|
## Boot Sequence
|
||||||
|
|
||||||
|
1. Grant serial/I2C permissions (cron @reboot)
|
||||||
|
2. Check WiFi connection, start hotspot if needed (`boot_hotspot.sh`)
|
||||||
|
3. Start SARA modem initialization (`SARA/reboot/start.py`)
|
||||||
|
4. Systemd timers begin sensor data collection
|
||||||
|
5. SARA transmission loop begins after 2-minute delay
|
||||||
|
|
||||||
|
## Cron Jobs
|
||||||
|
|
||||||
|
Located in `/var/www/nebuleair_pro_4g/cron_jobs`:
|
||||||
|
- @reboot: Permissions setup, hotspot check, SARA initialization
|
||||||
|
- Daily 00:00: Truncate log files
|
||||||
40
GPIO/control.py
Normal file
40
GPIO/control.py
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
'''
|
||||||
|
____ ____ ___ ___
|
||||||
|
/ ___| _ \_ _/ _ \
|
||||||
|
| | _| |_) | | | | |
|
||||||
|
| |_| | __/| | |_| |
|
||||||
|
\____|_| |___\___/
|
||||||
|
|
||||||
|
script to control GPIO output
|
||||||
|
|
||||||
|
GPIO 16 -> SARA 5V
|
||||||
|
GPIO 20 -> SARA PWR ON
|
||||||
|
|
||||||
|
option 1:
|
||||||
|
CLI tool like pinctrl
|
||||||
|
pinctrl set 16 op
|
||||||
|
pinctrl set 16 dh
|
||||||
|
pinctrl set 16 dl
|
||||||
|
|
||||||
|
option 2:
|
||||||
|
python library RPI.GPIO
|
||||||
|
|
||||||
|
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/GPIO/control.py
|
||||||
|
'''
|
||||||
|
|
||||||
|
import RPi.GPIO as GPIO
|
||||||
|
import time
|
||||||
|
|
||||||
|
selected_GPIO = 16
|
||||||
|
|
||||||
|
GPIO.setmode(GPIO.BCM) # Use BCM numbering
|
||||||
|
GPIO.setup(selected_GPIO, GPIO.OUT) # Set GPIO17 as an output
|
||||||
|
|
||||||
|
while True:
|
||||||
|
GPIO.output(selected_GPIO, GPIO.HIGH) # Turn ON
|
||||||
|
time.sleep(1) # Wait 1 sec
|
||||||
|
GPIO.output(selected_GPIO, GPIO.LOW) # Turn OFF
|
||||||
|
time.sleep(1) # Wait 1 sec
|
||||||
|
|
||||||
|
|
||||||
53
MH-Z19/get_data.py
Normal file
53
MH-Z19/get_data.py
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
'''
|
||||||
|
Script to get CO2 values from MH-Z19 sensor
|
||||||
|
need parameter: CO2_port
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/MH-Z19/get_data.py ttyAMA4
|
||||||
|
'''
|
||||||
|
|
||||||
|
import serial
|
||||||
|
import json
|
||||||
|
import sys
|
||||||
|
import time
|
||||||
|
|
||||||
|
parameter = sys.argv[1:]
|
||||||
|
port = '/dev/' + parameter[0]
|
||||||
|
|
||||||
|
|
||||||
|
def read_co2():
|
||||||
|
try:
|
||||||
|
ser = serial.Serial(
|
||||||
|
port=port,
|
||||||
|
baudrate=9600,
|
||||||
|
parity=serial.PARITY_NONE,
|
||||||
|
stopbits=serial.STOPBITS_ONE,
|
||||||
|
bytesize=serial.EIGHTBITS,
|
||||||
|
timeout=1
|
||||||
|
)
|
||||||
|
except serial.SerialException as e:
|
||||||
|
print(json.dumps({"error": f"Serial port error: {e}"}))
|
||||||
|
return
|
||||||
|
|
||||||
|
READ_CO2_COMMAND = b'\xFF\x01\x86\x00\x00\x00\x00\x00\x79'
|
||||||
|
|
||||||
|
try:
|
||||||
|
ser.write(READ_CO2_COMMAND)
|
||||||
|
time.sleep(2)
|
||||||
|
response = ser.read(9)
|
||||||
|
|
||||||
|
if len(response) < 9:
|
||||||
|
print(json.dumps({"error": "No data or incomplete data received from sensor"}))
|
||||||
|
return
|
||||||
|
|
||||||
|
if response[0] == 0xFF:
|
||||||
|
co2_concentration = response[2] * 256 + response[3]
|
||||||
|
print(json.dumps({"CO2": co2_concentration}))
|
||||||
|
else:
|
||||||
|
print(json.dumps({"error": "Invalid response from sensor"}))
|
||||||
|
except Exception as e:
|
||||||
|
print(json.dumps({"error": str(e)}))
|
||||||
|
finally:
|
||||||
|
ser.close()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
read_co2()
|
||||||
66
MH-Z19/write_data.py
Normal file
66
MH-Z19/write_data.py
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
'''
|
||||||
|
Script to get CO2 values from MH-Z19 sensor and write to database
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/MH-Z19/write_data.py
|
||||||
|
'''
|
||||||
|
|
||||||
|
import serial
|
||||||
|
import json
|
||||||
|
import sys
|
||||||
|
import time
|
||||||
|
import sqlite3
|
||||||
|
|
||||||
|
conn = sqlite3.connect("/var/www/nebuleair_pro_4g/sqlite/sensors.db")
|
||||||
|
cursor = conn.cursor()
|
||||||
|
|
||||||
|
mh_z19_port = "/dev/ttyAMA4"
|
||||||
|
|
||||||
|
ser = serial.Serial(
|
||||||
|
port=mh_z19_port,
|
||||||
|
baudrate=9600,
|
||||||
|
parity=serial.PARITY_NONE,
|
||||||
|
stopbits=serial.STOPBITS_ONE,
|
||||||
|
bytesize=serial.EIGHTBITS,
|
||||||
|
timeout=1
|
||||||
|
)
|
||||||
|
|
||||||
|
READ_CO2_COMMAND = b'\xFF\x01\x86\x00\x00\x00\x00\x00\x79'
|
||||||
|
|
||||||
|
|
||||||
|
def read_co2():
|
||||||
|
ser.write(READ_CO2_COMMAND)
|
||||||
|
time.sleep(2)
|
||||||
|
response = ser.read(9)
|
||||||
|
if len(response) < 9:
|
||||||
|
print("Error: No data or incomplete data received from CO2 sensor.")
|
||||||
|
return None
|
||||||
|
if response[0] == 0xFF:
|
||||||
|
co2_concentration = response[2] * 256 + response[3]
|
||||||
|
return co2_concentration
|
||||||
|
else:
|
||||||
|
print("Error reading data from CO2 sensor.")
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
try:
|
||||||
|
co2 = read_co2()
|
||||||
|
if co2 is not None:
|
||||||
|
# Get RTC time from SQLite
|
||||||
|
cursor.execute("SELECT * FROM timestamp_table LIMIT 1")
|
||||||
|
row = cursor.fetchone()
|
||||||
|
rtc_time_str = row[1]
|
||||||
|
# Save to SQLite
|
||||||
|
cursor.execute('INSERT INTO data_MHZ19 (timestamp, CO2) VALUES (?, ?)', (rtc_time_str, co2))
|
||||||
|
conn.commit()
|
||||||
|
print(f"CO2: {co2} ppm (saved at {rtc_time_str})")
|
||||||
|
else:
|
||||||
|
print("Failed to get CO2 data.")
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
print("Program terminated.")
|
||||||
|
finally:
|
||||||
|
ser.close()
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
main()
|
||||||
282
MPPT/read.py
Normal file
282
MPPT/read.py
Normal file
@@ -0,0 +1,282 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""
|
||||||
|
__ __ ____ ____ _____
|
||||||
|
| \/ | _ \| _ \_ _|
|
||||||
|
| |\/| | |_) | |_) || |
|
||||||
|
| | | | __/| __/ | |
|
||||||
|
|_| |_|_| |_| |_|
|
||||||
|
|
||||||
|
MPPT Chargeur solaire Victron interface UART
|
||||||
|
|
||||||
|
MPPT connections
|
||||||
|
5V / Rx / TX / GND
|
||||||
|
RPI connection
|
||||||
|
-- / GPIO9 / GPIO8 / GND
|
||||||
|
* pas besoin de connecter le 5V (le GND uniquement)
|
||||||
|
|
||||||
|
Fixed version - properly handles continuous data stream
|
||||||
|
"""
|
||||||
|
|
||||||
|
import serial
|
||||||
|
import time
|
||||||
|
import sqlite3
|
||||||
|
import os
|
||||||
|
|
||||||
|
# ===== LOGGING CONFIGURATION =====
|
||||||
|
# Set to True to enable all print statements, False to run silently
|
||||||
|
DEBUG_MODE = False
|
||||||
|
|
||||||
|
# Alternative: Use environment variable (can be set in systemd service)
|
||||||
|
# DEBUG_MODE = os.environ.get('MPPT_DEBUG', 'false').lower() == 'true'
|
||||||
|
|
||||||
|
# Alternative: Check if running under systemd
|
||||||
|
# DEBUG_MODE = os.isatty(1) # True if running in terminal, False if systemd/cron
|
||||||
|
|
||||||
|
# Alternative: Use different log levels
|
||||||
|
# LOG_LEVEL = "ERROR" # Options: "DEBUG", "INFO", "ERROR", "NONE"
|
||||||
|
# =================================
|
||||||
|
|
||||||
|
# Connect to the SQLite database
|
||||||
|
conn = sqlite3.connect("/var/www/nebuleair_pro_4g/sqlite/sensors.db")
|
||||||
|
cursor = conn.cursor()
|
||||||
|
|
||||||
|
# Logging function
|
||||||
|
def log(message, level="INFO"):
|
||||||
|
"""Print message only if DEBUG_MODE is True"""
|
||||||
|
if DEBUG_MODE:
|
||||||
|
print(message)
|
||||||
|
# Alternative: could write to a log file instead
|
||||||
|
# with open('/var/log/mppt.log', 'a') as f:
|
||||||
|
# f.write(f"{time.strftime('%Y-%m-%d %H:%M:%S')} [{level}] {message}\n")
|
||||||
|
|
||||||
|
|
||||||
|
def read_vedirect(port='/dev/ttyAMA4', baudrate=19200, timeout=10):
|
||||||
|
"""
|
||||||
|
Read and parse data from Victron MPPT controller
|
||||||
|
Returns parsed data as a dictionary
|
||||||
|
"""
|
||||||
|
required_keys = ['V', 'I', 'VPV', 'PPV', 'CS'] # Essential keys we need
|
||||||
|
|
||||||
|
try:
|
||||||
|
log(f"Opening serial port {port} at {baudrate} baud...")
|
||||||
|
ser = serial.Serial(port, baudrate, timeout=1)
|
||||||
|
|
||||||
|
# Clear any buffered data
|
||||||
|
ser.reset_input_buffer()
|
||||||
|
time.sleep(0.5)
|
||||||
|
|
||||||
|
# Initialize data dictionary
|
||||||
|
data = {}
|
||||||
|
start_time = time.time()
|
||||||
|
lines_read = 0
|
||||||
|
blocks_seen = 0
|
||||||
|
|
||||||
|
while time.time() - start_time < timeout:
|
||||||
|
try:
|
||||||
|
line = ser.readline().decode('utf-8', errors='ignore').strip()
|
||||||
|
|
||||||
|
if not line:
|
||||||
|
continue
|
||||||
|
|
||||||
|
lines_read += 1
|
||||||
|
|
||||||
|
# Check if this line contains tab-separated key-value pair
|
||||||
|
if '\t' in line:
|
||||||
|
parts = line.split('\t', 1)
|
||||||
|
if len(parts) == 2:
|
||||||
|
key, value = parts
|
||||||
|
data[key] = value
|
||||||
|
log(f"{key}: {value}")
|
||||||
|
|
||||||
|
# Check for checksum line (end of block)
|
||||||
|
elif line.startswith('Checksum'):
|
||||||
|
blocks_seen += 1
|
||||||
|
log(f"--- End of block {blocks_seen} ---")
|
||||||
|
|
||||||
|
# Check if we have all required keys
|
||||||
|
missing_keys = [key for key in required_keys if key not in data]
|
||||||
|
|
||||||
|
if not missing_keys:
|
||||||
|
log(f"✓ Complete data block received after {lines_read} lines!")
|
||||||
|
ser.close()
|
||||||
|
return data
|
||||||
|
else:
|
||||||
|
log(f"Block {blocks_seen} incomplete, missing: {', '.join(missing_keys)}")
|
||||||
|
# Don't clear data, maybe we missed the beginning of first block
|
||||||
|
if blocks_seen > 1:
|
||||||
|
# If we've seen multiple blocks and still missing data,
|
||||||
|
# something is wrong
|
||||||
|
log("Multiple incomplete blocks, clearing data...")
|
||||||
|
data = {}
|
||||||
|
|
||||||
|
except UnicodeDecodeError as e:
|
||||||
|
log(f"Decode error: {e}", "ERROR")
|
||||||
|
continue
|
||||||
|
except Exception as e:
|
||||||
|
log(f"Error reading line: {e}", "ERROR")
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Timeout reached
|
||||||
|
log(f"Timeout after {timeout}s, read {lines_read} lines, saw {blocks_seen} blocks")
|
||||||
|
ser.close()
|
||||||
|
|
||||||
|
# If we have some data but not all required keys, return what we have
|
||||||
|
if data and len(data) >= len(required_keys) - 1:
|
||||||
|
log("Returning partial data...")
|
||||||
|
return data
|
||||||
|
|
||||||
|
except serial.SerialException as e:
|
||||||
|
log(f"Serial port error: {e}", "ERROR")
|
||||||
|
except Exception as e:
|
||||||
|
log(f"Unexpected error: {e}", "ERROR")
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def parse_values(data):
|
||||||
|
"""Convert string values to appropriate types"""
|
||||||
|
if not data:
|
||||||
|
return None
|
||||||
|
|
||||||
|
parsed = {}
|
||||||
|
|
||||||
|
# Define conversions for each key
|
||||||
|
conversions = {
|
||||||
|
'PID': str,
|
||||||
|
'FW': int,
|
||||||
|
'SER#': str,
|
||||||
|
'V': lambda x: float(x)/1000, # Convert mV to V
|
||||||
|
'I': lambda x: float(x)/1000, # Convert mA to A
|
||||||
|
'VPV': lambda x: float(x)/1000 if x != '---' else 0, # Convert mV to V
|
||||||
|
'PPV': int,
|
||||||
|
'CS': int,
|
||||||
|
'MPPT': int,
|
||||||
|
'OR': str,
|
||||||
|
'ERR': int,
|
||||||
|
'LOAD': str,
|
||||||
|
'IL': lambda x: float(x)/1000, # Convert mA to A
|
||||||
|
'H19': float, # Total energy absorbed in kWh (already in kWh)
|
||||||
|
'H20': float, # Total energy discharged in kWh
|
||||||
|
'H21': int, # Maximum power today (W)
|
||||||
|
'H22': float, # Energy generated today (kWh)
|
||||||
|
'H23': int, # Maximum power yesterday (W)
|
||||||
|
'HSDS': int # Day sequence number
|
||||||
|
}
|
||||||
|
|
||||||
|
# Convert values according to their type
|
||||||
|
for key, value in data.items():
|
||||||
|
if key in conversions:
|
||||||
|
try:
|
||||||
|
parsed[key] = conversions[key](value)
|
||||||
|
except (ValueError, TypeError) as e:
|
||||||
|
log(f"Conversion error for {key}={value}: {e}", "ERROR")
|
||||||
|
parsed[key] = value # Keep as string if conversion fails
|
||||||
|
else:
|
||||||
|
parsed[key] = value
|
||||||
|
|
||||||
|
return parsed
|
||||||
|
|
||||||
|
|
||||||
|
def get_charger_status(cs_value):
|
||||||
|
"""Convert CS numeric value to human-readable status"""
|
||||||
|
status_map = {
|
||||||
|
0: "Off",
|
||||||
|
2: "Fault",
|
||||||
|
3: "Bulk",
|
||||||
|
4: "Absorption",
|
||||||
|
5: "Float",
|
||||||
|
6: "Storage",
|
||||||
|
7: "Equalize",
|
||||||
|
9: "Inverting",
|
||||||
|
11: "Power supply",
|
||||||
|
245: "Starting-up",
|
||||||
|
247: "Repeated absorption",
|
||||||
|
252: "External control"
|
||||||
|
}
|
||||||
|
return status_map.get(cs_value, f"Unknown ({cs_value})")
|
||||||
|
|
||||||
|
|
||||||
|
def get_mppt_status(mppt_value):
|
||||||
|
"""Convert MPPT value to human-readable status"""
|
||||||
|
mppt_map = {
|
||||||
|
0: "Off",
|
||||||
|
1: "Voltage or current limited",
|
||||||
|
2: "MPP Tracker active"
|
||||||
|
}
|
||||||
|
return mppt_map.get(mppt_value, f"Unknown ({mppt_value})")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
log("=== Victron MPPT Reader ===")
|
||||||
|
log(f"Started at: {time.strftime('%Y-%m-%d %H:%M:%S')}")
|
||||||
|
|
||||||
|
# Read data
|
||||||
|
raw_data = read_vedirect()
|
||||||
|
|
||||||
|
if raw_data:
|
||||||
|
# Parse data
|
||||||
|
parsed_data = parse_values(raw_data)
|
||||||
|
|
||||||
|
if parsed_data:
|
||||||
|
# Display summary
|
||||||
|
log("\n===== MPPT Status Summary =====")
|
||||||
|
log(f"Product: {parsed_data.get('PID', 'Unknown')} (FW: {parsed_data.get('FW', '?')})")
|
||||||
|
log(f"Serial: {parsed_data.get('SER#', 'Unknown')}")
|
||||||
|
log(f"\nBattery: {parsed_data.get('V', 0):.2f}V, {parsed_data.get('I', 0):.2f}A")
|
||||||
|
log(f"Solar Panel: {parsed_data.get('VPV', 0):.2f}V, {parsed_data.get('PPV', 0)}W")
|
||||||
|
log(f"Charger Status: {get_charger_status(parsed_data.get('CS', 0))}")
|
||||||
|
log(f"MPPT Status: {get_mppt_status(parsed_data.get('MPPT', 0))}")
|
||||||
|
log(f"Load Output: {parsed_data.get('LOAD', 'Unknown')}, {parsed_data.get('IL', 0):.2f}A")
|
||||||
|
log(f"\nToday's Energy: {parsed_data.get('H22', 0)}kWh (Max: {parsed_data.get('H21', 0)}W)")
|
||||||
|
log(f"Total Energy: {parsed_data.get('H19', 0)}kWh")
|
||||||
|
|
||||||
|
# Validate critical values
|
||||||
|
battery_voltage = parsed_data.get('V', 0)
|
||||||
|
|
||||||
|
if battery_voltage > 0:
|
||||||
|
# Get timestamp
|
||||||
|
try:
|
||||||
|
cursor.execute("SELECT * FROM timestamp_table LIMIT 1")
|
||||||
|
row = cursor.fetchone()
|
||||||
|
rtc_time_str = row[1] if row else time.strftime('%Y-%m-%d %H:%M:%S')
|
||||||
|
except:
|
||||||
|
rtc_time_str = time.strftime('%Y-%m-%d %H:%M:%S')
|
||||||
|
|
||||||
|
# Extract values for database
|
||||||
|
battery_current = parsed_data.get('I', 0)
|
||||||
|
solar_voltage = parsed_data.get('VPV', 0)
|
||||||
|
solar_power = parsed_data.get('PPV', 0)
|
||||||
|
charger_status = parsed_data.get('CS', 0)
|
||||||
|
|
||||||
|
# Save to database
|
||||||
|
try:
|
||||||
|
cursor.execute('''
|
||||||
|
INSERT INTO data_MPPT (timestamp, battery_voltage, battery_current, solar_voltage, solar_power, charger_status)
|
||||||
|
VALUES (?, ?, ?, ?, ?, ?)''',
|
||||||
|
(rtc_time_str, battery_voltage, battery_current, solar_voltage, solar_power, charger_status))
|
||||||
|
|
||||||
|
conn.commit()
|
||||||
|
log(f"\n✓ Data saved to database at {rtc_time_str}")
|
||||||
|
|
||||||
|
except sqlite3.Error as e:
|
||||||
|
# Always log database errors regardless of DEBUG_MODE
|
||||||
|
if not DEBUG_MODE:
|
||||||
|
print(f"Database error: {e}")
|
||||||
|
else:
|
||||||
|
log(f"\n✗ Database error: {e}", "ERROR")
|
||||||
|
conn.rollback()
|
||||||
|
else:
|
||||||
|
log("\n✗ Invalid data: Battery voltage is zero or missing", "ERROR")
|
||||||
|
else:
|
||||||
|
log("\n✗ Failed to parse data", "ERROR")
|
||||||
|
else:
|
||||||
|
log("\n✗ No valid data received from MPPT controller", "ERROR")
|
||||||
|
log("\nPossible issues:")
|
||||||
|
log("- Check serial connection (TX/RX/GND)")
|
||||||
|
log("- Verify port is /dev/ttyAMA4")
|
||||||
|
log("- Ensure MPPT is powered on")
|
||||||
|
log("- Check baudrate (should be 19200)")
|
||||||
|
|
||||||
|
# Always close the connection
|
||||||
|
conn.close()
|
||||||
|
log("\nDone.")
|
||||||
@@ -14,9 +14,9 @@ import serial
|
|||||||
import requests
|
import requests
|
||||||
import json
|
import json
|
||||||
import sys
|
import sys
|
||||||
|
import time
|
||||||
|
|
||||||
parameter = sys.argv[1:] # Exclude the script name
|
parameter = sys.argv[1:] # Exclude the script name
|
||||||
#print("Parameters received:")
|
|
||||||
port='/dev/'+parameter[0]
|
port='/dev/'+parameter[0]
|
||||||
|
|
||||||
ser = serial.Serial(
|
ser = serial.Serial(
|
||||||
@@ -34,42 +34,93 @@ ser.write(b'\x81\x11\x6E') #data10s
|
|||||||
while True:
|
while True:
|
||||||
try:
|
try:
|
||||||
byte_data = ser.readline()
|
byte_data = ser.readline()
|
||||||
#print(byte_data)
|
|
||||||
|
# Convert raw data to hex string for debugging
|
||||||
|
raw_hex = byte_data.hex() if byte_data else ""
|
||||||
|
|
||||||
|
# Check if we received data
|
||||||
|
if not byte_data or len(byte_data) < 15:
|
||||||
|
data = {
|
||||||
|
'PM1': 0.0,
|
||||||
|
'PM25': 0.0,
|
||||||
|
'PM10': 0.0,
|
||||||
|
'sleep': 0,
|
||||||
|
'degradedState': 0,
|
||||||
|
'notReady': 0,
|
||||||
|
'heatError': 0,
|
||||||
|
't_rhError': 0,
|
||||||
|
'fanError': 0,
|
||||||
|
'memoryError': 0,
|
||||||
|
'laserError': 0,
|
||||||
|
'raw': raw_hex,
|
||||||
|
'message': f"No data received or incomplete frame (length: {len(byte_data)})"
|
||||||
|
}
|
||||||
|
json_data = json.dumps(data)
|
||||||
|
print(json_data)
|
||||||
|
break
|
||||||
|
|
||||||
stateByte = int.from_bytes(byte_data[2:3], byteorder='big')
|
stateByte = int.from_bytes(byte_data[2:3], byteorder='big')
|
||||||
Statebits = [int(bit) for bit in bin(stateByte)[2:].zfill(8)]
|
Statebits = [int(bit) for bit in bin(stateByte)[2:].zfill(8)]
|
||||||
PM1 = int.from_bytes(byte_data[9:11], byteorder='big')/10
|
PM1 = int.from_bytes(byte_data[9:11], byteorder='big')/10
|
||||||
PM25 = int.from_bytes(byte_data[11:13], byteorder='big')/10
|
PM25 = int.from_bytes(byte_data[11:13], byteorder='big')/10
|
||||||
PM10 = int.from_bytes(byte_data[13:15], byteorder='big')/10
|
PM10 = int.from_bytes(byte_data[13:15], byteorder='big')/10
|
||||||
#print(f"State: {Statebits}")
|
|
||||||
#print(f"PM1: {PM1}")
|
# Create JSON with raw data and status message
|
||||||
#print(f"PM25: {PM25}")
|
|
||||||
#print(f"PM10: {PM10}")
|
|
||||||
#create JSON
|
|
||||||
data = {
|
data = {
|
||||||
'capteurID': 'nebuleairpro1',
|
|
||||||
'sondeID':'USB2',
|
|
||||||
'PM1': PM1,
|
'PM1': PM1,
|
||||||
'PM25': PM25,
|
'PM25': PM25,
|
||||||
'PM10': PM10,
|
'PM10': PM10,
|
||||||
'sleep' : Statebits[0],
|
'sleep': Statebits[0],
|
||||||
'degradedState' : Statebits[1],
|
'degradedState': Statebits[1],
|
||||||
'notReady' : Statebits[2],
|
'notReady': Statebits[2],
|
||||||
'heatError' : Statebits[3],
|
'heatError': Statebits[3],
|
||||||
't_rhError' : Statebits[4],
|
't_rhError': Statebits[4],
|
||||||
'fanError' : Statebits[5],
|
'fanError': Statebits[5],
|
||||||
'memoryError' : Statebits[6],
|
'memoryError': Statebits[6],
|
||||||
'laserError' : Statebits[7]
|
'laserError': Statebits[7],
|
||||||
|
'raw': raw_hex,
|
||||||
|
'message': 'OK' if sum(Statebits[1:]) == 0 else 'Sensor error detected'
|
||||||
}
|
}
|
||||||
json_data = json.dumps(data)
|
json_data = json.dumps(data)
|
||||||
print(json_data)
|
print(json_data)
|
||||||
break
|
break
|
||||||
|
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
print("User interrupt encountered. Exiting...")
|
data = {
|
||||||
time.sleep(3)
|
'PM1': 0.0,
|
||||||
exit()
|
'PM25': 0.0,
|
||||||
except:
|
'PM10': 0.0,
|
||||||
# for all other kinds of error, but not specifying which one
|
'sleep': 0,
|
||||||
print("Unknown error...")
|
'degradedState': 0,
|
||||||
|
'notReady': 0,
|
||||||
|
'heatError': 0,
|
||||||
|
't_rhError': 0,
|
||||||
|
'fanError': 0,
|
||||||
|
'memoryError': 0,
|
||||||
|
'laserError': 0,
|
||||||
|
'raw': '',
|
||||||
|
'message': 'User interrupt encountered'
|
||||||
|
}
|
||||||
|
print(json.dumps(data))
|
||||||
time.sleep(3)
|
time.sleep(3)
|
||||||
exit()
|
exit()
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
data = {
|
||||||
|
'PM1': 0.0,
|
||||||
|
'PM25': 0.0,
|
||||||
|
'PM10': 0.0,
|
||||||
|
'sleep': 0,
|
||||||
|
'degradedState': 0,
|
||||||
|
'notReady': 0,
|
||||||
|
'heatError': 0,
|
||||||
|
't_rhError': 0,
|
||||||
|
'fanError': 0,
|
||||||
|
'memoryError': 0,
|
||||||
|
'laserError': 0,
|
||||||
|
'raw': '',
|
||||||
|
'message': f'Error: {str(e)}'
|
||||||
|
}
|
||||||
|
print(json.dumps(data))
|
||||||
|
time.sleep(3)
|
||||||
|
exit()
|
||||||
177
NPM/get_data_modbus_v2_1.py
Normal file
177
NPM/get_data_modbus_v2_1.py
Normal file
@@ -0,0 +1,177 @@
|
|||||||
|
'''
|
||||||
|
_ _ ____ __ __
|
||||||
|
| \ | | _ \| \/ |
|
||||||
|
| \| | |_) | |\/| |
|
||||||
|
| |\ | __/| | | |
|
||||||
|
|_| \_|_| |_| |_|
|
||||||
|
|
||||||
|
Script to get NPM data via Modbus
|
||||||
|
|
||||||
|
Improved version with data stream lenght check
|
||||||
|
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/NPM/get_data_modbus_v3.py
|
||||||
|
|
||||||
|
Modbus RTU
|
||||||
|
[Slave Address][Function Code][Starting Address][Quantity of Registers][CRC]
|
||||||
|
|
||||||
|
Pour récupérer
|
||||||
|
les concentrations en PM1, PM10 et PM2.5 (a partir du registre 0x38)
|
||||||
|
les 5 cannaux
|
||||||
|
la température et l'humidité à l'intérieur du capteur
|
||||||
|
Donnée actualisée toutes les 10 secondes
|
||||||
|
|
||||||
|
Request
|
||||||
|
\x01\x03\x00\x38\x00\x55\...\...
|
||||||
|
|
||||||
|
\x01 Slave Address (slave device address)
|
||||||
|
\x03 Function code (read multiple holding registers)
|
||||||
|
\x00\x38 Starting Address (The request starts reading from holding register address x38 or 56)
|
||||||
|
\x00\x55 Quantity of Registers (Requests to read x55 or 85 consecutive registers starting from address 56)
|
||||||
|
\...\... Cyclic Redundancy Check (checksum )
|
||||||
|
|
||||||
|
'''
|
||||||
|
import serial
|
||||||
|
import requests
|
||||||
|
import json
|
||||||
|
import sys
|
||||||
|
import crcmod
|
||||||
|
import sqlite3
|
||||||
|
import time
|
||||||
|
|
||||||
|
# Connect to the SQLite database
|
||||||
|
conn = sqlite3.connect("/var/www/nebuleair_pro_4g/sqlite/sensors.db")
|
||||||
|
cursor = conn.cursor()
|
||||||
|
|
||||||
|
def load_config(config_file):
|
||||||
|
try:
|
||||||
|
with open(config_file, 'r') as file:
|
||||||
|
config_data = json.load(file)
|
||||||
|
return config_data
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error loading config file: {e}")
|
||||||
|
return {}
|
||||||
|
|
||||||
|
# Load the configuration data
|
||||||
|
npm_solo_port = "/dev/ttyAMA5" #port du NPM solo
|
||||||
|
|
||||||
|
#GET RTC TIME from SQlite
|
||||||
|
cursor.execute("SELECT * FROM timestamp_table LIMIT 1")
|
||||||
|
row = cursor.fetchone() # Get the first (and only) row
|
||||||
|
rtc_time_str = row[1] # '2025-02-07 12:30:45'
|
||||||
|
|
||||||
|
# Initialize serial port
|
||||||
|
ser = serial.Serial(
|
||||||
|
port=npm_solo_port,
|
||||||
|
baudrate=115200,
|
||||||
|
parity=serial.PARITY_EVEN,
|
||||||
|
stopbits=serial.STOPBITS_ONE,
|
||||||
|
bytesize=serial.EIGHTBITS,
|
||||||
|
timeout=2
|
||||||
|
)
|
||||||
|
|
||||||
|
# Define Modbus CRC-16 function
|
||||||
|
crc16 = crcmod.predefined.mkPredefinedCrcFun('modbus')
|
||||||
|
|
||||||
|
# Request frame without CRC
|
||||||
|
data = b'\x01\x03\x00\x38\x00\x55'
|
||||||
|
|
||||||
|
# Calculate and append CRC
|
||||||
|
crc = crc16(data)
|
||||||
|
crc_low = crc & 0xFF
|
||||||
|
crc_high = (crc >> 8) & 0xFF
|
||||||
|
request = data + bytes([crc_low, crc_high])
|
||||||
|
|
||||||
|
# Clear serial buffer before sending
|
||||||
|
ser.flushInput()
|
||||||
|
|
||||||
|
# Send request
|
||||||
|
ser.write(request)
|
||||||
|
time.sleep(0.2) # Wait for sensor to respond
|
||||||
|
|
||||||
|
# Read response
|
||||||
|
response_length = 2 + 1 + (2 * 85) + 2 # Address + Function + Data + CRC
|
||||||
|
byte_data = ser.read(response_length)
|
||||||
|
|
||||||
|
# Validate response length
|
||||||
|
if len(byte_data) < response_length:
|
||||||
|
print("[ERROR] Incomplete response received:", byte_data.hex())
|
||||||
|
exit()
|
||||||
|
|
||||||
|
# Verify CRC
|
||||||
|
received_crc = int.from_bytes(byte_data[-2:], byteorder='little')
|
||||||
|
calculated_crc = crc16(byte_data[:-2])
|
||||||
|
|
||||||
|
if received_crc != calculated_crc:
|
||||||
|
print("[ERROR] CRC check failed! Corrupted data received.")
|
||||||
|
exit()
|
||||||
|
|
||||||
|
# Convert response to hex for debugging
|
||||||
|
formatted = ''.join(f'\\x{byte:02x}' for byte in byte_data)
|
||||||
|
#print("Response:", formatted)
|
||||||
|
|
||||||
|
# Extract and print PM values
|
||||||
|
def extract_value(byte_data, register, scale=1, single_register=False, round_to=None):
|
||||||
|
REGISTER_START = 56
|
||||||
|
offset = (register - REGISTER_START) * 2 + 3
|
||||||
|
|
||||||
|
if single_register:
|
||||||
|
value = int.from_bytes(byte_data[offset:offset+2], byteorder='big')
|
||||||
|
else:
|
||||||
|
lsw = int.from_bytes(byte_data[offset:offset+2], byteorder='big')
|
||||||
|
msw = int.from_bytes(byte_data[offset+2:offset+4], byteorder='big')
|
||||||
|
value = (msw << 16) | lsw
|
||||||
|
|
||||||
|
value = value / scale
|
||||||
|
|
||||||
|
if round_to == 0:
|
||||||
|
return int(value)
|
||||||
|
elif round_to is not None:
|
||||||
|
return round(value, round_to)
|
||||||
|
else:
|
||||||
|
return value
|
||||||
|
|
||||||
|
pm1_10s = extract_value(byte_data, 56, 1000, round_to=1)
|
||||||
|
pm25_10s = extract_value(byte_data, 58, 1000, round_to=1)
|
||||||
|
pm10_10s = extract_value(byte_data, 60, 1000, round_to=1)
|
||||||
|
|
||||||
|
#print("10 sec concentration:")
|
||||||
|
#print(f"PM1: {pm1_10s}")
|
||||||
|
#print(f"PM2.5: {pm25_10s}")
|
||||||
|
#print(f"PM10: {pm10_10s}")
|
||||||
|
|
||||||
|
# Extract values for 5 channels
|
||||||
|
channel_1 = extract_value(byte_data, 128, round_to=0) # 0.2 - 0.5μm
|
||||||
|
channel_2 = extract_value(byte_data, 130, round_to=0) # 0.5 - 1.0μm
|
||||||
|
channel_3 = extract_value(byte_data, 132, round_to=0) # 1.0 - 2.5μm
|
||||||
|
channel_4 = extract_value(byte_data, 134, round_to=0) # 2.5 - 5.0μm
|
||||||
|
channel_5 = extract_value(byte_data, 136, round_to=0) # 5.0 - 10.0μm
|
||||||
|
|
||||||
|
#print(f"Channel 1 (0.2->0.5): {channel_1}")
|
||||||
|
#print(f"Channel 2 (0.5->1.0): {channel_2}")
|
||||||
|
#print(f"Channel 3 (1.0->2.5): {channel_3}")
|
||||||
|
#print(f"Channel 4 (2.5->5.0): {channel_4}")
|
||||||
|
#print(f"Channel 5 (5.0->10.): {channel_5}")
|
||||||
|
|
||||||
|
|
||||||
|
# Retrieve relative humidity from register 106 (0x6A)
|
||||||
|
relative_humidity = extract_value(byte_data, 106, 100, single_register=True)
|
||||||
|
# Retrieve temperature from register 106 (0x6A)
|
||||||
|
temperature = extract_value(byte_data, 107, 100, single_register=True)
|
||||||
|
|
||||||
|
#print(f"Internal Relative Humidity: {relative_humidity} %")
|
||||||
|
#print(f"Internal temperature: {temperature} °C")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
cursor.execute('''
|
||||||
|
INSERT INTO data_NPM_5channels (timestamp,PM_ch1, PM_ch2, PM_ch3, PM_ch4, PM_ch5) VALUES (?,?,?,?,?,?)'''
|
||||||
|
, (rtc_time_str,channel_1,channel_2,channel_3,channel_4,channel_5))
|
||||||
|
|
||||||
|
cursor.execute('''
|
||||||
|
INSERT INTO data_NPM (timestamp,PM1, PM25, PM10, temp_npm, hum_npm) VALUES (?,?,?,?,?,?)'''
|
||||||
|
, (rtc_time_str,pm1_10s,pm25_10s,pm10_10s,temperature,relative_humidity ))
|
||||||
|
|
||||||
|
# Commit and close the connection
|
||||||
|
conn.commit()
|
||||||
|
|
||||||
|
conn.close()
|
||||||
@@ -29,6 +29,8 @@ Request
|
|||||||
\x00\x55 Quantity of Registers (Requests to read x55 or 85 consecutive registers starting from address 56)
|
\x00\x55 Quantity of Registers (Requests to read x55 or 85 consecutive registers starting from address 56)
|
||||||
\...\... Cyclic Redundancy Check (checksum )
|
\...\... Cyclic Redundancy Check (checksum )
|
||||||
|
|
||||||
|
MAJ 2026 --> renvoie des 0 si pas de réponse du NPM
|
||||||
|
|
||||||
'''
|
'''
|
||||||
import serial
|
import serial
|
||||||
import requests
|
import requests
|
||||||
@@ -52,67 +54,79 @@ def load_config(config_file):
|
|||||||
return {}
|
return {}
|
||||||
|
|
||||||
# Load the configuration data
|
# Load the configuration data
|
||||||
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
npm_solo_port = "/dev/ttyAMA5" #port du NPM solo
|
||||||
config = load_config(config_file)
|
|
||||||
npm_solo_port = config.get('NPM_solo_port', '') #port du NPM solo
|
|
||||||
|
|
||||||
#GET RTC TIME from SQlite
|
#GET RTC TIME from SQlite
|
||||||
cursor.execute("SELECT * FROM timestamp_table LIMIT 1")
|
cursor.execute("SELECT * FROM timestamp_table LIMIT 1")
|
||||||
row = cursor.fetchone() # Get the first (and only) row
|
row = cursor.fetchone() # Get the first (and only) row
|
||||||
rtc_time_str = row[1] # '2025-02-07 12:30:45'
|
rtc_time_str = row[1] # '2025-02-07 12:30:45'
|
||||||
|
|
||||||
# Initialize serial port
|
# Initialize default error values
|
||||||
ser = serial.Serial(
|
pm1_10s = 0
|
||||||
|
pm25_10s = 0
|
||||||
|
pm10_10s = 0
|
||||||
|
channel_1 = 0
|
||||||
|
channel_2 = 0
|
||||||
|
channel_3 = 0
|
||||||
|
channel_4 = 0
|
||||||
|
channel_5 = 0
|
||||||
|
relative_humidity = 0
|
||||||
|
temperature = 0
|
||||||
|
npm_status = 0xFF # Default: all errors (will be overwritten if read succeeds)
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Initialize serial port
|
||||||
|
ser = serial.Serial(
|
||||||
port=npm_solo_port,
|
port=npm_solo_port,
|
||||||
baudrate=115200,
|
baudrate=115200,
|
||||||
parity=serial.PARITY_EVEN,
|
parity=serial.PARITY_EVEN,
|
||||||
stopbits=serial.STOPBITS_ONE,
|
stopbits=serial.STOPBITS_ONE,
|
||||||
bytesize=serial.EIGHTBITS,
|
bytesize=serial.EIGHTBITS,
|
||||||
timeout=2
|
timeout=2
|
||||||
)
|
)
|
||||||
|
|
||||||
# Define Modbus CRC-16 function
|
# Define Modbus CRC-16 function
|
||||||
crc16 = crcmod.predefined.mkPredefinedCrcFun('modbus')
|
crc16 = crcmod.predefined.mkPredefinedCrcFun('modbus')
|
||||||
|
|
||||||
# Request frame without CRC
|
# Request frame without CRC
|
||||||
data = b'\x01\x03\x00\x38\x00\x55'
|
data = b'\x01\x03\x00\x38\x00\x55'
|
||||||
|
|
||||||
# Calculate and append CRC
|
# Calculate and append CRC
|
||||||
crc = crc16(data)
|
crc = crc16(data)
|
||||||
crc_low = crc & 0xFF
|
crc_low = crc & 0xFF
|
||||||
crc_high = (crc >> 8) & 0xFF
|
crc_high = (crc >> 8) & 0xFF
|
||||||
request = data + bytes([crc_low, crc_high])
|
request = data + bytes([crc_low, crc_high])
|
||||||
|
|
||||||
# Clear serial buffer before sending
|
# Clear serial buffer before sending
|
||||||
ser.flushInput()
|
ser.flushInput()
|
||||||
|
|
||||||
# Send request
|
# Send request
|
||||||
ser.write(request)
|
ser.write(request)
|
||||||
time.sleep(0.2) # Wait for sensor to respond
|
time.sleep(0.2) # Wait for sensor to respond
|
||||||
|
|
||||||
# Read response
|
# Read response
|
||||||
response_length = 2 + 1 + (2 * 85) + 2 # Address + Function + Data + CRC
|
response_length = 2 + 1 + (2 * 85) + 2 # Address + Function + Data + CRC
|
||||||
byte_data = ser.read(response_length)
|
byte_data = ser.read(response_length)
|
||||||
|
|
||||||
# Validate response length
|
# Validate response length
|
||||||
if len(byte_data) < response_length:
|
if len(byte_data) < response_length:
|
||||||
print("[ERROR] Incomplete response received:", byte_data.hex())
|
print(f"[ERROR] Incomplete response received: {byte_data.hex()}")
|
||||||
exit()
|
raise Exception("Incomplete response")
|
||||||
|
|
||||||
# Verify CRC
|
# Verify CRC
|
||||||
received_crc = int.from_bytes(byte_data[-2:], byteorder='little')
|
received_crc = int.from_bytes(byte_data[-2:], byteorder='little')
|
||||||
calculated_crc = crc16(byte_data[:-2])
|
calculated_crc = crc16(byte_data[:-2])
|
||||||
|
|
||||||
if received_crc != calculated_crc:
|
if received_crc != calculated_crc:
|
||||||
print("[ERROR] CRC check failed! Corrupted data received.")
|
print("[ERROR] CRC check failed! Corrupted data received.")
|
||||||
exit()
|
raise Exception("CRC check failed")
|
||||||
|
|
||||||
# Convert response to hex for debugging
|
# Convert response to hex for debugging
|
||||||
formatted = ''.join(f'\\x{byte:02x}' for byte in byte_data)
|
formatted = ''.join(f'\\x{byte:02x}' for byte in byte_data)
|
||||||
#print("Response:", formatted)
|
#print("Response:", formatted)
|
||||||
|
|
||||||
# Extract and print PM values
|
# Extract and print PM values
|
||||||
def extract_value(byte_data, register, scale=1, single_register=False, round_to=None):
|
def extract_value(byte_data, register, scale=1, single_register=False, round_to=None):
|
||||||
REGISTER_START = 56
|
REGISTER_START = 56
|
||||||
offset = (register - REGISTER_START) * 2 + 3
|
offset = (register - REGISTER_START) * 2 + 3
|
||||||
|
|
||||||
@@ -132,48 +146,76 @@ def extract_value(byte_data, register, scale=1, single_register=False, round_to=
|
|||||||
else:
|
else:
|
||||||
return value
|
return value
|
||||||
|
|
||||||
pm1_10s = extract_value(byte_data, 56, 1000, round_to=1)
|
pm1_10s = extract_value(byte_data, 56, 1000, round_to=1)
|
||||||
pm25_10s = extract_value(byte_data, 58, 1000, round_to=1)
|
pm25_10s = extract_value(byte_data, 58, 1000, round_to=1)
|
||||||
pm10_10s = extract_value(byte_data, 60, 1000, round_to=1)
|
pm10_10s = extract_value(byte_data, 60, 1000, round_to=1)
|
||||||
|
|
||||||
#print("10 sec concentration:")
|
#print("10 sec concentration:")
|
||||||
#print(f"PM1: {pm1_10s}")
|
#print(f"PM1: {pm1_10s}")
|
||||||
#print(f"PM2.5: {pm25_10s}")
|
#print(f"PM2.5: {pm25_10s}")
|
||||||
#print(f"PM10: {pm10_10s}")
|
#print(f"PM10: {pm10_10s}")
|
||||||
|
|
||||||
# Extract values for 5 channels
|
# Extract values for 5 channels
|
||||||
channel_1 = extract_value(byte_data, 128, round_to=0) # 0.2 - 0.5μm
|
channel_1 = extract_value(byte_data, 128, round_to=0) # 0.2 - 0.5μm
|
||||||
channel_2 = extract_value(byte_data, 130, round_to=0) # 0.5 - 1.0μm
|
channel_2 = extract_value(byte_data, 130, round_to=0) # 0.5 - 1.0μm
|
||||||
channel_3 = extract_value(byte_data, 132, round_to=0) # 1.0 - 2.5μm
|
channel_3 = extract_value(byte_data, 132, round_to=0) # 1.0 - 2.5μm
|
||||||
channel_4 = extract_value(byte_data, 134, round_to=0) # 2.5 - 5.0μm
|
channel_4 = extract_value(byte_data, 134, round_to=0) # 2.5 - 5.0μm
|
||||||
channel_5 = extract_value(byte_data, 136, round_to=0) # 5.0 - 10.0μm
|
channel_5 = extract_value(byte_data, 136, round_to=0) # 5.0 - 10.0μm
|
||||||
|
|
||||||
#print(f"Channel 1 (0.2->0.5): {channel_1}")
|
#print(f"Channel 1 (0.2->0.5): {channel_1}")
|
||||||
#print(f"Channel 2 (0.5->1.0): {channel_2}")
|
#print(f"Channel 2 (0.5->1.0): {channel_2}")
|
||||||
#print(f"Channel 3 (1.0->2.5): {channel_3}")
|
#print(f"Channel 3 (1.0->2.5): {channel_3}")
|
||||||
#print(f"Channel 4 (2.5->5.0): {channel_4}")
|
#print(f"Channel 4 (2.5->5.0): {channel_4}")
|
||||||
#print(f"Channel 5 (5.0->10.): {channel_5}")
|
#print(f"Channel 5 (5.0->10.): {channel_5}")
|
||||||
|
|
||||||
|
|
||||||
# Retrieve relative humidity from register 106 (0x6A)
|
# Retrieve relative humidity from register 106 (0x6A)
|
||||||
relative_humidity = extract_value(byte_data, 106, 100, single_register=True)
|
relative_humidity = extract_value(byte_data, 106, 100, single_register=True)
|
||||||
# Retrieve temperature from register 106 (0x6A)
|
# Retrieve temperature from register 106 (0x6A)
|
||||||
temperature = extract_value(byte_data, 107, 100, single_register=True)
|
temperature = extract_value(byte_data, 107, 100, single_register=True)
|
||||||
|
|
||||||
#print(f"Internal Relative Humidity: {relative_humidity} %")
|
#print(f"Internal Relative Humidity: {relative_humidity} %")
|
||||||
#print(f"Internal temperature: {temperature} °C")
|
#print(f"Internal temperature: {temperature} °C")
|
||||||
|
|
||||||
|
# Read NPM status register (register 19 = 0x13, 1 register)
|
||||||
|
# Modbus request: slave=0x01, func=0x03, addr=0x0013, qty=0x0001
|
||||||
|
status_request = b'\x01\x03\x00\x13\x00\x01'
|
||||||
|
status_crc = crc16(status_request)
|
||||||
|
status_request += bytes([status_crc & 0xFF, (status_crc >> 8) & 0xFF])
|
||||||
|
|
||||||
|
ser.flushInput()
|
||||||
|
ser.write(status_request)
|
||||||
|
time.sleep(0.2)
|
||||||
|
|
||||||
cursor.execute('''
|
# Response: addr(1) + func(1) + byte_count(1) + data(2) + crc(2) = 7 bytes
|
||||||
INSERT INTO data_NPM_5channels (timestamp,PM_ch1, PM_ch2, PM_ch3, PM_ch4, PM_ch5) VALUES (?,?,?,?,?,?)'''
|
status_response = ser.read(7)
|
||||||
, (rtc_time_str,channel_1,channel_2,channel_3,channel_4,channel_5))
|
if len(status_response) == 7:
|
||||||
|
status_recv_crc = int.from_bytes(status_response[-2:], byteorder='little')
|
||||||
|
status_calc_crc = crc16(status_response[:-2])
|
||||||
|
if status_recv_crc == status_calc_crc:
|
||||||
|
npm_status = int.from_bytes(status_response[3:5], byteorder='big') & 0xFF
|
||||||
|
print(f"NPM status: 0x{npm_status:02X} ({npm_status})")
|
||||||
|
else:
|
||||||
|
print("[WARNING] NPM status CRC check failed, keeping default")
|
||||||
|
else:
|
||||||
|
print(f"[WARNING] NPM status incomplete response ({len(status_response)} bytes)")
|
||||||
|
|
||||||
cursor.execute('''
|
ser.close()
|
||||||
INSERT INTO data_NPM (timestamp,PM1, PM25, PM10, temp_npm, hum_npm) VALUES (?,?,?,?,?,?)'''
|
|
||||||
, (rtc_time_str,pm1_10s,pm25_10s,pm10_10s,temperature,relative_humidity ))
|
|
||||||
|
|
||||||
# Commit and close the connection
|
except Exception as e:
|
||||||
conn.commit()
|
print(f"[ERROR] Sensor communication failed: {e}")
|
||||||
|
# Variables already set to -1 at the beginning
|
||||||
|
|
||||||
conn.close()
|
finally:
|
||||||
|
# Always save data to database, even if all values are -1
|
||||||
|
cursor.execute('''
|
||||||
|
INSERT INTO data_NPM_5channels (timestamp,PM_ch1, PM_ch2, PM_ch3, PM_ch4, PM_ch5) VALUES (?,?,?,?,?,?)'''
|
||||||
|
, (rtc_time_str, channel_1, channel_2, channel_3, channel_4, channel_5))
|
||||||
|
|
||||||
|
cursor.execute('''
|
||||||
|
INSERT INTO data_NPM (timestamp,PM1, PM25, PM10, temp_npm, hum_npm, npm_status) VALUES (?,?,?,?,?,?,?)'''
|
||||||
|
, (rtc_time_str, pm1_10s, pm25_10s, pm10_10s, temperature, relative_humidity, npm_status))
|
||||||
|
|
||||||
|
# Commit and close the connection
|
||||||
|
conn.commit()
|
||||||
|
conn.close()
|
||||||
35
README.md
35
README.md
@@ -28,17 +28,19 @@ Line by line installation.
|
|||||||
|
|
||||||
```
|
```
|
||||||
sudo apt update
|
sudo apt update
|
||||||
sudo apt install git gh apache2 php php-sqlite3 python3 python3-pip jq autossh i2c-tools python3-smbus -y
|
sudo apt install git gh apache2 sqlite3 php php-sqlite3 python3 python3-pip jq autossh i2c-tools python3-smbus -y
|
||||||
sudo pip3 install pyserial requests RPi.GPIO adafruit-circuitpython-bme280 crcmod psutil ntplib pytz --break-system-packages
|
sudo pip3 install pyserial requests RPi.GPIO adafruit-circuitpython-bme280 crcmod psutil ntplib pytz gpiozero adafruit-circuitpython-ads1x15 numpy nsrt-mk3-dev --break-system-packages
|
||||||
sudo mkdir -p /var/www/.ssh
|
sudo mkdir -p /var/www/.ssh
|
||||||
sudo ssh-keygen -t rsa -b 4096 -f /var/www/.ssh/id_rsa -N ""
|
sudo ssh-keygen -t rsa -b 4096 -f /var/www/.ssh/id_rsa -N ""
|
||||||
sudo ssh-copy-id -i /var/www/.ssh/id_rsa.pub -p 50221 airlab_server1@aircarto.fr
|
sudo ssh-copy-id -i /var/www/.ssh/id_rsa.pub -p 50221 airlab_server1@aircarto.fr
|
||||||
sudo git clone http://gitea.aircarto.fr/PaulVua/nebuleair_pro_4g.git /var/www/nebuleair_pro_4g
|
sudo git clone http://gitea.aircarto.fr/PaulVua/nebuleair_pro_4g.git /var/www/nebuleair_pro_4g
|
||||||
sudo mkdir /var/www/nebuleair_pro_4g/logs
|
sudo mkdir /var/www/nebuleair_pro_4g/logs
|
||||||
sudo touch /var/www/nebuleair_pro_4g/logs/app.log /var/www/nebuleair_pro_4g/logs/loop.log /var/www/nebuleair_pro_4g/wifi_list.csv
|
sudo touch /var/www/nebuleair_pro_4g/logs/app.log /var/www/nebuleair_pro_4g/logs/loop.log /var/www/nebuleair_pro_4g/wifi_list.csv
|
||||||
sudo cp /var/www/nebuleair_pro_4g/config.json.dist /var/www/nebuleair_pro_4g/config.json
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/create_db.py
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/set_config.py
|
||||||
sudo chmod -R 777 /var/www/nebuleair_pro_4g/
|
sudo chmod -R 777 /var/www/nebuleair_pro_4g/
|
||||||
git config --global core.fileMode false
|
git config --global core.fileMode false
|
||||||
|
git -C /var/www/nebuleair_pro_4g config core.fileMode false
|
||||||
git config --global --add safe.directory /var/www/nebuleair_pro_4g
|
git config --global --add safe.directory /var/www/nebuleair_pro_4g
|
||||||
sudo crontab /var/www/nebuleair_pro_4g/cron_jobs
|
sudo crontab /var/www/nebuleair_pro_4g/cron_jobs
|
||||||
sudo /usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/create_db.py
|
sudo /usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/create_db.py
|
||||||
@@ -57,6 +59,9 @@ ALL ALL=(ALL) NOPASSWD: /usr/bin/nmcli, /usr/sbin/reboot
|
|||||||
www-data ALL=(ALL) NOPASSWD: /usr/bin/git pull
|
www-data ALL=(ALL) NOPASSWD: /usr/bin/git pull
|
||||||
www-data ALL=(ALL) NOPASSWD: /usr/bin/ssh
|
www-data ALL=(ALL) NOPASSWD: /usr/bin/ssh
|
||||||
www-data ALL=(ALL) NOPASSWD: /usr/bin/python3 *
|
www-data ALL=(ALL) NOPASSWD: /usr/bin/python3 *
|
||||||
|
www-data ALL=(ALL) NOPASSWD: /bin/systemctl *
|
||||||
|
www-data ALL=(ALL) NOPASSWD: /usr/bin/pkill
|
||||||
|
www-data ALL=(ALL) NOPASSWD: /var/www/nebuleair_pro_4g/*
|
||||||
```
|
```
|
||||||
## Serial
|
## Serial
|
||||||
|
|
||||||
@@ -208,4 +213,28 @@ This can be doned with script boot_hotspot.sh.
|
|||||||
@reboot /var/www/nebuleair_pro_4g/boot_hotspot.sh
|
@reboot /var/www/nebuleair_pro_4g/boot_hotspot.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Claude Code
|
||||||
|
|
||||||
|
Instructions to use claude code on the RPI.
|
||||||
|
|
||||||
|
### Install NPM
|
||||||
|
|
||||||
|
```
|
||||||
|
sudo apt install -y nodejs npm
|
||||||
|
node -v
|
||||||
|
npm -v
|
||||||
|
```
|
||||||
|
|
||||||
|
### Install Claude
|
||||||
|
|
||||||
|
```
|
||||||
|
sudo npm install -g @anthropic-ai/claude-code
|
||||||
|
```
|
||||||
|
|
||||||
|
### Run claude
|
||||||
|
|
||||||
|
```
|
||||||
|
claude
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,15 @@
|
|||||||
|
#!/usr/bin/python3
|
||||||
"""
|
"""
|
||||||
Script to set the RTC using an NTP server.
|
____ _____ ____
|
||||||
|
| _ \_ _/ ___|
|
||||||
|
| |_) || || |
|
||||||
|
| _ < | || |___
|
||||||
|
|_| \_\|_| \____|
|
||||||
|
|
||||||
|
Script to set the RTC using an NTP server (script used by web UI)
|
||||||
RPI needs to be connected to the internet (WIFI).
|
RPI needs to be connected to the internet (WIFI).
|
||||||
Requires ntplib and pytz:
|
Requires ntplib and pytz:
|
||||||
sudo pip3 install ntplib pytz --break-system-packages
|
sudo pip3 install ntplib pytz --break-system-packages
|
||||||
|
|
||||||
/usr/bin/python3 /var/www/nebuleair_pro_4g/RTC/set_with_NTP.py
|
|
||||||
|
|
||||||
"""
|
"""
|
||||||
import smbus2
|
import smbus2
|
||||||
import time
|
import time
|
||||||
@@ -49,29 +53,95 @@ def set_time(bus, year, month, day, hour, minute, second):
|
|||||||
])
|
])
|
||||||
|
|
||||||
def read_time(bus):
|
def read_time(bus):
|
||||||
"""Read the RTC time."""
|
"""Read the RTC time and validate the values."""
|
||||||
|
try:
|
||||||
data = bus.read_i2c_block_data(DS3231_ADDR, REG_TIME, 7)
|
data = bus.read_i2c_block_data(DS3231_ADDR, REG_TIME, 7)
|
||||||
|
|
||||||
|
# Convert from BCD
|
||||||
second = bcd_to_dec(data[0] & 0x7F)
|
second = bcd_to_dec(data[0] & 0x7F)
|
||||||
minute = bcd_to_dec(data[1])
|
minute = bcd_to_dec(data[1])
|
||||||
hour = bcd_to_dec(data[2] & 0x3F)
|
hour = bcd_to_dec(data[2] & 0x3F)
|
||||||
day = bcd_to_dec(data[4])
|
day = bcd_to_dec(data[4])
|
||||||
month = bcd_to_dec(data[5])
|
month = bcd_to_dec(data[5])
|
||||||
year = bcd_to_dec(data[6]) + 2000
|
year = bcd_to_dec(data[6]) + 2000
|
||||||
|
|
||||||
|
# Print raw values for debugging
|
||||||
|
print(f"Raw RTC values: {data}")
|
||||||
|
print(f"Decoded values: Y:{year} M:{month} D:{day} H:{hour} M:{minute} S:{second}")
|
||||||
|
|
||||||
|
# Validate date values
|
||||||
|
if not (1 <= month <= 12):
|
||||||
|
print(f"Invalid month value: {month}, using default")
|
||||||
|
month = 1
|
||||||
|
|
||||||
|
# Check days in month (simplified)
|
||||||
|
days_in_month = [0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
|
||||||
|
if not (1 <= day <= days_in_month[month]):
|
||||||
|
print(f"Invalid day value: {day} for month {month}, using default")
|
||||||
|
day = 1
|
||||||
|
|
||||||
|
# Validate time values
|
||||||
|
if not (0 <= hour <= 23):
|
||||||
|
print(f"Invalid hour value: {hour}, using default")
|
||||||
|
hour = 0
|
||||||
|
|
||||||
|
if not (0 <= minute <= 59):
|
||||||
|
print(f"Invalid minute value: {minute}, using default")
|
||||||
|
minute = 0
|
||||||
|
|
||||||
|
if not (0 <= second <= 59):
|
||||||
|
print(f"Invalid second value: {second}, using default")
|
||||||
|
second = 0
|
||||||
|
|
||||||
return (year, month, day, hour, minute, second)
|
return (year, month, day, hour, minute, second)
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error reading RTC: {e}")
|
||||||
|
# Return a safe default date (2023-01-01 00:00:00)
|
||||||
|
return (2023, 1, 1, 0, 0, 0)
|
||||||
|
|
||||||
def get_internet_time():
|
def get_internet_time():
|
||||||
"""Get the current time from an NTP server."""
|
"""Get the current time from an NTP server."""
|
||||||
ntp_client = ntplib.NTPClient()
|
ntp_client = ntplib.NTPClient()
|
||||||
response = ntp_client.request('pool.ntp.org')
|
# Try multiple NTP servers in case one fails
|
||||||
|
servers = ['pool.ntp.org', 'time.google.com', 'time.windows.com', 'time.apple.com']
|
||||||
|
|
||||||
|
for server in servers:
|
||||||
|
try:
|
||||||
|
print(f"Trying NTP server: {server}")
|
||||||
|
response = ntp_client.request(server, timeout=2)
|
||||||
utc_time = datetime.utcfromtimestamp(response.tx_time)
|
utc_time = datetime.utcfromtimestamp(response.tx_time)
|
||||||
|
print(f"Successfully got time from {server}")
|
||||||
return utc_time
|
return utc_time
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Failed to get time from {server}: {e}")
|
||||||
|
|
||||||
|
# If all servers fail, raise exception
|
||||||
|
raise Exception("All NTP servers failed")
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
try:
|
||||||
bus = smbus2.SMBus(1)
|
bus = smbus2.SMBus(1)
|
||||||
|
|
||||||
|
# Test if RTC is accessible
|
||||||
|
try:
|
||||||
|
bus.read_byte(DS3231_ADDR)
|
||||||
|
print("RTC module is accessible")
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error accessing RTC module: {e}")
|
||||||
|
print("Please check connections and I2C configuration")
|
||||||
|
return
|
||||||
|
|
||||||
# Get the current time from the RTC
|
# Get the current time from the RTC
|
||||||
|
try:
|
||||||
year, month, day, hours, minutes, seconds = read_time(bus)
|
year, month, day, hours, minutes, seconds = read_time(bus)
|
||||||
|
# Create datetime object with validation to handle invalid dates
|
||||||
rtc_time = datetime(year, month, day, hours, minutes, seconds)
|
rtc_time = datetime(year, month, day, hours, minutes, seconds)
|
||||||
|
print(f"Actual RTC Time : {rtc_time.strftime('%Y-%m-%d %H:%M:%S')}")
|
||||||
|
except ValueError as e:
|
||||||
|
print(f"Invalid date/time read from RTC: {e}")
|
||||||
|
print("Will proceed with setting RTC from internet time")
|
||||||
|
rtc_time = None
|
||||||
|
|
||||||
# Get current UTC time from an NTP server
|
# Get current UTC time from an NTP server
|
||||||
try:
|
try:
|
||||||
@@ -79,19 +149,35 @@ def main():
|
|||||||
print(f"Time from Internet (UTC) : {internet_utc_time.strftime('%Y-%m-%d %H:%M:%S')}")
|
print(f"Time from Internet (UTC) : {internet_utc_time.strftime('%Y-%m-%d %H:%M:%S')}")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"Error retrieving time from the internet: {e}")
|
print(f"Error retrieving time from the internet: {e}")
|
||||||
|
if rtc_time is None:
|
||||||
|
print("Cannot proceed without either valid RTC time or internet time")
|
||||||
|
return
|
||||||
|
print("Will keep current RTC time")
|
||||||
return
|
return
|
||||||
|
|
||||||
# Print current RTC time
|
|
||||||
print(f"Actual RTC Time : {rtc_time.strftime('%Y-%m-%d %H:%M:%S')}")
|
|
||||||
|
|
||||||
# Set the RTC to UTC time
|
# Set the RTC to UTC time
|
||||||
|
print("Setting RTC to internet time...")
|
||||||
set_time(bus, internet_utc_time.year, internet_utc_time.month, internet_utc_time.day,
|
set_time(bus, internet_utc_time.year, internet_utc_time.month, internet_utc_time.day,
|
||||||
internet_utc_time.hour, internet_utc_time.minute, internet_utc_time.second)
|
internet_utc_time.hour, internet_utc_time.minute, internet_utc_time.second)
|
||||||
|
|
||||||
# Read and print the new time from RTC
|
# Read and print the new time from RTC
|
||||||
|
print("Reading back new RTC time...")
|
||||||
year, month, day, hour, minute, second = read_time(bus)
|
year, month, day, hour, minute, second = read_time(bus)
|
||||||
rtc_time_new = datetime(year, month, day, hour, minute, second)
|
rtc_time_new = datetime(year, month, day, hour, minute, second)
|
||||||
print(f"New RTC Time (UTC) : {rtc_time_new.strftime('%Y-%m-%d %H:%M:%S')}")
|
print(f"New RTC Time (UTC) : {rtc_time_new.strftime('%Y-%m-%d %H:%M:%S')}")
|
||||||
|
|
||||||
|
# Calculate difference to verify accuracy
|
||||||
|
time_diff = abs((rtc_time_new - internet_utc_time).total_seconds())
|
||||||
|
print(f"Time difference : {time_diff:.2f} seconds")
|
||||||
|
|
||||||
|
if time_diff > 5:
|
||||||
|
print("Warning: RTC time differs significantly from internet time")
|
||||||
|
print("You may need to retry or check RTC module")
|
||||||
|
else:
|
||||||
|
print("RTC successfully synchronized with internet time")
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Unexpected error: {e}")
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
main()
|
main()
|
||||||
@@ -1,5 +1,11 @@
|
|||||||
"""
|
"""
|
||||||
Script to set the RTC using the browser time.
|
____ _____ ____
|
||||||
|
| _ \_ _/ ___|
|
||||||
|
| |_) || || |
|
||||||
|
| _ < | || |___
|
||||||
|
|_| \_\|_| \____|
|
||||||
|
|
||||||
|
Script to set the RTC using the browser time (script used by the web UI).
|
||||||
|
|
||||||
/usr/bin/python3 /var/www/nebuleair_pro_4g/RTC/set_with_browserTime.py '2024-01-30 12:48:39'
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/RTC/set_with_browserTime.py '2024-01-30 12:48:39'
|
||||||
|
|
||||||
|
|||||||
14
SARA/PPP/README.md
Normal file
14
SARA/PPP/README.md
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
# PPP activation
|
||||||
|
|
||||||
|
Une fois la connexion PPP activée on peut retrouver la connexion pp0 avec `ifconfig`.
|
||||||
|
|
||||||
|
### Test avec curl
|
||||||
|
|
||||||
|
On peut forcer l'utilisation du réseau pp0 avec curl:
|
||||||
|
|
||||||
|
`curl --interface ppp0 https://ifconfig.me`
|
||||||
|
|
||||||
|
ou avec ping:
|
||||||
|
|
||||||
|
`ping -I ppp0 google.com`
|
||||||
|
|
||||||
4
SARA/PPP/activate_ppp.sh
Normal file
4
SARA/PPP/activate_ppp.sh
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
|
||||||
|
sudo pppd /dev/ttyAMA2 115200 \
|
||||||
|
connect '/usr/sbin/chat -v -s "" "AT" OK "ATD*99#" CONNECT' \
|
||||||
|
noauth debug dump nodetach nocrtscts
|
||||||
121
SARA/R5/setPDP.py
Normal file
121
SARA/R5/setPDP.py
Normal file
@@ -0,0 +1,121 @@
|
|||||||
|
'''
|
||||||
|
____ _ ____ _
|
||||||
|
/ ___| / \ | _ \ / \
|
||||||
|
\___ \ / _ \ | |_) | / _ \
|
||||||
|
___) / ___ \| _ < / ___ \
|
||||||
|
|____/_/ \_\_| \_\/_/ \_\
|
||||||
|
|
||||||
|
Script to set the PDP context for the SARA R5
|
||||||
|
|
||||||
|
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/R5/setPDP.py
|
||||||
|
|
||||||
|
'''
|
||||||
|
import serial
|
||||||
|
import time
|
||||||
|
import sys
|
||||||
|
import json
|
||||||
|
import re
|
||||||
|
|
||||||
|
|
||||||
|
ser_sara = serial.Serial(
|
||||||
|
port='/dev/ttyAMA2',
|
||||||
|
baudrate=115200, #115200 ou 9600
|
||||||
|
parity=serial.PARITY_NONE, #PARITY_NONE, PARITY_EVEN or PARITY_ODD
|
||||||
|
stopbits=serial.STOPBITS_ONE,
|
||||||
|
bytesize=serial.EIGHTBITS,
|
||||||
|
timeout = 2
|
||||||
|
)
|
||||||
|
|
||||||
|
def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2, wait_for_lines=None, debug=True):
|
||||||
|
'''
|
||||||
|
Fonction très importante !!!
|
||||||
|
Reads the complete response from a serial connection and waits for specific lines.
|
||||||
|
'''
|
||||||
|
if wait_for_lines is None:
|
||||||
|
wait_for_lines = [] # Default to an empty list if not provided
|
||||||
|
|
||||||
|
response = bytearray()
|
||||||
|
serial_connection.timeout = timeout
|
||||||
|
end_time = time.time() + end_of_response_timeout
|
||||||
|
start_time = time.time()
|
||||||
|
|
||||||
|
while True:
|
||||||
|
elapsed_time = time.time() - start_time # Time since function start
|
||||||
|
if serial_connection.in_waiting > 0:
|
||||||
|
data = serial_connection.read(serial_connection.in_waiting)
|
||||||
|
response.extend(data)
|
||||||
|
end_time = time.time() + end_of_response_timeout # Reset timeout on new data
|
||||||
|
|
||||||
|
# Decode and check for any target line
|
||||||
|
decoded_response = response.decode('utf-8', errors='replace')
|
||||||
|
for target_line in wait_for_lines:
|
||||||
|
if target_line in decoded_response:
|
||||||
|
if debug:
|
||||||
|
print(f"[DEBUG] 🔎 Found target line: {target_line} (in {elapsed_time:.2f}s)")
|
||||||
|
return decoded_response # Return response immediately if a target line is found
|
||||||
|
elif time.time() > end_time:
|
||||||
|
if debug:
|
||||||
|
print(f"[DEBUG] Timeout reached. No more data received.")
|
||||||
|
break
|
||||||
|
time.sleep(0.1) # Short sleep to prevent busy waiting
|
||||||
|
|
||||||
|
# Final response and debug output
|
||||||
|
total_elapsed_time = time.time() - start_time
|
||||||
|
if debug:
|
||||||
|
print(f"[DEBUG] ⏱️ elapsed time: {total_elapsed_time:.2f}s. ⏱️")
|
||||||
|
# Check if the elapsed time exceeded 10 seconds
|
||||||
|
if total_elapsed_time > 10 and debug:
|
||||||
|
print(f"[ALERT] 🚨 The operation took too long 🚨")
|
||||||
|
print(f'<span style="color: red;font-weight: bold;">[ALERT] ⚠️{total_elapsed_time:.2f}s⚠️</span>')
|
||||||
|
|
||||||
|
return response.decode('utf-8', errors='replace') # Return the full response if no target line is found
|
||||||
|
|
||||||
|
try:
|
||||||
|
print('Start script')
|
||||||
|
|
||||||
|
# 1. Check connection
|
||||||
|
print('➡️Check SARA R5 connexion')
|
||||||
|
command = f'ATI0\r'
|
||||||
|
ser_sara.write(command.encode('utf-8'))
|
||||||
|
response_SARA_1 = read_complete_response(ser_sara, wait_for_lines=["OK"])
|
||||||
|
print(response_SARA_1, end="")
|
||||||
|
time.sleep(1)
|
||||||
|
|
||||||
|
# 2. Activate PDP context 1
|
||||||
|
print('➡️Activate PDP context 1')
|
||||||
|
command = f'AT+CGACT=1,1\r'
|
||||||
|
ser_sara.write(command.encode('utf-8'))
|
||||||
|
response_SARA_2 = read_complete_response(ser_sara, wait_for_lines=["OK"])
|
||||||
|
print(response_SARA_2, end="")
|
||||||
|
time.sleep(1)
|
||||||
|
|
||||||
|
# 2. Set the PDP type
|
||||||
|
print('➡️Set the PDP type to IPv4 referring to the outputof the +CGDCONT read command')
|
||||||
|
command = f'AT+UPSD=0,0,0\r'
|
||||||
|
ser_sara.write(command.encode('utf-8'))
|
||||||
|
response_SARA_3 = read_complete_response(ser_sara, wait_for_lines=["OK"])
|
||||||
|
print(response_SARA_3, end="")
|
||||||
|
time.sleep(1)
|
||||||
|
|
||||||
|
# 2. Profile #0 is mapped on CID=1.
|
||||||
|
print('➡️Profile #0 is mapped on CID=1.')
|
||||||
|
command = f'AT+UPSD=0,100,1\r'
|
||||||
|
ser_sara.write(command.encode('utf-8'))
|
||||||
|
response_SARA_3 = read_complete_response(ser_sara, wait_for_lines=["OK"])
|
||||||
|
print(response_SARA_3, end="")
|
||||||
|
time.sleep(1)
|
||||||
|
|
||||||
|
# 2. Set the PDP type
|
||||||
|
print('➡️Activate the PSD profile #0: the IPv4 address is already assigned by the network.')
|
||||||
|
command = f'AT+UPSDA=0,3\r'
|
||||||
|
ser_sara.write(command.encode('utf-8'))
|
||||||
|
response_SARA_3 = read_complete_response(ser_sara, wait_for_lines=["OK","+UUPSDA"])
|
||||||
|
print(response_SARA_3, end="")
|
||||||
|
time.sleep(1)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
print("An error occurred:", e)
|
||||||
|
traceback.print_exc() # This prints the full traceback
|
||||||
@@ -25,23 +25,8 @@ url = parameter[1] # ex: data.mobileair.fr
|
|||||||
|
|
||||||
profile_id = 3
|
profile_id = 3
|
||||||
|
|
||||||
#get baudrate
|
baudrate = 115200
|
||||||
def load_config(config_file):
|
send_uSpot = False
|
||||||
try:
|
|
||||||
with open(config_file, 'r') as file:
|
|
||||||
config_data = json.load(file)
|
|
||||||
return config_data
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading config file: {e}")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
# Define the config file path
|
|
||||||
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
|
||||||
# Load the configuration data
|
|
||||||
config = load_config(config_file)
|
|
||||||
# Access the shared variables
|
|
||||||
baudrate = config.get('SaraR4_baudrate', 115200)
|
|
||||||
send_uSpot = config.get('send_uSpot', False)
|
|
||||||
|
|
||||||
def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2, wait_for_line=None):
|
def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2, wait_for_line=None):
|
||||||
response = bytearray()
|
response = bytearray()
|
||||||
|
|||||||
@@ -26,23 +26,8 @@ url = parameter[1] # ex: data.mobileair.fr
|
|||||||
|
|
||||||
profile_id = 3
|
profile_id = 3
|
||||||
|
|
||||||
#get baudrate
|
baudrate = 115200
|
||||||
def load_config(config_file):
|
send_uSpot = False
|
||||||
try:
|
|
||||||
with open(config_file, 'r') as file:
|
|
||||||
config_data = json.load(file)
|
|
||||||
return config_data
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading config file: {e}")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
# Define the config file path
|
|
||||||
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
|
||||||
# Load the configuration data
|
|
||||||
config = load_config(config_file)
|
|
||||||
# Access the shared variables
|
|
||||||
baudrate = config.get('SaraR4_baudrate', 115200)
|
|
||||||
send_uSpot = config.get('send_uSpot', False)
|
|
||||||
|
|
||||||
def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2):
|
def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2):
|
||||||
response = bytearray()
|
response = bytearray()
|
||||||
|
|||||||
@@ -28,23 +28,8 @@ url = parameter[1] # ex: data.mobileair.fr
|
|||||||
endpoint = parameter[2]
|
endpoint = parameter[2]
|
||||||
profile_id = 2
|
profile_id = 2
|
||||||
|
|
||||||
#get baudrate
|
baudrate = 115200
|
||||||
def load_config(config_file):
|
send_uSpot = False
|
||||||
try:
|
|
||||||
with open(config_file, 'r') as file:
|
|
||||||
config_data = json.load(file)
|
|
||||||
return config_data
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading config file: {e}")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
# Define the config file path
|
|
||||||
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
|
||||||
# Load the configuration data
|
|
||||||
config = load_config(config_file)
|
|
||||||
# Access the shared variables
|
|
||||||
baudrate = config.get('SaraR4_baudrate', 115200)
|
|
||||||
send_uSpot = config.get('send_uSpot', False)
|
|
||||||
|
|
||||||
def color_text(text, color):
|
def color_text(text, color):
|
||||||
colors = {
|
colors = {
|
||||||
|
|||||||
@@ -31,23 +31,8 @@ endpoint = parameter[2]
|
|||||||
|
|
||||||
profile_id = 3
|
profile_id = 3
|
||||||
|
|
||||||
#get baudrate
|
baudrate = 115200
|
||||||
def load_config(config_file):
|
send_uSpot = False
|
||||||
try:
|
|
||||||
with open(config_file, 'r') as file:
|
|
||||||
config_data = json.load(file)
|
|
||||||
return config_data
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading config file: {e}")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
# Define the config file path
|
|
||||||
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
|
||||||
# Load the configuration data
|
|
||||||
config = load_config(config_file)
|
|
||||||
# Access the shared variables
|
|
||||||
baudrate = config.get('SaraR4_baudrate', 115200)
|
|
||||||
send_uSpot = config.get('send_uSpot', False)
|
|
||||||
|
|
||||||
def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2):
|
def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2):
|
||||||
response = bytearray()
|
response = bytearray()
|
||||||
|
|||||||
@@ -21,23 +21,8 @@ port='/dev/'+parameter[0] # ex: ttyAMA2
|
|||||||
url = parameter[1] # ex: data.mobileair.fr
|
url = parameter[1] # ex: data.mobileair.fr
|
||||||
|
|
||||||
|
|
||||||
#get baudrate
|
baudrate = 115200
|
||||||
def load_config(config_file):
|
send_uSpot = False
|
||||||
try:
|
|
||||||
with open(config_file, 'r') as file:
|
|
||||||
config_data = json.load(file)
|
|
||||||
return config_data
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading config file: {e}")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
# Define the config file path
|
|
||||||
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
|
||||||
# Load the configuration data
|
|
||||||
config = load_config(config_file)
|
|
||||||
# Access the shared variables
|
|
||||||
baudrate = config.get('SaraR4_baudrate', 115200)
|
|
||||||
send_uSpot = config.get('send_uSpot', False)
|
|
||||||
|
|
||||||
def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2):
|
def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2):
|
||||||
response = bytearray()
|
response = bytearray()
|
||||||
|
|||||||
@@ -23,24 +23,8 @@ parameter = sys.argv[1:] # Exclude the script name
|
|||||||
port='/dev/'+parameter[0] # ex: ttyAMA2
|
port='/dev/'+parameter[0] # ex: ttyAMA2
|
||||||
url = parameter[1] # ex: data.mobileair.fr
|
url = parameter[1] # ex: data.mobileair.fr
|
||||||
|
|
||||||
|
baudrate = 115200
|
||||||
#get baudrate
|
send_uSpot = False
|
||||||
def load_config(config_file):
|
|
||||||
try:
|
|
||||||
with open(config_file, 'r') as file:
|
|
||||||
config_data = json.load(file)
|
|
||||||
return config_data
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading config file: {e}")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
# Define the config file path
|
|
||||||
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
|
||||||
# Load the configuration data
|
|
||||||
config = load_config(config_file)
|
|
||||||
# Access the shared variables
|
|
||||||
baudrate = config.get('SaraR4_baudrate', 115200)
|
|
||||||
send_uSpot = config.get('send_uSpot', False)
|
|
||||||
|
|
||||||
def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2):
|
def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2):
|
||||||
response = bytearray()
|
response = bytearray()
|
||||||
|
|||||||
@@ -14,19 +14,7 @@ parameter = sys.argv[1:] # Exclude the script name
|
|||||||
port = '/dev/' + parameter[0] # e.g., ttyAMA2
|
port = '/dev/' + parameter[0] # e.g., ttyAMA2
|
||||||
timeout = float(parameter[1]) # e.g., 2 seconds
|
timeout = float(parameter[1]) # e.g., 2 seconds
|
||||||
|
|
||||||
def load_config(config_file):
|
baudrate = 115200
|
||||||
try:
|
|
||||||
with open(config_file, 'r') as file:
|
|
||||||
config_data = json.load(file)
|
|
||||||
return config_data
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading config file: {e}")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
# Define the config file path
|
|
||||||
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
|
||||||
config = load_config(config_file)
|
|
||||||
baudrate = config.get('SaraR4_baudrate', 115200)
|
|
||||||
|
|
||||||
def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2):
|
def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2):
|
||||||
response = bytearray()
|
response = bytearray()
|
||||||
|
|||||||
12
SARA/UDP/receiveUDP_downlink.py
Normal file
12
SARA/UDP/receiveUDP_downlink.py
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
'''
|
||||||
|
____ _ ____ _
|
||||||
|
/ ___| / \ | _ \ / \
|
||||||
|
\___ \ / _ \ | |_) | / _ \
|
||||||
|
___) / ___ \| _ < / ___ \
|
||||||
|
|____/_/ \_\_| \_\/_/ \_\
|
||||||
|
|
||||||
|
Script to read UDP message
|
||||||
|
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/UDP/receiveUDP_downlink.py
|
||||||
|
|
||||||
|
'''
|
||||||
129
SARA/UDP/sendUDP_message.py
Normal file
129
SARA/UDP/sendUDP_message.py
Normal file
@@ -0,0 +1,129 @@
|
|||||||
|
'''
|
||||||
|
____ _ ____ _
|
||||||
|
/ ___| / \ | _ \ / \
|
||||||
|
\___ \ / _ \ | |_) | / _ \
|
||||||
|
___) / ___ \| _ < / ___ \
|
||||||
|
|____/_/ \_\_| \_\/_/ \_\
|
||||||
|
|
||||||
|
Script to send UDP message
|
||||||
|
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/UDP/sendUDP_message.py
|
||||||
|
|
||||||
|
'''
|
||||||
|
import serial
|
||||||
|
import time
|
||||||
|
import sys
|
||||||
|
import json
|
||||||
|
import re
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
ser_sara = serial.Serial(
|
||||||
|
port='/dev/ttyAMA2',
|
||||||
|
baudrate=115200, #115200 ou 9600
|
||||||
|
parity=serial.PARITY_NONE, #PARITY_NONE, PARITY_EVEN or PARITY_ODD
|
||||||
|
stopbits=serial.STOPBITS_ONE,
|
||||||
|
bytesize=serial.EIGHTBITS,
|
||||||
|
timeout = 2
|
||||||
|
)
|
||||||
|
|
||||||
|
def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2, wait_for_lines=None, debug=True):
|
||||||
|
'''
|
||||||
|
Fonction très importante !!!
|
||||||
|
Reads the complete response from a serial connection and waits for specific lines.
|
||||||
|
'''
|
||||||
|
if wait_for_lines is None:
|
||||||
|
wait_for_lines = [] # Default to an empty list if not provided
|
||||||
|
|
||||||
|
response = bytearray()
|
||||||
|
serial_connection.timeout = timeout
|
||||||
|
end_time = time.time() + end_of_response_timeout
|
||||||
|
start_time = time.time()
|
||||||
|
|
||||||
|
while True:
|
||||||
|
elapsed_time = time.time() - start_time # Time since function start
|
||||||
|
if serial_connection.in_waiting > 0:
|
||||||
|
data = serial_connection.read(serial_connection.in_waiting)
|
||||||
|
response.extend(data)
|
||||||
|
end_time = time.time() + end_of_response_timeout # Reset timeout on new data
|
||||||
|
|
||||||
|
# Decode and check for any target line
|
||||||
|
decoded_response = response.decode('utf-8', errors='replace')
|
||||||
|
for target_line in wait_for_lines:
|
||||||
|
if target_line in decoded_response:
|
||||||
|
if debug:
|
||||||
|
print(f"[DEBUG] 🔎 Found target line: {target_line} (in {elapsed_time:.2f}s)")
|
||||||
|
return decoded_response # Return response immediately if a target line is found
|
||||||
|
elif time.time() > end_time:
|
||||||
|
if debug:
|
||||||
|
print(f"[DEBUG] Timeout reached. No more data received.")
|
||||||
|
break
|
||||||
|
time.sleep(0.1) # Short sleep to prevent busy waiting
|
||||||
|
|
||||||
|
# Final response and debug output
|
||||||
|
total_elapsed_time = time.time() - start_time
|
||||||
|
if debug:
|
||||||
|
print(f"[DEBUG] ⏱️ elapsed time: {total_elapsed_time:.2f}s. ⏱️")
|
||||||
|
# Check if the elapsed time exceeded 10 seconds
|
||||||
|
if total_elapsed_time > 10 and debug:
|
||||||
|
print(f"[ALERT] 🚨 The operation took too long 🚨")
|
||||||
|
print(f'<span style="color: red;font-weight: bold;">[ALERT] ⚠️{total_elapsed_time:.2f}s⚠️</span>')
|
||||||
|
|
||||||
|
return response.decode('utf-8', errors='replace') # Return the full response if no target line is found
|
||||||
|
|
||||||
|
try:
|
||||||
|
print('Start script')
|
||||||
|
|
||||||
|
# Increase verbosity
|
||||||
|
command = f'AT+CMEE=2\r'
|
||||||
|
ser_sara.write(command.encode('utf-8'))
|
||||||
|
response_SARA_1 = read_complete_response(ser_sara, wait_for_lines=["OK", "ERROR"])
|
||||||
|
print(response_SARA_1, end="")
|
||||||
|
time.sleep(1)
|
||||||
|
|
||||||
|
# 1. Create SOCKET
|
||||||
|
print('➡️Create SOCKET')
|
||||||
|
command = f'AT+USOCR=17\r'
|
||||||
|
ser_sara.write(command.encode('utf-8'))
|
||||||
|
response_SARA_1 = read_complete_response(ser_sara, wait_for_lines=["OK", "ERROR"])
|
||||||
|
print(response_SARA_1, end="")
|
||||||
|
time.sleep(1)
|
||||||
|
|
||||||
|
# 2. Retreive Socket ID
|
||||||
|
match = re.search(r'\+USOCR:\s*(\d+)', response_SARA_1)
|
||||||
|
if match:
|
||||||
|
socket_id = match.group(1)
|
||||||
|
print(f"Socket ID: {socket_id}")
|
||||||
|
else:
|
||||||
|
print("Failed to extract socket ID")
|
||||||
|
|
||||||
|
|
||||||
|
#3. Connect to UDP server
|
||||||
|
print("Connect to server:")
|
||||||
|
command = f'AT+USOCO={socket_id},"192.168.0.20",4242\r'
|
||||||
|
ser_sara.write(command.encode('utf-8'))
|
||||||
|
response_SARA_2 = read_complete_response(ser_sara, wait_for_lines=["OK", "+CME ERROR", "ERROR"], debug=False)
|
||||||
|
print(response_SARA_2)
|
||||||
|
|
||||||
|
# 4. Write data and send
|
||||||
|
print("Write data:")
|
||||||
|
command = f'AT+USOWR={socket_id},10\r'
|
||||||
|
ser_sara.write(command.encode('utf-8'))
|
||||||
|
response_SARA_2 = read_complete_response(ser_sara, wait_for_lines=["@","OK", "+CME ERROR", "ERROR"], debug=False)
|
||||||
|
print(response_SARA_2)
|
||||||
|
|
||||||
|
ser_sara.write("1234567890".encode())
|
||||||
|
response_SARA_2 = read_complete_response(ser_sara, wait_for_lines=["@","OK", "+CME ERROR", "ERROR"], debug=False)
|
||||||
|
print(response_SARA_2)
|
||||||
|
|
||||||
|
#Close socket
|
||||||
|
print("Close socket:")
|
||||||
|
command = f'AT+USOCL={socket_id}\r'
|
||||||
|
ser_sara.write(command.encode('utf-8'))
|
||||||
|
response_SARA_2 = read_complete_response(ser_sara, wait_for_lines=["OK", "+CME ERROR", "ERROR"], debug=False)
|
||||||
|
print(response_SARA_2)
|
||||||
|
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
print("An error occurred:", e)
|
||||||
|
traceback.print_exc() # This prints the full traceback
|
||||||
103
SARA/cellLocate/server_conf.py
Normal file
103
SARA/cellLocate/server_conf.py
Normal file
@@ -0,0 +1,103 @@
|
|||||||
|
'''
|
||||||
|
____ _ ____ _
|
||||||
|
/ ___| / \ | _ \ / \
|
||||||
|
\___ \ / _ \ | |_) | / _ \
|
||||||
|
___) / ___ \| _ < / ___ \
|
||||||
|
|____/_/ \_\_| \_\/_/ \_\
|
||||||
|
|
||||||
|
Script to Configures the network connection to a Multi GNSS Assistance (MGA) server used also per CellLocate
|
||||||
|
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/cellLocate/server_conf.py ttyAMA2 1
|
||||||
|
|
||||||
|
AT+UGSRV="cell-live1.services.u-blox.com","cell-live2.services.u-blox.com","XkEKfGqVSbmNE1eZfBZm4Q"
|
||||||
|
|
||||||
|
|
||||||
|
'''
|
||||||
|
|
||||||
|
import serial
|
||||||
|
import time
|
||||||
|
import sys
|
||||||
|
import json
|
||||||
|
|
||||||
|
parameter = sys.argv[1:] # Exclude the script name
|
||||||
|
port='/dev/'+parameter[0] # ex: ttyAMA2
|
||||||
|
timeout = float(parameter[1]) # ex:2
|
||||||
|
|
||||||
|
|
||||||
|
#get baudrate
|
||||||
|
def load_config(config_file):
|
||||||
|
try:
|
||||||
|
with open(config_file, 'r') as file:
|
||||||
|
config_data = json.load(file)
|
||||||
|
return config_data
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error loading config file: {e}")
|
||||||
|
return {}
|
||||||
|
|
||||||
|
# Define the config file path
|
||||||
|
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
||||||
|
# Load the configuration data
|
||||||
|
config = load_config(config_file)
|
||||||
|
# Access the shared variables
|
||||||
|
baudrate = config.get('SaraR4_baudrate', 115200)
|
||||||
|
|
||||||
|
ser = serial.Serial(
|
||||||
|
port=port, #USB0 or ttyS0
|
||||||
|
baudrate=baudrate, #115200 ou 9600
|
||||||
|
parity=serial.PARITY_NONE, #PARITY_NONE, PARITY_EVEN or PARITY_ODD
|
||||||
|
stopbits=serial.STOPBITS_ONE,
|
||||||
|
bytesize=serial.EIGHTBITS,
|
||||||
|
timeout = timeout
|
||||||
|
)
|
||||||
|
|
||||||
|
def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2, wait_for_lines=None, debug=True):
|
||||||
|
'''
|
||||||
|
Fonction très importante !!!
|
||||||
|
Reads the complete response from a serial connection and waits for specific lines.
|
||||||
|
'''
|
||||||
|
if wait_for_lines is None:
|
||||||
|
wait_for_lines = [] # Default to an empty list if not provided
|
||||||
|
|
||||||
|
response = bytearray()
|
||||||
|
serial_connection.timeout = timeout
|
||||||
|
end_time = time.time() + end_of_response_timeout
|
||||||
|
start_time = time.time()
|
||||||
|
|
||||||
|
while True:
|
||||||
|
elapsed_time = time.time() - start_time # Time since function start
|
||||||
|
if serial_connection.in_waiting > 0:
|
||||||
|
data = serial_connection.read(serial_connection.in_waiting)
|
||||||
|
response.extend(data)
|
||||||
|
end_time = time.time() + end_of_response_timeout # Reset timeout on new data
|
||||||
|
|
||||||
|
# Decode and check for any target line
|
||||||
|
decoded_response = response.decode('utf-8', errors='replace')
|
||||||
|
for target_line in wait_for_lines:
|
||||||
|
if target_line in decoded_response:
|
||||||
|
if debug:
|
||||||
|
print(f"[DEBUG] 🔎 Found target line: {target_line} (in {elapsed_time:.2f}s)")
|
||||||
|
return decoded_response # Return response immediately if a target line is found
|
||||||
|
elif time.time() > end_time:
|
||||||
|
if debug:
|
||||||
|
print(f"[DEBUG] Timeout reached. No more data received.")
|
||||||
|
break
|
||||||
|
time.sleep(0.1) # Short sleep to prevent busy waiting
|
||||||
|
|
||||||
|
# Final response and debug output
|
||||||
|
total_elapsed_time = time.time() - start_time
|
||||||
|
if debug:
|
||||||
|
print(f"[DEBUG] ⏱️ elapsed time: {total_elapsed_time:.2f}s. ⏱️")
|
||||||
|
# Check if the elapsed time exceeded 10 seconds
|
||||||
|
if total_elapsed_time > 10 and debug:
|
||||||
|
print(f"[ALERT] 🚨 The operation took too long 🚨")
|
||||||
|
print(f'<span style="color: red;font-weight: bold;">[ALERT] ⚠️{total_elapsed_time:.2f}s⚠️</span>')
|
||||||
|
|
||||||
|
return response.decode('utf-8', errors='replace') # Return the full response if no target line is found
|
||||||
|
|
||||||
|
|
||||||
|
#command = f'ATI\r'
|
||||||
|
command = f'AT+UGSRV="cell-live1.services.u-blox.com","cell-live2.services.u-blox.com","XkEKfGqVSbmNE1eZfBZm4Q"\r'
|
||||||
|
ser.write((command + '\r').encode('utf-8'))
|
||||||
|
|
||||||
|
response = read_complete_response(ser, wait_for_lines=["+UULOC"])
|
||||||
|
print(response)
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
'''
|
r'''
|
||||||
____ _ ____ _
|
____ _ ____ _
|
||||||
/ ___| / \ | _ \ / \
|
/ ___| / \ | _ \ / \
|
||||||
\___ \ / _ \ | |_) | / _ \
|
\___ \ / _ \ | |_) | / _ \
|
||||||
@@ -13,57 +13,112 @@ Script that starts at the boot of the RPI (with cron)
|
|||||||
|
|
||||||
'''
|
'''
|
||||||
import serial
|
import serial
|
||||||
|
import RPi.GPIO as GPIO
|
||||||
import time
|
import time
|
||||||
import sys
|
import sys
|
||||||
import json
|
import json
|
||||||
import re
|
import re
|
||||||
|
import sqlite3
|
||||||
|
import traceback
|
||||||
|
|
||||||
#get data from config
|
|
||||||
def load_config(config_file):
|
#GPIO
|
||||||
|
SARA_power_GPIO = 16
|
||||||
|
SARA_ON_GPIO = 20
|
||||||
|
|
||||||
|
GPIO.setmode(GPIO.BCM) # Use BCM numbering
|
||||||
|
GPIO.setup(SARA_power_GPIO, GPIO.OUT) # Set GPIO17 as an output
|
||||||
|
|
||||||
|
# database connection
|
||||||
|
conn = sqlite3.connect("/var/www/nebuleair_pro_4g/sqlite/sensors.db")
|
||||||
|
cursor = conn.cursor()
|
||||||
|
|
||||||
|
#get config data from SQLite table
|
||||||
|
def load_config_sqlite():
|
||||||
|
"""
|
||||||
|
Load configuration data from SQLite config table
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
dict: Configuration data with proper type conversion
|
||||||
|
"""
|
||||||
try:
|
try:
|
||||||
with open(config_file, 'r') as file:
|
|
||||||
config_data = json.load(file)
|
# Query the config table
|
||||||
|
cursor.execute("SELECT key, value, type FROM config_table")
|
||||||
|
rows = cursor.fetchall()
|
||||||
|
|
||||||
|
# Create config dictionary
|
||||||
|
config_data = {}
|
||||||
|
for key, value, type_name in rows:
|
||||||
|
# Convert value based on its type
|
||||||
|
if type_name == 'bool':
|
||||||
|
config_data[key] = value == '1' or value == 'true'
|
||||||
|
elif type_name == 'int':
|
||||||
|
config_data[key] = int(value)
|
||||||
|
elif type_name == 'float':
|
||||||
|
config_data[key] = float(value)
|
||||||
|
else:
|
||||||
|
config_data[key] = value
|
||||||
|
|
||||||
return config_data
|
return config_data
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"Error loading config file: {e}")
|
print(f"Error loading config from SQLite: {e}")
|
||||||
return {}
|
return {}
|
||||||
|
|
||||||
#Fonction pour mettre à jour le JSON de configuration
|
def update_sqlite_config(key, value):
|
||||||
def update_json_key(file_path, key, value):
|
|
||||||
"""
|
"""
|
||||||
Updates a specific key in a JSON file with a new value.
|
Updates a specific key in the SQLite config_table with a new value.
|
||||||
|
|
||||||
:param file_path: Path to the JSON file.
|
:param key: The key to update in the config_table.
|
||||||
:param key: The key to update in the JSON file.
|
|
||||||
:param value: The new value to assign to the key.
|
:param value: The new value to assign to the key.
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
# Load the existing data
|
|
||||||
with open(file_path, "r") as file:
|
|
||||||
data = json.load(file)
|
|
||||||
|
|
||||||
# Check if the key exists in the JSON file
|
# Check if the key exists and get its type
|
||||||
if key in data:
|
cursor.execute("SELECT type FROM config_table WHERE key = ?", (key,))
|
||||||
data[key] = value # Update the key with the new value
|
result = cursor.fetchone()
|
||||||
else:
|
|
||||||
print(f"Key '{key}' not found in the JSON file.")
|
if result is None:
|
||||||
|
print(f"Key '{key}' not found in the config_table.")
|
||||||
|
conn.close()
|
||||||
return
|
return
|
||||||
|
|
||||||
# Write the updated data back to the file
|
# Get the type of the value from the database
|
||||||
with open(file_path, "w") as file:
|
value_type = result[0]
|
||||||
json.dump(data, file, indent=2) # Use indent for pretty printing
|
|
||||||
|
|
||||||
print(f"💾 updating '{key}' to '{value}'.")
|
# Convert the value to the appropriate string representation based on its type
|
||||||
|
if value_type == 'bool':
|
||||||
|
# Convert Python boolean or string 'true'/'false' to '1'/'0'
|
||||||
|
if isinstance(value, bool):
|
||||||
|
str_value = '1' if value else '0'
|
||||||
|
else:
|
||||||
|
str_value = '1' if str(value).lower() in ('true', '1', 'yes', 'y') else '0'
|
||||||
|
elif value_type == 'int':
|
||||||
|
str_value = str(int(value))
|
||||||
|
elif value_type == 'float':
|
||||||
|
str_value = str(float(value))
|
||||||
|
else:
|
||||||
|
str_value = str(value)
|
||||||
|
|
||||||
|
# Update the value in the database
|
||||||
|
cursor.execute("UPDATE config_table SET value = ? WHERE key = ?", (str_value, key))
|
||||||
|
|
||||||
|
# Commit the changes and close the connection
|
||||||
|
conn.commit()
|
||||||
|
|
||||||
|
print(f"💾 Updated '{key}' to '{value}' in database.")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"Error updating the JSON file: {e}")
|
print(f"Error updating the SQLite database: {e}")
|
||||||
|
|
||||||
# Define the config file path
|
#Load config
|
||||||
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
config = load_config_sqlite()
|
||||||
# Load the configuration data
|
#config
|
||||||
config = load_config(config_file)
|
|
||||||
baudrate = config.get('SaraR4_baudrate', 115200) #baudrate du sara R4
|
baudrate = config.get('SaraR4_baudrate', 115200) #baudrate du sara R4
|
||||||
device_id = config.get('deviceID', '').upper() #device ID en maj
|
device_id = config.get('deviceID', '').upper() #device ID en maj
|
||||||
|
|
||||||
|
sara_r5_DPD_setup = False
|
||||||
|
|
||||||
ser_sara = serial.Serial(
|
ser_sara = serial.Serial(
|
||||||
port='/dev/ttyAMA2',
|
port='/dev/ttyAMA2',
|
||||||
baudrate=baudrate, #115200 ou 9600
|
baudrate=baudrate, #115200 ou 9600
|
||||||
@@ -120,20 +175,46 @@ def read_complete_response(serial_connection, timeout=2, end_of_response_timeout
|
|||||||
try:
|
try:
|
||||||
print('<h3>Start reboot python script</h3>')
|
print('<h3>Start reboot python script</h3>')
|
||||||
|
|
||||||
|
#First we need to power on the module (if connected to mosfet via gpio16)
|
||||||
|
GPIO.output(SARA_power_GPIO, GPIO.HIGH)
|
||||||
|
time.sleep(5)
|
||||||
|
|
||||||
#check modem status
|
#check modem status
|
||||||
|
#Attention:
|
||||||
|
# SARA R4 response: Manufacturer: u-blox Model: SARA-R410M-02B
|
||||||
|
# SArA R5 response: SARA-R500S-01B-00
|
||||||
print("⚙️Check SARA Status")
|
print("⚙️Check SARA Status")
|
||||||
command = f'ATI\r'
|
command = f'ATI\r'
|
||||||
ser_sara.write(command.encode('utf-8'))
|
ser_sara.write(command.encode('utf-8'))
|
||||||
response_SARA_ATI = read_complete_response(ser_sara, wait_for_lines=["IMEI"])
|
response_SARA_ATI = read_complete_response(ser_sara, wait_for_lines=["IMEI"])
|
||||||
print(response_SARA_ATI)
|
print(response_SARA_ATI)
|
||||||
match = re.search(r"Model:\s*(.+)", response_SARA_ATI)
|
|
||||||
model = match.group(1).strip() if match else "Unknown" # Strip unwanted characters
|
# Check for SARA model with more robust regex
|
||||||
print(f" Model: {model}")
|
model = "Unknown"
|
||||||
update_json_key(config_file, "modem_version", model)
|
if "SARA-R410M" in response_SARA_ATI:
|
||||||
|
model = "SARA-R410M"
|
||||||
|
print("📱 Detected SARA R4 modem")
|
||||||
|
elif "SARA-R500" in response_SARA_ATI:
|
||||||
|
model = "SARA-R500"
|
||||||
|
print("📱 Detected SARA R5 modem")
|
||||||
|
sara_r5_DPD_setup = True
|
||||||
|
else:
|
||||||
|
# Fallback to regex match if direct string match fails
|
||||||
|
match = re.search(r"Model:\s*([A-Za-z0-9\-]+)", response_SARA_ATI)
|
||||||
|
if match:
|
||||||
|
model = match.group(1).strip()
|
||||||
|
else:
|
||||||
|
model = "Unknown"
|
||||||
|
print("⚠️ Could not identify modem model")
|
||||||
|
|
||||||
|
print(f"🔍 Model: {model}")
|
||||||
|
update_sqlite_config("modem_version", model)
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
|
|
||||||
|
'''
|
||||||
# 1. Set AIRCARTO URL
|
AIRCARTO
|
||||||
|
'''
|
||||||
|
# 1. Set AIRCARTO URL (profile id = 0)
|
||||||
print('➡️Set aircarto URL')
|
print('➡️Set aircarto URL')
|
||||||
aircarto_profile_id = 0
|
aircarto_profile_id = 0
|
||||||
aircarto_url="data.nebuleair.fr"
|
aircarto_url="data.nebuleair.fr"
|
||||||
@@ -143,26 +224,155 @@ try:
|
|||||||
print(response_SARA_1)
|
print(response_SARA_1)
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
|
|
||||||
#2. Set uSpot URL
|
'''
|
||||||
print('➡️Set uSpot URL')
|
uSpot
|
||||||
|
'''
|
||||||
|
print("➡️➡️Set uSpot URL with SSL")
|
||||||
|
|
||||||
|
security_profile_id = 1
|
||||||
uSpot_profile_id = 1
|
uSpot_profile_id = 1
|
||||||
uSpot_url="api-prod.uspot.probesys.net"
|
uSpot_url="api-prod.uspot.probesys.net"
|
||||||
command = f'AT+UHTTP={uSpot_profile_id},1,"{uSpot_url}"\r'
|
|
||||||
ser_sara.write(command.encode('utf-8'))
|
|
||||||
response_SARA_2 = read_complete_response(ser_sara, wait_for_lines=["OK"])
|
#step 1: import the certificate
|
||||||
|
print("➡️ import certificate")
|
||||||
|
certificate_name = "e6"
|
||||||
|
with open("/var/www/nebuleair_pro_4g/SARA/SSL/certificate/e6.pem", "rb") as cert_file:
|
||||||
|
certificate = cert_file.read()
|
||||||
|
size_of_string = len(certificate)
|
||||||
|
|
||||||
|
# AT+USECMNG=0,<type>,<internal_name>,<data_size>
|
||||||
|
# type-> 0 -> trusted root CA
|
||||||
|
command = f'AT+USECMNG=0,0,"{certificate_name}",{size_of_string}\r'
|
||||||
|
ser_sara.write((command + '\r').encode('utf-8'))
|
||||||
|
response_SARA_1 = read_complete_response(ser_sara)
|
||||||
|
print(response_SARA_1)
|
||||||
|
|
||||||
|
time.sleep(0.5)
|
||||||
|
|
||||||
|
print("➡️ add certificate")
|
||||||
|
ser_sara.write(certificate)
|
||||||
|
response_SARA_2 = read_complete_response(ser_sara)
|
||||||
print(response_SARA_2)
|
print(response_SARA_2)
|
||||||
|
|
||||||
|
time.sleep(0.5)
|
||||||
|
|
||||||
|
# op_code: 0 -> certificate validation level
|
||||||
|
# param_val : 0 -> Level 0 No validation; 1-> Level 1 Root certificate validation
|
||||||
|
print("➡️Set the security profile (params)")
|
||||||
|
certification_level=0
|
||||||
|
command = f'AT+USECPRF={security_profile_id},0,{certification_level}\r'
|
||||||
|
ser_sara.write((command + '\r').encode('utf-8'))
|
||||||
|
response_SARA_5b = read_complete_response(ser_sara, wait_for_lines=["OK"])
|
||||||
|
print(response_SARA_5b)
|
||||||
|
time.sleep(0.5)
|
||||||
|
|
||||||
|
# op_code: 1 -> minimum SSL/TLS version
|
||||||
|
# param_val : 0 -> any; server can use any version for the connection; 1-> LSv1.0; 2->TLSv1.1; 3->TLSv1.2;
|
||||||
|
print("➡️Set the security profile (params)")
|
||||||
|
minimum_SSL_version = 0
|
||||||
|
command = f'AT+USECPRF={security_profile_id},1,{minimum_SSL_version}\r'
|
||||||
|
ser_sara.write((command + '\r').encode('utf-8'))
|
||||||
|
response_SARA_5bb = read_complete_response(ser_sara, wait_for_lines=["OK"])
|
||||||
|
print(response_SARA_5bb)
|
||||||
|
time.sleep(0.5)
|
||||||
|
|
||||||
|
#op_code: 2 -> legacy cipher suite selection
|
||||||
|
# 0 (factory-programmed value): a list of default cipher suites is proposed at the beginning of handshake process, and a cipher suite will be negotiated among the cipher suites proposed in the list.
|
||||||
|
print("➡️Set cipher")
|
||||||
|
cipher_suite = 0
|
||||||
|
command = f'AT+USECPRF={security_profile_id},2,{cipher_suite}\r'
|
||||||
|
ser_sara.write((command + '\r').encode('utf-8'))
|
||||||
|
response_SARA_5cc = read_complete_response(ser_sara, wait_for_lines=["OK"])
|
||||||
|
print(response_SARA_5cc)
|
||||||
|
time.sleep(0.5)
|
||||||
|
|
||||||
|
# op_code: 3 -> trusted root certificate internal name
|
||||||
|
print("➡️Set the security profile (choose cert)")
|
||||||
|
command = f'AT+USECPRF={security_profile_id},3,"{certificate_name}"\r'
|
||||||
|
ser_sara.write((command + '\r').encode('utf-8'))
|
||||||
|
response_SARA_5c = read_complete_response(ser_sara, wait_for_lines=["OK"])
|
||||||
|
print(response_SARA_5c)
|
||||||
|
time.sleep(0.5)
|
||||||
|
|
||||||
|
# op_code: 10 -> SNI (server name indication)
|
||||||
|
print("➡️Set the SNI")
|
||||||
|
command = f'AT+USECPRF={security_profile_id},10,"{uSpot_url}"\r'
|
||||||
|
ser_sara.write((command + '\r').encode('utf-8'))
|
||||||
|
response_SARA_5cf = read_complete_response(ser_sara, wait_for_lines=["OK"])
|
||||||
|
print(response_SARA_5cf)
|
||||||
|
time.sleep(0.5)
|
||||||
|
|
||||||
|
#step 4: set url (op_code = 1)
|
||||||
|
print("➡️SET URL")
|
||||||
|
command = f'AT+UHTTP={uSpot_profile_id},1,"{uSpot_url}"\r'
|
||||||
|
ser_sara.write((command + '\r').encode('utf-8'))
|
||||||
|
response_SARA_5 = read_complete_response(ser_sara, wait_for_lines=["OK"])
|
||||||
|
print(response_SARA_5)
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
|
|
||||||
print("set port 81")
|
#step 4: set PORT (op_code = 5)
|
||||||
command = f'AT+UHTTP={uSpot_profile_id},5,81\r'
|
print("➡️SET PORT")
|
||||||
|
port = 443
|
||||||
|
command = f'AT+UHTTP={uSpot_profile_id},5,{port}\r'
|
||||||
ser_sara.write((command + '\r').encode('utf-8'))
|
ser_sara.write((command + '\r').encode('utf-8'))
|
||||||
response_SARA_55 = read_complete_response(ser_sara, wait_for_lines=["OK"])
|
response_SARA_55 = read_complete_response(ser_sara, wait_for_lines=["OK"])
|
||||||
print(response_SARA_55)
|
print(response_SARA_55)
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
|
|
||||||
|
#step 4: set url to SSL (op_code = 6) (http_secure = 1 for HTTPS)(USECMNG_PROFILE = 2)
|
||||||
|
print("➡️SET SSL")
|
||||||
|
http_secure = 1
|
||||||
|
command = f'AT+UHTTP={uSpot_profile_id},6,{http_secure},{security_profile_id}\r'
|
||||||
|
|
||||||
|
ser_sara.write(command.encode('utf-8'))
|
||||||
|
response_SARA_5fg = read_complete_response(ser_sara, wait_for_lines=["OK"])
|
||||||
|
print(response_SARA_5fg)
|
||||||
|
time.sleep(1)
|
||||||
|
|
||||||
|
|
||||||
|
'''
|
||||||
|
SARA R5
|
||||||
|
'''
|
||||||
|
|
||||||
|
if sara_r5_DPD_setup:
|
||||||
|
print("➡️➡️SARA R5 PDP SETUP")
|
||||||
|
# 2. Activate PDP context 1
|
||||||
|
print('➡️Activate PDP context 1')
|
||||||
|
command = f'AT+CGACT=1,1\r'
|
||||||
|
ser_sara.write(command.encode('utf-8'))
|
||||||
|
response_SARA_2 = read_complete_response(ser_sara, wait_for_lines=["OK"])
|
||||||
|
print(response_SARA_2, end="")
|
||||||
|
time.sleep(1)
|
||||||
|
|
||||||
|
# 2. Set the PDP type
|
||||||
|
print('➡️Set the PDP type to IPv4 referring to the outputof the +CGDCONT read command')
|
||||||
|
command = f'AT+UPSD=0,0,0\r'
|
||||||
|
ser_sara.write(command.encode('utf-8'))
|
||||||
|
response_SARA_3 = read_complete_response(ser_sara, wait_for_lines=["OK"])
|
||||||
|
print(response_SARA_3, end="")
|
||||||
|
time.sleep(1)
|
||||||
|
|
||||||
|
# 2. Profile #0 is mapped on CID=1.
|
||||||
|
print('➡️Profile #0 is mapped on CID=1.')
|
||||||
|
command = f'AT+UPSD=0,100,1\r'
|
||||||
|
ser_sara.write(command.encode('utf-8'))
|
||||||
|
response_SARA_3 = read_complete_response(ser_sara, wait_for_lines=["OK"])
|
||||||
|
print(response_SARA_3, end="")
|
||||||
|
time.sleep(1)
|
||||||
|
|
||||||
|
# 2. Set the PDP type
|
||||||
|
print('➡️Activate the PSD profile #0: the IPv4 address is already assigned by the network.')
|
||||||
|
command = f'AT+UPSDA=0,3\r'
|
||||||
|
ser_sara.write(command.encode('utf-8'))
|
||||||
|
response_SARA_3 = read_complete_response(ser_sara, wait_for_lines=["OK","+UUPSDA"])
|
||||||
|
print(response_SARA_3, end="")
|
||||||
|
time.sleep(1)
|
||||||
|
|
||||||
|
|
||||||
#3. Get localisation (CellLocate)
|
#3. Get localisation (CellLocate)
|
||||||
mode = 2
|
mode = 2 #single shot position
|
||||||
sensor = 2
|
sensor = 2 #use cellular CellLocate® location information
|
||||||
response_type = 0
|
response_type = 0
|
||||||
timeout_s = 2
|
timeout_s = 2
|
||||||
accuracy_m = 1
|
accuracy_m = 1
|
||||||
@@ -176,12 +386,12 @@ try:
|
|||||||
latitude = match.group(1)
|
latitude = match.group(1)
|
||||||
longitude = match.group(2)
|
longitude = match.group(2)
|
||||||
print(f"📍 Latitude: {latitude}, Longitude: {longitude}")
|
print(f"📍 Latitude: {latitude}, Longitude: {longitude}")
|
||||||
|
#update sqlite table
|
||||||
|
update_sqlite_config("latitude_raw", float(latitude))
|
||||||
|
update_sqlite_config("longitude_raw", float(longitude))
|
||||||
else:
|
else:
|
||||||
print("❌ Failed to extract coordinates.")
|
print("❌ Failed to extract coordinates.")
|
||||||
|
|
||||||
#update config.json
|
|
||||||
update_json_key(config_file, "latitude_raw", float(latitude))
|
|
||||||
update_json_key(config_file, "longitude_raw", float(longitude))
|
|
||||||
|
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
|
|
||||||
|
|||||||
87
SARA/sara.py
87
SARA/sara.py
@@ -1,4 +1,4 @@
|
|||||||
'''
|
r'''
|
||||||
____ _ ____ _
|
____ _ ____ _
|
||||||
/ ___| / \ | _ \ / \
|
/ ___| / \ | _ \ / \
|
||||||
\___ \ / _ \ | |_) | / _ \
|
\___ \ / _ \ | |_) | / _ \
|
||||||
@@ -7,6 +7,8 @@
|
|||||||
|
|
||||||
Script to see if the SARA-R410 is running
|
Script to see if the SARA-R410 is running
|
||||||
ex:
|
ex:
|
||||||
|
python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 ATI 2
|
||||||
|
ex 1 (get SIM infos)
|
||||||
python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 AT+CCID? 2
|
python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 AT+CCID? 2
|
||||||
ex 2 (turn on blue light):
|
ex 2 (turn on blue light):
|
||||||
python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 AT+UGPIOC=16,2 2
|
python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 AT+UGPIOC=16,2 2
|
||||||
@@ -14,6 +16,8 @@ ex 3 (reconnect network)
|
|||||||
python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 AT+COPS=1,2,20801 20
|
python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 AT+COPS=1,2,20801 20
|
||||||
ex 4 (get HTTP Profiles)
|
ex 4 (get HTTP Profiles)
|
||||||
python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 AT+UHTTP? 2
|
python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 AT+UHTTP? 2
|
||||||
|
ex 5 (get IP addr)
|
||||||
|
python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 AT+CGPADDR=1 2
|
||||||
|
|
||||||
'''
|
'''
|
||||||
|
|
||||||
@@ -28,68 +32,67 @@ port='/dev/'+parameter[0] # ex: ttyAMA2
|
|||||||
command = parameter[1] # ex: AT+CCID?
|
command = parameter[1] # ex: AT+CCID?
|
||||||
timeout = float(parameter[2]) # ex:2
|
timeout = float(parameter[2]) # ex:2
|
||||||
|
|
||||||
#get baudrate
|
|
||||||
def load_config(config_file):
|
|
||||||
try:
|
|
||||||
with open(config_file, 'r') as file:
|
|
||||||
config_data = json.load(file)
|
|
||||||
return config_data
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading config file: {e}")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
# Define the config file path
|
|
||||||
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
|
||||||
# Load the configuration data
|
|
||||||
config = load_config(config_file)
|
|
||||||
# Access the shared variables
|
# Access the shared variables
|
||||||
baudrate = config.get('SaraR4_baudrate', 115200)
|
baudrate = 115200
|
||||||
|
|
||||||
ser = serial.Serial(
|
try:
|
||||||
|
|
||||||
|
ser = serial.Serial(
|
||||||
port=port, #USB0 or ttyS0
|
port=port, #USB0 or ttyS0
|
||||||
baudrate=baudrate, #115200 ou 9600
|
baudrate=baudrate, #115200 ou 9600
|
||||||
parity=serial.PARITY_NONE, #PARITY_NONE, PARITY_EVEN or PARITY_ODD
|
parity=serial.PARITY_NONE, #PARITY_NONE, PARITY_EVEN or PARITY_ODD
|
||||||
stopbits=serial.STOPBITS_ONE,
|
stopbits=serial.STOPBITS_ONE,
|
||||||
bytesize=serial.EIGHTBITS,
|
bytesize=serial.EIGHTBITS,
|
||||||
timeout = timeout
|
timeout = timeout
|
||||||
)
|
)
|
||||||
|
|
||||||
ser.write((command + '\r').encode('utf-8'))
|
# Flush any leftover data from previous commands or modem boot URCs
|
||||||
|
ser.reset_input_buffer()
|
||||||
|
|
||||||
#ser.write(b'ATI\r') #General Information
|
ser.write((command + '\r').encode('utf-8'))
|
||||||
#ser.write(b'AT+CCID?\r') #SIM card number
|
|
||||||
#ser.write(b'AT+CPIN?\r') #Check the status of the SIM card
|
#ser.write(b'ATI\r') #General Information
|
||||||
#ser.write(b'AT+CIND?\r') #Indication state (last number is SIM detection: 0 no SIM detection, 1 SIM detected, 2 not available)
|
#ser.write(b'AT+CCID?\r') #SIM card number
|
||||||
#ser.write(b'AT+UGPIOR=?\r') #Reads the current value of the specified GPIO pin
|
#ser.write(b'AT+CPIN?\r') #Check the status of the SIM card
|
||||||
#ser.write(b'AT+UGPIOC?\r') #GPIO select configuration
|
#ser.write(b'AT+CIND?\r') #Indication state (last number is SIM detection: 0 no SIM detection, 1 SIM detected, 2 not available)
|
||||||
#ser.write(b'AT+COPS=?\r') #Check the network and cellular technology the modem is currently using
|
#ser.write(b'AT+UGPIOR=?\r') #Reads the current value of the specified GPIO pin
|
||||||
#ser.write(b'AT+COPS=1,2,20801') #connext to orange
|
#ser.write(b'AT+UGPIOC?\r') #GPIO select configuration
|
||||||
#ser.write(b'AT+CFUN=?\r') #Selects/read the level of functionality
|
#ser.write(b'AT+COPS=?\r') #Check the network and cellular technology the modem is currently using
|
||||||
#ser.write(b'AT+URAT=?\r') #Radio Access Technology
|
#ser.write(b'AT+COPS=1,2,20801') #connext to orange
|
||||||
#ser.write(b'AT+USIMSTAT?')
|
#ser.write(b'AT+CFUN=?\r') #Selects/read the level of functionality
|
||||||
#ser.write(b'AT+IPR=115200') #Check/Define baud rate
|
#ser.write(b'AT+URAT=?\r') #Radio Access Technology
|
||||||
#ser.write(b'AT+CMUX=?')
|
#ser.write(b'AT+USIMSTAT?')
|
||||||
|
#ser.write(b'AT+IPR=115200') #Check/Define baud rate
|
||||||
|
#ser.write(b'AT+CMUX=?')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
try:
|
|
||||||
# Read lines until a timeout occurs
|
# Read lines until a timeout occurs
|
||||||
response_lines = []
|
response_lines = []
|
||||||
while True:
|
start_time = time.time()
|
||||||
line = ser.readline().decode('utf-8').strip()
|
|
||||||
if not line:
|
while (time.time() - start_time) < timeout:
|
||||||
break # Break the loop if an empty line is encountered
|
line = ser.readline().decode('utf-8', errors='ignore').strip()
|
||||||
|
if line:
|
||||||
response_lines.append(line)
|
response_lines.append(line)
|
||||||
|
|
||||||
|
# Check if we received any data
|
||||||
|
if not response_lines:
|
||||||
|
print(f"ERROR: No response received from {port} after sending command: {command}")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
# Print the response
|
# Print the response
|
||||||
for line in response_lines:
|
for line in response_lines:
|
||||||
print(line)
|
print(line)
|
||||||
|
|
||||||
except serial.SerialException as e:
|
except serial.SerialException as e:
|
||||||
print(f"Error: {e}")
|
print(f"ERROR: Serial communication error: {e}")
|
||||||
|
sys.exit(1)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"ERROR: Unexpected error: {e}")
|
||||||
|
sys.exit(1)
|
||||||
finally:
|
finally:
|
||||||
if ser.is_open:
|
# Close the serial port if it's open
|
||||||
|
if 'ser' in locals() and ser.is_open:
|
||||||
ser.close()
|
ser.close()
|
||||||
#print("Serial closed")
|
|
||||||
|
|
||||||
|
|||||||
63
SARA/sara_checkDNS.py
Normal file
63
SARA/sara_checkDNS.py
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
r'''
|
||||||
|
____ _ ____ _
|
||||||
|
/ ___| / \ | _ \ / \
|
||||||
|
\___ \ / _ \ | |_) | / _ \
|
||||||
|
___) / ___ \| _ < / ___ \
|
||||||
|
|____/_/ \_\_| \_\/_/ \_\
|
||||||
|
|
||||||
|
Script to resolve DNS (get IP from domain name) with AT+UDNSRN command
|
||||||
|
Ex:
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/sara_checkDNS.py ttyAMA2 data.nebuleair.fr
|
||||||
|
To do: need to add profile id as parameter
|
||||||
|
|
||||||
|
'''
|
||||||
|
|
||||||
|
import serial
|
||||||
|
import time
|
||||||
|
import sys
|
||||||
|
import json
|
||||||
|
|
||||||
|
parameter = sys.argv[1:] # Exclude the script name
|
||||||
|
#print("Parameters received:")
|
||||||
|
port='/dev/'+parameter[0] # ex: ttyAMA2
|
||||||
|
url = parameter[1] # ex: data.mobileair.fr
|
||||||
|
|
||||||
|
baudrate = 115200
|
||||||
|
|
||||||
|
ser = serial.Serial(
|
||||||
|
port=port, #USB0 or ttyS0
|
||||||
|
baudrate=baudrate, #115200 ou 9600
|
||||||
|
parity=serial.PARITY_NONE, #PARITY_NONE, PARITY_EVEN or PARITY_ODD
|
||||||
|
stopbits=serial.STOPBITS_ONE,
|
||||||
|
bytesize=serial.EIGHTBITS,
|
||||||
|
timeout = 2
|
||||||
|
)
|
||||||
|
|
||||||
|
command = f'AT+UDNSRN=0,"{url}"\r'
|
||||||
|
ser.write((command + '\r').encode('utf-8'))
|
||||||
|
|
||||||
|
print("****")
|
||||||
|
print("DNS check")
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Read lines until a timeout occurs
|
||||||
|
response_lines = []
|
||||||
|
while True:
|
||||||
|
line = ser.readline().decode('utf-8').strip()
|
||||||
|
if not line:
|
||||||
|
break # Break the loop if an empty line is encountered
|
||||||
|
response_lines.append(line)
|
||||||
|
|
||||||
|
# Print the response
|
||||||
|
for line in response_lines:
|
||||||
|
print(line)
|
||||||
|
|
||||||
|
except serial.SerialException as e:
|
||||||
|
print(f"Error: {e}")
|
||||||
|
|
||||||
|
finally:
|
||||||
|
if ser.is_open:
|
||||||
|
ser.close()
|
||||||
|
print("****")
|
||||||
|
#print("Serial closed")
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
'''
|
r'''
|
||||||
____ _ ____ _
|
____ _ ____ _
|
||||||
/ ___| / \ | _ \ / \
|
/ ___| / \ | _ \ / \
|
||||||
\___ \ / _ \ | |_) | / _ \
|
\___ \ / _ \ | |_) | / _ \
|
||||||
@@ -26,22 +26,54 @@ networkID = parameter[1] # ex: 20801
|
|||||||
timeout = float(parameter[2]) # ex:2
|
timeout = float(parameter[2]) # ex:2
|
||||||
|
|
||||||
|
|
||||||
#get baudrate
|
|
||||||
def load_config(config_file):
|
|
||||||
try:
|
|
||||||
with open(config_file, 'r') as file:
|
|
||||||
config_data = json.load(file)
|
|
||||||
return config_data
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading config file: {e}")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
# Define the config file path
|
|
||||||
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2, wait_for_lines=None, debug=True):
|
||||||
# Load the configuration data
|
'''
|
||||||
config = load_config(config_file)
|
Fonction très importante !!!
|
||||||
# Access the shared variables
|
Reads the complete response from a serial connection and waits for specific lines.
|
||||||
baudrate = config.get('SaraR4_baudrate', 115200)
|
'''
|
||||||
|
if wait_for_lines is None:
|
||||||
|
wait_for_lines = [] # Default to an empty list if not provided
|
||||||
|
|
||||||
|
response = bytearray()
|
||||||
|
serial_connection.timeout = timeout
|
||||||
|
end_time = time.time() + end_of_response_timeout
|
||||||
|
start_time = time.time()
|
||||||
|
|
||||||
|
while True:
|
||||||
|
elapsed_time = time.time() - start_time # Time since function start
|
||||||
|
if serial_connection.in_waiting > 0:
|
||||||
|
data = serial_connection.read(serial_connection.in_waiting)
|
||||||
|
response.extend(data)
|
||||||
|
end_time = time.time() + end_of_response_timeout # Reset timeout on new data
|
||||||
|
|
||||||
|
# Decode and check for any target line
|
||||||
|
decoded_response = response.decode('utf-8', errors='replace')
|
||||||
|
for target_line in wait_for_lines:
|
||||||
|
if target_line in decoded_response:
|
||||||
|
if debug:
|
||||||
|
print(f"[DEBUG] 🔎 Found target line: {target_line} (in {elapsed_time:.2f}s)")
|
||||||
|
return decoded_response # Return response immediately if a target line is found
|
||||||
|
elif time.time() > end_time:
|
||||||
|
if debug:
|
||||||
|
print(f"[DEBUG] Timeout reached. No more data received.")
|
||||||
|
break
|
||||||
|
time.sleep(0.1) # Short sleep to prevent busy waiting
|
||||||
|
|
||||||
|
# Final response and debug output
|
||||||
|
total_elapsed_time = time.time() - start_time
|
||||||
|
if debug:
|
||||||
|
print(f"[DEBUG] ⏱️ elapsed time: {total_elapsed_time:.2f}s. ⏱️")
|
||||||
|
# Check if the elapsed time exceeded 10 seconds
|
||||||
|
if total_elapsed_time > 10 and debug:
|
||||||
|
print(f"[ALERT] 🚨 The operation took too long 🚨")
|
||||||
|
print(f'<span style="color: red;font-weight: bold;">[ALERT] ⚠️{total_elapsed_time:.2f}s⚠️</span>')
|
||||||
|
|
||||||
|
return response.decode('utf-8', errors='replace') # Return the full response if no target line is found
|
||||||
|
|
||||||
|
|
||||||
|
baudrate = 115200
|
||||||
|
|
||||||
ser = serial.Serial(
|
ser = serial.Serial(
|
||||||
port=port, #USB0 or ttyS0
|
port=port, #USB0 or ttyS0
|
||||||
@@ -57,17 +89,11 @@ ser.write((command + '\r').encode('utf-8'))
|
|||||||
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
# Read lines until a timeout occurs
|
response = read_complete_response(ser, wait_for_lines=["OK", "ERROR"],timeout=5, end_of_response_timeout=120, debug=True)
|
||||||
response_lines = []
|
|
||||||
while True:
|
|
||||||
line = ser.readline().decode('utf-8').strip()
|
|
||||||
if not line:
|
|
||||||
break # Break the loop if an empty line is encountered
|
|
||||||
response_lines.append(line)
|
|
||||||
|
|
||||||
# Print the response
|
print('<p class="text-danger-emphasis">')
|
||||||
for line in response_lines:
|
print(response)
|
||||||
print(line)
|
print("</p>", end="")
|
||||||
|
|
||||||
except serial.SerialException as e:
|
except serial.SerialException as e:
|
||||||
print(f"Error: {e}")
|
print(f"Error: {e}")
|
||||||
|
|||||||
@@ -11,22 +11,7 @@ parameter = sys.argv[1:] # Exclude the script name
|
|||||||
port='/dev/'+parameter[0] # ex: ttyAMA2
|
port='/dev/'+parameter[0] # ex: ttyAMA2
|
||||||
message = parameter[1] # ex: Hello
|
message = parameter[1] # ex: Hello
|
||||||
|
|
||||||
#get baudrate
|
baudrate = 115200
|
||||||
def load_config(config_file):
|
|
||||||
try:
|
|
||||||
with open(config_file, 'r') as file:
|
|
||||||
config_data = json.load(file)
|
|
||||||
return config_data
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading config file: {e}")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
# Define the config file path
|
|
||||||
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
|
||||||
# Load the configuration data
|
|
||||||
config = load_config(config_file)
|
|
||||||
# Access the shared variables
|
|
||||||
baudrate = config.get('SaraR4_baudrate', 115200)
|
|
||||||
|
|
||||||
ser = serial.Serial(
|
ser = serial.Serial(
|
||||||
port=port, #USB0 or ttyS0
|
port=port, #USB0 or ttyS0
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
'''
|
r'''
|
||||||
____ _ ____ _
|
____ _ ____ _
|
||||||
/ ___| / \ | _ \ / \
|
/ ___| / \ | _ \ / \
|
||||||
\___ \ / _ \ | |_) | / _ \
|
\___ \ / _ \ | |_) | / _ \
|
||||||
@@ -18,24 +18,7 @@ import sys
|
|||||||
import json
|
import json
|
||||||
|
|
||||||
|
|
||||||
|
baudrate = 115200
|
||||||
|
|
||||||
#get baudrate
|
|
||||||
def load_config(config_file):
|
|
||||||
try:
|
|
||||||
with open(config_file, 'r') as file:
|
|
||||||
config_data = json.load(file)
|
|
||||||
return config_data
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading config file: {e}")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
# Define the config file path
|
|
||||||
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
|
||||||
# Load the configuration data
|
|
||||||
config = load_config(config_file)
|
|
||||||
# Access the shared variables
|
|
||||||
baudrate = config.get('SaraR4_baudrate', 115200)
|
|
||||||
|
|
||||||
ser = serial.Serial(
|
ser = serial.Serial(
|
||||||
port='/dev/ttyAMA2',
|
port='/dev/ttyAMA2',
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
'''
|
r'''
|
||||||
____ _ ____ _
|
____ _ ____ _
|
||||||
/ ___| / \ | _ \ / \
|
/ ___| / \ | _ \ / \
|
||||||
\___ \ / _ \ | |_) | / _ \
|
\___ \ / _ \ | |_) | / _ \
|
||||||
@@ -17,23 +17,7 @@ import json
|
|||||||
# SARA R4 UHTTPC profile IDs
|
# SARA R4 UHTTPC profile IDs
|
||||||
aircarto_profile_id = 0
|
aircarto_profile_id = 0
|
||||||
|
|
||||||
|
baudrate = 115200
|
||||||
#get baudrate
|
|
||||||
def load_config(config_file):
|
|
||||||
try:
|
|
||||||
with open(config_file, 'r') as file:
|
|
||||||
config_data = json.load(file)
|
|
||||||
return config_data
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading config file: {e}")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
# Define the config file path
|
|
||||||
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
|
||||||
# Load the configuration data
|
|
||||||
config = load_config(config_file)
|
|
||||||
# Access the shared variables
|
|
||||||
baudrate = config.get('SaraR4_baudrate', 115200)
|
|
||||||
|
|
||||||
ser_sara = serial.Serial(
|
ser_sara = serial.Serial(
|
||||||
port='/dev/ttyAMA2',
|
port='/dev/ttyAMA2',
|
||||||
@@ -89,13 +73,31 @@ def read_complete_response(serial_connection, timeout=2, end_of_response_timeout
|
|||||||
return response.decode('utf-8', errors='replace') # Return the full response if no target line is found
|
return response.decode('utf-8', errors='replace') # Return the full response if no target line is found
|
||||||
|
|
||||||
|
|
||||||
|
def extract_error_code(response):
|
||||||
|
"""
|
||||||
|
Extract just the error code from AT+UHTTPER response
|
||||||
|
"""
|
||||||
|
for line in response.split('\n'):
|
||||||
|
if '+UHTTPER' in line:
|
||||||
|
try:
|
||||||
|
# Split the line and get the third value (error code)
|
||||||
|
parts = line.split(':')[1].strip().split(',')
|
||||||
|
if len(parts) >= 3:
|
||||||
|
error_code = int(parts[2])
|
||||||
|
return error_code
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
|
# Return None if we couldn't find the error code
|
||||||
|
return None
|
||||||
|
|
||||||
try:
|
try:
|
||||||
#3. Send to endpoint (with device ID)
|
#3. Send to endpoint (with device ID)
|
||||||
print("Send data (GET REQUEST):")
|
print("Send data (GET REQUEST):")
|
||||||
command= f'AT+UHTTPC={aircarto_profile_id},1,"/ping.php","aircarto_server_response.txt"\r'
|
command= f'AT+UHTTPC={aircarto_profile_id},1,"/ping.php","aircarto_server_response.txt"\r'
|
||||||
ser_sara.write(command.encode('utf-8'))
|
ser_sara.write(command.encode('utf-8'))
|
||||||
|
|
||||||
response_SARA_3 = read_complete_response(ser_sara, timeout=5, end_of_response_timeout=120, wait_for_lines=["+UUHTTPCR", "+CME ERROR"], debug=True)
|
response_SARA_3 = read_complete_response(ser_sara, timeout=5, end_of_response_timeout=20, wait_for_lines=["+UUHTTPCR", "+CME ERROR"], debug=True)
|
||||||
|
|
||||||
print(response_SARA_3)
|
print(response_SARA_3)
|
||||||
# si on recoit la réponse UHTTPCR
|
# si on recoit la réponse UHTTPCR
|
||||||
@@ -111,7 +113,36 @@ try:
|
|||||||
parts = http_response.split(',')
|
parts = http_response.split(',')
|
||||||
# 2.1 code 0 (HTTP failed) ⛔⛔⛔
|
# 2.1 code 0 (HTTP failed) ⛔⛔⛔
|
||||||
if len(parts) == 3 and parts[-1] == '0': # The third value indicates success
|
if len(parts) == 3 and parts[-1] == '0': # The third value indicates success
|
||||||
print("⛔ATTENTION: HTTP operation failed")
|
print("⛔⛔ATTENTION: HTTP operation failed")
|
||||||
|
#get error code
|
||||||
|
print("Getting error code (11->Server connection error, 73->Secure socket connect error)")
|
||||||
|
command = f'AT+UHTTPER={aircarto_profile_id}\r'
|
||||||
|
ser_sara.write(command.encode('utf-8'))
|
||||||
|
response_SARA_9 = read_complete_response(ser_sara, wait_for_lines=["OK"], debug=False)
|
||||||
|
print('<p class="text-danger-emphasis">')
|
||||||
|
print(response_SARA_9)
|
||||||
|
print("</p>", end="")
|
||||||
|
# Extract just the error code
|
||||||
|
error_code = extract_error_code(response_SARA_9)
|
||||||
|
if error_code is not None:
|
||||||
|
# Display interpretation based on error code
|
||||||
|
if error_code == 0:
|
||||||
|
print('<p class="text-success">No error detected</p>')
|
||||||
|
elif error_code == 4:
|
||||||
|
print('<p class="text-danger">Error 4: Invalid server Hostname</p>')
|
||||||
|
elif error_code == 11:
|
||||||
|
print('<p class="text-danger">Error 11: Server connection error</p>')
|
||||||
|
elif error_code == 22:
|
||||||
|
print('<p class="text-danger">Error 22: PSD or CSD connection not established</p>')
|
||||||
|
elif error_code == 73:
|
||||||
|
print('<p class="text-danger">Error 73: Secure socket connect error</p>')
|
||||||
|
else:
|
||||||
|
print(f'<p class="text-danger">Unknown error code: {error_code}</p>')
|
||||||
|
else:
|
||||||
|
print('<p class="text-danger">Could not extract error code from response</p>')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# 2.2 code 1 (HHTP succeded)
|
# 2.2 code 1 (HHTP succeded)
|
||||||
else:
|
else:
|
||||||
# Si la commande HTTP a réussi
|
# Si la commande HTTP a réussi
|
||||||
|
|||||||
@@ -11,22 +11,7 @@ parameter = sys.argv[1:] # Exclude the script name
|
|||||||
port='/dev/'+parameter[0] # ex: ttyAMA2
|
port='/dev/'+parameter[0] # ex: ttyAMA2
|
||||||
message = parameter[1] # ex: Hello
|
message = parameter[1] # ex: Hello
|
||||||
|
|
||||||
#get baudrate
|
baudrate = 115200
|
||||||
def load_config(config_file):
|
|
||||||
try:
|
|
||||||
with open(config_file, 'r') as file:
|
|
||||||
config_data = json.load(file)
|
|
||||||
return config_data
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading config file: {e}")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
# Define the config file path
|
|
||||||
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
|
||||||
# Load the configuration data
|
|
||||||
config = load_config(config_file)
|
|
||||||
# Access the shared variables
|
|
||||||
baudrate = config.get('SaraR4_baudrate', 115200)
|
|
||||||
|
|
||||||
ser = serial.Serial(
|
ser = serial.Serial(
|
||||||
port=port, #USB0 or ttyS0
|
port=port, #USB0 or ttyS0
|
||||||
|
|||||||
@@ -12,22 +12,7 @@ port='/dev/'+parameter[0] # ex: ttyAMA2
|
|||||||
endpoint = parameter[1] # ex: /pro_4G/notif_message.php
|
endpoint = parameter[1] # ex: /pro_4G/notif_message.php
|
||||||
profile_id = parameter[2]
|
profile_id = parameter[2]
|
||||||
|
|
||||||
#get baudrate
|
baudrate = 115200
|
||||||
def load_config(config_file):
|
|
||||||
try:
|
|
||||||
with open(config_file, 'r') as file:
|
|
||||||
config_data = json.load(file)
|
|
||||||
return config_data
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading config file: {e}")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
# Define the config file path
|
|
||||||
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
|
||||||
# Load the configuration data
|
|
||||||
config = load_config(config_file)
|
|
||||||
# Access the shared variables
|
|
||||||
baudrate = config.get('SaraR4_baudrate', 115200)
|
|
||||||
|
|
||||||
ser = serial.Serial(
|
ser = serial.Serial(
|
||||||
port=port, #USB0 or ttyS0
|
port=port, #USB0 or ttyS0
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
'''
|
r'''
|
||||||
____ _ ____ _
|
____ _ ____ _
|
||||||
/ ___| / \ | _ \ / \
|
/ ___| / \ | _ \ / \
|
||||||
\___ \ / _ \ | |_) | / _ \
|
\___ \ / _ \ | |_) | / _ \
|
||||||
@@ -21,23 +21,7 @@ port='/dev/'+parameter[0] # ex: ttyAMA2
|
|||||||
apn_address = parameter[1] # ex: data.mono
|
apn_address = parameter[1] # ex: data.mono
|
||||||
timeout = float(parameter[2]) # ex:2
|
timeout = float(parameter[2]) # ex:2
|
||||||
|
|
||||||
|
baudrate = 115200
|
||||||
#get baudrate
|
|
||||||
def load_config(config_file):
|
|
||||||
try:
|
|
||||||
with open(config_file, 'r') as file:
|
|
||||||
config_data = json.load(file)
|
|
||||||
return config_data
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading config file: {e}")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
# Define the config file path
|
|
||||||
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
|
||||||
# Load the configuration data
|
|
||||||
config = load_config(config_file)
|
|
||||||
# Access the shared variables
|
|
||||||
baudrate = config.get('SaraR4_baudrate', 115200)
|
|
||||||
|
|
||||||
ser = serial.Serial(
|
ser = serial.Serial(
|
||||||
port=port, #USB0 or ttyS0
|
port=port, #USB0 or ttyS0
|
||||||
@@ -49,6 +33,8 @@ ser = serial.Serial(
|
|||||||
)
|
)
|
||||||
|
|
||||||
command = f'AT+CGDCONT=1,"IP","{apn_address}"\r'
|
command = f'AT+CGDCONT=1,"IP","{apn_address}"\r'
|
||||||
|
#command = f'AT+CGDCONT=1,"IPV4V6","{apn_address}"\r'
|
||||||
|
#command = f'AT+CGDCONT=1,"IP","{apn_address}",0,0\r'
|
||||||
ser.write((command + '\r').encode('utf-8'))
|
ser.write((command + '\r').encode('utf-8'))
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
'''
|
r'''
|
||||||
____ _ ____ _
|
____ _ ____ _
|
||||||
/ ___| / \ | _ \ / \
|
/ ___| / \ | _ \ / \
|
||||||
\___ \ / _ \ | |_) | / _ \
|
\___ \ / _ \ | |_) | / _ \
|
||||||
@@ -8,7 +8,6 @@
|
|||||||
Script to set the URL for a HTTP request
|
Script to set the URL for a HTTP request
|
||||||
Ex:
|
Ex:
|
||||||
/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/sara_setURL.py ttyAMA2 data.nebuleair.fr 0
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/sara_setURL.py ttyAMA2 data.nebuleair.fr 0
|
||||||
To do: need to add profile id as parameter
|
|
||||||
|
|
||||||
First profile id:
|
First profile id:
|
||||||
AT+UHTTP=0,1,"data.nebuleair.fr"
|
AT+UHTTP=0,1,"data.nebuleair.fr"
|
||||||
@@ -28,22 +27,7 @@ url = parameter[1] # ex: data.mobileair.fr
|
|||||||
profile_id = parameter[2] #ex: 0
|
profile_id = parameter[2] #ex: 0
|
||||||
|
|
||||||
|
|
||||||
#get baudrate
|
baudrate = 115200
|
||||||
def load_config(config_file):
|
|
||||||
try:
|
|
||||||
with open(config_file, 'r') as file:
|
|
||||||
config_data = json.load(file)
|
|
||||||
return config_data
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading config file: {e}")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
# Define the config file path
|
|
||||||
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
|
||||||
# Load the configuration data
|
|
||||||
config = load_config(config_file)
|
|
||||||
# Access the shared variables
|
|
||||||
baudrate = config.get('SaraR4_baudrate', 115200)
|
|
||||||
|
|
||||||
ser = serial.Serial(
|
ser = serial.Serial(
|
||||||
port=port, #USB0 or ttyS0
|
port=port, #USB0 or ttyS0
|
||||||
|
|||||||
@@ -40,22 +40,7 @@ def read_complete_response(serial_connection, timeout=2, end_of_response_timeout
|
|||||||
|
|
||||||
return response.decode('utf-8', errors='replace')
|
return response.decode('utf-8', errors='replace')
|
||||||
|
|
||||||
#get baudrate
|
baudrate = 115200
|
||||||
def load_config(config_file):
|
|
||||||
try:
|
|
||||||
with open(config_file, 'r') as file:
|
|
||||||
config_data = json.load(file)
|
|
||||||
return config_data
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading config file: {e}")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
# Define the config file path
|
|
||||||
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
|
||||||
# Load the configuration data
|
|
||||||
config = load_config(config_file)
|
|
||||||
# Access the shared variables
|
|
||||||
baudrate = config.get('SaraR4_baudrate', 115200)
|
|
||||||
|
|
||||||
ser_sara = serial.Serial(
|
ser_sara = serial.Serial(
|
||||||
port=port, #USB0 or ttyS0
|
port=port, #USB0 or ttyS0
|
||||||
|
|||||||
@@ -12,21 +12,7 @@ port='/dev/'+parameter[0] # ex: ttyAMA2
|
|||||||
message = parameter[1] # ex: Hello
|
message = parameter[1] # ex: Hello
|
||||||
|
|
||||||
#get baudrate
|
#get baudrate
|
||||||
def load_config(config_file):
|
baudrate = 115200
|
||||||
try:
|
|
||||||
with open(config_file, 'r') as file:
|
|
||||||
config_data = json.load(file)
|
|
||||||
return config_data
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading config file: {e}")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
# Define the config file path
|
|
||||||
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
|
||||||
# Load the configuration data
|
|
||||||
config = load_config(config_file)
|
|
||||||
# Access the shared variables
|
|
||||||
baudrate = config.get('SaraR4_baudrate', 115200)
|
|
||||||
|
|
||||||
ser = serial.Serial(
|
ser = serial.Serial(
|
||||||
port=port, #USB0 or ttyS0
|
port=port, #USB0 or ttyS0
|
||||||
|
|||||||
@@ -2,9 +2,10 @@
|
|||||||
|
|
||||||
# Script to check if wifi is connected and start hotspot if not
|
# Script to check if wifi is connected and start hotspot if not
|
||||||
# will also retreive unique RPi ID and store it to deviceID.txt
|
# will also retreive unique RPi ID and store it to deviceID.txt
|
||||||
|
# script that starts at boot:
|
||||||
|
# @reboot /var/www/nebuleair_pro_4g/boot_hotspot.sh >> /var/www/nebuleair_pro_4g/logs/app.log 2>&1
|
||||||
|
|
||||||
OUTPUT_FILE="/var/www/nebuleair_pro_4g/wifi_list.csv"
|
OUTPUT_FILE="/var/www/nebuleair_pro_4g/wifi_list.csv"
|
||||||
JSON_FILE="/var/www/nebuleair_pro_4g/config.json"
|
|
||||||
|
|
||||||
|
|
||||||
echo "-------------------"
|
echo "-------------------"
|
||||||
@@ -12,31 +13,70 @@ echo "-------------------"
|
|||||||
|
|
||||||
echo "NebuleAir pro started at $(date)"
|
echo "NebuleAir pro started at $(date)"
|
||||||
|
|
||||||
# Blink GPIO 23 and 24 five times
|
chmod -R 777 /var/www/nebuleair_pro_4g/
|
||||||
for i in {1..5}; do
|
|
||||||
# Turn GPIO 23 and 24 ON
|
|
||||||
gpioset gpiochip0 23=1 24=1
|
|
||||||
#echo "LEDs ON"
|
|
||||||
sleep 1
|
|
||||||
|
|
||||||
# Turn GPIO 23 and 24 OFF
|
# Blink GPIO 23 and 24 five times (starts OFF, stays OFF at end)
|
||||||
gpioset gpiochip0 23=0 24=0
|
#gpioset -c gpiochip0 -t 1s,1s,1s,1s,1s,1s,1s,1s,1s,1s,0 23=0 24=0
|
||||||
#echo "LEDs OFF"
|
|
||||||
sleep 1
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "getting SARA R4 serial number"
|
# Blink GPIO 23 and 24 five times (starts OFF, stays OFF at end)
|
||||||
|
python3 << 'EOF'
|
||||||
|
import RPi.GPIO as GPIO
|
||||||
|
import time
|
||||||
|
|
||||||
|
GPIO.setmode(GPIO.BCM)
|
||||||
|
GPIO.setwarnings(False)
|
||||||
|
GPIO.setup(23, GPIO.OUT)
|
||||||
|
GPIO.setup(24, GPIO.OUT)
|
||||||
|
|
||||||
|
for _ in range(5):
|
||||||
|
GPIO.output(23, GPIO.HIGH)
|
||||||
|
GPIO.output(24, GPIO.HIGH)
|
||||||
|
time.sleep(1)
|
||||||
|
GPIO.output(23, GPIO.LOW)
|
||||||
|
GPIO.output(24, GPIO.LOW)
|
||||||
|
time.sleep(1)
|
||||||
|
|
||||||
|
GPIO.cleanup()
|
||||||
|
EOF
|
||||||
|
|
||||||
|
echo "getting RPI serial number"
|
||||||
# Get the last 8 characters of the serial number and write to text file
|
# Get the last 8 characters of the serial number and write to text file
|
||||||
serial_number=$(cat /proc/cpuinfo | grep Serial | awk '{print substr($3, length($3) - 7)}')
|
serial_number=$(cat /proc/cpuinfo | grep Serial | awk '{print substr($3, length($3) - 7)}')
|
||||||
# Use jq to update the "deviceID" in the JSON file
|
|
||||||
jq --arg serial_number "$serial_number" '.deviceID = $serial_number' "$JSON_FILE" > temp.json && mv temp.json "$JSON_FILE"
|
# update Sqlite database (only if not already set, i.e., still has default value 'XXXX')
|
||||||
|
echo "Updating SQLite database with device ID: $serial_number"
|
||||||
|
sqlite3 /var/www/nebuleair_pro_4g/sqlite/sensors.db "UPDATE config_table SET value='$serial_number' WHERE key='deviceID' AND value='XXXX';"
|
||||||
|
|
||||||
echo "id: $serial_number"
|
echo "id: $serial_number"
|
||||||
|
|
||||||
#get the SSH port for tunneling
|
# Get deviceID from SQLite config_table (may be different from serial_number if manually configured)
|
||||||
SSH_TUNNEL_PORT=$(jq -r '.sshTunnel_port' "$JSON_FILE")
|
DEVICE_ID=$(sqlite3 /var/www/nebuleair_pro_4g/sqlite/sensors.db "SELECT value FROM config_table WHERE key='deviceID'")
|
||||||
|
echo "Device ID from database: $DEVICE_ID"
|
||||||
|
|
||||||
|
# Get deviceName from SQLite config_table for use in hotspot SSID
|
||||||
|
DEVICE_NAME=$(sqlite3 /var/www/nebuleair_pro_4g/sqlite/sensors.db "SELECT value FROM config_table WHERE key='deviceName'")
|
||||||
|
echo "Device Name from database: $DEVICE_NAME"
|
||||||
|
|
||||||
|
# Get SSH tunnel port from SQLite config_table
|
||||||
|
SSH_TUNNEL_PORT=$(sqlite3 /var/www/nebuleair_pro_4g/sqlite/sensors.db "SELECT value FROM config_table WHERE key='sshTunnel_port'")
|
||||||
|
|
||||||
#need to wait for the network manager to be ready
|
#need to wait for the network manager to be ready
|
||||||
sleep 20
|
sleep 20
|
||||||
|
|
||||||
|
# IMPORTANT: Always enable WiFi radio at boot (in case it was disabled by power save)
|
||||||
|
WIFI_RADIO_STATE=$(nmcli radio wifi)
|
||||||
|
echo "WiFi radio state: $WIFI_RADIO_STATE"
|
||||||
|
|
||||||
|
if [ "$WIFI_RADIO_STATE" == "disabled" ]; then
|
||||||
|
echo "WiFi radio is disabled, enabling it..."
|
||||||
|
nmcli radio wifi on
|
||||||
|
# Wait longer for NetworkManager to scan and reconnect to known networks
|
||||||
|
echo "Waiting 15 seconds for WiFi to reconnect to known networks..."
|
||||||
|
sleep 15
|
||||||
|
else
|
||||||
|
echo "WiFi radio is already enabled"
|
||||||
|
fi
|
||||||
|
|
||||||
# Get the connection state of wlan0
|
# Get the connection state of wlan0
|
||||||
STATE=$(nmcli -g GENERAL.STATE device show wlan0)
|
STATE=$(nmcli -g GENERAL.STATE device show wlan0)
|
||||||
|
|
||||||
@@ -47,23 +87,20 @@ if [ "$STATE" == "30 (disconnected)" ]; then
|
|||||||
# Perform a wifi scan and save its output to a csv file
|
# Perform a wifi scan and save its output to a csv file
|
||||||
# nmcli device wifi list
|
# nmcli device wifi list
|
||||||
nmcli -f SSID,SIGNAL,SECURITY device wifi list | awk 'BEGIN { OFS=","; print "SSID,SIGNAL,SECURITY" } NR>1 { print $1,$2,$3 }' > "$OUTPUT_FILE"
|
nmcli -f SSID,SIGNAL,SECURITY device wifi list | awk 'BEGIN { OFS=","; print "SSID,SIGNAL,SECURITY" } NR>1 { print $1,$2,$3 }' > "$OUTPUT_FILE"
|
||||||
# Start the hotspot
|
# Start the hotspot with SSID based on deviceName
|
||||||
echo "Starting hotspot..."
|
echo "Starting hotspot with SSID: $DEVICE_NAME"
|
||||||
sudo nmcli device wifi hotspot ifname wlan0 ssid nebuleair_pro password nebuleaircfg
|
sudo nmcli device wifi hotspot ifname wlan0 ssid "$DEVICE_NAME" password nebuleaircfg
|
||||||
|
|
||||||
# Update JSON to reflect hotspot mode
|
|
||||||
jq --arg status "hotspot" '.WIFI_status = $status' "$JSON_FILE" > temp.json && mv temp.json "$JSON_FILE"
|
|
||||||
|
|
||||||
|
# Update SQLite to reflect hotspot mode
|
||||||
|
sqlite3 /var/www/nebuleair_pro_4g/sqlite/sensors.db "UPDATE config_table SET value='hotspot' WHERE key='WIFI_status'"
|
||||||
|
|
||||||
else
|
else
|
||||||
echo "🛜Success: wlan0 is connected!🛜"
|
echo "🛜Success: wlan0 is connected!🛜"
|
||||||
CONN_SSID=$(nmcli -g GENERAL.CONNECTION device show wlan0)
|
CONN_SSID=$(nmcli -g GENERAL.CONNECTION device show wlan0)
|
||||||
echo "Connection: $CONN_SSID"
|
echo "Connection: $CONN_SSID"
|
||||||
|
|
||||||
#update config JSON file
|
# Update SQLite to reflect hotspot mode
|
||||||
jq --arg status "connected" '.WIFI_status = $status' "$JSON_FILE" > temp.json && mv temp.json "$JSON_FILE"
|
sqlite3 /var/www/nebuleair_pro_4g/sqlite/sensors.db "UPDATE config_table SET value='connected' WHERE key='WIFI_status'"
|
||||||
|
|
||||||
sudo chmod 777 "$JSON_FILE"
|
|
||||||
|
|
||||||
# Lancer le tunnel SSH
|
# Lancer le tunnel SSH
|
||||||
#echo "Démarrage du tunnel SSH sur le port $SSH_TUNNEL_PORT..."
|
#echo "Démarrage du tunnel SSH sur le port $SSH_TUNNEL_PORT..."
|
||||||
|
|||||||
246
changelog.json
Normal file
246
changelog.json
Normal file
@@ -0,0 +1,246 @@
|
|||||||
|
{
|
||||||
|
"versions": [
|
||||||
|
{
|
||||||
|
"version": "1.5.0",
|
||||||
|
"date": "2026-03-18",
|
||||||
|
"changes": {
|
||||||
|
"features": [
|
||||||
|
"Payload UDP Miotiq: byte 66 error_flags (erreurs systeme RTC/capteurs)",
|
||||||
|
"Payload UDP Miotiq: byte 67 npm_status (registre status NextPM)",
|
||||||
|
"Payload UDP Miotiq: byte 68 device_status (etat general du boitier, specification)",
|
||||||
|
"Methodes SensorPayload: set_error_flags(), set_npm_status(), set_device_status()"
|
||||||
|
],
|
||||||
|
"improvements": [
|
||||||
|
"Initialisation bytes 66-68 a 0x00 au lieu de 0xFF pour eviter faux positifs cote serveur",
|
||||||
|
"Escalade erreur UDP: si PDP reset echoue, notification WiFi + hardware reboot + exit"
|
||||||
|
],
|
||||||
|
"fixes": [],
|
||||||
|
"compatibility": [
|
||||||
|
"Necessite mise a jour du parser Miotiq pour decoder les bytes 66-68 (error_flags, npm_status, device_status)"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notes": "Ajout de registres d'erreur et d'etat dans la payload UDP (bytes 66-68). Les bytes de status sont initialises a 0x00 (aucune erreur) au lieu de 0xFF. Le flag RTC est implemente, les autres flags seront actives progressivement."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.4.6",
|
||||||
|
"date": "2026-03-17",
|
||||||
|
"changes": {
|
||||||
|
"features": [
|
||||||
|
"Page Admin: comparaison RTC vs heure du navigateur (au lieu de system time)",
|
||||||
|
"Page Admin: ajout champ Browser time (UTC) dans l'onglet Clock",
|
||||||
|
"Page Admin: bloquer update firmware en mode hotspot avec message explicatif",
|
||||||
|
"Page Admin: liens Gitea pour mise a jour hors-ligne (releases + main.zip)"
|
||||||
|
],
|
||||||
|
"improvements": [
|
||||||
|
"Page Admin: RTC time mis en evidence (label bold, input large, bordure bleue)",
|
||||||
|
"Page Admin: System time replie dans un details/summary (non utilise par le capteur)",
|
||||||
|
"Page Admin: descriptions ajoutees pour System time, RTC time et Synchroniser le RTC"
|
||||||
|
],
|
||||||
|
"fixes": [
|
||||||
|
"Fix forget_wifi scan: delai 5s + rescan explicite pour remplir wifi_list.csv",
|
||||||
|
"Fix blocage navigateur: revert optimisations fetch qui saturaient la limite 6 connexions/domaine"
|
||||||
|
],
|
||||||
|
"compatibility": []
|
||||||
|
},
|
||||||
|
"notes": "L'onglet Clock compare maintenant le RTC a l'heure du navigateur, plus fiable que le system time Linux (non utilise par le capteur). L'update firmware est bloque en mode hotspot avec un message explicatif. La mise a jour hors-ligne via upload .zip reste disponible."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.4.5",
|
||||||
|
"date": "2026-03-17",
|
||||||
|
"changes": {
|
||||||
|
"features": [
|
||||||
|
"Page WiFi: bouton Oublier le reseau pour passer en mode hotspot sans reboot",
|
||||||
|
"Page WiFi: badge Mode Hotspot visible dans la sidebar (lien vers page WiFi)",
|
||||||
|
"Page WiFi: scan des reseaux WiFi en mode hotspot via cache CSV (scan au demarrage)"
|
||||||
|
],
|
||||||
|
"improvements": [
|
||||||
|
"Page WiFi: refonte UI avec cards contextuelles (infos connexion detaillees si connecte, scan si hotspot)",
|
||||||
|
"Page WiFi: affichage SSID, signal, IP, passerelle, hostname, frequence, securite",
|
||||||
|
"Page WiFi: scan WiFi masque quand deja connecte, scan avec colonnes signal et securite",
|
||||||
|
"Page WiFi: migration de config.json vers get_config_sqlite",
|
||||||
|
"Endpoint internet enrichi: SSID, signal, frequence, securite, passerelle, hostname",
|
||||||
|
"Scan WiFi en mode hotspot: lecture du fichier wifi_list.csv avec notice explicative",
|
||||||
|
"forget_wifi.sh: scan WiFi avec rescan explicite et delai avant lancement hotspot"
|
||||||
|
],
|
||||||
|
"fixes": [
|
||||||
|
"Correction VERSION 1.4.3 -> 1.4.4",
|
||||||
|
"Fix IP hotspot: 192.168.43.1 -> 10.42.0.1 (defaut NetworkManager)",
|
||||||
|
"Fix forget_wifi.sh: appel bash explicite + disconnect wlan0 avant delete"
|
||||||
|
],
|
||||||
|
"compatibility": []
|
||||||
|
},
|
||||||
|
"notes": "Le bouton Oublier le reseau supprime la connexion WiFi sauvegardee, scanne les reseaux disponibles, puis demarre le hotspot (pas de reboot necessaire). En mode hotspot, la page WiFi affiche les reseaux scannes au demarrage via un cache CSV. Adresse hotspot: http://10.42.0.1/html/"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.4.4",
|
||||||
|
"date": "2026-03-16",
|
||||||
|
"changes": {
|
||||||
|
"features": [
|
||||||
|
"Bouton Self Test disponible sur les pages Accueil, Capteurs et Admin (en plus de Modem 4G)",
|
||||||
|
"Test du module RTC DS3231 integre dans le self-test (connexion + synchronisation horloge)"
|
||||||
|
],
|
||||||
|
"improvements": [
|
||||||
|
"Refactoring self-test : code JS et HTML des modals extraits dans des fichiers partages (selftest.js, selftest-modal.html)",
|
||||||
|
"Le modal self-test est charge dynamiquement via fetch, plus besoin de dupliquer le HTML"
|
||||||
|
],
|
||||||
|
"fixes": [],
|
||||||
|
"compatibility": []
|
||||||
|
},
|
||||||
|
"notes": "Le self-test est maintenant accessible depuis toutes les pages principales. Le test RTC verifie la connexion du module et l'ecart avec l'heure systeme."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.4.3",
|
||||||
|
"date": "2026-03-16",
|
||||||
|
"changes": {
|
||||||
|
"features": [
|
||||||
|
"Page database: bouton telecharger toute la table (bypass filtre dates)",
|
||||||
|
"Page database: validation obligatoire des dates avant telechargement par periode"
|
||||||
|
],
|
||||||
|
"improvements": [
|
||||||
|
"Payload UDP bruit: bytes 22-23 = noise_cur_leq, 24-25 = noise_cur_level, 26-27 = max_noise (reserve)",
|
||||||
|
"Envoi des deux valeurs bruit (cur_LEQ + DB_A_value) en UDP Miotiq au lieu d'une seule"
|
||||||
|
],
|
||||||
|
"fixes": [],
|
||||||
|
"compatibility": [
|
||||||
|
"Necessite mise a jour du parser Miotiq pour decoder les nouveaux champs noise_cur_leq et noise_cur_level"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notes": "Mise a jour structure UDP bruit pour alignement avec parser Miotiq et ameliorations page database."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.4.2",
|
||||||
|
"date": "2026-03-14",
|
||||||
|
"changes": {
|
||||||
|
"features": [],
|
||||||
|
"improvements": [],
|
||||||
|
"fixes": [
|
||||||
|
"Fix envoi UDP Miotiq: desynchronisation serie causant l'envoi de la commande AT+USOWR comme payload au lieu des donnees capteurs",
|
||||||
|
"Ajout flush buffer serie (reset_input_buffer) avant chaque etape UDP critique",
|
||||||
|
"Verification du prompt @ du modem avant envoi des donnees binaires",
|
||||||
|
"Abort propre de l'envoi UDP si creation socket, connexion ou prompt @ echoue",
|
||||||
|
"Retry creation socket apres reset PDP reussi"
|
||||||
|
],
|
||||||
|
"compatibility": []
|
||||||
|
},
|
||||||
|
"notes": "Corrige un bug ou le modem SARA envoyait la commande AT+USOWR comme donnees UDP, causant des erreurs UNKNOWN_DEVICE sur le parser Miotiq."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.4.1",
|
||||||
|
"date": "2026-03-12",
|
||||||
|
"changes": {
|
||||||
|
"features": [],
|
||||||
|
"improvements": [
|
||||||
|
"Migration capteur bruit de l'ancien systeme I2C vers le sonometre NSRT MK4 en USB",
|
||||||
|
"Nouveau script sound_meter/read.py pour lecture a la demande (retour JSON)",
|
||||||
|
"Page capteurs: carte USB avec affichage LEQ et dB(A) au lieu de l'ancien format texte",
|
||||||
|
"Self-test modem: parsing JSON du NSRT MK4 au lieu de texte brut"
|
||||||
|
],
|
||||||
|
"fixes": [
|
||||||
|
"Correction du self-test bruit qui affichait 'Unexpected value' avec le nouveau capteur"
|
||||||
|
],
|
||||||
|
"compatibility": []
|
||||||
|
},
|
||||||
|
"notes": "Mise a jour necessaire si le sonometre NSRT MK4 est connecte en USB. L'ancien capteur I2C n'est plus supporte sur la page capteurs."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.4.0",
|
||||||
|
"date": "2026-03-10",
|
||||||
|
"changes": {
|
||||||
|
"features": [
|
||||||
|
"Mise a jour firmware hors-ligne par upload de fichier ZIP via l'interface web admin",
|
||||||
|
"Barre de progression pour suivre l'upload du fichier",
|
||||||
|
"Fichier .update-exclude versionne pour gerer les exclusions rsync de maniere evolutive"
|
||||||
|
],
|
||||||
|
"improvements": [
|
||||||
|
"Vidage du buffer serie avant chaque commande AT dans sara.py (evite les URCs residuelles au demarrage)"
|
||||||
|
],
|
||||||
|
"fixes": [],
|
||||||
|
"compatibility": [
|
||||||
|
"Necessite l'ajout de update_firmware_from_file.sh dans les permissions sudo de www-data",
|
||||||
|
"Necessite Apache mod_rewrite pour html/.htaccess (upload 50MB)"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notes": "Permet la mise a jour du firmware sans connexion internet : telecharger le .zip depuis Gitea, se connecter au hotspot du capteur, et uploader via admin.html."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.3.0",
|
||||||
|
"date": "2026-02-17",
|
||||||
|
"changes": {
|
||||||
|
"features": [
|
||||||
|
"Onglet 'Ecran' pour le controle de l'affichage HDMI (ModuleAir Pro uniquement)",
|
||||||
|
"Demarrage et arret du script d'affichage via l'interface web",
|
||||||
|
"Verification automatique du type d'appareil pour afficher l'onglet"
|
||||||
|
],
|
||||||
|
"improvements": [
|
||||||
|
"Ajout de logs console pour le debougage des commandes web",
|
||||||
|
"Traduction de l'element de menu 'Ecran'"
|
||||||
|
],
|
||||||
|
"fixes": [
|
||||||
|
"Correction des permissions d'execution des scripts python via web (sudo)",
|
||||||
|
"Correction de la visibilite des onglets du menu lateral (doublons ID)"
|
||||||
|
],
|
||||||
|
"compatibility": [
|
||||||
|
"Necessite python3-kivy installe",
|
||||||
|
"Necessite l'ajout de permissions sudo pour www-data (voir documentation)"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notes": "Ajout de la fonctionnalite de controle d'ecran pour les demonstrations."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.2.0",
|
||||||
|
"date": "2026-02-17",
|
||||||
|
"changes": {
|
||||||
|
"features": [
|
||||||
|
"Integration capteur CO2 MH-Z19 (scripts, base de donnees, service systemd, interface web)",
|
||||||
|
"Carte test CO2 sur la page capteurs",
|
||||||
|
"Checkbox activation CO2 sur la page admin",
|
||||||
|
"Consultation et telechargement des mesures CO2 sur la page base de donnees"
|
||||||
|
],
|
||||||
|
"improvements": [],
|
||||||
|
"fixes": [
|
||||||
|
"Logo ModuleAir Pro ne s'affichait pas (script dans innerHTML non execute)"
|
||||||
|
],
|
||||||
|
"compatibility": [
|
||||||
|
"Necessite re-execution de create_db.py, set_config.py et setup_services.sh apres mise a jour"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notes": "Ajout du support capteur CO2 MH-Z19 pour le ModuleAir Pro. La transmission SARA sera integree dans une version ulterieure."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.1.0",
|
||||||
|
"date": "2026-02-16",
|
||||||
|
"changes": {
|
||||||
|
"features": [
|
||||||
|
"Card informations base de donnees (taille, nombre d'entrees, dates min/max par table)",
|
||||||
|
"Telechargement CSV complet par table depuis la page base de donnees",
|
||||||
|
"Bouton version firmware NextPM sur la page capteurs",
|
||||||
|
"Tests capteurs integres dans l'auto-test modem",
|
||||||
|
"Logo dynamique selon le type d'appareil (NebuleAir/ModuleAir)"
|
||||||
|
],
|
||||||
|
"improvements": [
|
||||||
|
"Reordonnancement de l'auto-test : capteurs avant communication"
|
||||||
|
],
|
||||||
|
"fixes": [],
|
||||||
|
"compatibility": []
|
||||||
|
},
|
||||||
|
"notes": "Ameliorations de l'interface web : meilleure visibilite sur l'etat de la base de donnees et des capteurs."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.0",
|
||||||
|
"date": "2026-02-11",
|
||||||
|
"changes": {
|
||||||
|
"features": [
|
||||||
|
"Support multi-device : NebuleAir Pro / ModuleAir Pro",
|
||||||
|
"Systeme de versioning firmware",
|
||||||
|
"Changelog viewer dans l'interface web"
|
||||||
|
],
|
||||||
|
"improvements": [],
|
||||||
|
"fixes": [],
|
||||||
|
"compatibility": [
|
||||||
|
"Les capteurs existants sont automatiquement configures en 'nebuleair_pro'"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notes": "Premiere version tracee. Les capteurs anterieurs recevront device_type=nebuleair_pro par defaut lors de la mise a jour."
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
41
connexion.sh
41
connexion.sh
@@ -2,26 +2,49 @@
|
|||||||
echo "-------"
|
echo "-------"
|
||||||
echo "Start connexion shell script at $(date)"
|
echo "Start connexion shell script at $(date)"
|
||||||
|
|
||||||
|
# Get deviceName from database for hotspot SSID
|
||||||
|
DEVICE_NAME=$(sqlite3 /var/www/nebuleair_pro_4g/sqlite/sensors.db "SELECT value FROM config_table WHERE key='deviceName'")
|
||||||
|
echo "Device Name: $DEVICE_NAME"
|
||||||
|
|
||||||
#disable hotspot
|
# Find and disable any active hotspot connection
|
||||||
echo "Disable Hotspot:"
|
echo "Disable Hotspot..."
|
||||||
sudo nmcli connection down Hotspot
|
# Get all wireless connections that are currently active (excludes the target WiFi)
|
||||||
sleep 10
|
ACTIVE_HOTSPOT=$(nmcli -t -f NAME,TYPE,DEVICE connection show --active | grep ':802-11-wireless:wlan0' | cut -d: -f1)
|
||||||
|
|
||||||
|
if [ -n "$ACTIVE_HOTSPOT" ]; then
|
||||||
|
echo "Disabling hotspot connection: $ACTIVE_HOTSPOT"
|
||||||
|
sudo nmcli connection down "$ACTIVE_HOTSPOT"
|
||||||
|
else
|
||||||
|
echo "No active hotspot found"
|
||||||
|
fi
|
||||||
|
|
||||||
|
sleep 5
|
||||||
|
|
||||||
echo "Start connection with:"
|
echo "Start connection with:"
|
||||||
echo "SSID: $1"
|
echo "SSID: $1"
|
||||||
echo "Password: $2"
|
echo "Password: [HIDDEN]"
|
||||||
sudo nmcli device wifi connect "$1" password "$2"
|
sudo nmcli device wifi connect "$1" password "$2"
|
||||||
|
|
||||||
#check if connection is successfull
|
# Check if connection is successful
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
echo "Connection to $1 is successfull"
|
echo "Connection to $1 is successful"
|
||||||
|
|
||||||
|
# Update SQLite to reflect connected status
|
||||||
|
sqlite3 /var/www/nebuleair_pro_4g/sqlite/sensors.db "UPDATE config_table SET value='connected' WHERE key='WIFI_status'"
|
||||||
|
echo "Updated database: WIFI_status = connected"
|
||||||
else
|
else
|
||||||
echo "Connection to $1 failed"
|
echo "Connection to $1 failed"
|
||||||
echo "Restarting hotspot..."
|
echo "Restarting hotspot..."
|
||||||
#enable hotspot
|
|
||||||
sudo nmcli connection up Hotspot
|
# Recreate hotspot with current deviceName as SSID
|
||||||
|
sudo nmcli device wifi hotspot ifname wlan0 ssid "$DEVICE_NAME" password nebuleaircfg
|
||||||
|
|
||||||
|
# Update SQLite to reflect hotspot mode
|
||||||
|
sqlite3 /var/www/nebuleair_pro_4g/sqlite/sensors.db "UPDATE config_table SET value='hotspot' WHERE key='WIFI_status'"
|
||||||
|
echo "Updated database: WIFI_status = hotspot"
|
||||||
|
echo "Hotspot restarted with SSID: $DEVICE_NAME"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "End connexion shell script"
|
echo "End connexion shell script"
|
||||||
echo "-------"
|
echo "-------"
|
||||||
|
|
||||||
|
|||||||
@@ -4,4 +4,10 @@
|
|||||||
|
|
||||||
@reboot sleep 30 && /usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/reboot/start.py >> /var/www/nebuleair_pro_4g/logs/app.log 2>&1
|
@reboot sleep 30 && /usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/reboot/start.py >> /var/www/nebuleair_pro_4g/logs/app.log 2>&1
|
||||||
|
|
||||||
0 0 * * * > /var/www/nebuleair_pro_4g/logs/master.log
|
#0 0 * * * > /var/www/nebuleair_pro_4g/logs/master.log
|
||||||
|
#0 0 * * * > /var/www/nebuleair_pro_4g/logs/master_errors.log
|
||||||
|
#0 0 * * * > /var/www/nebuleair_pro_4g/logs/app.log
|
||||||
|
|
||||||
|
0 0 * * * find /var/www/nebuleair_pro_4g/logs -name "*.log" -type f -exec truncate -s 0 {} \;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
0
envea/read_value_loop.py → envea/old/read_value_loop.py
Executable file → Normal file
0
envea/read_value_loop.py → envea/old/read_value_loop.py
Executable file → Normal file
0
envea/read_value_loop_json.py → envea/old/read_value_loop_json.py
Executable file → Normal file
0
envea/read_value_loop_json.py → envea/old/read_value_loop_json.py
Executable file → Normal file
@@ -1,6 +1,7 @@
|
|||||||
import serial
|
import serial
|
||||||
import time
|
import time
|
||||||
import sys
|
import sys
|
||||||
|
import re
|
||||||
|
|
||||||
parameter = sys.argv[1:] # Exclude the script name
|
parameter = sys.argv[1:] # Exclude the script name
|
||||||
#print("Parameters received:")
|
#print("Parameters received:")
|
||||||
@@ -61,8 +62,46 @@ def read_cairsens(port, baudrate=9600, parity=serial.PARITY_NONE, stopbits=seria
|
|||||||
|
|
||||||
# ASCII characters
|
# ASCII characters
|
||||||
ascii_data = ''.join(chr(b) if 0x20 <= b <= 0x7E else '.' for b in raw_bytes)
|
ascii_data = ''.join(chr(b) if 0x20 <= b <= 0x7E else '.' for b in raw_bytes)
|
||||||
print(f"Valeurs converties en ASCII : {ascii_data}")
|
sensor_type = "Unknown" # ou None, selon ton besoin
|
||||||
|
sensor_measurement = "Unknown"
|
||||||
|
sensor_range = "Unknown"
|
||||||
|
|
||||||
|
letters = re.findall(r'[A-Za-z]', ascii_data)
|
||||||
|
if len(letters) >= 1:
|
||||||
|
#print(f"First letter found: {letters[0]}")
|
||||||
|
if letters[0] == "C":
|
||||||
|
sensor_type = "Cairclip"
|
||||||
|
if len(letters) >= 2:
|
||||||
|
#print(f"Second letter found: {letters[1]}")
|
||||||
|
if letters[1] == "A":
|
||||||
|
sensor_measurement = "Ammonia(NH3)"
|
||||||
|
if letters[1] == "C":
|
||||||
|
sensor_measurement = "O3 and NO2"
|
||||||
|
if letters[1] == "G":
|
||||||
|
sensor_measurement = "CH4"
|
||||||
|
if letters[1] == "H":
|
||||||
|
sensor_measurement = "H2S"
|
||||||
|
if letters[1] == "N":
|
||||||
|
sensor_measurement = "NO2"
|
||||||
|
if len(letters) >= 3:
|
||||||
|
#print(f"Thrisd letter found: {letters[2]}")
|
||||||
|
if letters[2] == "B":
|
||||||
|
sensor_range = "0-250 ppb"
|
||||||
|
if letters[2] == "M":
|
||||||
|
sensor_range = "0-1ppm"
|
||||||
|
if letters[2] == "V":
|
||||||
|
sensor_range = "0-20 ppm"
|
||||||
|
if letters[2] == "P":
|
||||||
|
sensor_range = "PACKET data block ?"
|
||||||
|
|
||||||
|
if len(letters) < 1:
|
||||||
|
print("No letter found in the ASCII data.")
|
||||||
|
|
||||||
|
print(f"Valeurs converties en ASCII : {sensor_type} {sensor_measurement} {sensor_range}")
|
||||||
|
|
||||||
|
#print(f"Sensor type: {sensor_type}")
|
||||||
|
#print(f"Sensor measurment: {sensor_measurement}")
|
||||||
|
#print(f"Sensor range: {sensor_range}")
|
||||||
# Numeric values
|
# Numeric values
|
||||||
numeric_values = [b for b in raw_bytes]
|
numeric_values = [b for b in raw_bytes]
|
||||||
print(f"Valeurs numériques : {numeric_values}")
|
print(f"Valeurs numériques : {numeric_values}")
|
||||||
|
|||||||
224
envea/read_ref_v2.py
Normal file
224
envea/read_ref_v2.py
Normal file
@@ -0,0 +1,224 @@
|
|||||||
|
"""
|
||||||
|
_____ _ ___ _______ _
|
||||||
|
| ____| \ | \ \ / / ____| / \
|
||||||
|
| _| | \| |\ \ / /| _| / _ \
|
||||||
|
| |___| |\ | \ V / | |___ / ___ \
|
||||||
|
|_____|_| \_| \_/ |_____/_/ \_\
|
||||||
|
|
||||||
|
Gather data from envea Sensors and store them to the SQlite table
|
||||||
|
Use the RTC time for the timestamp
|
||||||
|
|
||||||
|
This script is run by a service nebuleair-envea-data.service
|
||||||
|
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/envea/read_ref_v2.py ttyAMA4
|
||||||
|
|
||||||
|
ATTENTION --> read_ref.py fonctionne mieux
|
||||||
|
"""
|
||||||
|
|
||||||
|
import serial
|
||||||
|
import time
|
||||||
|
import sys
|
||||||
|
|
||||||
|
parameter = sys.argv[1:] # Exclude the script name
|
||||||
|
port='/dev/'+parameter[0]
|
||||||
|
|
||||||
|
# Mapping dictionaries
|
||||||
|
COMPOUND_MAP = {
|
||||||
|
'A': 'Ammonia',
|
||||||
|
'B': 'Benzene',
|
||||||
|
'C': 'Carbon Monoxide',
|
||||||
|
'D': 'Hydrogen Sulfide',
|
||||||
|
'E': 'Ethylene',
|
||||||
|
'F': 'Formaldehyde',
|
||||||
|
'G': 'Gasoline',
|
||||||
|
'H': 'Hydrogen',
|
||||||
|
'I': 'Isobutylene',
|
||||||
|
'J': 'Jet Fuel',
|
||||||
|
'K': 'Kerosene',
|
||||||
|
'L': 'Liquified Petroleum Gas',
|
||||||
|
'M': 'Methane',
|
||||||
|
'N': 'Nitrogen Dioxide',
|
||||||
|
'O': 'Ozone',
|
||||||
|
'P': 'Propane',
|
||||||
|
'Q': 'Quinoline',
|
||||||
|
'R': 'Refrigerant',
|
||||||
|
'S': 'Sulfur Dioxide',
|
||||||
|
'T': 'Toluene',
|
||||||
|
'U': 'Uranium Hexafluoride',
|
||||||
|
'V': 'Vinyl Chloride',
|
||||||
|
'W': 'Water Vapor',
|
||||||
|
'X': 'Xylene',
|
||||||
|
'Y': 'Yttrium',
|
||||||
|
'Z': 'Zinc'
|
||||||
|
}
|
||||||
|
|
||||||
|
RANGE_MAP = {
|
||||||
|
'A': '0-10 ppm',
|
||||||
|
'B': '0-250 ppb',
|
||||||
|
'C': '0-1000 ppm',
|
||||||
|
'D': '0-50 ppm',
|
||||||
|
'E': '0-100 ppm',
|
||||||
|
'F': '0-5 ppm',
|
||||||
|
'G': '0-500 ppm',
|
||||||
|
'H': '0-2000 ppm',
|
||||||
|
'I': '0-200 ppm',
|
||||||
|
'J': '0-300 ppm',
|
||||||
|
'K': '0-400 ppm',
|
||||||
|
'L': '0-600 ppm',
|
||||||
|
'M': '0-800 ppm',
|
||||||
|
'N': '0-20 ppm',
|
||||||
|
'O': '0-1 ppm',
|
||||||
|
'P': '0-5000 ppm',
|
||||||
|
'Q': '0-150 ppm',
|
||||||
|
'R': '0-750 ppm',
|
||||||
|
'S': '0-25 ppm',
|
||||||
|
'T': '0-350 ppm',
|
||||||
|
'U': '0-450 ppm',
|
||||||
|
'V': '0-550 ppm',
|
||||||
|
'W': '0-650 ppm',
|
||||||
|
'X': '0-850 ppm',
|
||||||
|
'Y': '0-950 ppm',
|
||||||
|
'Z': '0-1500 ppm'
|
||||||
|
}
|
||||||
|
|
||||||
|
INTERFACE_MAP = {
|
||||||
|
0x01: 'USB',
|
||||||
|
0x02: 'UART',
|
||||||
|
0x03: 'I2C',
|
||||||
|
0x04: 'SPI'
|
||||||
|
}
|
||||||
|
|
||||||
|
def parse_cairsens_data(hex_data):
|
||||||
|
"""
|
||||||
|
Parse the extracted hex data from CAIRSENS sensor.
|
||||||
|
|
||||||
|
:param hex_data: Hexadecimal string of extracted data (indices 11-28)
|
||||||
|
:return: Dictionary with parsed information
|
||||||
|
"""
|
||||||
|
# Convert hex to bytes for easier processing
|
||||||
|
raw_bytes = bytes.fromhex(hex_data)
|
||||||
|
|
||||||
|
# Initialize result dictionary
|
||||||
|
result = {
|
||||||
|
'device_type': 'Unknown',
|
||||||
|
'compound': 'Unknown',
|
||||||
|
'range': 'Unknown',
|
||||||
|
'interface': 'Unknown',
|
||||||
|
'raw_data': hex_data
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(raw_bytes) >= 4: # Ensure we have at least 4 bytes
|
||||||
|
# First byte: Device type check
|
||||||
|
first_char = chr(raw_bytes[0]) if 0x20 <= raw_bytes[0] <= 0x7E else '?'
|
||||||
|
if first_char == 'C':
|
||||||
|
result['device_type'] = 'CAIRCLIP'
|
||||||
|
else:
|
||||||
|
result['device_type'] = f'Unknown ({first_char})'
|
||||||
|
|
||||||
|
# Second byte: Compound mapping
|
||||||
|
second_char = chr(raw_bytes[1]) if 0x20 <= raw_bytes[1] <= 0x7E else '?'
|
||||||
|
result['compound'] = COMPOUND_MAP.get(second_char, f'Unknown ({second_char})')
|
||||||
|
|
||||||
|
# Third byte: Range mapping
|
||||||
|
third_char = chr(raw_bytes[2]) if 0x20 <= raw_bytes[2] <= 0x7E else '?'
|
||||||
|
result['range'] = RANGE_MAP.get(third_char, f'Unknown ({third_char})')
|
||||||
|
|
||||||
|
# Fourth byte: Interface (raw byte value)
|
||||||
|
interface_byte = raw_bytes[3]
|
||||||
|
result['interface'] = INTERFACE_MAP.get(interface_byte, f'Unknown (0x{interface_byte:02X})')
|
||||||
|
result['interface_raw'] = f'0x{interface_byte:02X}'
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
|
def read_cairsens(port, baudrate=9600, parity=serial.PARITY_NONE, stopbits=serial.STOPBITS_ONE, databits=serial.EIGHTBITS, timeout=1):
|
||||||
|
"""
|
||||||
|
Lit les données de la sonde CAIRSENS via UART.
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/envea/read_ref_v2.py ttyAMA4
|
||||||
|
|
||||||
|
|
||||||
|
:param port: Le port série utilisé (ex: 'COM1' ou '/dev/ttyAMA0').
|
||||||
|
:param baudrate: Le débit en bauds (ex: 9600).
|
||||||
|
:param parity: Le bit de parité (serial.PARITY_NONE, serial.PARITY_EVEN, serial.PARITY_ODD).
|
||||||
|
:param stopbits: Le nombre de bits de stop (serial.STOPBITS_ONE, serial.STOPBITS_TWO).
|
||||||
|
:param databits: Le nombre de bits de données (serial.FIVEBITS, serial.SIXBITS, serial.SEVENBITS, serial.EIGHTBITS).
|
||||||
|
:param timeout: Temps d'attente maximal pour la lecture (en secondes).
|
||||||
|
:return: Les données reçues sous forme de chaîne de caractères.
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
# Ouvrir la connexion série
|
||||||
|
ser = serial.Serial(
|
||||||
|
port=port,
|
||||||
|
baudrate=baudrate,
|
||||||
|
parity=parity,
|
||||||
|
stopbits=stopbits,
|
||||||
|
bytesize=databits,
|
||||||
|
timeout=timeout
|
||||||
|
)
|
||||||
|
print(f"Connexion ouverte sur {port} à {baudrate} bauds.")
|
||||||
|
|
||||||
|
# Attendre un instant pour stabiliser la connexion
|
||||||
|
time.sleep(2)
|
||||||
|
|
||||||
|
# Envoyer une commande à la sonde (si nécessaire)
|
||||||
|
# Adapter cette ligne selon la documentation de la sonde
|
||||||
|
#ser.write(b'\r\n')
|
||||||
|
ser.write(b'\xFF\x02\x13\x30\x01\x02\x03\x04\x05\x06\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x1C\xD1\x61\x03')
|
||||||
|
|
||||||
|
# Lire les données reçues
|
||||||
|
data = ser.readline()
|
||||||
|
print(f"Données reçues brutes : {data}")
|
||||||
|
|
||||||
|
# Convertir les données en hexadécimal
|
||||||
|
hex_data = data.hex() # Convertit en chaîne hexadécimale
|
||||||
|
formatted_hex = ' '.join(hex_data[i:i+2] for i in range(0, len(hex_data), 2)) # Formate avec des espaces
|
||||||
|
print(f"Données reçues en hexadécimal : {formatted_hex}")
|
||||||
|
|
||||||
|
# Extraire les valeurs de l'index 11 à 28 (indices 22 à 56 en hex string)
|
||||||
|
extracted_hex = hex_data[22:56] # Each byte is 2 hex chars, so 11*2=22 to 28*2=56
|
||||||
|
print(f"Valeurs hexadécimales extraites (11 à 28) : {extracted_hex}")
|
||||||
|
|
||||||
|
# Parse the extracted data
|
||||||
|
parsed_data = parse_cairsens_data(extracted_hex)
|
||||||
|
|
||||||
|
# Display parsed information
|
||||||
|
print("\n=== CAIRSENS SENSOR INFORMATION ===")
|
||||||
|
print(f"Device Type: {parsed_data['device_type']}")
|
||||||
|
print(f"Compound: {parsed_data['compound']}")
|
||||||
|
print(f"Range: {parsed_data['range']}")
|
||||||
|
print(f"Interface: {parsed_data['interface']} ({parsed_data.get('interface_raw', 'N/A')})")
|
||||||
|
print(f"Raw Data: {parsed_data['raw_data']}")
|
||||||
|
print("=====================================")
|
||||||
|
|
||||||
|
# Convertir en ASCII et en valeurs numériques (pour debug)
|
||||||
|
if extracted_hex:
|
||||||
|
raw_bytes = bytes.fromhex(extracted_hex)
|
||||||
|
ascii_data = ''.join(chr(b) if 0x20 <= b <= 0x7E else '.' for b in raw_bytes)
|
||||||
|
print(f"Valeurs converties en ASCII : {ascii_data}")
|
||||||
|
|
||||||
|
numeric_values = [b for b in raw_bytes]
|
||||||
|
print(f"Valeurs numériques : {numeric_values}")
|
||||||
|
|
||||||
|
# Fermer la connexion
|
||||||
|
ser.close()
|
||||||
|
print("Connexion fermée.")
|
||||||
|
|
||||||
|
return parsed_data
|
||||||
|
|
||||||
|
except serial.SerialException as e:
|
||||||
|
print(f"Erreur de connexion série : {e}")
|
||||||
|
return None
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Erreur générale : {e}")
|
||||||
|
return None
|
||||||
|
|
||||||
|
# Exemple d'utilisation
|
||||||
|
if __name__ == "__main__":
|
||||||
|
port = port # Remplacez par votre port série (ex: /dev/ttyAMA0 sur Raspberry Pi)
|
||||||
|
baudrate = 9600 # Débit en bauds (à vérifier dans la documentation)
|
||||||
|
parity = serial.PARITY_NONE # Parité (NONE, EVEN, ODD)
|
||||||
|
stopbits = serial.STOPBITS_ONE # Bits de stop (ONE, TWO)
|
||||||
|
databits = serial.EIGHTBITS # Bits de données (FIVEBITS, SIXBITS, SEVENBITS, EIGHTBITS)
|
||||||
|
|
||||||
|
data = read_cairsens(port, baudrate, parity, stopbits, databits)
|
||||||
|
if data:
|
||||||
|
print(f"\nRésultat final : {data}")
|
||||||
@@ -44,9 +44,9 @@ def read_cairsens(port, baudrate=9600, parity=serial.PARITY_NONE, stopbits=seria
|
|||||||
|
|
||||||
|
|
||||||
# Lire les données reçues
|
# Lire les données reçues
|
||||||
#data = ser.read_until(b'\n') # Lire jusqu'à la fin de ligne ou un autre délimiteur
|
data = ser.read_until(b'\n') # Lire jusqu'à la fin de ligne ou un autre délimiteur
|
||||||
data = ser.readline()
|
data = ser.readline()
|
||||||
#print(f"Données reçues brutes : {data}")
|
print(f"Données reçues brutes : {data}")
|
||||||
#print(f"Données reçues (utf-8) : {data.decode('utf-8').strip()}")
|
#print(f"Données reçues (utf-8) : {data.decode('utf-8').strip()}")
|
||||||
|
|
||||||
# Extraire le 20ème octet
|
# Extraire le 20ème octet
|
||||||
|
|||||||
@@ -8,7 +8,9 @@
|
|||||||
Gather data from envea Sensors and store them to the SQlite table
|
Gather data from envea Sensors and store them to the SQlite table
|
||||||
Use the RTC time for the timestamp
|
Use the RTC time for the timestamp
|
||||||
|
|
||||||
/usr/bin/python3 /var/www/nebuleair_pro_4g/envea/read_value_v2.py
|
This script is run by a service nebuleair-envea-data.service
|
||||||
|
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/envea/read_value_v2.py -d
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@@ -18,41 +20,59 @@ import time
|
|||||||
import traceback
|
import traceback
|
||||||
import sqlite3
|
import sqlite3
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
import sys
|
||||||
|
|
||||||
|
# Set DEBUG to True to enable debug prints, False to disable
|
||||||
|
DEBUG = False # Change this to False to disable debug output
|
||||||
|
|
||||||
|
# You can also control debug via command line argument
|
||||||
|
if len(sys.argv) > 1 and sys.argv[1] in ['--debug', '-d']:
|
||||||
|
DEBUG = True
|
||||||
|
elif len(sys.argv) > 1 and sys.argv[1] in ['--quiet', '-q']:
|
||||||
|
DEBUG = False
|
||||||
|
|
||||||
|
def debug_print(message):
|
||||||
|
"""Print debug messages only if DEBUG is True"""
|
||||||
|
if DEBUG:
|
||||||
|
timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
||||||
|
print(f"[{timestamp}] {message}")
|
||||||
|
|
||||||
|
debug_print("=== ENVEA Sensor Reader Started ===")
|
||||||
|
|
||||||
# Connect to the SQLite database
|
# Connect to the SQLite database
|
||||||
conn = sqlite3.connect("/var/www/nebuleair_pro_4g/sqlite/sensors.db")
|
try:
|
||||||
cursor = conn.cursor()
|
conn = sqlite3.connect("/var/www/nebuleair_pro_4g/sqlite/sensors.db")
|
||||||
|
cursor = conn.cursor()
|
||||||
|
except Exception as e:
|
||||||
|
debug_print(f"✗ Failed to connect to database: {e}")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
#GET RTC TIME from SQlite
|
# GET RTC TIME from SQlite
|
||||||
cursor.execute("SELECT * FROM timestamp_table LIMIT 1")
|
try:
|
||||||
row = cursor.fetchone() # Get the first (and only) row
|
cursor.execute("SELECT * FROM timestamp_table LIMIT 1")
|
||||||
rtc_time_str = row[1] # '2025-02-07 12:30:45'
|
row = cursor.fetchone() # Get the first (and only) row
|
||||||
|
rtc_time_str = row[1] # '2025-02-07 12:30:45'
|
||||||
|
except Exception as e:
|
||||||
|
debug_print(f"✗ Failed to get RTC time: {e}")
|
||||||
|
rtc_time_str = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
||||||
|
debug_print(f" Using system time instead: {rtc_time_str}")
|
||||||
|
|
||||||
# Function to load config data
|
# Fetch connected ENVEA sondes from SQLite config table
|
||||||
def load_config(config_file):
|
try:
|
||||||
try:
|
cursor.execute("SELECT port, name, coefficient FROM envea_sondes_table WHERE connected = 1")
|
||||||
with open(config_file, 'r') as file:
|
connected_envea_sondes = cursor.fetchall() # List of tuples (port, name, coefficient)
|
||||||
config_data = json.load(file)
|
debug_print(f"✓ Found {len(connected_envea_sondes)} connected ENVEA sensors")
|
||||||
return config_data
|
for port, name, coefficient in connected_envea_sondes:
|
||||||
except Exception as e:
|
debug_print(f" - {name}: port={port}, coefficient={coefficient}")
|
||||||
print(f"Error loading config file: {e}")
|
except Exception as e:
|
||||||
return {}
|
debug_print(f"✗ Failed to fetch connected sensors: {e}")
|
||||||
|
connected_envea_sondes = []
|
||||||
|
|
||||||
# Define the config file path
|
|
||||||
config_file = '/var/www/nebuleair_pro_4g/config.json'
|
|
||||||
|
|
||||||
# Load the configuration data
|
|
||||||
config = load_config(config_file)
|
|
||||||
|
|
||||||
# Initialize sensors and serial connections
|
|
||||||
envea_sondes = config.get('envea_sondes', [])
|
|
||||||
connected_envea_sondes = [sonde for sonde in envea_sondes if sonde.get('connected', False)]
|
|
||||||
serial_connections = {}
|
serial_connections = {}
|
||||||
|
|
||||||
if connected_envea_sondes:
|
if connected_envea_sondes:
|
||||||
for device in connected_envea_sondes:
|
debug_print("\n--- Opening Serial Connections ---")
|
||||||
port = device.get('port', 'Unknown')
|
for port, name, coefficient in connected_envea_sondes:
|
||||||
name = device.get('name', 'Unknown')
|
|
||||||
try:
|
try:
|
||||||
serial_connections[name] = serial.Serial(
|
serial_connections[name] = serial.Serial(
|
||||||
port=f'/dev/{port}',
|
port=f'/dev/{port}',
|
||||||
@@ -62,60 +82,132 @@ if connected_envea_sondes:
|
|||||||
bytesize=serial.EIGHTBITS,
|
bytesize=serial.EIGHTBITS,
|
||||||
timeout=1
|
timeout=1
|
||||||
)
|
)
|
||||||
|
debug_print(f"✓ Opened serial port for {name} on /dev/{port}")
|
||||||
except serial.SerialException as e:
|
except serial.SerialException as e:
|
||||||
print(f"Error opening serial port for {name}: {e}")
|
debug_print(f"✗ Error opening serial port for {name}: {e}")
|
||||||
|
else:
|
||||||
|
debug_print("! No connected ENVEA sensors found in configuration")
|
||||||
|
|
||||||
global data_h2s, data_no2, data_o3
|
# Initialize sensor data variables
|
||||||
|
global data_h2s, data_no2, data_o3, data_co, data_nh3, data_so2
|
||||||
data_h2s = 0
|
data_h2s = 0
|
||||||
data_no2 = 0
|
data_no2 = 0
|
||||||
data_o3 = 0
|
data_o3 = 0
|
||||||
data_co = 0
|
data_co = 0
|
||||||
data_nh3 = 0
|
data_nh3 = 0
|
||||||
|
data_so2 = 0
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if connected_envea_sondes:
|
if connected_envea_sondes:
|
||||||
for device in connected_envea_sondes:
|
debug_print("\n--- Reading Sensor Data ---")
|
||||||
name = device.get('name', 'Unknown')
|
for port, name, coefficient in connected_envea_sondes:
|
||||||
coefficient = device.get('coefficient', 1)
|
|
||||||
if name in serial_connections:
|
if name in serial_connections:
|
||||||
serial_connection = serial_connections[name]
|
serial_connection = serial_connections[name]
|
||||||
try:
|
try:
|
||||||
serial_connection.write(
|
debug_print(f"Reading from {name}...")
|
||||||
b"\xFF\x02\x13\x30\x01\x02\x03\x04\x05\x06\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x12\xAF\x88\x03"
|
|
||||||
)
|
calculated_value = None
|
||||||
data_envea = serial_connection.readline()
|
max_retries = 3
|
||||||
if len(data_envea) >= 20:
|
|
||||||
byte_20 = data_envea[19] * coefficient
|
for attempt in range(max_retries):
|
||||||
|
# Flush input buffer to clear any stale data
|
||||||
|
serial_connection.reset_input_buffer()
|
||||||
|
|
||||||
|
# Send command to sensor
|
||||||
|
command = b"\xFF\x02\x13\x30\x01\x02\x03\x04\x05\x06\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x12\xAF\x88\x03"
|
||||||
|
serial_connection.write(command)
|
||||||
|
if attempt == 0:
|
||||||
|
debug_print(f" → Sent command: {command.hex()}")
|
||||||
|
|
||||||
|
# Wait for sensor response
|
||||||
|
time.sleep(0.8)
|
||||||
|
|
||||||
|
# Read all available data from buffer
|
||||||
|
bytes_available = serial_connection.in_waiting
|
||||||
|
debug_print(f" ← Attempt {attempt + 1}: {bytes_available} bytes available")
|
||||||
|
|
||||||
|
if bytes_available > 0:
|
||||||
|
data_envea = serial_connection.read(bytes_available)
|
||||||
|
else:
|
||||||
|
data_envea = serial_connection.read(32)
|
||||||
|
|
||||||
|
if len(data_envea) > 0:
|
||||||
|
debug_print(f" ← Received {len(data_envea)} bytes: {data_envea.hex()}")
|
||||||
|
|
||||||
|
# Find frame start (0xFF 0x02) in received data
|
||||||
|
frame_start = -1
|
||||||
|
for i in range(len(data_envea) - 1):
|
||||||
|
if data_envea[i] == 0xFF and data_envea[i + 1] == 0x02:
|
||||||
|
frame_start = i
|
||||||
|
break
|
||||||
|
|
||||||
|
if frame_start >= 0:
|
||||||
|
frame_data = data_envea[frame_start:]
|
||||||
|
if len(frame_data) >= 20:
|
||||||
|
byte_20 = frame_data[19]
|
||||||
|
calculated_value = byte_20 * coefficient
|
||||||
|
debug_print(f" → Found valid frame at position {frame_start}")
|
||||||
|
debug_print(f" → Byte 20 = {byte_20} × {coefficient} = {calculated_value}")
|
||||||
|
break # Success, exit retry loop
|
||||||
|
|
||||||
|
debug_print(f" ✗ Attempt {attempt + 1} failed, {'retrying...' if attempt < max_retries - 1 else 'giving up'}")
|
||||||
|
time.sleep(0.2)
|
||||||
|
|
||||||
|
if calculated_value is not None:
|
||||||
if name == "h2s":
|
if name == "h2s":
|
||||||
data_h2s = byte_20
|
data_h2s = calculated_value
|
||||||
elif name == "no2":
|
elif name == "no2":
|
||||||
data_no2 = byte_20
|
data_no2 = calculated_value
|
||||||
elif name == "o3":
|
elif name == "o3":
|
||||||
data_o3 = byte_20
|
data_o3 = calculated_value
|
||||||
|
elif name == "co":
|
||||||
|
data_co = calculated_value
|
||||||
|
elif name == "nh3":
|
||||||
|
data_nh3 = calculated_value
|
||||||
|
elif name == "so2":
|
||||||
|
data_so2 = calculated_value
|
||||||
|
debug_print(f" ✓ {name.upper()} = {calculated_value}")
|
||||||
|
else:
|
||||||
|
debug_print(f" ✗ Failed to read {name} after {max_retries} attempts")
|
||||||
|
|
||||||
except serial.SerialException as e:
|
except serial.SerialException as e:
|
||||||
print(f"Error communicating with {name}: {e}")
|
debug_print(f"✗ Error communicating with {name}: {e}")
|
||||||
|
else:
|
||||||
|
debug_print(f"! No serial connection available for {name}")
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print("An error occurred while gathering data:", e)
|
debug_print(f"\n✗ An error occurred while gathering data: {e}")
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
|
|
||||||
|
# Display all collected data
|
||||||
|
debug_print(f"\n--- Collected Sensor Data ---")
|
||||||
|
debug_print(f"H2S: {data_h2s} ppb")
|
||||||
|
debug_print(f"NO2: {data_no2} ppb")
|
||||||
|
debug_print(f"O3: {data_o3} ppb")
|
||||||
|
debug_print(f"CO: {data_co} ppb")
|
||||||
|
debug_print(f"NH3: {data_nh3} ppb")
|
||||||
|
debug_print(f"SO2: {data_so2} ppb")
|
||||||
|
|
||||||
#print(f" H2S: {data_h2s}, NO2: {data_no2}, O3: {data_o3}")
|
# Save to sqlite database
|
||||||
|
|
||||||
#save to sqlite database
|
|
||||||
try:
|
try:
|
||||||
cursor.execute('''
|
cursor.execute('''
|
||||||
INSERT INTO data_envea (timestamp,h2s, no2, o3, co, nh3) VALUES (?,?,?,?,?,?)'''
|
INSERT INTO data_envea (timestamp, h2s, no2, o3, co, nh3, so2) VALUES (?,?,?,?,?,?,?)'''
|
||||||
, (rtc_time_str,data_h2s,data_no2,data_o3,data_co,data_nh3 ))
|
, (rtc_time_str, data_h2s, data_no2, data_o3, data_co, data_nh3, data_so2))
|
||||||
|
|
||||||
# Commit and close the connection
|
# Commit and close the connection
|
||||||
conn.commit()
|
conn.commit()
|
||||||
|
|
||||||
#print("Sensor data saved successfully!")
|
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"Database error: {e}")
|
debug_print(f"✗ Database error: {e}")
|
||||||
|
traceback.print_exc()
|
||||||
|
|
||||||
|
# Close serial connections
|
||||||
|
if serial_connections:
|
||||||
|
for name, connection in serial_connections.items():
|
||||||
|
try:
|
||||||
|
connection.close()
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
conn.close()
|
conn.close()
|
||||||
|
debug_print("\n=== ENVEA Sensor Reader Finished ===\n")
|
||||||
|
|
||||||
55
forget_wifi.sh
Normal file
55
forget_wifi.sh
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
echo "-------"
|
||||||
|
echo "Start forget WiFi shell script at $(date)"
|
||||||
|
|
||||||
|
# Get deviceName from database for hotspot SSID
|
||||||
|
DEVICE_NAME=$(sqlite3 /var/www/nebuleair_pro_4g/sqlite/sensors.db "SELECT value FROM config_table WHERE key='deviceName'")
|
||||||
|
echo "Device Name: $DEVICE_NAME"
|
||||||
|
|
||||||
|
# Get current active WiFi connection name
|
||||||
|
ACTIVE_WIFI=$(nmcli -t -f NAME,TYPE,DEVICE connection show --active | grep ':802-11-wireless:wlan0' | cut -d: -f1)
|
||||||
|
|
||||||
|
if [ -z "$ACTIVE_WIFI" ]; then
|
||||||
|
echo "No active WiFi connection found on wlan0"
|
||||||
|
echo "End forget WiFi shell script"
|
||||||
|
echo "-------"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Forgetting WiFi connection: $ACTIVE_WIFI"
|
||||||
|
|
||||||
|
# Disconnect wlan0 first to prevent NetworkManager from auto-reconnecting
|
||||||
|
sudo nmcli device disconnect wlan0
|
||||||
|
echo "wlan0 disconnected"
|
||||||
|
|
||||||
|
# Delete (forget) the saved connection
|
||||||
|
sudo nmcli connection delete "$ACTIVE_WIFI"
|
||||||
|
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
echo "Connection '$ACTIVE_WIFI' deleted successfully"
|
||||||
|
else
|
||||||
|
echo "Failed to delete connection '$ACTIVE_WIFI'"
|
||||||
|
fi
|
||||||
|
|
||||||
|
sleep 5
|
||||||
|
|
||||||
|
# Scan WiFi networks BEFORE starting hotspot (scan impossible once hotspot is active)
|
||||||
|
OUTPUT_FILE="/var/www/nebuleair_pro_4g/wifi_list.csv"
|
||||||
|
echo "Scanning WiFi networks (waiting for wlan0 to be ready)..."
|
||||||
|
nmcli device wifi rescan ifname wlan0 2>/dev/null
|
||||||
|
sleep 3
|
||||||
|
nmcli -f SSID,SIGNAL,SECURITY device wifi list ifname wlan0 | awk 'BEGIN { OFS=","; print "SSID,SIGNAL,SECURITY" } NR>1 { print $1,$2,$3 }' > "$OUTPUT_FILE"
|
||||||
|
echo "WiFi scan saved to $OUTPUT_FILE"
|
||||||
|
cat "$OUTPUT_FILE"
|
||||||
|
|
||||||
|
# Start hotspot
|
||||||
|
echo "Starting hotspot with SSID: $DEVICE_NAME"
|
||||||
|
sudo nmcli device wifi hotspot ifname wlan0 ssid "$DEVICE_NAME" password nebuleaircfg
|
||||||
|
|
||||||
|
# Update SQLite to reflect hotspot mode
|
||||||
|
sqlite3 /var/www/nebuleair_pro_4g/sqlite/sensors.db "UPDATE config_table SET value='hotspot' WHERE key='WIFI_status'"
|
||||||
|
echo "Updated database: WIFI_status = hotspot"
|
||||||
|
echo "Hotspot started with SSID: $DEVICE_NAME"
|
||||||
|
|
||||||
|
echo "End forget WiFi shell script"
|
||||||
|
echo "-------"
|
||||||
3
html/.htaccess
Normal file
3
html/.htaccess
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
php_value upload_max_filesize 50M
|
||||||
|
php_value post_max_size 55M
|
||||||
|
php_value max_execution_time 300
|
||||||
1818
html/admin.html
1818
html/admin.html
File diff suppressed because it is too large
Load Diff
66
html/assets/data/operators.json
Normal file
66
html/assets/data/operators.json
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
{
|
||||||
|
"operators": {
|
||||||
|
"20801": { "name": "Orange", "country": "France" },
|
||||||
|
"20802": { "name": "Orange", "country": "France" },
|
||||||
|
"20810": { "name": "SFR", "country": "France" },
|
||||||
|
"20811": { "name": "SFR", "country": "France" },
|
||||||
|
"20813": { "name": "SFR", "country": "France" },
|
||||||
|
"20815": { "name": "Free Mobile", "country": "France" },
|
||||||
|
"20816": { "name": "Free Mobile", "country": "France" },
|
||||||
|
"20820": { "name": "Bouygues Telecom", "country": "France" },
|
||||||
|
"20821": { "name": "Bouygues Telecom", "country": "France" },
|
||||||
|
"20826": { "name": "NRJ Mobile", "country": "France" },
|
||||||
|
"20888": { "name": "Bouygues Telecom", "country": "France" },
|
||||||
|
"22201": { "name": "TIM", "country": "Italy" },
|
||||||
|
"22210": { "name": "Vodafone", "country": "Italy" },
|
||||||
|
"22288": { "name": "WIND", "country": "Italy" },
|
||||||
|
"22299": { "name": "3 Italia", "country": "Italy" },
|
||||||
|
"23410": { "name": "O2", "country": "UK" },
|
||||||
|
"23415": { "name": "Vodafone", "country": "UK" },
|
||||||
|
"23420": { "name": "3", "country": "UK" },
|
||||||
|
"23430": { "name": "EE", "country": "UK" },
|
||||||
|
"23433": { "name": "EE", "country": "UK" },
|
||||||
|
"26201": { "name": "Telekom", "country": "Germany" },
|
||||||
|
"26202": { "name": "Vodafone", "country": "Germany" },
|
||||||
|
"26203": { "name": "O2", "country": "Germany" },
|
||||||
|
"26207": { "name": "O2", "country": "Germany" },
|
||||||
|
"21401": { "name": "Vodafone", "country": "Spain" },
|
||||||
|
"21403": { "name": "Orange", "country": "Spain" },
|
||||||
|
"21404": { "name": "Yoigo", "country": "Spain" },
|
||||||
|
"21407": { "name": "Movistar", "country": "Spain" },
|
||||||
|
"22801": { "name": "Swisscom", "country": "Switzerland" },
|
||||||
|
"22802": { "name": "Sunrise", "country": "Switzerland" },
|
||||||
|
"22803": { "name": "Salt", "country": "Switzerland" },
|
||||||
|
"20601": { "name": "Proximus", "country": "Belgium" },
|
||||||
|
"20610": { "name": "Orange", "country": "Belgium" },
|
||||||
|
"20620": { "name": "Base", "country": "Belgium" },
|
||||||
|
"20404": { "name": "Vodafone", "country": "Netherlands" },
|
||||||
|
"20408": { "name": "KPN", "country": "Netherlands" },
|
||||||
|
"20412": { "name": "T-Mobile", "country": "Netherlands" },
|
||||||
|
"20416": { "name": "T-Mobile", "country": "Netherlands" },
|
||||||
|
"26801": { "name": "Vodafone", "country": "Portugal" },
|
||||||
|
"26803": { "name": "NOS", "country": "Portugal" },
|
||||||
|
"26806": { "name": "MEO", "country": "Portugal" },
|
||||||
|
"29340": { "name": "SI Mobil", "country": "Slovenia" },
|
||||||
|
"29341": { "name": "Mobitel", "country": "Slovenia" }
|
||||||
|
},
|
||||||
|
"modes": {
|
||||||
|
"0": "Automatic",
|
||||||
|
"1": "Manual",
|
||||||
|
"2": "Deregistered",
|
||||||
|
"3": "Format only",
|
||||||
|
"4": "Manual/Automatic"
|
||||||
|
},
|
||||||
|
"accessTechnology": {
|
||||||
|
"0": "GSM",
|
||||||
|
"1": "GSM Compact",
|
||||||
|
"2": "UTRAN (3G)",
|
||||||
|
"3": "GSM/GPRS with EDGE",
|
||||||
|
"4": "UTRAN with HSDPA",
|
||||||
|
"5": "UTRAN with HSUPA",
|
||||||
|
"6": "UTRAN with HSDPA/HSUPA",
|
||||||
|
"7": "LTE (4G)",
|
||||||
|
"8": "EC-GSM-IoT",
|
||||||
|
"9": "LTE Cat-M / NB-IoT"
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
html/assets/img/logoModuleAir.png
Normal file
BIN
html/assets/img/logoModuleAir.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 233 KiB |
129
html/assets/js/i18n.js
Normal file
129
html/assets/js/i18n.js
Normal file
@@ -0,0 +1,129 @@
|
|||||||
|
/**
|
||||||
|
* NebuleAir i18n - Lightweight internationalization system
|
||||||
|
* Works offline with local JSON translation files
|
||||||
|
* Stores language preference in SQLite database
|
||||||
|
*/
|
||||||
|
|
||||||
|
const i18n = {
|
||||||
|
currentLang: 'fr', // Default language
|
||||||
|
translations: {},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initialize i18n system
|
||||||
|
* Loads language preference from server and applies translations
|
||||||
|
*/
|
||||||
|
async init() {
|
||||||
|
try {
|
||||||
|
// Load language preference from server (SQLite database)
|
||||||
|
const response = await fetch('launcher.php?type=get_language');
|
||||||
|
const data = await response.json();
|
||||||
|
this.currentLang = data.language || 'fr';
|
||||||
|
} catch (error) {
|
||||||
|
console.warn('Could not load language preference, using default (fr):', error);
|
||||||
|
this.currentLang = 'fr';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load translations and apply
|
||||||
|
await this.loadTranslations(this.currentLang);
|
||||||
|
this.applyTranslations();
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Load translation file for specified language
|
||||||
|
* @param {string} lang - Language code (fr, en)
|
||||||
|
*/
|
||||||
|
async loadTranslations(lang) {
|
||||||
|
try {
|
||||||
|
const response = await fetch(`lang/${lang}.json`);
|
||||||
|
this.translations = await response.json();
|
||||||
|
console.log(`Translations loaded for: ${lang}`);
|
||||||
|
} catch (error) {
|
||||||
|
console.error(`Failed to load translations for ${lang}:`, error);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Apply translations to all elements with data-i18n attribute
|
||||||
|
*/
|
||||||
|
applyTranslations() {
|
||||||
|
document.querySelectorAll('[data-i18n]').forEach(element => {
|
||||||
|
const key = element.getAttribute('data-i18n');
|
||||||
|
const translation = this.get(key);
|
||||||
|
|
||||||
|
if (translation) {
|
||||||
|
// Handle different element types
|
||||||
|
if (element.tagName === 'INPUT' || element.tagName === 'TEXTAREA') {
|
||||||
|
if (element.type === 'button' || element.type === 'submit') {
|
||||||
|
element.value = translation;
|
||||||
|
} else {
|
||||||
|
element.placeholder = translation;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
element.textContent = translation;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.warn(`Translation not found for key: ${key}`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Update HTML lang attribute
|
||||||
|
document.documentElement.lang = this.currentLang;
|
||||||
|
|
||||||
|
// Update language switcher dropdown
|
||||||
|
const languageSwitcher = document.getElementById('languageSwitcher');
|
||||||
|
if (languageSwitcher) {
|
||||||
|
languageSwitcher.value = this.currentLang;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get translation by key (supports nested keys with dot notation)
|
||||||
|
* @param {string} key - Translation key (e.g., 'sensors.title')
|
||||||
|
* @returns {string} Translated string or key if not found
|
||||||
|
*/
|
||||||
|
get(key) {
|
||||||
|
const keys = key.split('.');
|
||||||
|
let value = this.translations;
|
||||||
|
|
||||||
|
for (const k of keys) {
|
||||||
|
if (value && typeof value === 'object' && k in value) {
|
||||||
|
value = value[k];
|
||||||
|
} else {
|
||||||
|
return key; // Return key if translation not found
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return value;
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Change language and reload translations
|
||||||
|
* @param {string} lang - Language code (fr, en)
|
||||||
|
*/
|
||||||
|
async setLanguage(lang) {
|
||||||
|
if (lang === this.currentLang) return;
|
||||||
|
|
||||||
|
this.currentLang = lang;
|
||||||
|
|
||||||
|
// Save to server (SQLite database)
|
||||||
|
try {
|
||||||
|
await fetch(`launcher.php?type=set_language&language=${lang}`);
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to save language preference:', error);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reload translations and apply
|
||||||
|
await this.loadTranslations(lang);
|
||||||
|
this.applyTranslations();
|
||||||
|
|
||||||
|
// Emit custom event for other scripts to react to language change
|
||||||
|
document.dispatchEvent(new CustomEvent('languageChanged', { detail: { language: lang } }));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Auto-initialize when DOM is ready
|
||||||
|
if (document.readyState === 'loading') {
|
||||||
|
document.addEventListener('DOMContentLoaded', () => i18n.init());
|
||||||
|
} else {
|
||||||
|
i18n.init();
|
||||||
|
}
|
||||||
946
html/assets/js/selftest.js
Normal file
946
html/assets/js/selftest.js
Normal file
@@ -0,0 +1,946 @@
|
|||||||
|
// ============================================
|
||||||
|
// SELF TEST FUNCTIONS (shared across pages)
|
||||||
|
// ============================================
|
||||||
|
|
||||||
|
// Cache for operators data
|
||||||
|
let operatorsDataSelfTest = null;
|
||||||
|
|
||||||
|
function loadOperatorsDataSelfTest() {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
if (operatorsDataSelfTest) {
|
||||||
|
resolve(operatorsDataSelfTest);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
$.ajax({
|
||||||
|
url: 'assets/data/operators.json',
|
||||||
|
dataType: 'json',
|
||||||
|
method: 'GET',
|
||||||
|
success: function(data) {
|
||||||
|
operatorsDataSelfTest = data;
|
||||||
|
resolve(data);
|
||||||
|
},
|
||||||
|
error: function(xhr, status, error) {
|
||||||
|
console.error('Failed to load operators data:', error);
|
||||||
|
reject(error);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Global object to store test results for report
|
||||||
|
let selfTestReport = {
|
||||||
|
timestamp: '',
|
||||||
|
deviceId: '',
|
||||||
|
modemVersion: '',
|
||||||
|
results: {},
|
||||||
|
rawResponses: {}
|
||||||
|
};
|
||||||
|
|
||||||
|
function runSelfTest() {
|
||||||
|
console.log("Starting Self Test...");
|
||||||
|
|
||||||
|
// Reset report
|
||||||
|
selfTestReport = {
|
||||||
|
timestamp: new Date().toISOString(),
|
||||||
|
deviceId: document.querySelector('.sideBar_sensorName')?.textContent || 'Unknown',
|
||||||
|
modemVersion: document.getElementById('modem_version')?.textContent || 'Unknown',
|
||||||
|
results: {},
|
||||||
|
rawResponses: {}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Reset UI
|
||||||
|
resetSelfTestUI();
|
||||||
|
|
||||||
|
// Show modal
|
||||||
|
const modal = new bootstrap.Modal(document.getElementById('selfTestModal'));
|
||||||
|
modal.show();
|
||||||
|
|
||||||
|
// Disable buttons during test
|
||||||
|
document.getElementById('selfTestCloseBtn').disabled = true;
|
||||||
|
document.getElementById('selfTestDoneBtn').disabled = true;
|
||||||
|
document.getElementById('selfTestCopyBtn').disabled = true;
|
||||||
|
document.querySelectorAll('.btn_selfTest').forEach(btn => btn.disabled = true);
|
||||||
|
|
||||||
|
// Start test sequence
|
||||||
|
selfTestSequence();
|
||||||
|
}
|
||||||
|
|
||||||
|
function resetSelfTestUI() {
|
||||||
|
// Reset status
|
||||||
|
document.getElementById('selftest_status').innerHTML = `
|
||||||
|
<div class="d-flex align-items-center text-muted">
|
||||||
|
<div class="spinner-border spinner-border-sm me-2" role="status"></div>
|
||||||
|
<span>Preparing test...</span>
|
||||||
|
</div>`;
|
||||||
|
|
||||||
|
// Reset test items
|
||||||
|
document.getElementById('test_wifi_status').className = 'badge bg-secondary';
|
||||||
|
document.getElementById('test_wifi_status').textContent = 'Pending';
|
||||||
|
document.getElementById('test_wifi_detail').textContent = 'Waiting...';
|
||||||
|
|
||||||
|
document.getElementById('test_modem_status').className = 'badge bg-secondary';
|
||||||
|
document.getElementById('test_modem_status').textContent = 'Pending';
|
||||||
|
document.getElementById('test_modem_detail').textContent = 'Waiting...';
|
||||||
|
|
||||||
|
document.getElementById('test_sim_status').className = 'badge bg-secondary';
|
||||||
|
document.getElementById('test_sim_status').textContent = 'Pending';
|
||||||
|
document.getElementById('test_sim_detail').textContent = 'Waiting...';
|
||||||
|
|
||||||
|
document.getElementById('test_signal_status').className = 'badge bg-secondary';
|
||||||
|
document.getElementById('test_signal_status').textContent = 'Pending';
|
||||||
|
document.getElementById('test_signal_detail').textContent = 'Waiting...';
|
||||||
|
|
||||||
|
document.getElementById('test_network_status').className = 'badge bg-secondary';
|
||||||
|
document.getElementById('test_network_status').textContent = 'Pending';
|
||||||
|
document.getElementById('test_network_detail').textContent = 'Waiting...';
|
||||||
|
|
||||||
|
// Reset sensor tests
|
||||||
|
document.getElementById('sensor_tests_container').innerHTML = '';
|
||||||
|
document.getElementById('comm_tests_separator').style.display = 'none';
|
||||||
|
|
||||||
|
// Reset logs
|
||||||
|
document.getElementById('selftest_logs').innerHTML = '';
|
||||||
|
|
||||||
|
// Reset summary
|
||||||
|
document.getElementById('selftest_summary').innerHTML = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
function addSelfTestLog(message, isRaw = false) {
|
||||||
|
const logsEl = document.getElementById('selftest_logs');
|
||||||
|
const timestamp = new Date().toLocaleTimeString();
|
||||||
|
|
||||||
|
if (isRaw) {
|
||||||
|
// Raw AT response - format nicely
|
||||||
|
logsEl.textContent += `[${timestamp}] >>> RAW RESPONSE:\n${message}\n<<<\n`;
|
||||||
|
} else {
|
||||||
|
logsEl.textContent += `[${timestamp}] ${message}\n`;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Auto-scroll to bottom
|
||||||
|
logsEl.parentElement.scrollTop = logsEl.parentElement.scrollHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateTestStatus(testId, status, detail, badge) {
|
||||||
|
document.getElementById(`test_${testId}_status`).className = `badge ${badge}`;
|
||||||
|
document.getElementById(`test_${testId}_status`).textContent = status;
|
||||||
|
document.getElementById(`test_${testId}_detail`).textContent = detail;
|
||||||
|
|
||||||
|
// Store result in report
|
||||||
|
selfTestReport.results[testId] = {
|
||||||
|
status: status,
|
||||||
|
detail: detail
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function setConfigMode(enabled) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
addSelfTestLog(`Setting modem_config_mode to ${enabled}...`);
|
||||||
|
|
||||||
|
$.ajax({
|
||||||
|
url: `launcher.php?type=update_config_sqlite¶m=modem_config_mode&value=${enabled}`,
|
||||||
|
dataType: 'json',
|
||||||
|
method: 'GET',
|
||||||
|
cache: false,
|
||||||
|
success: function(response) {
|
||||||
|
if (response.success) {
|
||||||
|
addSelfTestLog(`modem_config_mode set to ${enabled}`);
|
||||||
|
// Update checkbox state if it exists on the page
|
||||||
|
const checkbox = document.getElementById('check_modem_configMode');
|
||||||
|
if (checkbox) checkbox.checked = enabled;
|
||||||
|
resolve(true);
|
||||||
|
} else {
|
||||||
|
addSelfTestLog(`Failed to set modem_config_mode: ${response.error || 'Unknown error'}`);
|
||||||
|
reject(new Error(response.error || 'Failed to set config mode'));
|
||||||
|
}
|
||||||
|
},
|
||||||
|
error: function(xhr, status, error) {
|
||||||
|
addSelfTestLog(`AJAX error setting config mode: ${error}`);
|
||||||
|
reject(new Error(error));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function sendATCommand(command, timeout) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
addSelfTestLog(`Sending AT command: ${command} (timeout: ${timeout}s)`);
|
||||||
|
|
||||||
|
$.ajax({
|
||||||
|
url: `launcher.php?type=sara&port=ttyAMA2&command=${encodeURIComponent(command)}&timeout=${timeout}`,
|
||||||
|
dataType: 'text',
|
||||||
|
method: 'GET',
|
||||||
|
success: function(response) {
|
||||||
|
// Store raw response in report
|
||||||
|
selfTestReport.rawResponses[command] = response;
|
||||||
|
|
||||||
|
// Log raw response
|
||||||
|
addSelfTestLog(response.trim(), true);
|
||||||
|
|
||||||
|
resolve(response);
|
||||||
|
},
|
||||||
|
error: function(xhr, status, error) {
|
||||||
|
addSelfTestLog(`AT command error: ${error}`);
|
||||||
|
selfTestReport.rawResponses[command] = `ERROR: ${error}`;
|
||||||
|
reject(new Error(error));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function delaySelfTest(ms) {
|
||||||
|
return new Promise(resolve => setTimeout(resolve, ms));
|
||||||
|
}
|
||||||
|
|
||||||
|
async function selfTestSequence() {
|
||||||
|
let testsPassed = 0;
|
||||||
|
let testsFailed = 0;
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Collect system info at the start
|
||||||
|
document.getElementById('selftest_status').innerHTML = `
|
||||||
|
<div class="d-flex align-items-center text-primary">
|
||||||
|
<div class="spinner-border spinner-border-sm me-2" role="status"></div>
|
||||||
|
<span>Collecting system information...</span>
|
||||||
|
</div>`;
|
||||||
|
|
||||||
|
// Get system info from config
|
||||||
|
try {
|
||||||
|
const configResponse = await new Promise((resolve, reject) => {
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=get_config_sqlite',
|
||||||
|
dataType: 'json',
|
||||||
|
method: 'GET',
|
||||||
|
success: function(data) { resolve(data); },
|
||||||
|
error: function(xhr, status, error) { reject(new Error(error)); }
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Store in report
|
||||||
|
selfTestReport.deviceId = configResponse.deviceID || 'Unknown';
|
||||||
|
selfTestReport.deviceName = configResponse.deviceName || 'Unknown';
|
||||||
|
selfTestReport.modemVersion = configResponse.modem_version || 'Unknown';
|
||||||
|
selfTestReport.latitude = configResponse.latitude_raw || 'N/A';
|
||||||
|
selfTestReport.longitude = configResponse.longitude_raw || 'N/A';
|
||||||
|
selfTestReport.config = configResponse;
|
||||||
|
|
||||||
|
// Get RTC time
|
||||||
|
try {
|
||||||
|
const rtcTime = await new Promise((resolve, reject) => {
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=RTC_time',
|
||||||
|
dataType: 'text',
|
||||||
|
method: 'GET',
|
||||||
|
success: function(data) { resolve(data.trim()); },
|
||||||
|
error: function(xhr, status, error) { resolve('N/A'); }
|
||||||
|
});
|
||||||
|
});
|
||||||
|
selfTestReport.systemTime = rtcTime;
|
||||||
|
} catch (e) {
|
||||||
|
selfTestReport.systemTime = 'N/A';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Log system info
|
||||||
|
addSelfTestLog('════════════════════════════════════════════════════════');
|
||||||
|
addSelfTestLog(' NEBULEAIR PRO 4G - SELF TEST');
|
||||||
|
addSelfTestLog('════════════════════════════════════════════════════════');
|
||||||
|
addSelfTestLog(`Device ID: ${selfTestReport.deviceId}`);
|
||||||
|
addSelfTestLog(`Device Name: ${selfTestReport.deviceName}`);
|
||||||
|
addSelfTestLog(`Modem Version: ${selfTestReport.modemVersion}`);
|
||||||
|
addSelfTestLog(`RTC Time: ${selfTestReport.systemTime}`);
|
||||||
|
addSelfTestLog(`Browser Time: ${new Date().toLocaleString()}`);
|
||||||
|
addSelfTestLog(`GPS: ${selfTestReport.latitude}, ${selfTestReport.longitude}`);
|
||||||
|
addSelfTestLog('────────────────────────────────────────────────────────');
|
||||||
|
addSelfTestLog('');
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
addSelfTestLog(`Warning: Could not get system config: ${error.message}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
await delaySelfTest(300);
|
||||||
|
|
||||||
|
// ═══════════════════════════════════════════════════════
|
||||||
|
// SENSOR TESTS - Test enabled sensors based on config
|
||||||
|
// ═══════════════════════════════════════════════════════
|
||||||
|
const config = selfTestReport.config || {};
|
||||||
|
const sensorTests = [];
|
||||||
|
|
||||||
|
// NPM is always present
|
||||||
|
sensorTests.push({ id: 'npm', name: 'NextPM (Particles)', type: 'npm', port: 'ttyAMA5' });
|
||||||
|
|
||||||
|
// BME280 if enabled
|
||||||
|
if (config.BME280) {
|
||||||
|
sensorTests.push({ id: 'bme280', name: 'BME280 (Temp/Hum)', type: 'BME280' });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Noise if enabled
|
||||||
|
if (config.NOISE) {
|
||||||
|
sensorTests.push({ id: 'noise', name: 'Noise Sensor', type: 'noise' });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Envea if enabled
|
||||||
|
if (config.envea) {
|
||||||
|
sensorTests.push({ id: 'envea', name: 'Envea (Gas Sensors)', type: 'envea' });
|
||||||
|
}
|
||||||
|
|
||||||
|
// RTC module is always present (DS3231)
|
||||||
|
sensorTests.push({ id: 'rtc', name: 'RTC Module (DS3231)', type: 'rtc' });
|
||||||
|
|
||||||
|
// Create sensor test UI entries dynamically
|
||||||
|
const sensorContainer = document.getElementById('sensor_tests_container');
|
||||||
|
sensorContainer.innerHTML = '';
|
||||||
|
|
||||||
|
sensorTests.forEach(sensor => {
|
||||||
|
sensorContainer.innerHTML += `
|
||||||
|
<div class="list-group-item d-flex justify-content-between align-items-center" id="test_${sensor.id}">
|
||||||
|
<div>
|
||||||
|
<strong>${sensor.name}</strong>
|
||||||
|
<div class="small text-muted" id="test_${sensor.id}_detail">Waiting...</div>
|
||||||
|
</div>
|
||||||
|
<span id="test_${sensor.id}_status" class="badge bg-secondary">Pending</span>
|
||||||
|
</div>`;
|
||||||
|
});
|
||||||
|
|
||||||
|
addSelfTestLog('');
|
||||||
|
addSelfTestLog('────────────────────────────────────────────────────────');
|
||||||
|
addSelfTestLog('SENSOR TESTS');
|
||||||
|
addSelfTestLog('────────────────────────────────────────────────────────');
|
||||||
|
|
||||||
|
// Run each sensor test
|
||||||
|
for (const sensor of sensorTests) {
|
||||||
|
await delaySelfTest(500);
|
||||||
|
|
||||||
|
document.getElementById('selftest_status').innerHTML = `
|
||||||
|
<div class="d-flex align-items-center text-primary">
|
||||||
|
<div class="spinner-border spinner-border-sm me-2" role="status"></div>
|
||||||
|
<span>Testing ${sensor.name}...</span>
|
||||||
|
</div>`;
|
||||||
|
|
||||||
|
updateTestStatus(sensor.id, 'Testing...', 'Reading sensor data...', 'bg-info');
|
||||||
|
addSelfTestLog(`Testing ${sensor.name}...`);
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (sensor.type === 'npm') {
|
||||||
|
// NPM sensor test
|
||||||
|
const npmResult = await new Promise((resolve, reject) => {
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=npm&port=' + sensor.port,
|
||||||
|
dataType: 'json',
|
||||||
|
method: 'GET',
|
||||||
|
timeout: 15000,
|
||||||
|
success: function(data) { resolve(data); },
|
||||||
|
error: function(xhr, status, error) { reject(new Error(error || status)); }
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
selfTestReport.rawResponses['NPM Sensor'] = JSON.stringify(npmResult, null, 2);
|
||||||
|
addSelfTestLog(`NPM response: PM1=${npmResult.PM1}, PM2.5=${npmResult.PM25}, PM10=${npmResult.PM10}`);
|
||||||
|
|
||||||
|
// Check for errors
|
||||||
|
const npmErrors = ['notReady', 'fanError', 'laserError', 'heatError', 't_rhError', 'memoryError', 'degradedState'];
|
||||||
|
const activeErrors = npmErrors.filter(e => npmResult[e] === 1);
|
||||||
|
|
||||||
|
if (activeErrors.length > 0) {
|
||||||
|
updateTestStatus(sensor.id, 'Warning', `Errors: ${activeErrors.join(', ')}`, 'bg-warning');
|
||||||
|
testsFailed++;
|
||||||
|
} else if (npmResult.PM1 !== undefined && npmResult.PM25 !== undefined && npmResult.PM10 !== undefined) {
|
||||||
|
updateTestStatus(sensor.id, 'Passed', `PM1: ${npmResult.PM1} | PM2.5: ${npmResult.PM25} | PM10: ${npmResult.PM10} ug/m3`, 'bg-success');
|
||||||
|
testsPassed++;
|
||||||
|
} else {
|
||||||
|
updateTestStatus(sensor.id, 'Warning', 'Incomplete data received', 'bg-warning');
|
||||||
|
testsFailed++;
|
||||||
|
}
|
||||||
|
|
||||||
|
} else if (sensor.type === 'BME280') {
|
||||||
|
// BME280 sensor test
|
||||||
|
const bme280Result = await new Promise((resolve, reject) => {
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=BME280',
|
||||||
|
dataType: 'text',
|
||||||
|
method: 'GET',
|
||||||
|
timeout: 15000,
|
||||||
|
success: function(data) { resolve(data); },
|
||||||
|
error: function(xhr, status, error) { reject(new Error(error || status)); }
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
const bmeData = JSON.parse(bme280Result);
|
||||||
|
selfTestReport.rawResponses['BME280 Sensor'] = JSON.stringify(bmeData, null, 2);
|
||||||
|
addSelfTestLog(`BME280 response: temp=${bmeData.temp}, hum=${bmeData.hum}, press=${bmeData.press}`);
|
||||||
|
|
||||||
|
if (bmeData.temp !== undefined && bmeData.hum !== undefined && bmeData.press !== undefined) {
|
||||||
|
updateTestStatus(sensor.id, 'Passed', `${bmeData.temp}°C | ${bmeData.hum}% | ${bmeData.press} hPa`, 'bg-success');
|
||||||
|
testsPassed++;
|
||||||
|
} else {
|
||||||
|
updateTestStatus(sensor.id, 'Warning', 'Incomplete data received', 'bg-warning');
|
||||||
|
testsFailed++;
|
||||||
|
}
|
||||||
|
|
||||||
|
} else if (sensor.type === 'noise') {
|
||||||
|
// NSRT MK4 noise sensor test (returns JSON)
|
||||||
|
const noiseResult = await new Promise((resolve, reject) => {
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=noise',
|
||||||
|
dataType: 'json',
|
||||||
|
method: 'GET',
|
||||||
|
timeout: 15000,
|
||||||
|
success: function(data) { resolve(data); },
|
||||||
|
error: function(xhr, status, error) { reject(new Error(error || status)); }
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
selfTestReport.rawResponses['Noise Sensor'] = JSON.stringify(noiseResult);
|
||||||
|
addSelfTestLog(`Noise response: ${JSON.stringify(noiseResult)}`);
|
||||||
|
|
||||||
|
if (noiseResult.error) {
|
||||||
|
updateTestStatus(sensor.id, 'Failed', noiseResult.error, 'bg-danger');
|
||||||
|
testsFailed++;
|
||||||
|
} else if (noiseResult.LEQ > 0 && noiseResult.dBA > 0) {
|
||||||
|
updateTestStatus(sensor.id, 'Passed', `LEQ: ${noiseResult.LEQ} dB | dB(A): ${noiseResult.dBA}`, 'bg-success');
|
||||||
|
testsPassed++;
|
||||||
|
} else {
|
||||||
|
updateTestStatus(sensor.id, 'Warning', `Unexpected values: LEQ=${noiseResult.LEQ}, dBA=${noiseResult.dBA}`, 'bg-warning');
|
||||||
|
testsFailed++;
|
||||||
|
}
|
||||||
|
|
||||||
|
} else if (sensor.type === 'envea') {
|
||||||
|
// Envea sensor test - use the debug endpoint for all sensors
|
||||||
|
const enveaResult = await new Promise((resolve, reject) => {
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=envea_debug',
|
||||||
|
dataType: 'text',
|
||||||
|
method: 'GET',
|
||||||
|
timeout: 30000,
|
||||||
|
success: function(data) { resolve(data); },
|
||||||
|
error: function(xhr, status, error) { reject(new Error(error || status)); }
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
selfTestReport.rawResponses['Envea Sensors'] = enveaResult;
|
||||||
|
addSelfTestLog(`Envea response: ${enveaResult.trim().substring(0, 200)}`);
|
||||||
|
|
||||||
|
if (enveaResult.trim() !== '' && !enveaResult.toLowerCase().includes('error')) {
|
||||||
|
updateTestStatus(sensor.id, 'Passed', 'Sensors responding', 'bg-success');
|
||||||
|
testsPassed++;
|
||||||
|
} else if (enveaResult.toLowerCase().includes('error')) {
|
||||||
|
updateTestStatus(sensor.id, 'Failed', 'Sensor error detected', 'bg-danger');
|
||||||
|
testsFailed++;
|
||||||
|
} else {
|
||||||
|
updateTestStatus(sensor.id, 'Failed', 'No data received', 'bg-danger');
|
||||||
|
testsFailed++;
|
||||||
|
}
|
||||||
|
|
||||||
|
} else if (sensor.type === 'rtc') {
|
||||||
|
// RTC DS3231 module test
|
||||||
|
const rtcResult = await new Promise((resolve, reject) => {
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=sys_RTC_module_time',
|
||||||
|
dataType: 'json',
|
||||||
|
method: 'GET',
|
||||||
|
timeout: 10000,
|
||||||
|
success: function(data) { resolve(data); },
|
||||||
|
error: function(xhr, status, error) { reject(new Error(error || status)); }
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
selfTestReport.rawResponses['RTC Module'] = JSON.stringify(rtcResult, null, 2);
|
||||||
|
addSelfTestLog(`RTC response: ${JSON.stringify(rtcResult)}`);
|
||||||
|
|
||||||
|
if (rtcResult.rtc_module_time === 'not connected') {
|
||||||
|
updateTestStatus(sensor.id, 'Failed', 'RTC module not connected', 'bg-danger');
|
||||||
|
testsFailed++;
|
||||||
|
} else if (rtcResult.rtc_module_time) {
|
||||||
|
// Compare RTC with browser time (more reliable than system time)
|
||||||
|
const rtcDate = new Date(rtcResult.rtc_module_time + ' UTC');
|
||||||
|
const browserDate = new Date();
|
||||||
|
const timeDiff = Math.abs(Math.round((browserDate - rtcDate) / 1000));
|
||||||
|
|
||||||
|
if (timeDiff <= 60) {
|
||||||
|
updateTestStatus(sensor.id, 'Passed', `${rtcResult.rtc_module_time} (sync OK vs navigateur, ecart: ${timeDiff}s)`, 'bg-success');
|
||||||
|
testsPassed++;
|
||||||
|
} else {
|
||||||
|
const minutes = Math.floor(timeDiff / 60);
|
||||||
|
const label = minutes > 0 ? `${minutes}min ${timeDiff % 60}s` : `${timeDiff}s`;
|
||||||
|
updateTestStatus(sensor.id, 'Warning', `${rtcResult.rtc_module_time} (desync vs navigateur: ${label})`, 'bg-warning');
|
||||||
|
testsFailed++;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
updateTestStatus(sensor.id, 'Warning', 'Unexpected response', 'bg-warning');
|
||||||
|
testsFailed++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
addSelfTestLog(`${sensor.name} test error: ${error.message}`);
|
||||||
|
updateTestStatus(sensor.id, 'Failed', error.message, 'bg-danger');
|
||||||
|
selfTestReport.rawResponses[`${sensor.name}`] = `ERROR: ${error.message}`;
|
||||||
|
testsFailed++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ═══════════════════════════════════════════════════════
|
||||||
|
// COMMUNICATION TESTS - WiFi, Modem, SIM, Signal, Network
|
||||||
|
// ═══════════════════════════════════════════════════════
|
||||||
|
addSelfTestLog('');
|
||||||
|
addSelfTestLog('────────────────────────────────────────────────────────');
|
||||||
|
addSelfTestLog('COMMUNICATION TESTS');
|
||||||
|
addSelfTestLog('────────────────────────────────────────────────────────');
|
||||||
|
|
||||||
|
document.getElementById('comm_tests_separator').style.display = '';
|
||||||
|
|
||||||
|
// Check WiFi / Network status (informational, no pass/fail)
|
||||||
|
document.getElementById('selftest_status').innerHTML = `
|
||||||
|
<div class="d-flex align-items-center text-primary">
|
||||||
|
<div class="spinner-border spinner-border-sm me-2" role="status"></div>
|
||||||
|
<span>Checking network status...</span>
|
||||||
|
</div>`;
|
||||||
|
|
||||||
|
updateTestStatus('wifi', 'Checking...', 'Getting network info...', 'bg-info');
|
||||||
|
|
||||||
|
try {
|
||||||
|
const wifiResponse = await new Promise((resolve, reject) => {
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=wifi_status',
|
||||||
|
dataType: 'json',
|
||||||
|
method: 'GET',
|
||||||
|
success: function(data) {
|
||||||
|
addSelfTestLog(`WiFi status received`);
|
||||||
|
// Store raw response
|
||||||
|
selfTestReport.rawResponses['WiFi Status'] = JSON.stringify(data, null, 2);
|
||||||
|
resolve(data);
|
||||||
|
},
|
||||||
|
error: function(xhr, status, error) {
|
||||||
|
addSelfTestLog(`WiFi status error: ${error}`);
|
||||||
|
selfTestReport.rawResponses['WiFi Status'] = `ERROR: ${error}`;
|
||||||
|
reject(new Error(error));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Log detailed WiFi info
|
||||||
|
addSelfTestLog(`Mode: ${wifiResponse.mode}, SSID: ${wifiResponse.ssid}, IP: ${wifiResponse.ip}, Hostname: ${wifiResponse.hostname}`);
|
||||||
|
|
||||||
|
if (wifiResponse.connected) {
|
||||||
|
let modeLabel = '';
|
||||||
|
let badgeClass = 'bg-info';
|
||||||
|
|
||||||
|
if (wifiResponse.mode === 'hotspot') {
|
||||||
|
modeLabel = 'Hotspot';
|
||||||
|
badgeClass = 'bg-warning text-dark';
|
||||||
|
} else if (wifiResponse.mode === 'wifi') {
|
||||||
|
modeLabel = 'WiFi';
|
||||||
|
badgeClass = 'bg-info';
|
||||||
|
} else if (wifiResponse.mode === 'ethernet') {
|
||||||
|
modeLabel = 'Ethernet';
|
||||||
|
badgeClass = 'bg-info';
|
||||||
|
}
|
||||||
|
|
||||||
|
const detailText = `${wifiResponse.ssid} | ${wifiResponse.ip} | ${wifiResponse.hostname}.local`;
|
||||||
|
updateTestStatus('wifi', modeLabel, detailText, badgeClass);
|
||||||
|
} else {
|
||||||
|
updateTestStatus('wifi', 'Disconnected', 'No network connection', 'bg-secondary');
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
updateTestStatus('wifi', 'Error', error.message, 'bg-secondary');
|
||||||
|
}
|
||||||
|
|
||||||
|
await delaySelfTest(500);
|
||||||
|
|
||||||
|
// Enable config mode
|
||||||
|
document.getElementById('selftest_status').innerHTML = `
|
||||||
|
<div class="d-flex align-items-center text-primary">
|
||||||
|
<div class="spinner-border spinner-border-sm me-2" role="status"></div>
|
||||||
|
<span>Enabling configuration mode...</span>
|
||||||
|
</div>`;
|
||||||
|
|
||||||
|
await setConfigMode(true);
|
||||||
|
|
||||||
|
// Wait for SARA script to release the port (2 seconds should be enough)
|
||||||
|
addSelfTestLog('Waiting for modem port to be available...');
|
||||||
|
await delaySelfTest(2000);
|
||||||
|
|
||||||
|
// Test Modem Connection (ATI)
|
||||||
|
document.getElementById('selftest_status').innerHTML = `
|
||||||
|
<div class="d-flex align-items-center text-primary">
|
||||||
|
<div class="spinner-border spinner-border-sm me-2" role="status"></div>
|
||||||
|
<span>Testing modem connection...</span>
|
||||||
|
</div>`;
|
||||||
|
|
||||||
|
updateTestStatus('modem', 'Testing...', 'Sending ATI command...', 'bg-info');
|
||||||
|
|
||||||
|
try {
|
||||||
|
const modemResponse = await sendATCommand('ATI', 5);
|
||||||
|
|
||||||
|
if (modemResponse.includes('OK') && (modemResponse.toUpperCase().includes('SARA-R5') || modemResponse.toUpperCase().includes('SARA-R4'))) {
|
||||||
|
// Extract model
|
||||||
|
const modelMatch = modemResponse.match(/SARA-R[45]\d*[A-Z]*-\d+[A-Z]*-\d+/i);
|
||||||
|
const model = modelMatch ? modelMatch[0] : 'SARA module';
|
||||||
|
updateTestStatus('modem', 'Passed', `Model: ${model}`, 'bg-success');
|
||||||
|
testsPassed++;
|
||||||
|
} else if (modemResponse.includes('OK')) {
|
||||||
|
updateTestStatus('modem', 'Passed', 'Modem responding', 'bg-success');
|
||||||
|
testsPassed++;
|
||||||
|
} else {
|
||||||
|
updateTestStatus('modem', 'Failed', 'No valid response', 'bg-danger');
|
||||||
|
testsFailed++;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
updateTestStatus('modem', 'Failed', error.message, 'bg-danger');
|
||||||
|
testsFailed++;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delay between AT commands
|
||||||
|
await delaySelfTest(1000);
|
||||||
|
|
||||||
|
// Test SIM Card (AT+CCID?)
|
||||||
|
document.getElementById('selftest_status').innerHTML = `
|
||||||
|
<div class="d-flex align-items-center text-primary">
|
||||||
|
<div class="spinner-border spinner-border-sm me-2" role="status"></div>
|
||||||
|
<span>Testing SIM card...</span>
|
||||||
|
</div>`;
|
||||||
|
|
||||||
|
updateTestStatus('sim', 'Testing...', 'Sending AT+CCID? command...', 'bg-info');
|
||||||
|
|
||||||
|
try {
|
||||||
|
const simResponse = await sendATCommand('AT+CCID?', 5);
|
||||||
|
|
||||||
|
const ccidMatch = simResponse.match(/\+CCID:\s*(\d{18,22})/);
|
||||||
|
if (simResponse.includes('OK') && ccidMatch) {
|
||||||
|
const iccid = ccidMatch[1];
|
||||||
|
// Show last 4 digits only for privacy
|
||||||
|
const maskedIccid = '****' + iccid.slice(-4);
|
||||||
|
updateTestStatus('sim', 'Passed', `ICCID: ...${maskedIccid}`, 'bg-success');
|
||||||
|
testsPassed++;
|
||||||
|
} else if (simResponse.includes('ERROR')) {
|
||||||
|
updateTestStatus('sim', 'Failed', 'SIM card not detected', 'bg-danger');
|
||||||
|
testsFailed++;
|
||||||
|
} else {
|
||||||
|
updateTestStatus('sim', 'Warning', 'Unable to read ICCID', 'bg-warning');
|
||||||
|
testsFailed++;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
updateTestStatus('sim', 'Failed', error.message, 'bg-danger');
|
||||||
|
testsFailed++;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delay between AT commands
|
||||||
|
await delaySelfTest(1000);
|
||||||
|
|
||||||
|
// Test Signal Strength (AT+CSQ)
|
||||||
|
document.getElementById('selftest_status').innerHTML = `
|
||||||
|
<div class="d-flex align-items-center text-primary">
|
||||||
|
<div class="spinner-border spinner-border-sm me-2" role="status"></div>
|
||||||
|
<span>Testing signal strength...</span>
|
||||||
|
</div>`;
|
||||||
|
|
||||||
|
updateTestStatus('signal', 'Testing...', 'Sending AT+CSQ command...', 'bg-info');
|
||||||
|
|
||||||
|
try {
|
||||||
|
const signalResponse = await sendATCommand('AT+CSQ', 5);
|
||||||
|
|
||||||
|
const csqMatch = signalResponse.match(/\+CSQ:\s*(\d+),(\d+)/);
|
||||||
|
if (signalResponse.includes('OK') && csqMatch) {
|
||||||
|
const signalPower = parseInt(csqMatch[1]);
|
||||||
|
|
||||||
|
if (signalPower === 99) {
|
||||||
|
updateTestStatus('signal', 'Failed', 'No signal detected', 'bg-danger');
|
||||||
|
testsFailed++;
|
||||||
|
} else if (signalPower === 0) {
|
||||||
|
updateTestStatus('signal', 'Warning', 'Very poor signal (0/31)', 'bg-warning');
|
||||||
|
testsFailed++;
|
||||||
|
} else if (signalPower <= 24) {
|
||||||
|
updateTestStatus('signal', 'Passed', `Poor signal (${signalPower}/31)`, 'bg-success');
|
||||||
|
testsPassed++;
|
||||||
|
} else if (signalPower <= 26) {
|
||||||
|
updateTestStatus('signal', 'Passed', `Good signal (${signalPower}/31)`, 'bg-success');
|
||||||
|
testsPassed++;
|
||||||
|
} else if (signalPower <= 28) {
|
||||||
|
updateTestStatus('signal', 'Passed', `Very good signal (${signalPower}/31)`, 'bg-success');
|
||||||
|
testsPassed++;
|
||||||
|
} else {
|
||||||
|
updateTestStatus('signal', 'Passed', `Excellent signal (${signalPower}/31)`, 'bg-success');
|
||||||
|
testsPassed++;
|
||||||
|
}
|
||||||
|
} else if (signalResponse.includes('ERROR')) {
|
||||||
|
updateTestStatus('signal', 'Failed', 'Unable to read signal', 'bg-danger');
|
||||||
|
testsFailed++;
|
||||||
|
} else {
|
||||||
|
updateTestStatus('signal', 'Warning', 'Unexpected response', 'bg-warning');
|
||||||
|
testsFailed++;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
updateTestStatus('signal', 'Failed', error.message, 'bg-danger');
|
||||||
|
testsFailed++;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delay between AT commands
|
||||||
|
await delaySelfTest(1000);
|
||||||
|
|
||||||
|
// Test Network Connection (AT+COPS?)
|
||||||
|
document.getElementById('selftest_status').innerHTML = `
|
||||||
|
<div class="d-flex align-items-center text-primary">
|
||||||
|
<div class="spinner-border spinner-border-sm me-2" role="status"></div>
|
||||||
|
<span>Testing network connection...</span>
|
||||||
|
</div>`;
|
||||||
|
|
||||||
|
updateTestStatus('network', 'Testing...', 'Sending AT+COPS? command...', 'bg-info');
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Load operators data for network name lookup
|
||||||
|
let opData = null;
|
||||||
|
try {
|
||||||
|
opData = await loadOperatorsDataSelfTest();
|
||||||
|
} catch (e) {
|
||||||
|
addSelfTestLog('Warning: Could not load operators data');
|
||||||
|
}
|
||||||
|
|
||||||
|
const networkResponse = await sendATCommand('AT+COPS?', 5);
|
||||||
|
|
||||||
|
const copsMatch = networkResponse.match(/\+COPS:\s*(\d+)(?:,(\d+),"?([^",]+)"?,(\d+))?/);
|
||||||
|
if (networkResponse.includes('OK') && copsMatch) {
|
||||||
|
const mode = copsMatch[1];
|
||||||
|
const oper = copsMatch[3];
|
||||||
|
const act = copsMatch[4];
|
||||||
|
|
||||||
|
if (oper) {
|
||||||
|
// Get operator name from lookup table
|
||||||
|
let operatorName = oper;
|
||||||
|
if (opData && opData.operators && opData.operators[oper]) {
|
||||||
|
operatorName = opData.operators[oper].name;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get access technology
|
||||||
|
let actDesc = 'Unknown';
|
||||||
|
if (opData && opData.accessTechnology && opData.accessTechnology[act]) {
|
||||||
|
actDesc = opData.accessTechnology[act];
|
||||||
|
}
|
||||||
|
|
||||||
|
updateTestStatus('network', 'Passed', `${operatorName} (${actDesc})`, 'bg-success');
|
||||||
|
testsPassed++;
|
||||||
|
} else {
|
||||||
|
updateTestStatus('network', 'Warning', 'Not registered to network', 'bg-warning');
|
||||||
|
testsFailed++;
|
||||||
|
}
|
||||||
|
} else if (networkResponse.includes('ERROR')) {
|
||||||
|
updateTestStatus('network', 'Failed', 'Unable to get network info', 'bg-danger');
|
||||||
|
testsFailed++;
|
||||||
|
} else {
|
||||||
|
updateTestStatus('network', 'Warning', 'Unexpected response', 'bg-warning');
|
||||||
|
testsFailed++;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
updateTestStatus('network', 'Failed', error.message, 'bg-danger');
|
||||||
|
testsFailed++;
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
addSelfTestLog(`Test sequence error: ${error.message}`);
|
||||||
|
} finally {
|
||||||
|
// Always disable config mode at the end
|
||||||
|
document.getElementById('selftest_status').innerHTML = `
|
||||||
|
<div class="d-flex align-items-center text-primary">
|
||||||
|
<div class="spinner-border spinner-border-sm me-2" role="status"></div>
|
||||||
|
<span>Disabling configuration mode...</span>
|
||||||
|
</div>`;
|
||||||
|
|
||||||
|
try {
|
||||||
|
await delaySelfTest(500);
|
||||||
|
await setConfigMode(false);
|
||||||
|
} catch (error) {
|
||||||
|
addSelfTestLog(`Warning: Failed to disable config mode: ${error.message}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Show final status
|
||||||
|
const totalTests = testsPassed + testsFailed;
|
||||||
|
let statusClass, statusIcon, statusText;
|
||||||
|
|
||||||
|
if (testsFailed === 0) {
|
||||||
|
statusClass = 'text-success';
|
||||||
|
statusIcon = '✓';
|
||||||
|
statusText = 'All tests passed';
|
||||||
|
} else if (testsPassed === 0) {
|
||||||
|
statusClass = 'text-danger';
|
||||||
|
statusIcon = '✗';
|
||||||
|
statusText = 'All tests failed';
|
||||||
|
} else {
|
||||||
|
statusClass = 'text-warning';
|
||||||
|
statusIcon = '!';
|
||||||
|
statusText = 'Some tests failed';
|
||||||
|
}
|
||||||
|
|
||||||
|
document.getElementById('selftest_status').innerHTML = `
|
||||||
|
<div class="d-flex align-items-center ${statusClass}">
|
||||||
|
<span class="fs-4 me-2">${statusIcon}</span>
|
||||||
|
<span><strong>${statusText}</strong></span>
|
||||||
|
</div>`;
|
||||||
|
|
||||||
|
document.getElementById('selftest_summary').innerHTML = `
|
||||||
|
<span class="badge bg-success me-1">${testsPassed} passed</span>
|
||||||
|
<span class="badge bg-danger">${testsFailed} failed</span>`;
|
||||||
|
|
||||||
|
// Store summary in report
|
||||||
|
selfTestReport.summary = {
|
||||||
|
passed: testsPassed,
|
||||||
|
failed: testsFailed,
|
||||||
|
status: statusText
|
||||||
|
};
|
||||||
|
|
||||||
|
// Enable buttons
|
||||||
|
document.getElementById('selfTestCloseBtn').disabled = false;
|
||||||
|
document.getElementById('selfTestDoneBtn').disabled = false;
|
||||||
|
document.getElementById('selfTestCopyBtn').disabled = false;
|
||||||
|
document.querySelectorAll('.btn_selfTest').forEach(btn => btn.disabled = false);
|
||||||
|
|
||||||
|
addSelfTestLog('Self test completed.');
|
||||||
|
addSelfTestLog('Click "Copy Report" to share results with support.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function generateReport() {
|
||||||
|
// Build formatted report
|
||||||
|
let report = `===============================================================
|
||||||
|
NEBULEAIR PRO 4G - SELF TEST REPORT
|
||||||
|
===============================================================
|
||||||
|
|
||||||
|
DEVICE INFORMATION
|
||||||
|
------------------
|
||||||
|
Device ID: ${selfTestReport.deviceId || 'Unknown'}
|
||||||
|
Device Name: ${selfTestReport.deviceName || 'Unknown'}
|
||||||
|
Modem Version: ${selfTestReport.modemVersion || 'Unknown'}
|
||||||
|
System Time: ${selfTestReport.systemTime || 'Unknown'}
|
||||||
|
Report Date: ${selfTestReport.timestamp}
|
||||||
|
GPS Location: ${selfTestReport.latitude || 'N/A'}, ${selfTestReport.longitude || 'N/A'}
|
||||||
|
|
||||||
|
===============================================================
|
||||||
|
TEST RESULTS
|
||||||
|
===============================================================
|
||||||
|
|
||||||
|
`;
|
||||||
|
|
||||||
|
// Add test results (sensors first, then communication)
|
||||||
|
const testNames = {
|
||||||
|
npm: 'NextPM (Particles)',
|
||||||
|
bme280: 'BME280 (Temp/Hum)',
|
||||||
|
noise: 'Noise Sensor',
|
||||||
|
envea: 'Envea (Gas Sensors)',
|
||||||
|
rtc: 'RTC Module (DS3231)',
|
||||||
|
wifi: 'WiFi/Network',
|
||||||
|
modem: 'Modem Connection',
|
||||||
|
sim: 'SIM Card',
|
||||||
|
signal: 'Signal Strength',
|
||||||
|
network: 'Network Connection'
|
||||||
|
};
|
||||||
|
|
||||||
|
for (const [testId, name] of Object.entries(testNames)) {
|
||||||
|
if (selfTestReport.results[testId]) {
|
||||||
|
const result = selfTestReport.results[testId];
|
||||||
|
const statusIcon = result.status === 'Passed' ? '[OK]' :
|
||||||
|
result.status === 'Failed' ? '[FAIL]' :
|
||||||
|
result.status.includes('Hotspot') || result.status.includes('WiFi') || result.status.includes('Ethernet') ? '[INFO]' : '[WARN]';
|
||||||
|
report += `${statusIcon} ${name}
|
||||||
|
Status: ${result.status}
|
||||||
|
Detail: ${result.detail}
|
||||||
|
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add summary
|
||||||
|
if (selfTestReport.summary) {
|
||||||
|
report += `===============================================================
|
||||||
|
SUMMARY
|
||||||
|
===============================================================
|
||||||
|
|
||||||
|
Passed: ${selfTestReport.summary.passed}
|
||||||
|
Failed: ${selfTestReport.summary.failed}
|
||||||
|
Status: ${selfTestReport.summary.status}
|
||||||
|
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add raw AT responses
|
||||||
|
report += `===============================================================
|
||||||
|
RAW AT RESPONSES
|
||||||
|
===============================================================
|
||||||
|
|
||||||
|
`;
|
||||||
|
|
||||||
|
for (const [command, response] of Object.entries(selfTestReport.rawResponses)) {
|
||||||
|
report += `--- ${command} ---
|
||||||
|
${response}
|
||||||
|
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add full logs
|
||||||
|
report += `===============================================================
|
||||||
|
DETAILED LOGS
|
||||||
|
===============================================================
|
||||||
|
|
||||||
|
${document.getElementById('selftest_logs').textContent}
|
||||||
|
|
||||||
|
===============================================================
|
||||||
|
END OF REPORT - Generated by NebuleAir Pro 4G
|
||||||
|
===============================================================
|
||||||
|
`;
|
||||||
|
|
||||||
|
return report;
|
||||||
|
}
|
||||||
|
|
||||||
|
function openShareReportModal() {
|
||||||
|
// Generate the report
|
||||||
|
const report = generateReport();
|
||||||
|
|
||||||
|
// Put report in textarea
|
||||||
|
document.getElementById('shareReportText').value = report;
|
||||||
|
|
||||||
|
// Open the share modal
|
||||||
|
const shareModal = new bootstrap.Modal(document.getElementById('shareReportModal'));
|
||||||
|
shareModal.show();
|
||||||
|
}
|
||||||
|
|
||||||
|
function selectAllReportText() {
|
||||||
|
const textarea = document.getElementById('shareReportText');
|
||||||
|
textarea.select();
|
||||||
|
textarea.setSelectionRange(0, textarea.value.length); // For mobile devices
|
||||||
|
}
|
||||||
|
|
||||||
|
function downloadReport() {
|
||||||
|
const report = generateReport();
|
||||||
|
|
||||||
|
// Create filename with device ID
|
||||||
|
const deviceId = selfTestReport.deviceId || 'unknown';
|
||||||
|
const date = new Date().toISOString().slice(0, 10);
|
||||||
|
const filename = `logs_nebuleair_${deviceId}_${date}.txt`;
|
||||||
|
|
||||||
|
// Create blob and download
|
||||||
|
const blob = new Blob([report], { type: 'text/plain;charset=utf-8' });
|
||||||
|
const url = URL.createObjectURL(blob);
|
||||||
|
|
||||||
|
const a = document.createElement('a');
|
||||||
|
a.href = url;
|
||||||
|
a.download = filename;
|
||||||
|
document.body.appendChild(a);
|
||||||
|
a.click();
|
||||||
|
|
||||||
|
// Cleanup
|
||||||
|
setTimeout(function() {
|
||||||
|
document.body.removeChild(a);
|
||||||
|
URL.revokeObjectURL(url);
|
||||||
|
}, 100);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load the self-test modal HTML into the page
|
||||||
|
function initSelfTestModal() {
|
||||||
|
fetch('selftest-modal.html')
|
||||||
|
.then(response => response.text())
|
||||||
|
.then(html => {
|
||||||
|
// Insert modal HTML before </body>
|
||||||
|
const container = document.createElement('div');
|
||||||
|
container.id = 'selftest-modal-container';
|
||||||
|
container.innerHTML = html;
|
||||||
|
document.body.appendChild(container);
|
||||||
|
})
|
||||||
|
.catch(error => console.error('Error loading selftest modal:', error));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Auto-init when DOM is ready
|
||||||
|
document.addEventListener('DOMContentLoaded', initSelfTestModal);
|
||||||
58
html/assets/js/topbar-logo.js
Normal file
58
html/assets/js/topbar-logo.js
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
|
||||||
|
/**
|
||||||
|
* Global configuration handler for UI elements
|
||||||
|
* - Updates Topbar Logo based on device type
|
||||||
|
* - Shows/Hides "Screen" sidebar tab based on device type
|
||||||
|
*/
|
||||||
|
document.addEventListener('DOMContentLoaded', () => {
|
||||||
|
let config = null;
|
||||||
|
|
||||||
|
// Fetch config once
|
||||||
|
fetch('launcher.php?type=get_config_sqlite')
|
||||||
|
.then(response => response.json())
|
||||||
|
.then(data => {
|
||||||
|
config = data;
|
||||||
|
applyConfig(); // Apply immediately if elements are ready
|
||||||
|
})
|
||||||
|
.catch(error => console.error('Error loading config:', error));
|
||||||
|
|
||||||
|
// Observe DOM changes to handle dynamically loaded elements (sidebar, topbar)
|
||||||
|
const observer = new MutationObserver(() => {
|
||||||
|
if (config) applyConfig();
|
||||||
|
});
|
||||||
|
|
||||||
|
observer.observe(document.body, { childList: true, subtree: true });
|
||||||
|
|
||||||
|
function applyConfig() {
|
||||||
|
if (!config) return;
|
||||||
|
|
||||||
|
const isModuleAirPro = (config.device_type === 'moduleair_pro' || config.type === 'moduleair_pro');
|
||||||
|
|
||||||
|
// 1. Topbar Logo Logic
|
||||||
|
const logo = document.getElementById('topbar-logo');
|
||||||
|
if (logo && isModuleAirPro) {
|
||||||
|
// prevent unnecessary re-assignments
|
||||||
|
if (!logo.src.includes('logoModuleAir.png')) {
|
||||||
|
logo.src = 'assets/img/logoModuleAir.png';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Sidebar Screen Tab Logic - Use class since ID might be duplicated (desktop/mobile)
|
||||||
|
const navScreenElements = document.querySelectorAll('.nav-screen-item');
|
||||||
|
if (navScreenElements.length > 0) {
|
||||||
|
navScreenElements.forEach(navScreen => {
|
||||||
|
if (isModuleAirPro) {
|
||||||
|
// Ensure it's visible (bootstrap nav-link usually block or flex)
|
||||||
|
if (navScreen.style.display === 'none') {
|
||||||
|
navScreen.style.display = 'flex';
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Hide if not pro
|
||||||
|
if (navScreen.style.display !== 'none') {
|
||||||
|
navScreen.style.display = 'none';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
@@ -26,6 +26,13 @@
|
|||||||
.offcanvas-backdrop {
|
.offcanvas-backdrop {
|
||||||
z-index: 1040;
|
z-index: 1040;
|
||||||
}
|
}
|
||||||
|
/* Highlight most recent data row with light green background */
|
||||||
|
.table .most-recent-row td {
|
||||||
|
background-color: #d4edda !important;
|
||||||
|
}
|
||||||
|
.table-striped .most-recent-row td {
|
||||||
|
background-color: #d4edda !important;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
@@ -49,58 +56,108 @@
|
|||||||
</aside>
|
</aside>
|
||||||
<!-- Main content -->
|
<!-- Main content -->
|
||||||
<main class="col-md-10 ms-sm-auto col-lg-11 offset-md-2 offset-lg-1 px-md-4">
|
<main class="col-md-10 ms-sm-auto col-lg-11 offset-md-2 offset-lg-1 px-md-4">
|
||||||
<h1 class="mt-4">Base de données</h1>
|
<h1 class="mt-4" data-i18n="database.title">Base de données</h1>
|
||||||
<p>Le capteur enregistre en local les données de mesures. Vous pouvez ici les consulter et les télécharger.</p>
|
<p data-i18n="database.description">Le capteur enregistre en local les données de mesures. Vous pouvez ici les consulter et les télécharger.</p>
|
||||||
|
|
||||||
<div class="row mb-3">
|
<div class="row mb-3">
|
||||||
|
|
||||||
<div class="col-sm-5">
|
<div class="col-lg-4 col-md-6 mb-3">
|
||||||
<div class="card text-dark bg-light">
|
<div class="card text-dark bg-light h-100">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<h5 class="card-title">Consulter la base de donnée</h5>
|
<h5 class="card-title" data-i18n="database.viewDatabase">Consulter la base de donnée</h5>
|
||||||
<!-- Dropdown to select number of records -->
|
<!-- Dropdown to select number of records -->
|
||||||
<div class="d-flex align-items-center mb-3">
|
<div class="d-flex align-items-center mb-3">
|
||||||
<label for="records_limit" class="form-label me-2">Nombre de mesures:</label>
|
<label for="records_limit" class="form-label me-2" data-i18n="database.numberOfMeasures">Nombre de mesures:</label>
|
||||||
<select id="records_limit" class="form-select w-auto">
|
<select id="records_limit" class="form-select w-auto">
|
||||||
<option value="10" selected>10 dernières</option>
|
<option value="10" selected data-i18n="database.last10">10 dernières</option>
|
||||||
<option value="20">20 dernières</option>
|
<option value="20" data-i18n="database.last20">20 dernières</option>
|
||||||
<option value="30">30 dernières</option>
|
<option value="30" data-i18n="database.last30">30 dernières</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<button class="btn btn-primary" onclick="get_data_sqlite('data_NPM',getSelectedLimit(),false)">Mesures PM</button>
|
<button class="btn btn-primary mb-2" onclick="get_data_sqlite('data_NPM',getSelectedLimit(),false)" data-i18n="database.pmMeasures">Mesures PM</button>
|
||||||
<button class="btn btn-primary" onclick="get_data_sqlite('data_BME280',getSelectedLimit(),false)">Mesures Temp/Hum</button>
|
<button class="btn btn-primary mb-2" onclick="get_data_sqlite('data_BME280',getSelectedLimit(),false)" data-i18n="database.tempHumMeasures">Mesures Temp/Hum</button>
|
||||||
<button class="btn btn-primary" onclick="get_data_sqlite('data_NPM_5channels',getSelectedLimit(),false)">Mesures PM (5 canaux)</button>
|
<button class="btn btn-primary mb-2" onclick="get_data_sqlite('data_NPM_5channels',getSelectedLimit(),false)" data-i18n="database.pm5Channels">Mesures PM (5 canaux)</button>
|
||||||
<button class="btn btn-primary" onclick="get_data_sqlite('data_envea',getSelectedLimit(),false)">Sonde Cairsens</button>
|
<button class="btn btn-primary mb-2" onclick="get_data_sqlite('data_envea',getSelectedLimit(),false)" data-i18n="database.cairsensProbe">Sonde Cairsens</button>
|
||||||
<button class="btn btn-warning" onclick="get_data_sqlite('timestamp_table',getSelectedLimit(),false)">Timestamp Table</button>
|
<button class="btn btn-primary mb-2" onclick="get_data_sqlite('data_NOISE',getSelectedLimit(),false)" data-i18n="database.noiseProbe">Sonde bruit</button>
|
||||||
|
<button class="btn btn-primary mb-2" onclick="get_data_sqlite('data_WIND',getSelectedLimit(),false)" data-i18n="database.windProbe">Sonde Vent</button>
|
||||||
|
<button class="btn btn-primary mb-2" onclick="get_data_sqlite('data_MPPT',getSelectedLimit(),false)" data-i18n="database.battery">Batterie</button>
|
||||||
|
<button class="btn btn-primary mb-2" onclick="get_data_sqlite('data_MHZ19',getSelectedLimit(),false)">Mesures CO2</button>
|
||||||
|
<button class="btn btn-warning mb-2" onclick="get_data_sqlite('timestamp_table',getSelectedLimit(),false)" data-i18n="database.timestampTable">Timestamp Table</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-sm-5">
|
<div class="col-lg-4 col-md-6 mb-3">
|
||||||
<div class="card text-dark bg-light">
|
<div class="card text-dark bg-light h-100">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<h5 class="card-title">Télécharger les données</h5>
|
<h5 class="card-title" data-i18n="database.downloadData">Télécharger les données</h5>
|
||||||
<!-- Date selection for download -->
|
<!-- Date selection for download -->
|
||||||
<div class="d-flex align-items-center gap-3 mb-3">
|
<div class="d-flex align-items-center gap-3 mb-3">
|
||||||
<label for="start_date" class="form-label">Date de début:</label>
|
<label for="start_date" class="form-label" data-i18n="database.startDate">Date de début:</label>
|
||||||
<input type="date" id="start_date" class="form-control w-auto">
|
<input type="date" id="start_date" class="form-control w-auto">
|
||||||
<label for="end_date" class="form-label">Date de fin:</label>
|
<label for="end_date" class="form-label" data-i18n="database.endDate">Date de fin:</label>
|
||||||
<input type="date" id="end_date" class="form-control w-auto">
|
<input type="date" id="end_date" class="form-control w-auto">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<button class="btn btn-primary mb-2" onclick="downloadByDate('data_NPM')" data-i18n="database.pmMeasures">Mesures PM</button>
|
||||||
<button class="btn btn-primary" onclick="get_data_sqlite('data_NPM',10,true, getStartDate(), getEndDate())">Mesures PM</button>
|
<button class="btn btn-primary mb-2" onclick="downloadByDate('data_BME280')" data-i18n="database.tempHumMeasures">Mesures Temp/Hum</button>
|
||||||
<button class="btn btn-primary" onclick="get_data_sqlite('data_BME280',10,true, getStartDate(), getEndDate())">Mesures Temp/Hum</button>
|
<button class="btn btn-primary mb-2" onclick="downloadByDate('data_NPM_5channels')" data-i18n="database.pm5Channels">Mesures PM (5 canaux)</button>
|
||||||
<button class="btn btn-primary" onclick="get_data_sqlite('data_NPM_5channels',10,true, getStartDate(), getEndDate())">Mesures PM (5 canaux)</button>
|
<button class="btn btn-primary mb-2" onclick="downloadByDate('data_envea')" data-i18n="database.cairsensProbe">Sonde Cairsens</button>
|
||||||
<button class="btn btn-primary" onclick="get_data_sqlite('data_envea',10,true, getStartDate(), getEndDate())">Sonde Cairsens</button>
|
<button class="btn btn-primary mb-2" onclick="downloadByDate('data_NOISE')" data-i18n="database.noiseProbe">Sonde Bruit</button>
|
||||||
|
<button class="btn btn-primary mb-2" onclick="downloadByDate('data_mppt')" data-i18n="database.battery">Batterie</button>
|
||||||
</table>
|
<button class="btn btn-primary mb-2" onclick="downloadByDate('data_MHZ19')">Mesures CO2</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div class="col-lg-4 col-md-6 mb-3">
|
||||||
|
<div class="card text-dark bg-light h-100">
|
||||||
|
<div class="card-body">
|
||||||
|
<h5 class="card-title" data-i18n="database.downloadAll">Télécharger toute la table</h5>
|
||||||
|
<p class="text-muted small" data-i18n="database.downloadAllDesc">Télécharge l'intégralité des données sans filtre de date.</p>
|
||||||
|
<button class="btn btn-success mb-2" onclick="downloadFullTable('data_NPM')" data-i18n="database.pmMeasures">Mesures PM</button>
|
||||||
|
<button class="btn btn-success mb-2" onclick="downloadFullTable('data_BME280')" data-i18n="database.tempHumMeasures">Mesures Temp/Hum</button>
|
||||||
|
<button class="btn btn-success mb-2" onclick="downloadFullTable('data_NPM_5channels')" data-i18n="database.pm5Channels">Mesures PM (5 canaux)</button>
|
||||||
|
<button class="btn btn-success mb-2" onclick="downloadFullTable('data_envea')" data-i18n="database.cairsensProbe">Sonde Cairsens</button>
|
||||||
|
<button class="btn btn-success mb-2" onclick="downloadFullTable('data_NOISE')" data-i18n="database.noiseProbe">Sonde Bruit</button>
|
||||||
|
<button class="btn btn-success mb-2" onclick="downloadFullTable('data_MPPT')" data-i18n="database.battery">Batterie</button>
|
||||||
|
<button class="btn btn-success mb-2" onclick="downloadFullTable('data_MHZ19')">Mesures CO2</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row mb-3">
|
||||||
|
|
||||||
|
<div class="col-lg-4 col-md-6 mb-3">
|
||||||
|
<div class="card text-dark bg-light h-100">
|
||||||
|
<div class="card-body">
|
||||||
|
<h5 class="card-title" data-i18n="database.statsTitle">Informations sur la base</h5>
|
||||||
|
<div id="db_stats_content">
|
||||||
|
<div class="text-center py-3">
|
||||||
|
<div class="spinner-border spinner-border-sm" role="status"></div>
|
||||||
|
<span class="ms-2" data-i18n="common.loading">Chargement...</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row mb-3">
|
||||||
|
<div class="col-lg-4 col-md-6 mb-3">
|
||||||
|
<div class="card text-white bg-danger h-100">
|
||||||
|
<div class="card-body">
|
||||||
|
<h5 class="card-title" data-i18n="database.dangerZone">Zone dangereuse</h5>
|
||||||
|
<p class="card-text" data-i18n="database.dangerWarning">Attention: Cette action est irréversible!</p>
|
||||||
|
<button class="btn btn-dark btn-lg w-100 mb-2" onclick="emptySensorTables()" data-i18n="database.emptyAllTables">Vider toutes les tables de capteurs</button>
|
||||||
|
<small class="d-block mt-2" data-i18n="database.emptyTablesNote">Note: Les tables de configuration et horodatage seront préservées.</small>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="row mt-2">
|
<div class="row mt-2">
|
||||||
<div id="table_data"></div>
|
<div id="table_data"></div>
|
||||||
@@ -116,6 +173,9 @@
|
|||||||
<script src="assets/jquery/jquery-3.7.1.min.js"></script>
|
<script src="assets/jquery/jquery-3.7.1.min.js"></script>
|
||||||
<!-- Link Bootstrap JS and Popper.js locally -->
|
<!-- Link Bootstrap JS and Popper.js locally -->
|
||||||
<script src="assets/js/bootstrap.bundle.js"></script>
|
<script src="assets/js/bootstrap.bundle.js"></script>
|
||||||
|
<!-- i18n translation system -->
|
||||||
|
<script src="assets/js/i18n.js"></script>
|
||||||
|
<script src="assets/js/topbar-logo.js"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
document.addEventListener('DOMContentLoaded', function () {
|
document.addEventListener('DOMContentLoaded', function () {
|
||||||
@@ -127,6 +187,19 @@
|
|||||||
{ id: 'sidebar_mobile', file: 'sidebar.html' }
|
{ id: 'sidebar_mobile', file: 'sidebar.html' }
|
||||||
];
|
];
|
||||||
|
|
||||||
|
let loadedCount = 0;
|
||||||
|
const totalElements = elementsToLoad.length;
|
||||||
|
|
||||||
|
function applyTranslationsWhenReady() {
|
||||||
|
if (typeof i18n !== 'undefined' && i18n.translations && Object.keys(i18n.translations).length > 0) {
|
||||||
|
console.log("Applying translations to dynamically loaded content");
|
||||||
|
i18n.applyTranslations();
|
||||||
|
} else {
|
||||||
|
// Retry after a short delay if translations aren't loaded yet
|
||||||
|
setTimeout(applyTranslationsWhenReady, 100);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
elementsToLoad.forEach(({ id, file }) => {
|
elementsToLoad.forEach(({ id, file }) => {
|
||||||
fetch(file)
|
fetch(file)
|
||||||
.then(response => response.text())
|
.then(response => response.text())
|
||||||
@@ -135,10 +208,21 @@
|
|||||||
if (element) {
|
if (element) {
|
||||||
element.innerHTML = data;
|
element.innerHTML = data;
|
||||||
}
|
}
|
||||||
|
loadedCount++;
|
||||||
|
|
||||||
|
// Re-apply translations after all dynamic content is loaded
|
||||||
|
if (loadedCount === totalElements) {
|
||||||
|
applyTranslationsWhenReady();
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.catch(error => console.error(`Error loading ${file}:`, error));
|
.catch(error => console.error(`Error loading ${file}:`, error));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Also listen for language change events to re-apply translations
|
||||||
|
document.addEventListener('languageChanged', function() {
|
||||||
|
console.log("Language changed, re-applying translations");
|
||||||
|
i18n.applyTranslations();
|
||||||
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -147,23 +231,40 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
window.onload = function() {
|
window.onload = function() {
|
||||||
fetch('../config.json') // Replace 'deviceID.txt' with 'config.json'
|
|
||||||
.then(response => response.json()) // Parse response as JSON
|
|
||||||
.then(data => {
|
|
||||||
console.log("Getting config file (onload)");
|
|
||||||
//get device ID
|
|
||||||
const deviceID = data.deviceID.trim().toUpperCase();
|
|
||||||
//document.getElementById('pageTitle_plus_ID').innerText = 'token: ' + deviceID;
|
|
||||||
|
|
||||||
//get device Name
|
|
||||||
const deviceName = data.deviceName;
|
|
||||||
|
|
||||||
|
//NEW way to get data from SQLITE
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=get_config_sqlite',
|
||||||
|
dataType:'json',
|
||||||
|
//dataType: 'json', // Specify that you expect a JSON response
|
||||||
|
method: 'GET', // Use GET or POST depending on your needs
|
||||||
|
success: function(response) {
|
||||||
|
console.log("Getting SQLite config table:");
|
||||||
|
console.log(response);
|
||||||
|
|
||||||
|
//get device Name (for the side bar)
|
||||||
|
const deviceName = response.deviceName;
|
||||||
const elements = document.querySelectorAll('.sideBar_sensorName');
|
const elements = document.querySelectorAll('.sideBar_sensorName');
|
||||||
elements.forEach((element) => {
|
elements.forEach((element) => {
|
||||||
element.innerText = deviceName;
|
element.innerText = deviceName;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
//device name html page title
|
||||||
|
if (response.deviceName) {
|
||||||
|
document.title = response.deviceName;
|
||||||
|
}
|
||||||
|
|
||||||
|
},
|
||||||
|
error: function(xhr, status, error) {
|
||||||
|
console.error('AJAX request failed:', status, error);
|
||||||
|
}
|
||||||
|
}); //end ajax
|
||||||
|
|
||||||
|
|
||||||
|
// Get database table stats
|
||||||
|
loadDbStats();
|
||||||
|
|
||||||
//get local RTC
|
//get local RTC
|
||||||
$.ajax({
|
$.ajax({
|
||||||
@@ -178,11 +279,10 @@
|
|||||||
error: function(xhr, status, error) {
|
error: function(xhr, status, error) {
|
||||||
console.error('AJAX request failed:', status, error);
|
console.error('AJAX request failed:', status, error);
|
||||||
}
|
}
|
||||||
});
|
}); //end AJAX
|
||||||
|
|
||||||
})
|
|
||||||
.catch(error => console.error('Error loading config.json:', error));
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -199,7 +299,6 @@ function get_data_sqlite(table, limit, download , startDate = "", endDate = "")
|
|||||||
|
|
||||||
console.log(url);
|
console.log(url);
|
||||||
|
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: url,
|
url: url,
|
||||||
dataType: 'text', // Specify that you expect a JSON response
|
dataType: 'text', // Specify that you expect a JSON response
|
||||||
@@ -228,6 +327,7 @@ function get_data_sqlite(table, limit, download , startDate = "", endDate = "")
|
|||||||
<th>PM10</th>
|
<th>PM10</th>
|
||||||
<th>Temperature (°C)</th>
|
<th>Temperature (°C)</th>
|
||||||
<th>Humidity (%)</th>
|
<th>Humidity (%)</th>
|
||||||
|
<th>Status</th>
|
||||||
`;
|
`;
|
||||||
} else if (table === "data_BME280") {
|
} else if (table === "data_BME280") {
|
||||||
tableHTML += `
|
tableHTML += `
|
||||||
@@ -260,16 +360,51 @@ function get_data_sqlite(table, limit, download , startDate = "", endDate = "")
|
|||||||
tableHTML += `
|
tableHTML += `
|
||||||
<th>Timestamp</th>
|
<th>Timestamp</th>
|
||||||
`;
|
`;
|
||||||
|
}else if (table === "data_WIND") {
|
||||||
|
tableHTML += `
|
||||||
|
<th>Timestamp</th>
|
||||||
|
<th>speed (km/h)</th>
|
||||||
|
<th>Direction (V)</th>
|
||||||
|
`;
|
||||||
|
}else if (table === "data_MPPT") {
|
||||||
|
tableHTML += `
|
||||||
|
<th>Timestamp</th>
|
||||||
|
<th>Battery Voltage</th>
|
||||||
|
<th>Battery Current</th>
|
||||||
|
<th> solar_voltage</th>
|
||||||
|
<th> solar_power</th>
|
||||||
|
<th> charger_status</th>
|
||||||
|
|
||||||
|
`;
|
||||||
|
}else if (table === "data_NOISE") {
|
||||||
|
tableHTML += `
|
||||||
|
<th>Timestamp</th>
|
||||||
|
<th>Curent LEQ</th>
|
||||||
|
<th>DB_A_value</th>
|
||||||
|
|
||||||
|
`;
|
||||||
|
}else if (table === "data_MHZ19") {
|
||||||
|
tableHTML += `
|
||||||
|
<th>Timestamp</th>
|
||||||
|
<th>CO2 (ppm)</th>
|
||||||
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
tableHTML += `</tr></thead><tbody>`;
|
tableHTML += `</tr></thead><tbody>`;
|
||||||
|
|
||||||
// Loop through rows and create table rows
|
// Loop through rows and create table rows
|
||||||
rows.forEach(row => {
|
rows.forEach((row, index) => {
|
||||||
let columns = row.replace(/[()]/g, "").split(", "); // Remove parentheses and split
|
let columns = row.replace(/[()]/g, "").split(", "); // Remove parentheses and split
|
||||||
tableHTML += "<tr>";
|
// Add special class to first row (most recent data)
|
||||||
|
const rowClass = index === 0 ? ' class="most-recent-row"' : '';
|
||||||
|
tableHTML += `<tr${rowClass}>`;
|
||||||
|
|
||||||
if (table === "data_NPM") {
|
if (table === "data_NPM") {
|
||||||
|
const statusVal = parseInt(columns[6]) || 0;
|
||||||
|
const statusBadge = statusVal === 0
|
||||||
|
? '<span class="badge text-bg-success">OK</span>'
|
||||||
|
: `<span class="badge text-bg-warning">0x${statusVal.toString(16).toUpperCase().padStart(2,'0')}</span>`;
|
||||||
tableHTML += `
|
tableHTML += `
|
||||||
<td>${columns[0]}</td>
|
<td>${columns[0]}</td>
|
||||||
<td>${columns[1]}</td>
|
<td>${columns[1]}</td>
|
||||||
@@ -277,6 +412,7 @@ function get_data_sqlite(table, limit, download , startDate = "", endDate = "")
|
|||||||
<td>${columns[3]}</td>
|
<td>${columns[3]}</td>
|
||||||
<td>${columns[4]}</td>
|
<td>${columns[4]}</td>
|
||||||
<td>${columns[5]}</td>
|
<td>${columns[5]}</td>
|
||||||
|
<td>${statusBadge}</td>
|
||||||
`;
|
`;
|
||||||
} else if (table === "data_BME280") {
|
} else if (table === "data_BME280") {
|
||||||
tableHTML += `
|
tableHTML += `
|
||||||
@@ -310,6 +446,33 @@ function get_data_sqlite(table, limit, download , startDate = "", endDate = "")
|
|||||||
tableHTML += `
|
tableHTML += `
|
||||||
<td>${columns[1]}</td>
|
<td>${columns[1]}</td>
|
||||||
`;
|
`;
|
||||||
|
}else if (table === "data_WIND") {
|
||||||
|
tableHTML += `
|
||||||
|
<td>${columns[0]}</td>
|
||||||
|
<td>${columns[1]}</td>
|
||||||
|
<td>${columns[2]}</td>
|
||||||
|
`;
|
||||||
|
}else if (table === "data_MPPT") {
|
||||||
|
tableHTML += `
|
||||||
|
<td>${columns[0]}</td>
|
||||||
|
<td>${columns[1]}</td>
|
||||||
|
<td>${columns[2]}</td>
|
||||||
|
<td>${columns[3]}</td>
|
||||||
|
<td>${columns[4]}</td>
|
||||||
|
<td>${columns[5]}</td>
|
||||||
|
`;
|
||||||
|
}else if (table === "data_NOISE") {
|
||||||
|
tableHTML += `
|
||||||
|
<td>${columns[0]}</td>
|
||||||
|
<td>${columns[1]}</td>
|
||||||
|
<td>${columns[2]}</td>
|
||||||
|
|
||||||
|
`;
|
||||||
|
}else if (table === "data_MHZ19") {
|
||||||
|
tableHTML += `
|
||||||
|
<td>${columns[0]}</td>
|
||||||
|
<td>${columns[1]}</td>
|
||||||
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
tableHTML += "</tr>";
|
tableHTML += "</tr>";
|
||||||
@@ -334,11 +497,25 @@ function getSelectedLimit() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function getStartDate() {
|
function getStartDate() {
|
||||||
return document.getElementById("start_date").value || "2025-01-01"; // Default to a safe date
|
return document.getElementById("start_date").value;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getEndDate() {
|
function getEndDate() {
|
||||||
return document.getElementById("end_date").value || "2025-12-31"; // Default to a safe date
|
return document.getElementById("end_date").value;
|
||||||
|
}
|
||||||
|
|
||||||
|
function downloadByDate(table) {
|
||||||
|
const startDate = getStartDate();
|
||||||
|
const endDate = getEndDate();
|
||||||
|
if (!startDate || !endDate) {
|
||||||
|
alert("Veuillez sélectionner une date de début et une date de fin.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
get_data_sqlite(table, 10, true, startDate, endDate);
|
||||||
|
}
|
||||||
|
|
||||||
|
function downloadFullTable(table) {
|
||||||
|
window.location.href = 'launcher.php?type=download_full_table&table=' + encodeURIComponent(table);
|
||||||
}
|
}
|
||||||
|
|
||||||
function downloadCSV(response, table) {
|
function downloadCSV(response, table) {
|
||||||
@@ -348,13 +525,16 @@ function downloadCSV(response, table) {
|
|||||||
|
|
||||||
// Add headers based on table type
|
// Add headers based on table type
|
||||||
if (table === "data_NPM") {
|
if (table === "data_NPM") {
|
||||||
csvContent += "TimestampUTC,PM1,PM2.5,PM10,Temperature_sensor,Humidity_sensor\n";
|
csvContent += "TimestampUTC,PM1,PM2.5,PM10,Temperature_sensor,Humidity_sensor,npm_status\n";
|
||||||
} else if (table === "data_BME280") {
|
} else if (table === "data_BME280") {
|
||||||
csvContent += "TimestampUTC,Temperature (°C),Humidity (%),Pressure (hPa)\n";
|
csvContent += "TimestampUTC,Temperature (°C),Humidity (%),Pressure (hPa)\n";
|
||||||
}
|
}
|
||||||
else if (table === "data_NPM_5channels") {
|
else if (table === "data_NPM_5channels") {
|
||||||
csvContent += "TimestampUTC,PM_ch1,PM_ch2,PM_ch3,PM_ch4,PM_ch5\n";
|
csvContent += "TimestampUTC,PM_ch1,PM_ch2,PM_ch3,PM_ch4,PM_ch5\n";
|
||||||
}
|
}
|
||||||
|
else if (table === "data_MHZ19") {
|
||||||
|
csvContent += "TimestampUTC,CO2_ppm\n";
|
||||||
|
}
|
||||||
|
|
||||||
// Format rows as CSV
|
// Format rows as CSV
|
||||||
rows.forEach(row => {
|
rows.forEach(row => {
|
||||||
@@ -373,6 +553,140 @@ function downloadCSV(response, table) {
|
|||||||
document.body.removeChild(a);
|
document.body.removeChild(a);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Table display names
|
||||||
|
const tableDisplayNames = {
|
||||||
|
'data_NPM': 'PM (NextPM)',
|
||||||
|
'data_NPM_5channels': 'PM 5 canaux',
|
||||||
|
'data_BME280': 'Temp/Hum (BME280)',
|
||||||
|
'data_envea': 'Gaz (Cairsens)',
|
||||||
|
'data_WIND': 'Vent',
|
||||||
|
'data_MPPT': 'Batterie (MPPT)',
|
||||||
|
'data_NOISE': 'Bruit'
|
||||||
|
};
|
||||||
|
|
||||||
|
function loadDbStats() {
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=db_table_stats',
|
||||||
|
dataType: 'json',
|
||||||
|
method: 'GET',
|
||||||
|
success: function(response) {
|
||||||
|
if (!response.success) {
|
||||||
|
document.getElementById('db_stats_content').innerHTML =
|
||||||
|
'<div class="alert alert-danger mb-0">' + (response.error || 'Erreur') + '</div>';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
let html = '<p class="mb-2"><strong data-i18n="database.statsDbSize">Taille totale:</strong> ' + response.size_mb + ' MB</p>';
|
||||||
|
html += '<div class="table-responsive"><table class="table table-sm table-bordered mb-0">';
|
||||||
|
html += '<thead class="table-secondary"><tr>';
|
||||||
|
html += '<th data-i18n="database.statsTable">Table</th>';
|
||||||
|
html += '<th data-i18n="database.statsCount">Entrées</th>';
|
||||||
|
html += '<th data-i18n="database.statsOldest">Plus ancienne</th>';
|
||||||
|
html += '<th data-i18n="database.statsNewest">Plus récente</th>';
|
||||||
|
html += '<th data-i18n="database.statsDownload">CSV</th>';
|
||||||
|
html += '</tr></thead><tbody>';
|
||||||
|
|
||||||
|
response.tables.forEach(function(t) {
|
||||||
|
const displayName = tableDisplayNames[t.name] || t.name;
|
||||||
|
const oldest = t.oldest ? t.oldest.substring(0, 16) : '-';
|
||||||
|
const newest = t.newest ? t.newest.substring(0, 16) : '-';
|
||||||
|
const downloadBtn = t.count > 0
|
||||||
|
? '<a href="launcher.php?type=download_full_table&table=' + t.name + '" class="btn btn-outline-primary btn-sm py-0 px-1" title="Download CSV"><svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" viewBox="0 0 16 16"><path d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/><path d="M7.646 11.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V1.5a.5.5 0 0 0-1 0v8.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3z"/></svg></a>'
|
||||||
|
: '-';
|
||||||
|
html += '<tr>';
|
||||||
|
html += '<td>' + displayName + '</td>';
|
||||||
|
html += '<td>' + t.count.toLocaleString() + '</td>';
|
||||||
|
html += '<td><small>' + oldest + '</small></td>';
|
||||||
|
html += '<td><small>' + newest + '</small></td>';
|
||||||
|
html += '<td class="text-center">' + downloadBtn + '</td>';
|
||||||
|
html += '</tr>';
|
||||||
|
});
|
||||||
|
|
||||||
|
html += '</tbody></table></div>';
|
||||||
|
html += '<button class="btn btn-outline-secondary btn-sm mt-2" onclick="loadDbStats()" data-i18n="logs.refresh">Refresh</button>';
|
||||||
|
|
||||||
|
document.getElementById('db_stats_content').innerHTML = html;
|
||||||
|
|
||||||
|
// Re-apply translations if i18n is loaded
|
||||||
|
if (typeof i18n !== 'undefined' && i18n.translations && Object.keys(i18n.translations).length > 0) {
|
||||||
|
i18n.applyTranslations();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
error: function(xhr, status, error) {
|
||||||
|
document.getElementById('db_stats_content').innerHTML =
|
||||||
|
'<div class="alert alert-danger mb-0">Erreur: ' + error + '</div>';
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Function to empty all sensor tables
|
||||||
|
function emptySensorTables() {
|
||||||
|
// Show confirmation dialog
|
||||||
|
const confirmed = confirm(
|
||||||
|
"WARNING: This will permanently delete ALL sensor data from the database!\n\n" +
|
||||||
|
"The following tables will be emptied:\n" +
|
||||||
|
"- data_NPM\n" +
|
||||||
|
"- data_NPM_5channels\n" +
|
||||||
|
"- data_BME280\n" +
|
||||||
|
"- data_envea\n" +
|
||||||
|
"- data_WIND\n" +
|
||||||
|
"- data_MPPT\n" +
|
||||||
|
"- data_NOISE\n\n" +
|
||||||
|
"Configuration and timestamp tables will be preserved.\n\n" +
|
||||||
|
"Are you absolutely sure you want to continue?"
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!confirmed) {
|
||||||
|
console.log("Empty sensor tables operation cancelled by user");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Show loading message
|
||||||
|
const tableDataDiv = document.getElementById("table_data");
|
||||||
|
tableDataDiv.innerHTML = '<div class="alert alert-info">Emptying sensor tables... Please wait...</div>';
|
||||||
|
|
||||||
|
// Make AJAX request to empty tables
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=empty_sensor_tables',
|
||||||
|
dataType: 'json',
|
||||||
|
method: 'GET',
|
||||||
|
success: function(response) {
|
||||||
|
console.log("Empty sensor tables response:", response);
|
||||||
|
|
||||||
|
if (response.success) {
|
||||||
|
// Show success message
|
||||||
|
let message = '<div class="alert alert-success">';
|
||||||
|
message += '<h5>Success!</h5>';
|
||||||
|
message += '<p>' + response.message + '</p>';
|
||||||
|
|
||||||
|
if (response.tables_processed && response.tables_processed.length > 0) {
|
||||||
|
message += '<p><strong>Tables emptied:</strong></p><ul>';
|
||||||
|
response.tables_processed.forEach(table => {
|
||||||
|
message += `<li>${table.name}: ${table.deleted} records deleted</li>`;
|
||||||
|
});
|
||||||
|
message += '</ul>';
|
||||||
|
}
|
||||||
|
|
||||||
|
message += '</div>';
|
||||||
|
tableDataDiv.innerHTML = message;
|
||||||
|
} else {
|
||||||
|
// Show error message
|
||||||
|
tableDataDiv.innerHTML = `<div class="alert alert-danger">
|
||||||
|
<h5>Error!</h5>
|
||||||
|
<p>${response.message || response.error || 'Unknown error occurred'}</p>
|
||||||
|
</div>`;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
error: function(xhr, status, error) {
|
||||||
|
console.error('AJAX request failed:', status, error);
|
||||||
|
tableDataDiv.innerHTML = `<div class="alert alert-danger">
|
||||||
|
<h5>Error!</h5>
|
||||||
|
<p>Failed to empty sensor tables: ${error}</p>
|
||||||
|
</div>`;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
133
html/index.html
133
html/index.html
@@ -1,5 +1,6 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
@@ -11,31 +12,39 @@
|
|||||||
body {
|
body {
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
#sidebar a.nav-link {
|
#sidebar a.nav-link {
|
||||||
position: relative;
|
position: relative;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
#sidebar a.nav-link:hover {
|
#sidebar a.nav-link:hover {
|
||||||
background-color: rgba(0, 0, 0, 0.5);
|
background-color: rgba(0, 0, 0, 0.5);
|
||||||
}
|
}
|
||||||
|
|
||||||
#sidebar a.nav-link svg {
|
#sidebar a.nav-link svg {
|
||||||
margin-right: 8px; /* Add spacing between icons and text */
|
margin-right: 8px;
|
||||||
|
/* Add spacing between icons and text */
|
||||||
}
|
}
|
||||||
|
|
||||||
#sidebar {
|
#sidebar {
|
||||||
transition: transform 0.3s ease-in-out;
|
transition: transform 0.3s ease-in-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
.offcanvas-backdrop {
|
.offcanvas-backdrop {
|
||||||
z-index: 1040;
|
z-index: 1040;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<!-- Topbar -->
|
<!-- Topbar -->
|
||||||
<span id="topbar"></span>
|
<span id="topbar"></span>
|
||||||
|
|
||||||
<!-- Sidebar Offcanvas for Mobile -->
|
<!-- Sidebar Offcanvas for Mobile -->
|
||||||
<div class="offcanvas offcanvas-start text-white bg-dark" tabindex="-1" id="sidebarOffcanvas" aria-labelledby="sidebarOffcanvasLabel">
|
<div class="offcanvas offcanvas-start text-white bg-dark" tabindex="-1" id="sidebarOffcanvas"
|
||||||
|
aria-labelledby="sidebarOffcanvasLabel">
|
||||||
<div class="offcanvas-header">
|
<div class="offcanvas-header">
|
||||||
<h5 class="offcanvas-title" id="sidebarOffcanvasLabel">NebuleAir</h5>
|
<h5 class="offcanvas-title" id="sidebarOffcanvasLabel">NebuleAir</h5>
|
||||||
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="offcanvas" aria-label="Close"></button>
|
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="offcanvas" aria-label="Close"></button>
|
||||||
@@ -51,8 +60,16 @@
|
|||||||
</aside>
|
</aside>
|
||||||
<!-- Main content -->
|
<!-- Main content -->
|
||||||
<main class="col-md-9 ms-sm-auto col-lg-10 offset-md-3 offset-lg-2 px-md-4">
|
<main class="col-md-9 ms-sm-auto col-lg-10 offset-md-3 offset-lg-2 px-md-4">
|
||||||
<h1 class="mt-4">Votre capteur</h1>
|
<h1 class="mt-4" data-i18n="home.title">Votre capteur</h1>
|
||||||
<p>Bienvenue sur votre interface de configuration de votre capteur.</p>
|
<p data-i18n="home.welcome">Bienvenue sur votre interface de configuration de votre capteur.</p>
|
||||||
|
|
||||||
|
<button class="btn btn-success mb-3 btn_selfTest" onclick="runSelfTest()">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-check2-circle me-1" viewBox="0 0 16 16">
|
||||||
|
<path d="M2.5 8a5.5 5.5 0 1 1 11 0 5.5 5.5 0 0 1-11 0z"/>
|
||||||
|
<path d="M15.354 3.354a.5.5 0 0 0-.708-.708L8 9.293 5.354 6.646a.5.5 0 1 0-.708.708l3 3a.5.5 0 0 0 .708 0l7-7z"/>
|
||||||
|
</svg>
|
||||||
|
Run Self Test
|
||||||
|
</button>
|
||||||
|
|
||||||
<div class="row mb-3">
|
<div class="row mb-3">
|
||||||
|
|
||||||
@@ -60,7 +77,7 @@
|
|||||||
<div class="col-sm-4 mt-2">
|
<div class="col-sm-4 mt-2">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<h5 class="card-title">Mesures PM</h5>
|
<h5 class="card-title" data-i18n="home.pmMeasures">Mesures PM</h5>
|
||||||
<canvas id="sensorPMChart" style="width: 100%; max-width: 600px; height: 200px;"></canvas>
|
<canvas id="sensorPMChart" style="width: 100%; max-width: 600px; height: 200px;"></canvas>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -70,12 +87,16 @@
|
|||||||
<div class="col-sm-4 mt-2">
|
<div class="col-sm-4 mt-2">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<h5 class="card-title">Linux stats</h5>
|
<h5 class="card-title" data-i18n="home.linuxStats">Statistiques Linux</h5>
|
||||||
<p class="card-text">Disk usage (total size <span id="disk_size"></span> Gb) </p>
|
<p class="card-text"><span data-i18n="home.diskUsage">Utilisation du disque (taille totale</span> <span
|
||||||
|
id="disk_size"></span> Gb) </p>
|
||||||
<div id="disk_space"></div>
|
<div id="disk_space"></div>
|
||||||
<p class="card-text">Memory usage (total size <span id="memory_size"></span> Mb) </p>
|
<p class="card-text"><span data-i18n="home.memoryUsage">Utilisation de la mémoire (taille totale</span>
|
||||||
|
<span id="memory_size"></span> Mb)
|
||||||
|
</p>
|
||||||
<div id="memory_space"></div>
|
<div id="memory_space"></div>
|
||||||
<p class="card-text"> Database size: <span id="database_size"></span> </p>
|
<p class="card-text"><span data-i18n="home.databaseSize">Taille de la base de données:</span> <span
|
||||||
|
id="database_size"></span> </p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -102,14 +123,18 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- JAVASCRIPT -->
|
<!-- JAVASCRIPT -->
|
||||||
|
|
||||||
<!-- Link Ajax locally -->
|
<!-- Link Ajax locally -->
|
||||||
<script src="assets/jquery/jquery-3.7.1.min.js"></script>
|
<script src="assets/jquery/jquery-3.7.1.min.js"></script>
|
||||||
<!-- Link Bootstrap JS and Popper.js locally -->
|
<!-- Link Bootstrap JS and Popper.js locally -->
|
||||||
<script src="assets/js/bootstrap.bundle.js"></script>
|
<script src="assets/js/bootstrap.bundle.js"></script>
|
||||||
|
<!-- i18n translation system -->
|
||||||
|
<script src="assets/js/i18n.js"></script>
|
||||||
|
<script src="assets/js/topbar-logo.js"></script>
|
||||||
|
<script src="assets/js/selftest.js"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
document.addEventListener('DOMContentLoaded', function () {
|
document.addEventListener('DOMContentLoaded', function () {
|
||||||
const elementsToLoad = [
|
const elementsToLoad = [
|
||||||
{ id: 'topbar', file: 'topbar.html' },
|
{ id: 'topbar', file: 'topbar.html' },
|
||||||
@@ -124,17 +149,57 @@
|
|||||||
const element = document.getElementById(id);
|
const element = document.getElementById(id);
|
||||||
if (element) {
|
if (element) {
|
||||||
element.innerHTML = data;
|
element.innerHTML = data;
|
||||||
|
// Apply translations after loading dynamic content
|
||||||
|
if (window.i18n && typeof window.i18n.applyTranslations === 'function') {
|
||||||
|
window.i18n.applyTranslations();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(error => console.error(`Error loading ${file}:`, error));
|
.catch(error => console.error(`Error loading ${file}:`, error));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
window.onload = function() {
|
window.onload = function () {
|
||||||
|
|
||||||
|
//NEW way to get data from SQLITE
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=get_config_sqlite',
|
||||||
|
dataType: 'json',
|
||||||
|
//dataType: 'json', // Specify that you expect a JSON response
|
||||||
|
method: 'GET', // Use GET or POST depending on your needs
|
||||||
|
success: function (response) {
|
||||||
|
console.log("Getting SQLite config table:");
|
||||||
|
console.log(response);
|
||||||
|
|
||||||
|
//get device Name (for the side bar)
|
||||||
|
const deviceName = response.deviceName;
|
||||||
|
const elements = document.querySelectorAll('.sideBar_sensorName');
|
||||||
|
elements.forEach((element) => {
|
||||||
|
element.innerText = deviceName;
|
||||||
|
});
|
||||||
|
|
||||||
|
//device name html page title
|
||||||
|
if (response.deviceName) {
|
||||||
|
document.title = response.deviceName;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check for device type to show Screen tab
|
||||||
|
// Assuming the key in config is 'device_type' or 'type'
|
||||||
|
if (response.device_type === 'moduleair_pro' || response.type === 'moduleair_pro') {
|
||||||
|
$('.nav-screen-item').show();
|
||||||
|
$('.nav-screen-item').css('display', 'flex'); // Ensure flex display to match others
|
||||||
|
}
|
||||||
|
|
||||||
|
},
|
||||||
|
error: function (xhr, status, error) {
|
||||||
|
console.error('AJAX request failed:', status, error);
|
||||||
|
}
|
||||||
|
}); //end ajax
|
||||||
|
|
||||||
|
/* OLD way of getting config data
|
||||||
fetch('../config.json') // Replace 'deviceID.txt' with 'config.json'
|
fetch('../config.json') // Replace 'deviceID.txt' with 'config.json'
|
||||||
.then(response => response.json()) // Parse response as JSON
|
.then(response => response.json()) // Parse response as JSON
|
||||||
.then(data => {
|
.then(data => {
|
||||||
@@ -152,17 +217,22 @@ window.onload = function() {
|
|||||||
element.innerText = deviceName;
|
element.innerText = deviceName;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
//end fetch config
|
||||||
|
})
|
||||||
|
.catch(error => console.error('Error loading config.json:', error));
|
||||||
|
//end windows on load
|
||||||
|
*/
|
||||||
//get local RTC
|
//get local RTC
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: 'launcher.php?type=RTC_time',
|
url: 'launcher.php?type=RTC_time',
|
||||||
dataType: 'text', // Specify that you expect a JSON response
|
dataType: 'text', // Specify that you expect a JSON response
|
||||||
method: 'GET', // Use GET or POST depending on your needs
|
method: 'GET', // Use GET or POST depending on your needs
|
||||||
success: function(response) {
|
success: function (response) {
|
||||||
console.log("Local RTC: " + response);
|
console.log("Local RTC: " + response);
|
||||||
const RTC_Element = document.getElementById("RTC_time");
|
const RTC_Element = document.getElementById("RTC_time");
|
||||||
RTC_Element.textContent = response;
|
RTC_Element.textContent = response;
|
||||||
},
|
},
|
||||||
error: function(xhr, status, error) {
|
error: function (xhr, status, error) {
|
||||||
console.error('AJAX request failed:', status, error);
|
console.error('AJAX request failed:', status, error);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -172,7 +242,7 @@ window.onload = function() {
|
|||||||
url: 'launcher.php?type=database_size',
|
url: 'launcher.php?type=database_size',
|
||||||
dataType: 'json', // Specify that you expect a JSON response
|
dataType: 'json', // Specify that you expect a JSON response
|
||||||
method: 'GET', // Use GET or POST depending on your needs
|
method: 'GET', // Use GET or POST depending on your needs
|
||||||
success: function(response) {
|
success: function (response) {
|
||||||
console.log(response);
|
console.log(response);
|
||||||
|
|
||||||
if (response.size_megabytes !== undefined) {
|
if (response.size_megabytes !== undefined) {
|
||||||
@@ -189,7 +259,7 @@ window.onload = function() {
|
|||||||
console.error("Error from server:", response.error);
|
console.error("Error from server:", response.error);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
error: function(xhr, status, error) {
|
error: function (xhr, status, error) {
|
||||||
console.error('AJAX request failed:', status, error);
|
console.error('AJAX request failed:', status, error);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -200,7 +270,7 @@ window.onload = function() {
|
|||||||
url: 'launcher.php?type=linux_disk',
|
url: 'launcher.php?type=linux_disk',
|
||||||
dataType: 'text', // Specify that you expect a JSON response
|
dataType: 'text', // Specify that you expect a JSON response
|
||||||
method: 'GET', // Use GET or POST depending on your needs
|
method: 'GET', // Use GET or POST depending on your needs
|
||||||
success: function(response) {
|
success: function (response) {
|
||||||
console.log("Linux disk space: " + response);
|
console.log("Linux disk space: " + response);
|
||||||
//1. disk size
|
//1. disk size
|
||||||
const disk_size = document.getElementById("disk_size");
|
const disk_size = document.getElementById("disk_size");
|
||||||
@@ -234,7 +304,7 @@ window.onload = function() {
|
|||||||
diskSpace.appendChild(progressDiv);
|
diskSpace.appendChild(progressDiv);
|
||||||
|
|
||||||
},
|
},
|
||||||
error: function(xhr, status, error) {
|
error: function (xhr, status, error) {
|
||||||
console.error('AJAX request failed:', status, error);
|
console.error('AJAX request failed:', status, error);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -244,7 +314,7 @@ window.onload = function() {
|
|||||||
url: 'launcher.php?type=linux_memory',
|
url: 'launcher.php?type=linux_memory',
|
||||||
dataType: 'text', // Specify that you expect a JSON response
|
dataType: 'text', // Specify that you expect a JSON response
|
||||||
method: 'GET', // Use GET or POST depending on your needs
|
method: 'GET', // Use GET or POST depending on your needs
|
||||||
success: function(response) {
|
success: function (response) {
|
||||||
console.log("Linux memory space: " + response);
|
console.log("Linux memory space: " + response);
|
||||||
//1. memory size
|
//1. memory size
|
||||||
const memory_size = document.getElementById("memory_size");
|
const memory_size = document.getElementById("memory_size");
|
||||||
@@ -288,7 +358,7 @@ window.onload = function() {
|
|||||||
memorySpace.appendChild(progressDiv);
|
memorySpace.appendChild(progressDiv);
|
||||||
|
|
||||||
},
|
},
|
||||||
error: function(xhr, status, error) {
|
error: function (xhr, status, error) {
|
||||||
console.error('AJAX request failed:', status, error);
|
console.error('AJAX request failed:', status, error);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -299,11 +369,11 @@ window.onload = function() {
|
|||||||
url: 'launcher.php?type=get_npm_sqlite_data',
|
url: 'launcher.php?type=get_npm_sqlite_data',
|
||||||
dataType: 'json', // Specify that you expect a JSON response
|
dataType: 'json', // Specify that you expect a JSON response
|
||||||
method: 'GET', // Use GET or POST depending on your needs
|
method: 'GET', // Use GET or POST depending on your needs
|
||||||
success: function(response) {
|
success: function (response) {
|
||||||
console.log(response);
|
console.log(response);
|
||||||
updatePMChart(response);
|
updatePMChart(response);
|
||||||
},
|
},
|
||||||
error: function(xhr, status, error) {
|
error: function (xhr, status, error) {
|
||||||
console.error('AJAX request failed:', status, error);
|
console.error('AJAX request failed:', status, error);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -379,7 +449,7 @@ window.onload = function() {
|
|||||||
autoSkip: true,
|
autoSkip: true,
|
||||||
maxTicksLimit: 5,
|
maxTicksLimit: 5,
|
||||||
color: '#4A4A4A',
|
color: '#4A4A4A',
|
||||||
callback: function(value, index) {
|
callback: function (value, index) {
|
||||||
// Access the correct label from the `labels` array
|
// Access the correct label from the `labels` array
|
||||||
const label = labels[index]; // Use the original `labels` array
|
const label = labels[index]; // Use the original `labels` array
|
||||||
if (label && typeof label === 'string' && label.includes(' ')) {
|
if (label && typeof label === 'string' && label.includes(' ')) {
|
||||||
@@ -421,13 +491,10 @@ window.onload = function() {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
//end fetch config
|
|
||||||
})
|
|
||||||
.catch(error => console.error('Error loading config.json:', error));
|
|
||||||
//end windows on load
|
|
||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
247
html/lang/README.md
Normal file
247
html/lang/README.md
Normal file
@@ -0,0 +1,247 @@
|
|||||||
|
# NebuleAir i18n System
|
||||||
|
|
||||||
|
Lightweight internationalization (i18n) system for NebuleAir web interface.
|
||||||
|
|
||||||
|
## Features
|
||||||
|
|
||||||
|
- **Offline-first**: Works completely offline with local JSON translation files
|
||||||
|
- **Database-backed**: Language preference stored in SQLite `config_table`
|
||||||
|
- **Automatic**: Translations apply on page load and when language changes
|
||||||
|
- **Simple API**: Easy-to-use data attributes and JavaScript API
|
||||||
|
|
||||||
|
## Quick Start
|
||||||
|
|
||||||
|
### 1. Include i18n.js in your HTML page
|
||||||
|
|
||||||
|
```html
|
||||||
|
<script src="assets/js/i18n.js"></script>
|
||||||
|
```
|
||||||
|
|
||||||
|
The i18n system will automatically initialize when the page loads.
|
||||||
|
|
||||||
|
### 2. Add translation keys to HTML elements
|
||||||
|
|
||||||
|
Use the `data-i18n` attribute to mark elements for translation:
|
||||||
|
|
||||||
|
```html
|
||||||
|
<h1 data-i18n="page.title">Titre en français</h1>
|
||||||
|
<p data-i18n="page.description">Description en français</p>
|
||||||
|
<button data-i18n="common.submit">Soumettre</button>
|
||||||
|
```
|
||||||
|
|
||||||
|
The text content serves as a fallback if translations aren't loaded.
|
||||||
|
|
||||||
|
### 3. Add translations to JSON files
|
||||||
|
|
||||||
|
Edit `lang/fr.json` and `lang/en.json`:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"page": {
|
||||||
|
"title": "Mon Titre",
|
||||||
|
"description": "Ma description"
|
||||||
|
},
|
||||||
|
"common": {
|
||||||
|
"submit": "Soumettre"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Translation keys use dot notation for nested objects.
|
||||||
|
|
||||||
|
## Translation Files
|
||||||
|
|
||||||
|
- **`fr.json`**: French translations (default)
|
||||||
|
- **`en.json`**: English translations
|
||||||
|
|
||||||
|
### File Structure Example
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"common": {
|
||||||
|
"save": "Enregistrer",
|
||||||
|
"cancel": "Annuler",
|
||||||
|
"delete": "Supprimer"
|
||||||
|
},
|
||||||
|
"navigation": {
|
||||||
|
"home": "Accueil",
|
||||||
|
"settings": "Paramètres"
|
||||||
|
},
|
||||||
|
"sensors": {
|
||||||
|
"title": "Capteurs",
|
||||||
|
"description": "Liste des capteurs"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## JavaScript API
|
||||||
|
|
||||||
|
### Get Current Language
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
const currentLang = i18n.currentLang; // 'fr' or 'en'
|
||||||
|
```
|
||||||
|
|
||||||
|
### Change Language Programmatically
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
await i18n.setLanguage('en'); // Switch to English
|
||||||
|
```
|
||||||
|
|
||||||
|
### Get Translation in JavaScript
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
const translation = i18n.get('sensors.title'); // Returns translated string
|
||||||
|
```
|
||||||
|
|
||||||
|
### Manual Translation Application
|
||||||
|
|
||||||
|
If you dynamically create HTML elements, call `applyTranslations()` after adding them to the DOM:
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
// Create new element
|
||||||
|
const div = document.createElement('div');
|
||||||
|
div.setAttribute('data-i18n', 'mypage.newElement');
|
||||||
|
div.textContent = 'Fallback text';
|
||||||
|
document.body.appendChild(div);
|
||||||
|
|
||||||
|
// Apply translations
|
||||||
|
i18n.applyTranslations();
|
||||||
|
```
|
||||||
|
|
||||||
|
### Listen for Language Changes
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
document.addEventListener('languageChanged', (event) => {
|
||||||
|
console.log('Language changed to:', event.detail.language);
|
||||||
|
// Reload dynamic content, update charts, etc.
|
||||||
|
});
|
||||||
|
```
|
||||||
|
|
||||||
|
## Special Cases
|
||||||
|
|
||||||
|
### Input Placeholders
|
||||||
|
|
||||||
|
For input fields, the translation applies to the `placeholder` attribute:
|
||||||
|
|
||||||
|
```html
|
||||||
|
<input type="text" data-i18n="form.emailPlaceholder" placeholder="Email...">
|
||||||
|
```
|
||||||
|
|
||||||
|
### Button Values
|
||||||
|
|
||||||
|
For input buttons, the translation applies to the `value` attribute:
|
||||||
|
|
||||||
|
```html
|
||||||
|
<input type="submit" data-i18n="common.submit" value="Submit">
|
||||||
|
```
|
||||||
|
|
||||||
|
### Dynamic Content
|
||||||
|
|
||||||
|
For content created with JavaScript (like sensor cards), add `data-i18n` attributes to your template strings and call `i18n.applyTranslations()` after inserting into the DOM.
|
||||||
|
|
||||||
|
## Example: Migrating an Existing Page
|
||||||
|
|
||||||
|
### Before (French only):
|
||||||
|
|
||||||
|
```html
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>Capteurs</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<h1>Liste des capteurs</h1>
|
||||||
|
<button onclick="getData()">Obtenir les données</button>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
```
|
||||||
|
|
||||||
|
### After (Multilingual):
|
||||||
|
|
||||||
|
```html
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title data-i18n="sensors.pageTitle">Capteurs</title>
|
||||||
|
<script src="assets/js/i18n.js"></script>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<h1 data-i18n="sensors.title">Liste des capteurs</h1>
|
||||||
|
<button onclick="getData()" data-i18n="common.getData">Obtenir les données</button>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
```
|
||||||
|
|
||||||
|
**Add to `lang/fr.json`:**
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"sensors": {
|
||||||
|
"pageTitle": "Capteurs",
|
||||||
|
"title": "Liste des capteurs"
|
||||||
|
},
|
||||||
|
"common": {
|
||||||
|
"getData": "Obtenir les données"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Add to `lang/en.json`:**
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"sensors": {
|
||||||
|
"pageTitle": "Sensors",
|
||||||
|
"title": "Sensor List"
|
||||||
|
},
|
||||||
|
"common": {
|
||||||
|
"getData": "Get Data"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Backend Integration
|
||||||
|
|
||||||
|
### Get Language Preference
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
const response = await fetch('launcher.php?type=get_language');
|
||||||
|
const data = await response.json();
|
||||||
|
console.log(data.language); // 'fr' or 'en'
|
||||||
|
```
|
||||||
|
|
||||||
|
### Set Language Preference
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
const response = await fetch('launcher.php?type=set_language&language=en');
|
||||||
|
const data = await response.json();
|
||||||
|
console.log(data.success); // true
|
||||||
|
```
|
||||||
|
|
||||||
|
Language preference is stored in SQLite `config_table` with key `language`.
|
||||||
|
|
||||||
|
## Completed Pages
|
||||||
|
|
||||||
|
- ✅ **sensors.html** - Fully translated with French/English support
|
||||||
|
|
||||||
|
## TODO: Pages to Migrate
|
||||||
|
|
||||||
|
- ⏳ index.html
|
||||||
|
- ⏳ admin.html
|
||||||
|
- ⏳ wifi.html
|
||||||
|
- ⏳ saraR4.html
|
||||||
|
- ⏳ map.html
|
||||||
|
|
||||||
|
## Tips
|
||||||
|
|
||||||
|
1. **Reuse common translations**: Put frequently used strings (buttons, actions, status messages) in the `common` section
|
||||||
|
2. **Keep keys descriptive**: Use `sensors.bme280.title` instead of `s1` for maintainability
|
||||||
|
3. **Test both languages**: Always verify that both French and English translations display correctly
|
||||||
|
4. **Fallback text**: Always provide fallback text in HTML for graceful degradation
|
||||||
|
|
||||||
|
## Support
|
||||||
|
|
||||||
|
For issues or questions about the i18n system, refer to the implementation in:
|
||||||
|
- `/html/assets/js/i18n.js` - Core translation library
|
||||||
|
- `/html/lang/fr.json` - French translations
|
||||||
|
- `/html/lang/en.json` - English translations
|
||||||
|
- `/html/sensors.html` - Example implementation
|
||||||
113
html/lang/en.json
Normal file
113
html/lang/en.json
Normal file
@@ -0,0 +1,113 @@
|
|||||||
|
{
|
||||||
|
"common": {
|
||||||
|
"getData": "Get Data",
|
||||||
|
"loading": "Loading...",
|
||||||
|
"error": "Error",
|
||||||
|
"startRecording": "Start recording",
|
||||||
|
"stopRecording": "Stop recording"
|
||||||
|
},
|
||||||
|
"sensors": {
|
||||||
|
"title": "Measurement Sensors",
|
||||||
|
"description": "Your NebuleAir sensor is equipped with one or more probes that measure environmental variables. Measurements are automatic, but you can verify their operation here.",
|
||||||
|
"npm": {
|
||||||
|
"title": "NextPM",
|
||||||
|
"description": "Particulate matter sensor.",
|
||||||
|
"headerUart": "UART Port"
|
||||||
|
},
|
||||||
|
"bme280": {
|
||||||
|
"title": "BME280 Temp/Humidity Sensor",
|
||||||
|
"description": "Temperature and humidity sensor on I2C port.",
|
||||||
|
"headerI2c": "I2C Port",
|
||||||
|
"temp": "Temperature",
|
||||||
|
"hum": "Humidity",
|
||||||
|
"press": "Pressure"
|
||||||
|
},
|
||||||
|
"noise": {
|
||||||
|
"title": "NSRT MK4",
|
||||||
|
"description": "NSRT MK4 sound level meter on USB port.",
|
||||||
|
"headerUsb": "USB Port"
|
||||||
|
},
|
||||||
|
"envea": {
|
||||||
|
"title": "Envea Probe",
|
||||||
|
"description": "Gas sensor."
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"wifi": {
|
||||||
|
"title": "WIFI Connection",
|
||||||
|
"description": "WIFI connection is not mandatory but it allows you to perform updates and enable remote control.",
|
||||||
|
"status": "Status",
|
||||||
|
"connected": "Connected",
|
||||||
|
"hotspot": "Hotspot",
|
||||||
|
"disconnected": "Disconnected",
|
||||||
|
"scan": "Scan",
|
||||||
|
"connect": "Connect",
|
||||||
|
"enterPassword": "Enter password for"
|
||||||
|
},
|
||||||
|
"admin": {
|
||||||
|
"title": "Administration",
|
||||||
|
"parameters": "Parameters (config)",
|
||||||
|
"deviceName": "Device Name",
|
||||||
|
"deviceID": "Device ID",
|
||||||
|
"modemVersion": "Modem Version"
|
||||||
|
},
|
||||||
|
"sidebar": {
|
||||||
|
"home": "Home",
|
||||||
|
"screen": "Screen",
|
||||||
|
"sensors": "Sensors",
|
||||||
|
"database": "Database",
|
||||||
|
"modem4g": "4G Modem",
|
||||||
|
"wifi": "WIFI",
|
||||||
|
"logs": "Logs",
|
||||||
|
"map": "Map",
|
||||||
|
"terminal": "Terminal",
|
||||||
|
"admin": "Admin"
|
||||||
|
},
|
||||||
|
"home": {
|
||||||
|
"title": "Your Sensor",
|
||||||
|
"welcome": "Welcome to your sensor configuration interface.",
|
||||||
|
"pmMeasures": "PM Measurements",
|
||||||
|
"linuxStats": "Linux Statistics",
|
||||||
|
"diskUsage": "Disk usage (total size",
|
||||||
|
"memoryUsage": "Memory usage (total size",
|
||||||
|
"databaseSize": "Database size:"
|
||||||
|
},
|
||||||
|
"database": {
|
||||||
|
"title": "Database",
|
||||||
|
"description": "The sensor records measurement data locally. You can view and download it here.",
|
||||||
|
"viewDatabase": "View Database",
|
||||||
|
"numberOfMeasures": "Number of measurements:",
|
||||||
|
"last10": "Last 10",
|
||||||
|
"last20": "Last 20",
|
||||||
|
"last30": "Last 30",
|
||||||
|
"pmMeasures": "PM Measurements",
|
||||||
|
"tempHumMeasures": "Temp/Hum Measurements",
|
||||||
|
"pm5Channels": "PM Measurements (5 channels)",
|
||||||
|
"cairsensProbe": "Cairsens Probe",
|
||||||
|
"noiseProbe": "Noise Probe",
|
||||||
|
"windProbe": "Wind Probe",
|
||||||
|
"battery": "Battery",
|
||||||
|
"timestampTable": "Timestamp Table",
|
||||||
|
"downloadData": "Download Data",
|
||||||
|
"startDate": "Start date:",
|
||||||
|
"endDate": "End date:",
|
||||||
|
"dangerZone": "Danger Zone",
|
||||||
|
"dangerWarning": "Warning: This action is irreversible!",
|
||||||
|
"emptyAllTables": "Empty all sensor tables",
|
||||||
|
"emptyTablesNote": "Note: Configuration and timestamp tables will be preserved.",
|
||||||
|
"statsTitle": "Database Information",
|
||||||
|
"statsDbSize": "Total size:",
|
||||||
|
"statsTable": "Table",
|
||||||
|
"statsCount": "Entries",
|
||||||
|
"statsOldest": "Oldest",
|
||||||
|
"statsNewest": "Newest",
|
||||||
|
"statsDownload": "CSV"
|
||||||
|
},
|
||||||
|
"logs": {
|
||||||
|
"title": "The Log",
|
||||||
|
"description": "The log allows you to know if the sensor processes are running correctly.",
|
||||||
|
"saraLogs": "Sara logs",
|
||||||
|
"bootLogs": "Boot logs",
|
||||||
|
"refresh": "Refresh",
|
||||||
|
"clear": "Clear"
|
||||||
|
}
|
||||||
|
}
|
||||||
113
html/lang/fr.json
Normal file
113
html/lang/fr.json
Normal file
@@ -0,0 +1,113 @@
|
|||||||
|
{
|
||||||
|
"common": {
|
||||||
|
"getData": "Obtenir les données",
|
||||||
|
"loading": "Chargement...",
|
||||||
|
"error": "Erreur",
|
||||||
|
"startRecording": "Démarrer l'enregistrement",
|
||||||
|
"stopRecording": "Arrêter l'enregistrement"
|
||||||
|
},
|
||||||
|
"sensors": {
|
||||||
|
"title": "Les sondes de mesure",
|
||||||
|
"description": "Votre capteur NebuleAir est équipé de une ou plusieurs sondes qui permettent de mesurer certaines variables environnementales. La mesure est automatique mais vous pouvez ici vous assurer de leur bon fonctionnement.",
|
||||||
|
"npm": {
|
||||||
|
"title": "NextPM",
|
||||||
|
"description": "Capteur particules fines.",
|
||||||
|
"headerUart": "Port UART"
|
||||||
|
},
|
||||||
|
"bme280": {
|
||||||
|
"title": "Capteur Temp/Humidité BME280",
|
||||||
|
"description": "Capteur température et humidité sur le port I2C.",
|
||||||
|
"headerI2c": "Port I2C",
|
||||||
|
"temp": "Température",
|
||||||
|
"hum": "Humidité",
|
||||||
|
"press": "Pression"
|
||||||
|
},
|
||||||
|
"noise": {
|
||||||
|
"title": "NSRT MK4",
|
||||||
|
"description": "Sonomètre NSRT MK4 sur port USB.",
|
||||||
|
"headerUsb": "Port USB"
|
||||||
|
},
|
||||||
|
"envea": {
|
||||||
|
"title": "Sonde Envea",
|
||||||
|
"description": "Capteur gaz."
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"wifi": {
|
||||||
|
"title": "Connexion WIFI",
|
||||||
|
"description": "La connexion WIFI n'est pas obligatoire mais elle vous permet d'effectuer des mises à jour et d'activer le contrôle à distance.",
|
||||||
|
"status": "Statut",
|
||||||
|
"connected": "Connecté",
|
||||||
|
"hotspot": "Point d'accès",
|
||||||
|
"disconnected": "Déconnecté",
|
||||||
|
"scan": "Scanner",
|
||||||
|
"connect": "Se connecter",
|
||||||
|
"enterPassword": "Entrer le mot de passe pour"
|
||||||
|
},
|
||||||
|
"admin": {
|
||||||
|
"title": "Administration",
|
||||||
|
"parameters": "Paramètres (config)",
|
||||||
|
"deviceName": "Nom de l'appareil",
|
||||||
|
"deviceID": "ID de l'appareil",
|
||||||
|
"modemVersion": "Version du modem"
|
||||||
|
},
|
||||||
|
"sidebar": {
|
||||||
|
"home": "Accueil",
|
||||||
|
"screen": "Écran",
|
||||||
|
"sensors": "Capteurs",
|
||||||
|
"database": "Base de données",
|
||||||
|
"modem4g": "Modem 4G",
|
||||||
|
"wifi": "WIFI",
|
||||||
|
"logs": "Logs",
|
||||||
|
"map": "Carte",
|
||||||
|
"terminal": "Terminal",
|
||||||
|
"admin": "Admin"
|
||||||
|
},
|
||||||
|
"home": {
|
||||||
|
"title": "Votre capteur",
|
||||||
|
"welcome": "Bienvenue sur votre interface de configuration de votre capteur.",
|
||||||
|
"pmMeasures": "Mesures PM",
|
||||||
|
"linuxStats": "Statistiques Linux",
|
||||||
|
"diskUsage": "Utilisation du disque (taille totale",
|
||||||
|
"memoryUsage": "Utilisation de la mémoire (taille totale",
|
||||||
|
"databaseSize": "Taille de la base de données:"
|
||||||
|
},
|
||||||
|
"database": {
|
||||||
|
"title": "Base de données",
|
||||||
|
"description": "Le capteur enregistre en local les données de mesures. Vous pouvez ici les consulter et les télécharger.",
|
||||||
|
"viewDatabase": "Consulter la base de donnée",
|
||||||
|
"numberOfMeasures": "Nombre de mesures:",
|
||||||
|
"last10": "10 dernières",
|
||||||
|
"last20": "20 dernières",
|
||||||
|
"last30": "30 dernières",
|
||||||
|
"pmMeasures": "Mesures PM",
|
||||||
|
"tempHumMeasures": "Mesures Temp/Hum",
|
||||||
|
"pm5Channels": "Mesures PM (5 canaux)",
|
||||||
|
"cairsensProbe": "Sonde Cairsens",
|
||||||
|
"noiseProbe": "Sonde bruit",
|
||||||
|
"windProbe": "Sonde Vent",
|
||||||
|
"battery": "Batterie",
|
||||||
|
"timestampTable": "Timestamp Table",
|
||||||
|
"downloadData": "Télécharger les données",
|
||||||
|
"startDate": "Date de début:",
|
||||||
|
"endDate": "Date de fin:",
|
||||||
|
"dangerZone": "Zone dangereuse",
|
||||||
|
"dangerWarning": "Attention: Cette action est irréversible!",
|
||||||
|
"emptyAllTables": "Vider toutes les tables de capteurs",
|
||||||
|
"emptyTablesNote": "Note: Les tables de configuration et horodatage seront préservées.",
|
||||||
|
"statsTitle": "Informations sur la base",
|
||||||
|
"statsDbSize": "Taille totale:",
|
||||||
|
"statsTable": "Table",
|
||||||
|
"statsCount": "Entrées",
|
||||||
|
"statsOldest": "Plus ancienne",
|
||||||
|
"statsNewest": "Plus récente",
|
||||||
|
"statsDownload": "CSV"
|
||||||
|
},
|
||||||
|
"logs": {
|
||||||
|
"title": "Le journal",
|
||||||
|
"description": "Le journal des logs permet de savoir si les processus du capteur se déroulent correctement.",
|
||||||
|
"saraLogs": "Sara logs",
|
||||||
|
"bootLogs": "Boot logs",
|
||||||
|
"refresh": "Refresh",
|
||||||
|
"clear": "Clear"
|
||||||
|
}
|
||||||
|
}
|
||||||
1620
html/launcher.php
1620
html/launcher.php
File diff suppressed because it is too large
Load Diff
179
html/logs.html
179
html/logs.html
@@ -49,14 +49,17 @@
|
|||||||
</aside>
|
</aside>
|
||||||
<!-- Main content -->
|
<!-- Main content -->
|
||||||
<main class="col-md-10 ms-sm-auto col-lg-11 offset-md-2 offset-lg-1 px-md-4">
|
<main class="col-md-10 ms-sm-auto col-lg-11 offset-md-2 offset-lg-1 px-md-4">
|
||||||
<h1 class="mt-4">Le journal</h1>
|
<h1 class="mt-4" data-i18n="logs.title">Le journal</h1>
|
||||||
<p>Le journal des logs permet de savoir si les processus du capteur se déroulent correctement.</p>
|
<p data-i18n="logs.description">Le journal des logs permet de savoir si les processus du capteur se déroulent correctement.</p>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<!-- card 1 -->
|
<!-- card 1 -->
|
||||||
<div class="col-lg-6 col-12">
|
<div class="col-lg-6 col-12">
|
||||||
<div class="card" style="height: 80vh;">
|
<div class="card" style="height: 80vh;">
|
||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
Master logs <button type="submit" class="btn btn-secondary btn-sm" onclick="clear_loopLogs()">Clear</button>
|
<span data-i18n="logs.saraLogs">Sara logs</span>
|
||||||
|
<button type="submit" class="btn btn-secondary btn-sm" id="refresh-master-log" data-i18n="logs.refresh">Refresh</button>
|
||||||
|
<button type="submit" class="btn btn-secondary btn-sm" onclick="clear_loopLogs()" data-i18n="logs.clear">Clear</button>
|
||||||
|
|
||||||
<span id="script_running"></span>
|
<span id="script_running"></span>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body overflow-auto" id="card_loop_content">
|
<div class="card-body overflow-auto" id="card_loop_content">
|
||||||
@@ -68,7 +71,8 @@
|
|||||||
<div class="col-lg-6 col-12">
|
<div class="col-lg-6 col-12">
|
||||||
<div class="card" style="height: 80vh;">
|
<div class="card" style="height: 80vh;">
|
||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
Boot logs
|
<span data-i18n="logs.bootLogs">Boot logs</span>
|
||||||
|
<button type="submit" class="btn btn-secondary btn-sm" id="refresh-boot-log" data-i18n="logs.refresh">Refresh</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body overflow-auto" id="card_boot_content">
|
<div class="card-body overflow-auto" id="card_boot_content">
|
||||||
|
|
||||||
@@ -86,6 +90,9 @@
|
|||||||
<script src="assets/jquery/jquery-3.7.1.min.js"></script>
|
<script src="assets/jquery/jquery-3.7.1.min.js"></script>
|
||||||
<!-- Link Bootstrap JS and Popper.js locally -->
|
<!-- Link Bootstrap JS and Popper.js locally -->
|
||||||
<script src="assets/js/bootstrap.bundle.js"></script>
|
<script src="assets/js/bootstrap.bundle.js"></script>
|
||||||
|
<!-- i18n translation system -->
|
||||||
|
<script src="assets/js/i18n.js"></script>
|
||||||
|
<script src="assets/js/topbar-logo.js"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
document.addEventListener('DOMContentLoaded', function () {
|
document.addEventListener('DOMContentLoaded', function () {
|
||||||
@@ -111,65 +118,17 @@
|
|||||||
const boot_card_content = document.getElementById('card_boot_content');
|
const boot_card_content = document.getElementById('card_boot_content');
|
||||||
|
|
||||||
//Getting Master logs
|
//Getting Master logs
|
||||||
console.log("Getting master logs");
|
console.log("Getting SARA logs");
|
||||||
|
displayLogFile('../logs/sara_service.log', loop_card_content, true, 1000);
|
||||||
fetch('../logs/master.log')
|
|
||||||
.then((response) => {
|
|
||||||
console.log("OK");
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error('Failed to fetch the log file.');
|
|
||||||
}
|
|
||||||
return response.text();
|
|
||||||
})
|
|
||||||
.then((data) => {
|
|
||||||
const lines = data.split('\n');
|
|
||||||
|
|
||||||
// Format log content
|
|
||||||
const formattedLog = lines
|
|
||||||
.map((line) => line.trim()) // Remove extra whitespace
|
|
||||||
.filter((line) => line) // Remove empty lines
|
|
||||||
.join('<br>'); // Join formatted lines with line breaks
|
|
||||||
|
|
||||||
loop_card_content.innerHTML = `<pre style="white-space: pre-wrap; word-wrap: break-word; margin: 0;">${formattedLog}</pre>`;
|
|
||||||
loop_card_content.scrollTop = loop_card_content.scrollHeight; // Scroll to the bottom
|
|
||||||
|
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
console.error(error);
|
|
||||||
loop_card_content.textContent = 'Error loading log file.';
|
|
||||||
});
|
|
||||||
|
|
||||||
console.log("Getting app/boot logs");
|
console.log("Getting app/boot logs");
|
||||||
|
displayLogFile('../logs/app.log', boot_card_content, true, 1000);
|
||||||
|
|
||||||
//Getting App logs
|
// Setup master log with refresh button
|
||||||
fetch('../logs/app.log')
|
setupLogRefreshButton('refresh-master-log', '../logs/sara_service.log', 'card_loop_content', 3000);
|
||||||
.then((response) => {
|
|
||||||
console.log("OK");
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error('Failed to fetch the log file.');
|
|
||||||
}
|
|
||||||
return response.text();
|
|
||||||
})
|
|
||||||
.then((data) => {
|
|
||||||
const lines = data.split('\n');
|
|
||||||
|
|
||||||
// Format log content
|
|
||||||
const formattedLog = lines
|
|
||||||
.map((line) => line.trim()) // Remove extra whitespace
|
|
||||||
.filter((line) => line) // Remove empty lines
|
|
||||||
.join('<br>'); // Join formatted lines with line breaks
|
|
||||||
|
|
||||||
boot_card_content.innerHTML = `<pre style="white-space: pre-wrap; word-wrap: break-word; margin: 0;">${formattedLog}</pre>`;
|
|
||||||
boot_card_content.scrollTop = loop_card_content.scrollHeight; // Scroll to the bottom
|
|
||||||
|
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
console.error(error);
|
|
||||||
boot_card_content.textContent = 'Error loading log file.';
|
|
||||||
});
|
|
||||||
|
|
||||||
|
// Setup boot log with refresh button
|
||||||
|
setupLogRefreshButton('refresh-boot-log', '../logs/app.log', 'card_boot_content', 300);
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
@@ -179,21 +138,33 @@ window.onload = function() {
|
|||||||
getModem_busy_status();
|
getModem_busy_status();
|
||||||
setInterval(getModem_busy_status, 2000);
|
setInterval(getModem_busy_status, 2000);
|
||||||
|
|
||||||
fetch('../config.json') // Replace 'deviceID.txt' with 'config.json'
|
//NEW way to get config (SQLite)
|
||||||
.then(response => response.json()) // Parse response as JSON
|
$.ajax({
|
||||||
.then(data => {
|
url: 'launcher.php?type=get_config_sqlite',
|
||||||
console.log("Getting config file (onload)");
|
dataType:'json',
|
||||||
//get device ID
|
//dataType: 'json', // Specify that you expect a JSON response
|
||||||
const deviceID = data.deviceID.trim().toUpperCase();
|
method: 'GET', // Use GET or POST depending on your needs
|
||||||
// document.getElementById('pageTitle_plus_ID').innerText = 'token: ' + deviceID;
|
success: function(response) {
|
||||||
//get device Name
|
console.log("Getting SQLite config table:");
|
||||||
const deviceName = data.deviceName;
|
console.log(response);
|
||||||
|
|
||||||
|
//device name_side bar
|
||||||
const elements = document.querySelectorAll('.sideBar_sensorName');
|
const elements = document.querySelectorAll('.sideBar_sensorName');
|
||||||
elements.forEach((element) => {
|
elements.forEach((element) => {
|
||||||
element.innerText = deviceName;
|
element.innerText = response.deviceName;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
//device name html page title
|
||||||
|
if (response.deviceName) {
|
||||||
|
document.title = response.deviceName;
|
||||||
|
}
|
||||||
|
|
||||||
|
},
|
||||||
|
error: function(xhr, status, error) {
|
||||||
|
console.error('AJAX request failed:', status, error);
|
||||||
|
}
|
||||||
|
});//end AJAX
|
||||||
|
|
||||||
|
|
||||||
//get local RTC
|
//get local RTC
|
||||||
$.ajax({
|
$.ajax({
|
||||||
@@ -210,10 +181,78 @@ window.onload = function() {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
}//end onload
|
||||||
|
|
||||||
|
function displayLogFile(logFilePath, containerElement, scrollToBottom = true, maxLines = 0) {
|
||||||
|
// Show loading indicator
|
||||||
|
containerElement.innerHTML = '<div class="text-center"><i>Loading log file...</i></div>';
|
||||||
|
|
||||||
|
return fetch(logFilePath)
|
||||||
|
.then((response) => {
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`Failed to fetch the log file: ${response.status} ${response.statusText}`);
|
||||||
|
}
|
||||||
|
return response.text();
|
||||||
})
|
})
|
||||||
.catch(error => console.error('Error loading config.json:', error));
|
.then((data) => {
|
||||||
|
// Split the log into lines
|
||||||
|
let lines = data.split('\n');
|
||||||
|
|
||||||
|
// Apply max lines limit if specified
|
||||||
|
if (maxLines > 0 && lines.length > maxLines) {
|
||||||
|
lines = lines.slice(-maxLines); // Get only the last N lines
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Format log content
|
||||||
|
const formattedLog = lines
|
||||||
|
.map((line) => line.trim()) // Remove extra whitespace
|
||||||
|
.filter((line) => line) // Remove empty lines
|
||||||
|
.join('<br>'); // Join formatted lines with line breaks
|
||||||
|
|
||||||
|
// Display the formatted log
|
||||||
|
containerElement.innerHTML = `<pre style="white-space: pre-wrap; word-wrap: break-word; margin: 0;">${formattedLog}</pre>`;
|
||||||
|
|
||||||
|
// Scroll to bottom if requested
|
||||||
|
if (scrollToBottom) {
|
||||||
|
containerElement.scrollTop = containerElement.scrollHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
return formattedLog; // Return the formatted log in case the caller needs it
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
console.error(`Error loading log file ${logFilePath}:`, error);
|
||||||
|
containerElement.innerHTML = `<div class="text-danger">Error loading log file: ${error.message}</div>`;
|
||||||
|
throw error; // Re-throw the error for the caller to handle if needed
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set up a refresh button for a log file
|
||||||
|
* @param {string} buttonId - ID of the button element
|
||||||
|
* @param {string} logFilePath - Path to the log file
|
||||||
|
* @param {string} containerId - ID of the container to display the log in
|
||||||
|
* @param {number} maxLines - Maximum number of lines to display (0 for all)
|
||||||
|
*/
|
||||||
|
function setupLogRefreshButton(buttonId, logFilePath, containerId, maxLines = 0) {
|
||||||
|
console.log("Refreshing logs");
|
||||||
|
|
||||||
|
const button = document.getElementById(buttonId);
|
||||||
|
const container = document.getElementById(containerId);
|
||||||
|
|
||||||
|
if (!button || !container) {
|
||||||
|
console.error('Button or container element not found');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initial load
|
||||||
|
displayLogFile(logFilePath, container, true, maxLines);
|
||||||
|
|
||||||
|
// Set up button click handler
|
||||||
|
button.addEventListener('click', () => {
|
||||||
|
displayLogFile(logFilePath, container, true, maxLines);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
function clear_loopLogs(){
|
function clear_loopLogs(){
|
||||||
console.log("Clearing loop logs");
|
console.log("Clearing loop logs");
|
||||||
|
|||||||
@@ -117,6 +117,7 @@
|
|||||||
<script src="assets/jquery/jquery-3.7.1.min.js"></script>
|
<script src="assets/jquery/jquery-3.7.1.min.js"></script>
|
||||||
<!-- Link Bootstrap JS and Popper.js locally -->
|
<!-- Link Bootstrap JS and Popper.js locally -->
|
||||||
<script src="assets/js/bootstrap.bundle.js"></script>
|
<script src="assets/js/bootstrap.bundle.js"></script>
|
||||||
|
<script src="assets/js/topbar-logo.js"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
document.addEventListener('DOMContentLoaded', function () {
|
document.addEventListener('DOMContentLoaded', function () {
|
||||||
|
|||||||
878
html/saraR4.html
878
html/saraR4.html
File diff suppressed because it is too large
Load Diff
179
html/screen.html
Normal file
179
html/screen.html
Normal file
@@ -0,0 +1,179 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<title>Screen Control</title>
|
||||||
|
<link rel="stylesheet" href="assets/css/bootstrap.min.css">
|
||||||
|
|
||||||
|
<style>
|
||||||
|
body {
|
||||||
|
overflow-x: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
#sidebar a.nav-link {
|
||||||
|
position: relative;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
#sidebar a.nav-link:hover {
|
||||||
|
background-color: rgba(0, 0, 0, 0.5);
|
||||||
|
}
|
||||||
|
|
||||||
|
#sidebar a.nav-link svg {
|
||||||
|
margin-right: 8px;
|
||||||
|
/* Add spacing between icons and text */
|
||||||
|
}
|
||||||
|
|
||||||
|
#sidebar {
|
||||||
|
transition: transform 0.3s ease-in-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
.offcanvas-backdrop {
|
||||||
|
z-index: 1040;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
<!-- Topbar -->
|
||||||
|
<span id="topbar"></span>
|
||||||
|
|
||||||
|
<!-- Sidebar Offcanvas for Mobile -->
|
||||||
|
<div class="offcanvas offcanvas-start text-white bg-dark" tabindex="-1" id="sidebarOffcanvas"
|
||||||
|
aria-labelledby="sidebarOffcanvasLabel">
|
||||||
|
<div class="offcanvas-header">
|
||||||
|
<h5 class="offcanvas-title" id="sidebarOffcanvasLabel">NebuleAir</h5>
|
||||||
|
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="offcanvas"
|
||||||
|
aria-label="Close"></button>
|
||||||
|
</div>
|
||||||
|
<div class="offcanvas-body" id="sidebar_mobile">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="container-fluid mt-5">
|
||||||
|
<div class="row">
|
||||||
|
<aside class="col-md-2 col-lg-1 d-none d-md-block vh-100 position-fixed bg-dark text-white" id="sidebar">
|
||||||
|
</aside>
|
||||||
|
<!-- Main content -->
|
||||||
|
<main class="col-md-9 ms-sm-auto col-lg-10 offset-md-3 offset-lg-2 px-md-4">
|
||||||
|
<h1 class="mt-4" data-i18n="screen.title">Contrôle de l'écran</h1>
|
||||||
|
<p data-i18n="screen.description">Gérer l'affichage sur l'écran HDMI.</p>
|
||||||
|
|
||||||
|
<div class="row mt-4">
|
||||||
|
<div class="col-md-6">
|
||||||
|
<div class="card">
|
||||||
|
<div class="card-body">
|
||||||
|
<h5 class="card-title">Actions</h5>
|
||||||
|
<p class="card-text">Démarrer ou arrêter l'application d'affichage sur l'écran HDMI.</p>
|
||||||
|
<button id="startBtn" class="btn btn-success m-2" onclick="controlScreen('start')">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
|
||||||
|
class="bi bi-play-fill" viewBox="0 0 16 16">
|
||||||
|
<path
|
||||||
|
d="m11.596 8.697-6.363 3.692c-.54.313-1.233-.066-1.233-.697V4.308c0-.63.692-1.01 1.233-.696l6.363 3.692a.802.802 0 0 1 0 1.393z" />
|
||||||
|
</svg>
|
||||||
|
Démarrer
|
||||||
|
</button>
|
||||||
|
<button id="stopBtn" class="btn btn-danger m-2" onclick="controlScreen('stop')">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
|
||||||
|
class="bi bi-stop-fill" viewBox="0 0 16 16">
|
||||||
|
<path
|
||||||
|
d="M5 3.5h6A1.5 1.5 0 0 1 12.5 5v6a1.5 1.5 0 0 1-1.5 1.5H5A1.5 1.5 0 0 1 3.5 11V5A1.5 1.5 0 0 1 5 3.5z" />
|
||||||
|
</svg>
|
||||||
|
Arrêter
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="status-message" class="mt-3 col-md-6"></div>
|
||||||
|
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- JAVASCRIPT -->
|
||||||
|
|
||||||
|
<!-- Link Ajax locally -->
|
||||||
|
<script src="assets/jquery/jquery-3.7.1.min.js"></script>
|
||||||
|
<!-- Link Bootstrap JS and Popper.js locally -->
|
||||||
|
<script src="assets/js/bootstrap.bundle.js"></script>
|
||||||
|
<!-- i18n translation system -->
|
||||||
|
<script src="assets/js/i18n.js"></script>
|
||||||
|
<script src="assets/js/topbar-logo.js"></script>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
document.addEventListener('DOMContentLoaded', function () {
|
||||||
|
const elementsToLoad = [
|
||||||
|
{ id: 'topbar', file: 'topbar.html' },
|
||||||
|
{ id: 'sidebar', file: 'sidebar.html' },
|
||||||
|
{ id: 'sidebar_mobile', file: 'sidebar.html' }
|
||||||
|
];
|
||||||
|
|
||||||
|
elementsToLoad.forEach(({ id, file }) => {
|
||||||
|
fetch(file)
|
||||||
|
.then(response => response.text())
|
||||||
|
.then(data => {
|
||||||
|
const element = document.getElementById(id);
|
||||||
|
if (element) {
|
||||||
|
element.innerHTML = data;
|
||||||
|
// Apply translations after loading dynamic content
|
||||||
|
if (window.i18n && typeof window.i18n.applyTranslations === 'function') {
|
||||||
|
window.i18n.applyTranslations();
|
||||||
|
}
|
||||||
|
// Ensure the screen tab is visible here as well
|
||||||
|
if (id.includes('sidebar')) {
|
||||||
|
setTimeout(() => {
|
||||||
|
const navScreenElements = element.querySelectorAll('.nav-screen-item');
|
||||||
|
navScreenElements.forEach(el => el.style.display = 'flex');
|
||||||
|
}, 100);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(error => console.error(`Error loading ${file}:`, error));
|
||||||
|
});
|
||||||
|
|
||||||
|
// Translation fallback for now if keys are missing
|
||||||
|
setTimeout(() => {
|
||||||
|
if (document.querySelector('[data-i18n="screen.title"]').innerText === "screen.title") {
|
||||||
|
document.querySelector('[data-i18n="screen.title"]').innerText = "Contrôle de l'écran";
|
||||||
|
}
|
||||||
|
if (document.querySelector('[data-i18n="screen.description"]').innerText === "screen.description") {
|
||||||
|
document.querySelector('[data-i18n="screen.description"]').innerText = "Gérer l'affichage sur l'écran HDMI.";
|
||||||
|
}
|
||||||
|
}, 500);
|
||||||
|
});
|
||||||
|
|
||||||
|
function controlScreen(action) {
|
||||||
|
console.log("Sending Screen Control Action:", action);
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=screen_control&action=' + action,
|
||||||
|
dataType: 'text',
|
||||||
|
method: 'GET',
|
||||||
|
success: function (response) {
|
||||||
|
console.log("Server Response:", response);
|
||||||
|
if (action == 'start') {
|
||||||
|
$('#startBtn').removeClass('btn-success').addClass('btn-secondary').prop('disabled', true);
|
||||||
|
$('#stopBtn').removeClass('btn-secondary').addClass('btn-danger').prop('disabled', false);
|
||||||
|
$('#status-message').html('<div class="alert alert-success">L\'écran a été démarré. Réponse: ' + response + '</div>');
|
||||||
|
} else {
|
||||||
|
$('#startBtn').removeClass('btn-secondary').addClass('btn-success').prop('disabled', false);
|
||||||
|
$('#stopBtn').removeClass('btn-danger').addClass('btn-secondary').prop('disabled', true);
|
||||||
|
$('#status-message').html('<div class="alert alert-warning">L\'écran a été arrêté. Réponse: ' + response + '</div>');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
error: function (xhr, status, error) {
|
||||||
|
console.error("AJAX Error:", status, error);
|
||||||
|
$('#status-message').html('<div class="alert alert-danger">Erreur: ' + error + '</div>');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
|
||||||
|
</html>
|
||||||
134
html/selftest-modal.html
Normal file
134
html/selftest-modal.html
Normal file
@@ -0,0 +1,134 @@
|
|||||||
|
<!-- Self Test Modal -->
|
||||||
|
<div class="modal fade" id="selfTestModal" tabindex="-1" aria-labelledby="selfTestModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
|
||||||
|
<div class="modal-dialog modal-dialog-centered">
|
||||||
|
<div class="modal-content">
|
||||||
|
<div class="modal-header">
|
||||||
|
<h5 class="modal-title" id="selfTestModalLabel">Modem Self Test</h5>
|
||||||
|
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" id="selfTestCloseBtn" disabled></button>
|
||||||
|
</div>
|
||||||
|
<div class="modal-body">
|
||||||
|
<div id="selftest_status" class="mb-3">
|
||||||
|
<div class="d-flex align-items-center text-muted">
|
||||||
|
<div class="spinner-border spinner-border-sm me-2" role="status"></div>
|
||||||
|
<span>Preparing test...</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="list-group" id="selftest_results">
|
||||||
|
<!-- Dynamic sensor test entries will be added here -->
|
||||||
|
<div id="sensor_tests_container"></div>
|
||||||
|
|
||||||
|
<!-- Separator for communication tests -->
|
||||||
|
<div id="comm_tests_separator" class="list-group-item bg-light text-center py-1" style="display:none;">
|
||||||
|
<small class="text-muted fw-bold">COMMUNICATION</small>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Info: WiFi Status -->
|
||||||
|
<div class="list-group-item d-flex justify-content-between align-items-center" id="test_wifi">
|
||||||
|
<div>
|
||||||
|
<strong>WiFi / Network</strong>
|
||||||
|
<div class="small text-muted" id="test_wifi_detail">Waiting...</div>
|
||||||
|
</div>
|
||||||
|
<span id="test_wifi_status" class="badge bg-secondary">Pending</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Test: Modem Connection -->
|
||||||
|
<div class="list-group-item d-flex justify-content-between align-items-center" id="test_modem">
|
||||||
|
<div>
|
||||||
|
<strong>Modem Connection</strong>
|
||||||
|
<div class="small text-muted" id="test_modem_detail">Waiting...</div>
|
||||||
|
</div>
|
||||||
|
<span id="test_modem_status" class="badge bg-secondary">Pending</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Test: SIM Card -->
|
||||||
|
<div class="list-group-item d-flex justify-content-between align-items-center" id="test_sim">
|
||||||
|
<div>
|
||||||
|
<strong>SIM Card</strong>
|
||||||
|
<div class="small text-muted" id="test_sim_detail">Waiting...</div>
|
||||||
|
</div>
|
||||||
|
<span id="test_sim_status" class="badge bg-secondary">Pending</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Test: Signal Strength -->
|
||||||
|
<div class="list-group-item d-flex justify-content-between align-items-center" id="test_signal">
|
||||||
|
<div>
|
||||||
|
<strong>Signal Strength</strong>
|
||||||
|
<div class="small text-muted" id="test_signal_detail">Waiting...</div>
|
||||||
|
</div>
|
||||||
|
<span id="test_signal_status" class="badge bg-secondary">Pending</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Test: Network Connection -->
|
||||||
|
<div class="list-group-item d-flex justify-content-between align-items-center" id="test_network">
|
||||||
|
<div>
|
||||||
|
<strong>Network Connection</strong>
|
||||||
|
<div class="small text-muted" id="test_network_detail">Waiting...</div>
|
||||||
|
</div>
|
||||||
|
<span id="test_network_status" class="badge bg-secondary">Pending</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Logs section -->
|
||||||
|
<div class="mt-3">
|
||||||
|
<button class="btn btn-sm btn-outline-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#selftest_logs_collapse">
|
||||||
|
Show detailed logs
|
||||||
|
</button>
|
||||||
|
<div class="collapse mt-2" id="selftest_logs_collapse">
|
||||||
|
<div class="card card-body bg-dark text-light" style="max-height: 250px; overflow-y: auto; font-family: monospace; font-size: 0.75rem;">
|
||||||
|
<pre id="selftest_logs" style="margin: 0; white-space: pre-wrap; word-wrap: break-word;"></pre>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="modal-footer">
|
||||||
|
<div id="selftest_summary" class="me-auto"></div>
|
||||||
|
<button type="button" class="btn btn-primary" id="selfTestCopyBtn" onclick="openShareReportModal()" disabled>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-share me-1" viewBox="0 0 16 16">
|
||||||
|
<path d="M13.5 1a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3zM11 2.5a2.5 2.5 0 1 1 .603 1.628l-6.718 3.12a2.499 2.499 0 0 1 0 1.504l6.718 3.12a2.5 2.5 0 1 1-.488.876l-6.718-3.12a2.5 2.5 0 1 1 0-3.256l6.718-3.12A2.5 2.5 0 0 1 11 2.5zm-8.5 4a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3zm11 5.5a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3z"/>
|
||||||
|
</svg>
|
||||||
|
Share Report
|
||||||
|
</button>
|
||||||
|
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" id="selfTestDoneBtn" disabled>Close</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Share Report Modal -->
|
||||||
|
<div class="modal fade" id="shareReportModal" tabindex="-1" aria-labelledby="shareReportModalLabel" aria-hidden="true">
|
||||||
|
<div class="modal-dialog modal-lg modal-dialog-centered">
|
||||||
|
<div class="modal-content">
|
||||||
|
<div class="modal-header bg-primary text-white">
|
||||||
|
<h5 class="modal-title" id="shareReportModalLabel">Share Diagnostic Report</h5>
|
||||||
|
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||||
|
</div>
|
||||||
|
<div class="modal-body">
|
||||||
|
<div class="alert alert-info">
|
||||||
|
<strong>Need help?</strong> You can send this diagnostic report to our support team at
|
||||||
|
<a href="mailto:contact@aircarto.fr?subject=NebuleAir%20Diagnostic%20Report" class="alert-link">contact@aircarto.fr</a>
|
||||||
|
<br><small>Select all the text below (Ctrl+A) and copy it (Ctrl+C), or use the Download button.</small>
|
||||||
|
</div>
|
||||||
|
<div class="mb-3">
|
||||||
|
<textarea id="shareReportText" class="form-control font-monospace" rows="15" readonly style="font-size: 0.75rem; background-color: #1e1e1e; color: #d4d4d4;"></textarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="modal-footer">
|
||||||
|
<button type="button" class="btn btn-success" onclick="downloadReport()">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-download me-1" viewBox="0 0 16 16">
|
||||||
|
<path d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/>
|
||||||
|
<path d="M7.646 11.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V1.5a.5.5 0 0 0-1 0v8.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3z"/>
|
||||||
|
</svg>
|
||||||
|
Download (.txt)
|
||||||
|
</button>
|
||||||
|
<button type="button" class="btn btn-outline-primary" onclick="selectAllReportText()">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-cursor-text me-1" viewBox="0 0 16 16">
|
||||||
|
<path d="M5 2a.5.5 0 0 1 .5-.5c.862 0 1.573.287 2.06.566.174.099.321.198.44.286.119-.088.266-.187.44-.286A4.165 4.165 0 0 1 10.5 1.5a.5.5 0 0 1 0 1c-.638 0-1.177.213-1.564.434a3.49 3.49 0 0 0-.436.294V7.5H9a.5.5 0 0 1 0 1h-.5v4.272c.1.08.248.187.436.294.387.221.926.434 1.564.434a.5.5 0 0 1 0 1 4.165 4.165 0 0 1-2.06-.566A4.561 4.561 0 0 1 8 13.65a4.561 4.561 0 0 1-.44.285 4.165 4.165 0 0 1-2.06.566.5.5 0 0 1 0-1c.638 0 1.177-.213 1.564-.434.188-.107.335-.214.436-.294V8.5H7a.5.5 0 0 1 0-1h.5V3.228a3.49 3.49 0 0 0-.436-.294A3.166 3.166 0 0 0 5.5 2.5.5.5 0 0 1 5 2z"/>
|
||||||
|
</svg>
|
||||||
|
Select All
|
||||||
|
</button>
|
||||||
|
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
@@ -9,31 +10,39 @@
|
|||||||
body {
|
body {
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
#sidebar a.nav-link {
|
#sidebar a.nav-link {
|
||||||
position: relative;
|
position: relative;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
#sidebar a.nav-link:hover {
|
#sidebar a.nav-link:hover {
|
||||||
background-color: rgba(0, 0, 0, 0.5);
|
background-color: rgba(0, 0, 0, 0.5);
|
||||||
}
|
}
|
||||||
|
|
||||||
#sidebar a.nav-link svg {
|
#sidebar a.nav-link svg {
|
||||||
margin-right: 8px; /* Add spacing between icons and text */
|
margin-right: 8px;
|
||||||
|
/* Add spacing between icons and text */
|
||||||
}
|
}
|
||||||
|
|
||||||
#sidebar {
|
#sidebar {
|
||||||
transition: transform 0.3s ease-in-out;
|
transition: transform 0.3s ease-in-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
.offcanvas-backdrop {
|
.offcanvas-backdrop {
|
||||||
z-index: 1040;
|
z-index: 1040;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<!-- Topbar -->
|
<!-- Topbar -->
|
||||||
<span id="topbar"></span>
|
<span id="topbar"></span>
|
||||||
|
|
||||||
<!-- Sidebar Offcanvas for Mobile -->
|
<!-- Sidebar Offcanvas for Mobile -->
|
||||||
<div class="offcanvas offcanvas-start text-white bg-dark" tabindex="-1" id="sidebarOffcanvas" aria-labelledby="sidebarOffcanvasLabel">
|
<div class="offcanvas offcanvas-start text-white bg-dark" tabindex="-1" id="sidebarOffcanvas"
|
||||||
|
aria-labelledby="sidebarOffcanvasLabel">
|
||||||
<div class="offcanvas-header">
|
<div class="offcanvas-header">
|
||||||
<h5 class="offcanvas-title" id="sidebarOffcanvasLabel">NebuleAir</h5>
|
<h5 class="offcanvas-title" id="sidebarOffcanvasLabel">NebuleAir</h5>
|
||||||
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="offcanvas" aria-label="Close"></button>
|
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="offcanvas" aria-label="Close"></button>
|
||||||
@@ -49,23 +58,36 @@
|
|||||||
</aside>
|
</aside>
|
||||||
<!-- Main content -->
|
<!-- Main content -->
|
||||||
<main class="col-md-10 ms-sm-auto col-lg-11 offset-md-2 offset-lg-1 px-md-4">
|
<main class="col-md-10 ms-sm-auto col-lg-11 offset-md-2 offset-lg-1 px-md-4">
|
||||||
<h1 class="mt-4">Les sondes de mesure</h1>
|
<h1 class="mt-4" data-i18n="sensors.title">Les sondes de mesure</h1>
|
||||||
<p>Votre capteur NebuleAir est équipé de une ou plusieurs sondes qui permettent de mesurer certaines variables environnementales. La mesure
|
<p data-i18n="sensors.description">Votre capteur NebuleAir est équipé de une ou plusieurs sondes qui permettent
|
||||||
|
de mesurer certaines variables environnementales. La mesure
|
||||||
est automatique mais vous pouvez ici vous assurer de leur bon fonctionnement.
|
est automatique mais vous pouvez ici vous assurer de leur bon fonctionnement.
|
||||||
</p>
|
</p>
|
||||||
|
<button class="btn btn-success mb-3 btn_selfTest" onclick="runSelfTest()">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-check2-circle me-1" viewBox="0 0 16 16">
|
||||||
|
<path d="M2.5 8a5.5 5.5 0 1 1 11 0 5.5 5.5 0 0 1-11 0z"/>
|
||||||
|
<path d="M15.354 3.354a.5.5 0 0 0-.708-.708L8 9.293 5.354 6.646a.5.5 0 1 0-.708.708l3 3a.5.5 0 0 0 .708 0l7-7z"/>
|
||||||
|
</svg>
|
||||||
|
Run Self Test
|
||||||
|
</button>
|
||||||
|
|
||||||
<div class="row mb-3" id="card-container"></div>
|
<div class="row mb-3" id="card-container"></div>
|
||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- JAVASCRIPT -->
|
<!-- JAVASCRIPT -->
|
||||||
|
|
||||||
<!-- Link Ajax locally -->
|
<!-- Link Ajax locally -->
|
||||||
<script src="assets/jquery/jquery-3.7.1.min.js"></script>
|
<script src="assets/jquery/jquery-3.7.1.min.js"></script>
|
||||||
<!-- Link Bootstrap JS and Popper.js locally -->
|
<!-- Link Bootstrap JS and Popper.js locally -->
|
||||||
<script src="assets/js/bootstrap.bundle.js"></script>
|
<script src="assets/js/bootstrap.bundle.js"></script>
|
||||||
|
<!-- i18n translation system -->
|
||||||
|
<script src="assets/js/i18n.js"></script>
|
||||||
|
<script src="assets/js/topbar-logo.js"></script>
|
||||||
|
<script src="assets/js/selftest.js"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
document.addEventListener('DOMContentLoaded', function () {
|
document.addEventListener('DOMContentLoaded', function () {
|
||||||
const elementsToLoad = [
|
const elementsToLoad = [
|
||||||
{ id: 'topbar', file: 'topbar.html' },
|
{ id: 'topbar', file: 'topbar.html' },
|
||||||
@@ -80,28 +102,32 @@
|
|||||||
const element = document.getElementById(id);
|
const element = document.getElementById(id);
|
||||||
if (element) {
|
if (element) {
|
||||||
element.innerHTML = data;
|
element.innerHTML = data;
|
||||||
|
// Apply translations after loading dynamic content
|
||||||
|
if (window.i18n && typeof window.i18n.applyTranslations === 'function') {
|
||||||
|
window.i18n.applyTranslations();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(error => console.error(`Error loading ${file}:`, error));
|
.catch(error => console.error(`Error loading ${file}:`, error));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
function getNPM_values(port){
|
function getNPM_values(port) {
|
||||||
console.log("Data from NPM (port "+port+"):");
|
console.log("Data from NPM (port " + port + "):");
|
||||||
$("#loading_"+port).show();
|
$("#loading_" + port).show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: 'launcher.php?type=npm&port='+port,
|
url: 'launcher.php?type=npm&port=' + port,
|
||||||
dataType: 'json', // Specify that you expect a JSON response
|
dataType: 'json', // Specify that you expect a JSON response
|
||||||
method: 'GET', // Use GET or POST depending on your needs
|
method: 'GET', // Use GET or POST depending on your needs
|
||||||
success: function(response) {
|
success: function (response) {
|
||||||
console.log(response);
|
console.log(response);
|
||||||
const tableBody = document.getElementById("data-table-body_"+port);
|
const tableBody = document.getElementById("data-table-body_" + port);
|
||||||
tableBody.innerHTML = "";
|
tableBody.innerHTML = "";
|
||||||
|
|
||||||
$("#loading_"+port).hide();
|
$("#loading_" + port).hide();
|
||||||
// Create an array of the desired keys
|
// Create an array of the desired keys
|
||||||
const keysToShow = ["PM1", "PM25", "PM10"];
|
const keysToShow = ["PM1", "PM25", "PM10", "message"];
|
||||||
// Error messages mapping
|
// Error messages mapping
|
||||||
const errorMessages = {
|
const errorMessages = {
|
||||||
"notReady": "Sensor is not ready",
|
"notReady": "Sensor is not ready",
|
||||||
@@ -116,7 +142,7 @@ function getNPM_values(port){
|
|||||||
keysToShow.forEach(key => {
|
keysToShow.forEach(key => {
|
||||||
if (response[key] !== undefined) { // Check if the key exists in the response
|
if (response[key] !== undefined) { // Check if the key exists in the response
|
||||||
const value = response[key];
|
const value = response[key];
|
||||||
$("#data-table-body_"+port).append(`
|
$("#data-table-body_" + port).append(`
|
||||||
<tr>
|
<tr>
|
||||||
<td>${key}</td>
|
<td>${key}</td>
|
||||||
<td>${value} µg/m³</td>
|
<td>${value} µg/m³</td>
|
||||||
@@ -137,34 +163,59 @@ function getNPM_values(port){
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
error: function(xhr, status, error) {
|
error: function (xhr, status, error) {
|
||||||
console.error('AJAX request failed:', status, error);
|
console.error('AJAX request failed:', status, error);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function getENVEA_values(port, name){
|
function getNPM_firmware(port) {
|
||||||
console.log("Data from Envea "+ name+" (port "+port+"):");
|
console.log("Firmware version from NPM (port " + port + "):");
|
||||||
$("#loading_envea"+name).show();
|
$("#loading_fw_" + port).show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: 'launcher.php?type=envea&port='+port+'&name='+name,
|
url: 'launcher.php?type=npm_firmware&port=' + port,
|
||||||
dataType: 'json', // Specify that you expect a JSON response
|
dataType: 'json',
|
||||||
method: 'GET', // Use GET or POST depending on your needs
|
method: 'GET',
|
||||||
success: function(response) {
|
success: function (response) {
|
||||||
console.log(response);
|
console.log(response);
|
||||||
const tableBody = document.getElementById("data-table-body_envea"+name);
|
$("#loading_fw_" + port).hide();
|
||||||
|
const fwSpan = document.getElementById("fw_version_" + port);
|
||||||
|
if (response.firmware_version !== undefined) {
|
||||||
|
fwSpan.innerHTML = '<span class="badge bg-success">Firmware: ' + response.firmware_version + '</span>';
|
||||||
|
} else {
|
||||||
|
fwSpan.innerHTML = '<span class="badge bg-danger">Error reading firmware</span>';
|
||||||
|
}
|
||||||
|
},
|
||||||
|
error: function (xhr, status, error) {
|
||||||
|
console.error('AJAX request failed:', status, error);
|
||||||
|
$("#loading_fw_" + port).hide();
|
||||||
|
const fwSpan = document.getElementById("fw_version_" + port);
|
||||||
|
fwSpan.innerHTML = '<span class="badge bg-danger">Error</span>';
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function getENVEA_values(port, name) {
|
||||||
|
console.log("Data from Envea " + name + " (port " + port + "):");
|
||||||
|
$("#loading_envea" + name).show();
|
||||||
|
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=envea&port=' + port + '&name=' + name,
|
||||||
|
dataType: 'json',
|
||||||
|
method: 'GET',
|
||||||
|
success: function (response) {
|
||||||
|
console.log(response);
|
||||||
|
const tableBody = document.getElementById("data-table-body_envea" + name);
|
||||||
tableBody.innerHTML = "";
|
tableBody.innerHTML = "";
|
||||||
|
|
||||||
$("#loading_envea"+name).hide();
|
$("#loading_envea" + name).hide();
|
||||||
// Create an array of the desired keys
|
|
||||||
// Create an array of the desired keys
|
|
||||||
const keysToShow = [name];
|
const keysToShow = [name];
|
||||||
// Add only the specified elements to the table
|
|
||||||
keysToShow.forEach(key => {
|
keysToShow.forEach(key => {
|
||||||
if (response !== undefined) { // Check if the key exists in the response
|
if (response !== undefined) {
|
||||||
const value = response;
|
const value = response;
|
||||||
$("#data-table-body_envea"+name).append(`
|
$("#data-table-body_envea" + name).append(`
|
||||||
<tr>
|
<tr>
|
||||||
<td>${key}</td>
|
<td>${key}</td>
|
||||||
<td>${value} ppb</td>
|
<td>${value} ppb</td>
|
||||||
@@ -173,48 +224,145 @@ function getENVEA_values(port, name){
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
error: function(xhr, status, error) {
|
error: function (xhr, status, error) {
|
||||||
console.error('AJAX request failed:', status, error);
|
console.error('AJAX request failed:', status, error);
|
||||||
|
const tableBody = document.getElementById("data-table-body_envea" + name);
|
||||||
|
$("#loading_envea" + name).hide();
|
||||||
|
|
||||||
|
tableBody.innerHTML = `
|
||||||
|
<tr>
|
||||||
|
<td colspan="2" class="text-danger">
|
||||||
|
❌ Error: unable to get data from sensor.<br>
|
||||||
|
<small>${status}: ${error}</small>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
`;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function getNoise_values(){
|
function getENVEA_debug_values() {
|
||||||
console.log("Data from I2C Noise Sensor:");
|
console.log("Getting debug data from all Envea sensors");
|
||||||
|
$("#loading_envea_debug").show();
|
||||||
|
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=envea_debug',
|
||||||
|
dataType: 'text',
|
||||||
|
method: 'GET',
|
||||||
|
success: function (response) {
|
||||||
|
console.log("Envea debug output:", response);
|
||||||
|
const outputDiv = document.getElementById("envea-debug-output");
|
||||||
|
$("#loading_envea_debug").hide();
|
||||||
|
|
||||||
|
// Display raw output in a pre block
|
||||||
|
outputDiv.innerHTML = `<pre style="background-color: #f5f5f5; padding: 10px; border-radius: 5px; max-height: 500px; overflow-y: auto; font-size: 12px;">${response}</pre>`;
|
||||||
|
},
|
||||||
|
error: function (xhr, status, error) {
|
||||||
|
console.error('AJAX request failed:', status, error);
|
||||||
|
const outputDiv = document.getElementById("envea-debug-output");
|
||||||
|
$("#loading_envea_debug").hide();
|
||||||
|
|
||||||
|
outputDiv.innerHTML = `
|
||||||
|
<div class="alert alert-danger">
|
||||||
|
❌ Error: unable to get debug data from sensors.<br>
|
||||||
|
<small>${status}: ${error}</small>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function getNoise_values() {
|
||||||
|
console.log("Data from NSRT MK4 Noise Sensor:");
|
||||||
$("#loading_noise").show();
|
$("#loading_noise").show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: 'launcher.php?type=noise',
|
url: 'launcher.php?type=noise',
|
||||||
dataType: 'text',
|
dataType: 'json',
|
||||||
method: 'GET', // Use GET or POST depending on your needs
|
method: 'GET',
|
||||||
success: function(response) {
|
success: function (response) {
|
||||||
console.log(response);
|
console.log(response);
|
||||||
const tableBody = document.getElementById("data-table-body_noise");
|
const tableBody = document.getElementById("data-table-body_noise");
|
||||||
tableBody.innerHTML = "";
|
tableBody.innerHTML = "";
|
||||||
$("#loading_noise").hide();
|
$("#loading_noise").hide();
|
||||||
|
|
||||||
// Create an array of the desired keys
|
if (response.error) {
|
||||||
const keysToShow = ["Noise"];
|
$("#data-table-body_noise").append(`
|
||||||
// Add only the specified elements to the table
|
<tr><td colspan="2" class="text-danger">${response.error}</td></tr>
|
||||||
keysToShow.forEach(key => {
|
`);
|
||||||
if (response !== undefined) { // Check if the key exists in the response
|
return;
|
||||||
const value = response;
|
}
|
||||||
|
|
||||||
|
const rows = [
|
||||||
|
{ label: "LEQ", value: response.LEQ + " dB" },
|
||||||
|
{ label: "dB(A)", value: response.dBA + " dBA" },
|
||||||
|
{ label: "Weighting", value: response.weighting },
|
||||||
|
{ label: "Tau", value: response.tau + " s" }
|
||||||
|
];
|
||||||
|
rows.forEach(row => {
|
||||||
$("#data-table-body_noise").append(`
|
$("#data-table-body_noise").append(`
|
||||||
<tr>
|
<tr>
|
||||||
<td>${key}</td>
|
<td>${row.label}</td>
|
||||||
<td>${value} DB</td>
|
<td>${row.value}</td>
|
||||||
</tr>
|
</tr>
|
||||||
`);
|
`);
|
||||||
}
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
error: function(xhr, status, error) {
|
error: function (xhr, status, error) {
|
||||||
|
$("#loading_noise").hide();
|
||||||
console.error('AJAX request failed:', status, error);
|
console.error('AJAX request failed:', status, error);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function getBME280_values(){
|
function getMHZ19_values() {
|
||||||
|
console.log("Data from MH-Z19 CO2 sensor:");
|
||||||
|
$("#loading_mhz19").show();
|
||||||
|
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=mhz19',
|
||||||
|
dataType: 'json',
|
||||||
|
method: 'GET',
|
||||||
|
success: function (response) {
|
||||||
|
console.log(response);
|
||||||
|
const tableBody = document.getElementById("data-table-body_mhz19");
|
||||||
|
tableBody.innerHTML = "";
|
||||||
|
$("#loading_mhz19").hide();
|
||||||
|
|
||||||
|
if (response.error) {
|
||||||
|
$("#data-table-body_mhz19").append(`
|
||||||
|
<tr>
|
||||||
|
<td colspan="2" class="text-danger">
|
||||||
|
⚠ ${response.error}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
`);
|
||||||
|
} else if (response.CO2 !== undefined) {
|
||||||
|
$("#data-table-body_mhz19").append(`
|
||||||
|
<tr>
|
||||||
|
<td>CO2</td>
|
||||||
|
<td>${response.CO2} ppm</td>
|
||||||
|
</tr>
|
||||||
|
`);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
error: function (xhr, status, error) {
|
||||||
|
console.error('AJAX request failed:', status, error);
|
||||||
|
$("#loading_mhz19").hide();
|
||||||
|
const tableBody = document.getElementById("data-table-body_mhz19");
|
||||||
|
tableBody.innerHTML = `
|
||||||
|
<tr>
|
||||||
|
<td colspan="2" class="text-danger">
|
||||||
|
⚠ Erreur de communication avec le capteur
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function getBME280_values() {
|
||||||
console.log("Data from I2C BME280:");
|
console.log("Data from I2C BME280:");
|
||||||
$("#loading_BME280").show();
|
$("#loading_BME280").show();
|
||||||
|
|
||||||
@@ -223,7 +371,7 @@ function getBME280_values(){
|
|||||||
dataType: 'text',
|
dataType: 'text',
|
||||||
|
|
||||||
method: 'GET', // Use GET or POST depending on your needs
|
method: 'GET', // Use GET or POST depending on your needs
|
||||||
success: function(response) {
|
success: function (response) {
|
||||||
console.log(response);
|
console.log(response);
|
||||||
|
|
||||||
const tableBody = document.getElementById("data-table-body_BME280");
|
const tableBody = document.getElementById("data-table-body_BME280");
|
||||||
@@ -253,110 +401,106 @@ function getBME280_values(){
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
error: function(xhr, status, error) {
|
error: function (xhr, status, error) {
|
||||||
console.error('AJAX request failed:', status, error);
|
console.error('AJAX request failed:', status, error);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
window.onload = function() {
|
window.onload = function () {
|
||||||
fetch('../config.json') // Replace 'deviceID.txt' with 'config.json'
|
|
||||||
.then(response => response.json()) // Parse response as JSON
|
|
||||||
.then(data => {
|
|
||||||
//get device ID
|
|
||||||
const deviceID = data.deviceID.trim().toUpperCase();
|
|
||||||
//document.getElementById('pageTitle_plus_ID').innerText = 'token: ' + deviceID;
|
|
||||||
//get device Name
|
|
||||||
const deviceName = data.deviceName;
|
|
||||||
|
|
||||||
|
//NEW way to get config (SQLite)
|
||||||
|
let mainConfig = {}; // Store main config for use in sensor card creation
|
||||||
|
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=get_config_sqlite',
|
||||||
|
dataType: 'json',
|
||||||
|
//dataType: 'json', // Specify that you expect a JSON response
|
||||||
|
method: 'GET', // Use GET or POST depending on your needs
|
||||||
|
success: function (response) {
|
||||||
|
console.log("Getting SQLite config table:");
|
||||||
|
console.log(response);
|
||||||
|
|
||||||
|
mainConfig = response; // Store for later use
|
||||||
|
|
||||||
|
// Function to update sidebar device name
|
||||||
|
function updateSidebarDeviceName(deviceName) {
|
||||||
const elements = document.querySelectorAll('.sideBar_sensorName');
|
const elements = document.querySelectorAll('.sideBar_sensorName');
|
||||||
|
if (elements.length > 0) {
|
||||||
elements.forEach((element) => {
|
elements.forEach((element) => {
|
||||||
element.innerText = deviceName;
|
element.innerText = deviceName;
|
||||||
});
|
});
|
||||||
|
console.log("Device name updated in sidebar:", deviceName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update device name immediately and with retries to handle async sidebar loading
|
||||||
|
if (response.deviceName) {
|
||||||
|
updateSidebarDeviceName(response.deviceName);
|
||||||
|
// Retry after delays to catch async sidebar load
|
||||||
|
setTimeout(() => updateSidebarDeviceName(response.deviceName), 100);
|
||||||
|
setTimeout(() => updateSidebarDeviceName(response.deviceName), 500);
|
||||||
|
|
||||||
|
// Set page title
|
||||||
|
document.title = response.deviceName;
|
||||||
|
}
|
||||||
|
|
||||||
//get local RTC
|
// After getting main config, create sensor cards
|
||||||
$.ajax({
|
createSensorCards(mainConfig);
|
||||||
url: 'launcher.php?type=RTC_time',
|
|
||||||
dataType: 'text', // Specify that you expect a JSON response
|
|
||||||
method: 'GET', // Use GET or POST depending on your needs
|
|
||||||
success: function(response) {
|
|
||||||
console.log("Local RTC: " + response);
|
|
||||||
const RTC_Element = document.getElementById("RTC_time");
|
|
||||||
RTC_Element.textContent = response;
|
|
||||||
|
|
||||||
},
|
},
|
||||||
error: function(xhr, status, error) {
|
error: function (xhr, status, error) {
|
||||||
console.error('AJAX request failed:', status, error);
|
console.error('AJAX request failed:', status, error);
|
||||||
}
|
}
|
||||||
});
|
});//end AJAX
|
||||||
|
|
||||||
|
//Function to create sensor cards based on config
|
||||||
|
function createSensorCards(config) {
|
||||||
|
console.log("Creating sensor cards with config:");
|
||||||
|
console.log(config);
|
||||||
|
|
||||||
const container = document.getElementById('card-container'); // Conteneur des cartes
|
const container = document.getElementById('card-container'); // Conteneur des cartes
|
||||||
|
|
||||||
//creates NPM cards
|
//creates NPM card (by default)
|
||||||
const NPM_ports = data.NextPM_ports; // Récupère les ports
|
|
||||||
NPM_ports.forEach((port, index) => {
|
|
||||||
const cardHTML = `
|
const cardHTML = `
|
||||||
<div class="col-sm-3">
|
<div class="col-sm-3">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-header">
|
<div class="card-header" data-i18n="sensors.npm.headerUart">
|
||||||
Port UART ${port.replace('ttyAMA', '')}
|
Port UART
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<h5 class="card-title">NextPM ${String.fromCharCode(65 + index)}</h5>
|
<h5 class="card-title" data-i18n="sensors.npm.title">NextPM</h5>
|
||||||
<p class="card-text">Capteur particules fines.</p>
|
<p class="card-text" data-i18n="sensors.npm.description">Capteur particules fines.</p>
|
||||||
<button class="btn btn-primary" onclick="getNPM_values('${port}')">Get Data</button>
|
<button class="btn btn-primary" onclick="getNPM_values('ttyAMA5')" data-i18n="common.getData">Get Data</button>
|
||||||
<div id="loading_${port}" class="spinner-border spinner-border-sm" style="display: none;" role="status"></div>
|
<button class="btn btn-secondary" onclick="getNPM_firmware('ttyAMA5')">Firmware Version</button>
|
||||||
|
<br>
|
||||||
|
<div id="loading_ttyAMA5" class="spinner-border spinner-border-sm" style="display: none;" role="status"></div>
|
||||||
|
<div id="loading_fw_ttyAMA5" class="spinner-border spinner-border-sm" style="display: none;" role="status"></div>
|
||||||
|
<div id="fw_version_ttyAMA5" class="mt-1"></div>
|
||||||
<table class="table table-striped-columns">
|
<table class="table table-striped-columns">
|
||||||
<tbody id="data-table-body_${port}"></tbody>
|
<tbody id="data-table-body_ttyAMA5"></tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>`;
|
</div>`;
|
||||||
container.innerHTML += cardHTML; // Ajouter la carte au conteneur
|
|
||||||
});
|
|
||||||
|
|
||||||
//creates ENVEA cards
|
container.innerHTML += cardHTML; // Add the I2C card if condition is met
|
||||||
const ENVEA_sensors = data.envea_sondes.filter(sonde => sonde.connected); // Filter only connected sondes
|
|
||||||
|
|
||||||
ENVEA_sensors.forEach((sensor, index) => {
|
|
||||||
const port = sensor.port; // Port from the sensor object
|
|
||||||
const name = sensor.name; // Port from the sensor object
|
|
||||||
const coefficient = sensor.coefficient;
|
|
||||||
const cardHTML = `
|
|
||||||
<div class="col-sm-3">
|
|
||||||
<div class="card">
|
|
||||||
<div class="card-header">
|
|
||||||
Port UART ${port.replace('ttyAMA', '')}
|
|
||||||
</div>
|
|
||||||
<div class="card-body">
|
|
||||||
<h5 class="card-title">Sonde Envea ${name}</h5>
|
|
||||||
<p class="card-text">Capteur gas.</p>
|
|
||||||
<button class="btn btn-primary" onclick="getENVEA_values('${port}','${name}','${coefficient}')">Get Data</button>
|
|
||||||
<div id="loading_envea${name}" class="spinner-border spinner-border-sm" style="display: none;" role="status"></div>
|
|
||||||
<table class="table table-striped-columns">
|
|
||||||
<tbody id="data-table-body_envea${name}"></tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>`;
|
|
||||||
container.innerHTML += cardHTML; // Ajouter la carte au conteneur
|
|
||||||
});
|
|
||||||
|
|
||||||
//creates i2c BME280 card
|
//creates i2c BME280 card
|
||||||
if (data["BME280/get_data_v2.py"]) {
|
if (config.BME280) {
|
||||||
const i2C_BME_HTML = `
|
const i2C_BME_HTML = `
|
||||||
<div class="col-sm-3">
|
<div class="col-sm-3">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-header">
|
<div class="card-header" data-i18n="sensors.bme280.headerI2c">
|
||||||
Port I2C
|
Port I2C
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<h5 class="card-title">BME280 Temp/Hum sensor</h5>
|
<h5 class="card-title" data-i18n="sensors.bme280.title">BME280 Temp/Hum sensor</h5>
|
||||||
<p class="card-text">Capteur température et humidité sur le port I2C.</p>
|
<p class="card-text" data-i18n="sensors.bme280.description">Capteur température et humidité sur le port I2C.</p>
|
||||||
<button class="btn btn-primary mb-1" onclick="getBME280_values()">Get Data</button>
|
<button class="btn btn-primary mb-1" onclick="getBME280_values()" data-i18n="common.getData">Get Data</button>
|
||||||
<br>
|
<br>
|
||||||
<div id="loading_BME280" class="spinner-border spinner-border-sm" style="display: none;" role="status"></div>
|
<div id="loading_BME280" class="spinner-border spinner-border-sm" style="display: none;" role="status"></div>
|
||||||
<table class="table table-striped-columns">
|
<table class="table table-striped-columns">
|
||||||
@@ -369,21 +513,18 @@ window.onload = function() {
|
|||||||
container.innerHTML += i2C_BME_HTML; // Add the I2C card if condition is met
|
container.innerHTML += i2C_BME_HTML; // Add the I2C card if condition is met
|
||||||
}
|
}
|
||||||
|
|
||||||
//creates i2c sound card
|
//creates NSRT MK4 noise sensor card (USB)
|
||||||
if (data.i2C_sound) {
|
if (config.NOISE) {
|
||||||
const i2C_HTML = `
|
const noiseHTML = `
|
||||||
<div class="col-sm-3">
|
<div class="col-sm-3">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-header">
|
<div class="card-header" data-i18n="sensors.noise.headerUsb">
|
||||||
Port I2C
|
Port USB
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<h5 class="card-title">Decibel Meter</h5>
|
<h5 class="card-title" data-i18n="sensors.noise.title">NSRT MK4</h5>
|
||||||
<p class="card-text">Capteur bruit sur le port I2C.</p>
|
<p class="card-text" data-i18n="sensors.noise.description">Sonomètre NSRT MK4 sur port USB.</p>
|
||||||
<button class="btn btn-primary mb-1" onclick="getNoise_values()">Get Data</button>
|
<button class="btn btn-primary mb-1" onclick="getNoise_values()" data-i18n="common.getData">Get Data</button>
|
||||||
<br>
|
|
||||||
<button class="btn btn-success" onclick="startNoise()">Start recording</button>
|
|
||||||
<button class="btn btn-danger" onclick="stopNoise()">Stop recording</button>
|
|
||||||
<div id="loading_noise" class="spinner-border spinner-border-sm" style="display: none;" role="status"></div>
|
<div id="loading_noise" class="spinner-border spinner-border-sm" style="display: none;" role="status"></div>
|
||||||
<table class="table table-striped-columns">
|
<table class="table table-striped-columns">
|
||||||
<tbody id="data-table-body_noise"></tbody>
|
<tbody id="data-table-body_noise"></tbody>
|
||||||
@@ -392,13 +533,103 @@ window.onload = function() {
|
|||||||
</div>
|
</div>
|
||||||
</div>`;
|
</div>`;
|
||||||
|
|
||||||
container.innerHTML += i2C_HTML; // Add the I2C card if condition is met
|
container.innerHTML += noiseHTML;
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
//creates MH-Z19 CO2 card
|
||||||
.catch(error => console.error('Error loading config.json:', error));
|
if (config.MHZ19) {
|
||||||
|
const MHZ19_HTML = `
|
||||||
|
<div class="col-sm-3">
|
||||||
|
<div class="card">
|
||||||
|
<div class="card-header">
|
||||||
|
Port UART 4
|
||||||
|
</div>
|
||||||
|
<div class="card-body">
|
||||||
|
<h5 class="card-title">MH-Z19 CO2</h5>
|
||||||
|
<p class="card-text">Capteur de dioxyde de carbone.</p>
|
||||||
|
<button class="btn btn-primary mb-1" onclick="getMHZ19_values()" data-i18n="common.getData">Get Data</button>
|
||||||
|
<div id="loading_mhz19" class="spinner-border spinner-border-sm" style="display: none;" role="status"></div>
|
||||||
|
<table class="table table-striped-columns">
|
||||||
|
<tbody id="data-table-body_mhz19"></tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>`;
|
||||||
|
|
||||||
|
container.innerHTML += MHZ19_HTML;
|
||||||
}
|
}
|
||||||
</script>
|
|
||||||
|
//Si on a des SONDES ENVEA connectée il faut faire un deuxième call dans la table envea_sondes_table
|
||||||
|
//creates ENVEA debug card
|
||||||
|
if (config.envea) {
|
||||||
|
console.log("Need to display ENVEA sondes");
|
||||||
|
//getting config_scripts table
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=get_envea_sondes_table_sqlite',
|
||||||
|
dataType: 'json',
|
||||||
|
method: 'GET',
|
||||||
|
success: function (sondes) {
|
||||||
|
console.log("Getting SQLite envea sondes table:");
|
||||||
|
console.log(sondes);
|
||||||
|
const ENVEA_sensors = sondes.filter(sonde => sonde.connected); // Filter only connected sondes
|
||||||
|
|
||||||
|
// Only create the card if there are connected sensors
|
||||||
|
if (ENVEA_sensors.length > 0) {
|
||||||
|
// Create a single debug card for all Envea sensors
|
||||||
|
const cardHTML = `
|
||||||
|
<div class="col-sm-6">
|
||||||
|
<div class="card">
|
||||||
|
<div class="card-header">
|
||||||
|
<strong>Sondes Envea (Debug)</strong>
|
||||||
|
</div>
|
||||||
|
<div class="card-body">
|
||||||
|
<h5 class="card-title" data-i18n="sensors.envea.title">Sonde Envea</h5>
|
||||||
|
<p class="card-text" data-i18n="sensors.envea.description">Capteur gaz.</p>
|
||||||
|
<p class="text-muted small">Sondes connectées: ${ENVEA_sensors.map(s => s.name).join(', ')}</p>
|
||||||
|
<button class="btn btn-primary" onclick="getENVEA_debug_values()" data-i18n="common.getData">Get Data</button>
|
||||||
|
<div id="loading_envea_debug" class="spinner-border spinner-border-sm" style="display: none;" role="status"></div>
|
||||||
|
<div id="envea-debug-output" class="mt-3"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>`;
|
||||||
|
container.innerHTML += cardHTML;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Apply translations to dynamically created Envea card
|
||||||
|
i18n.applyTranslations();
|
||||||
|
|
||||||
|
},
|
||||||
|
error: function (xhr, status, error) {
|
||||||
|
console.error('AJAX request failed:', status, error);
|
||||||
|
}
|
||||||
|
});//end AJAX envea Sondes
|
||||||
|
|
||||||
|
}//end if envea
|
||||||
|
|
||||||
|
// Apply translations to all dynamically created sensor cards
|
||||||
|
i18n.applyTranslations();
|
||||||
|
|
||||||
|
} // end createSensorCards function
|
||||||
|
|
||||||
|
//get local RTC
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=RTC_time',
|
||||||
|
dataType: 'text', // Specify that you expect a JSON response
|
||||||
|
method: 'GET', // Use GET or POST depending on your needs
|
||||||
|
success: function (response) {
|
||||||
|
console.log("Local RTC: " + response);
|
||||||
|
const RTC_Element = document.getElementById("RTC_time");
|
||||||
|
RTC_Element.textContent = response;
|
||||||
|
|
||||||
|
},
|
||||||
|
error: function (xhr, status, error) {
|
||||||
|
console.error('AJAX request failed:', status, error);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
} //end windows onload
|
||||||
|
</script>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
@@ -1,64 +1,109 @@
|
|||||||
<!-- Sidebar -->
|
<!-- Sidebar -->
|
||||||
<nav class="nav flex-column">
|
<nav class="nav flex-column">
|
||||||
<a class="nav-link text-white mt-4" href="index.html">
|
<a class="nav-link text-white mt-4" href="index.html">
|
||||||
<svg class="bi me-2" width="16" height="16" fill="currentColor" aria-hidden="true">
|
<svg class="bi me-2" width="16" height="16" fill="currentColor" aria-hidden="true">
|
||||||
<use xlink:href="assets/icons/bootstrap-icons.svg#house"></use>
|
<use xlink:href="assets/icons/bootstrap-icons.svg#house"></use>
|
||||||
</svg>
|
</svg>
|
||||||
Home
|
<span data-i18n="sidebar.home">Accueil</span>
|
||||||
|
</a>
|
||||||
|
|
||||||
|
<!-- Screen Control (Hidden by default) -->
|
||||||
|
<a class="nav-link text-white nav-screen-item" href="screen.html" id="nav-screen" style="display: none;">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-display"
|
||||||
|
viewBox="0 0 16 16">
|
||||||
|
<path
|
||||||
|
d="M0 4s0-2 2-2h12s2 0 2 2v6s0 2-2 2h-4c0 .667.083 1.167.25 1.5H11a.5.5 0 0 1 0 1H5a.5.5 0 0 1 0-1h.75c.167-.333.25-.833.25-1.5H2s-2 0-2-2V4zm1.398-.855a.758.758 0 0 0-.254.302A1.46 1.46 0 0 0 1 4.01V10c0 .325.078.502.145.602.07.105.17.188.302.254a1.464 1.464 0 0 0 .538.143L2.01 11H14c.325 0 .502-.078.602-.145a.758.758 0 0 0 .254-.302 1.464 1.464 0 0 0 .143-.538L15 9.99V4c0-.325-.078-.502-.145-.602a.757.757 0 0 0-.302-.254A1.46 1.46 0 0 0 13.99 3H2c-.325 0-.502.078-.602.145z" />
|
||||||
|
</svg>
|
||||||
|
<span data-i18n="sidebar.screen">Screen</span>
|
||||||
</a>
|
</a>
|
||||||
<a class="nav-link text-white" href="sensors.html">
|
<a class="nav-link text-white" href="sensors.html">
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-thermometer-sun" viewBox="0 0 16 16">
|
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-thermometer-sun"
|
||||||
<path d="M5 12.5a1.5 1.5 0 1 1-2-1.415V2.5a.5.5 0 0 1 1 0v8.585A1.5 1.5 0 0 1 5 12.5"/>
|
viewBox="0 0 16 16">
|
||||||
<path d="M1 2.5a2.5 2.5 0 0 1 5 0v7.55a3.5 3.5 0 1 1-5 0zM3.5 1A1.5 1.5 0 0 0 2 2.5v7.987l-.167.15a2.5 2.5 0 1 0 3.333 0L5 10.486V2.5A1.5 1.5 0 0 0 3.5 1m5 1a.5.5 0 0 1 .5.5v1a.5.5 0 0 1-1 0v-1a.5.5 0 0 1 .5-.5m4.243 1.757a.5.5 0 0 1 0 .707l-.707.708a.5.5 0 1 1-.708-.708l.708-.707a.5.5 0 0 1 .707 0M8 5.5a.5.5 0 0 1 .5-.5 3 3 0 1 1 0 6 .5.5 0 0 1 0-1 2 2 0 0 0 0-4 .5.5 0 0 1-.5-.5M12.5 8a.5.5 0 0 1 .5-.5h1a.5.5 0 1 1 0 1h-1a.5.5 0 0 1-.5-.5m-1.172 2.828a.5.5 0 0 1 .708 0l.707.708a.5.5 0 0 1-.707.707l-.708-.707a.5.5 0 0 1 0-.708M8.5 12a.5.5 0 0 1 .5.5v1a.5.5 0 0 1-1 0v-1a.5.5 0 0 1 .5-.5"/>
|
<path d="M5 12.5a1.5 1.5 0 1 1-2-1.415V2.5a.5.5 0 0 1 1 0v8.585A1.5 1.5 0 0 1 5 12.5" />
|
||||||
|
<path
|
||||||
|
d="M1 2.5a2.5 2.5 0 0 1 5 0v7.55a3.5 3.5 0 1 1-5 0zM3.5 1A1.5 1.5 0 0 0 2 2.5v7.987l-.167.15a2.5 2.5 0 1 0 3.333 0L5 10.486V2.5A1.5 1.5 0 0 0 3.5 1m5 1a.5.5 0 0 1 .5.5v1a.5.5 0 0 1-1 0v-1a.5.5 0 0 1 .5-.5m4.243 1.757a.5.5 0 0 1 0 .707l-.707.708a.5.5 0 1 1-.708-.708l.708-.707a.5.5 0 0 1 .707 0M8 5.5a.5.5 0 0 1 .5-.5 3 3 0 1 1 0 6 .5.5 0 0 1 0-1 2 2 0 0 0 0-4 .5.5 0 0 1-.5-.5M12.5 8a.5.5 0 0 1 .5-.5h1a.5.5 0 1 1 0 1h-1a.5.5 0 0 1-.5-.5m-1.172 2.828a.5.5 0 0 1 .708 0l.707.708a.5.5 0 0 1-.707.707l-.708-.707a.5.5 0 0 1 0-.708M8.5 12a.5.5 0 0 1 .5.5v1a.5.5 0 0 1-1 0v-1a.5.5 0 0 1 .5-.5" />
|
||||||
</svg>
|
</svg>
|
||||||
Capteurs
|
<span data-i18n="sidebar.sensors">Capteurs</span>
|
||||||
</a>
|
</a>
|
||||||
<a class="nav-link text-white" href="database.html">
|
<a class="nav-link text-white" href="database.html">
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-database" viewBox="0 0 16 16">
|
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-database"
|
||||||
<path d="M4.318 2.687C5.234 2.271 6.536 2 8 2s2.766.27 3.682.687C12.644 3.125 13 3.627 13 4c0 .374-.356.875-1.318 1.313C10.766 5.729 9.464 6 8 6s-2.766-.27-3.682-.687C3.356 4.875 3 4.373 3 4c0-.374.356-.875 1.318-1.313M13 5.698V7c0 .374-.356.875-1.318 1.313C10.766 8.729 9.464 9 8 9s-2.766-.27-3.682-.687C3.356 7.875 3 7.373 3 7V5.698c.271.202.58.378.904.525C4.978 6.711 6.427 7 8 7s3.022-.289 4.096-.777A5 5 0 0 0 13 5.698M14 4c0-1.007-.875-1.755-1.904-2.223C11.022 1.289 9.573 1 8 1s-3.022.289-4.096.777C2.875 2.245 2 2.993 2 4v9c0 1.007.875 1.755 1.904 2.223C4.978 15.71 6.427 16 8 16s3.022-.289 4.096-.777C13.125 14.755 14 14.007 14 13zm-1 4.698V10c0 .374-.356.875-1.318 1.313C10.766 11.729 9.464 12 8 12s-2.766-.27-3.682-.687C3.356 10.875 3 10.373 3 10V8.698c.271.202.58.378.904.525C4.978 9.71 6.427 10 8 10s3.022-.289 4.096-.777A5 5 0 0 0 13 8.698m0 3V13c0 .374-.356.875-1.318 1.313C10.766 14.729 9.464 15 8 15s-2.766-.27-3.682-.687C3.356 13.875 3 13.373 3 13v-1.302c.271.202.58.378.904.525C4.978 12.71 6.427 13 8 13s3.022-.289 4.096-.777c.324-.147.633-.323.904-.525"/>
|
viewBox="0 0 16 16">
|
||||||
|
<path
|
||||||
|
d="M4.318 2.687C5.234 2.271 6.536 2 8 2s2.766.27 3.682.687C12.644 3.125 13 3.627 13 4c0 .374-.356.875-1.318 1.313C10.766 5.729 9.464 6 8 6s-2.766-.27-3.682-.687C3.356 4.875 3 4.373 3 4c0-.374.356-.875 1.318-1.313M13 5.698V7c0 .374-.356.875-1.318 1.313C10.766 8.729 9.464 9 8 9s-2.766-.27-3.682-.687C3.356 7.875 3 7.373 3 7V5.698c.271.202.58.378.904.525C4.978 6.711 6.427 7 8 7s3.022-.289 4.096-.777A5 5 0 0 0 13 5.698M14 4c0-1.007-.875-1.755-1.904-2.223C11.022 1.289 9.573 1 8 1s-3.022.289-4.096.777C2.875 2.245 2 2.993 2 4v9c0 1.007.875 1.755 1.904 2.223C4.978 15.71 6.427 16 8 16s3.022-.289 4.096-.777C13.125 14.755 14 14.007 14 13zm-1 4.698V10c0 .374-.356.875-1.318 1.313C10.766 11.729 9.464 12 8 12s-2.766-.27-3.682-.687C3.356 10.875 3 10.373 3 10V8.698c.271.202.58.378.904.525C4.978 9.71 6.427 10 8 10s3.022-.289 4.096-.777A5 5 0 0 0 13 8.698m0 3V13c0 .374-.356.875-1.318 1.313C10.766 14.729 9.464 15 8 15s-2.766-.27-3.682-.687C3.356 13.875 3 13.373 3 13v-1.302c.271.202.58.378.904.525C4.978 12.71 6.427 13 8 13s3.022-.289 4.096-.777c.324-.147.633-.323.904-.525" />
|
||||||
</svg>
|
</svg>
|
||||||
|
|
||||||
DataBase
|
<span data-i18n="sidebar.database">Base de données</span>
|
||||||
</a>
|
</a>
|
||||||
<a class="nav-link text-white" href="saraR4.html">
|
<a class="nav-link text-white" href="saraR4.html">
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-reception-4" viewBox="0 0 16 16">
|
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-reception-4"
|
||||||
<path d="M0 11.5a.5.5 0 0 1 .5-.5h2a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5zm4-3a.5.5 0 0 1 .5-.5h2a.5.5 0 0 1 .5.5v5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5zm4-3a.5.5 0 0 1 .5-.5h2a.5.5 0 0 1 .5.5v8a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5zm4-3a.5.5 0 0 1 .5-.5h2a.5.5 0 0 1 .5.5v11a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5z"/>
|
viewBox="0 0 16 16">
|
||||||
|
<path
|
||||||
|
d="M0 11.5a.5.5 0 0 1 .5-.5h2a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5zm4-3a.5.5 0 0 1 .5-.5h2a.5.5 0 0 1 .5.5v5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5zm4-3a.5.5 0 0 1 .5-.5h2a.5.5 0 0 1 .5.5v8a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5zm4-3a.5.5 0 0 1 .5-.5h2a.5.5 0 0 1 .5.5v11a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5z" />
|
||||||
</svg>
|
</svg>
|
||||||
Modem 4G
|
<span data-i18n="sidebar.modem4g">Modem 4G</span>
|
||||||
</a>
|
</a>
|
||||||
<a class="nav-link text-white" href="wifi.html">
|
<a class="nav-link text-white" href="wifi.html">
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-wifi" viewBox="0 0 16 16">
|
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-wifi"
|
||||||
<path d="M15.384 6.115a.485.485 0 0 0-.047-.736A12.44 12.44 0 0 0 8 3C5.259 3 2.723 3.882.663 5.379a.485.485 0 0 0-.048.736.52.52 0 0 0 .668.05A11.45 11.45 0 0 1 8 4c2.507 0 4.827.802 6.716 2.164.205.148.49.13.668-.049"/>
|
viewBox="0 0 16 16">
|
||||||
<path d="M13.229 8.271a.482.482 0 0 0-.063-.745A9.46 9.46 0 0 0 8 6c-1.905 0-3.68.56-5.166 1.526a.48.48 0 0 0-.063.745.525.525 0 0 0 .652.065A8.46 8.46 0 0 1 8 7a8.46 8.46 0 0 1 4.576 1.336c.206.132.48.108.653-.065m-2.183 2.183c.226-.226.185-.605-.1-.75A6.5 6.5 0 0 0 8 9c-1.06 0-2.062.254-2.946.704-.285.145-.326.524-.1.75l.015.015c.16.16.407.19.611.09A5.5 5.5 0 0 1 8 10c.868 0 1.69.201 2.42.56.203.1.45.07.61-.091zM9.06 12.44c.196-.196.198-.52-.04-.66A2 2 0 0 0 8 11.5a2 2 0 0 0-1.02.28c-.238.14-.236.464-.04.66l.706.706a.5.5 0 0 0 .707 0l.707-.707z"/>
|
<path
|
||||||
|
d="M15.384 6.115a.485.485 0 0 0-.047-.736A12.44 12.44 0 0 0 8 3C5.259 3 2.723 3.882.663 5.379a.485.485 0 0 0-.048.736.52.52 0 0 0 .668.05A11.45 11.45 0 0 1 8 4c2.507 0 4.827.802 6.716 2.164.205.148.49.13.668-.049" />
|
||||||
|
<path
|
||||||
|
d="M13.229 8.271a.482.482 0 0 0-.063-.745A9.46 9.46 0 0 0 8 6c-1.905 0-3.68.56-5.166 1.526a.48.48 0 0 0-.063.745.525.525 0 0 0 .652.065A8.46 8.46 0 0 1 8 7a8.46 8.46 0 0 1 4.576 1.336c.206.132.48.108.653-.065m-2.183 2.183c.226-.226.185-.605-.1-.75A6.5 6.5 0 0 0 8 9c-1.06 0-2.062.254-2.946.704-.285.145-.326.524-.1.75l.015.015c.16.16.407.19.611.09A5.5 5.5 0 0 1 8 10c.868 0 1.69.201 2.42.56.203.1.45.07.61-.091zM9.06 12.44c.196-.196.198-.52-.04-.66A2 2 0 0 0 8 11.5a2 2 0 0 0-1.02.28c-.238.14-.236.464-.04.66l.706.706a.5.5 0 0 0 .707 0l.707-.707z" />
|
||||||
</svg>
|
</svg>
|
||||||
WIFI
|
<span data-i18n="sidebar.wifi">WIFI</span>
|
||||||
</a>
|
</a>
|
||||||
<a class="nav-link text-white" href="logs.html">
|
<a class="nav-link text-white" href="logs.html">
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-journal-code" viewBox="0 0 16 16">
|
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-journal-code"
|
||||||
<path fill-rule="evenodd" d="M8.646 5.646a.5.5 0 0 1 .708 0l2 2a.5.5 0 0 1 0 .708l-2 2a.5.5 0 0 1-.708-.708L10.293 8 8.646 6.354a.5.5 0 0 1 0-.708m-1.292 0a.5.5 0 0 0-.708 0l-2 2a.5.5 0 0 0 0 .708l2 2a.5.5 0 0 0 .708-.708L5.707 8l1.647-1.646a.5.5 0 0 0 0-.708"/>
|
viewBox="0 0 16 16">
|
||||||
<path d="M3 0h10a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2v-1h1v1a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1H3a1 1 0 0 0-1 1v1H1V2a2 2 0 0 1 2-2"/>
|
<path fill-rule="evenodd"
|
||||||
<path d="M1 5v-.5a.5.5 0 0 1 1 0V5h.5a.5.5 0 0 1 0 1h-2a.5.5 0 0 1 0-1zm0 3v-.5a.5.5 0 0 1 1 0V8h.5a.5.5 0 0 1 0 1h-2a.5.5 0 0 1 0-1zm0 3v-.5a.5.5 0 0 1 1 0v.5h.5a.5.5 0 0 1 0 1h-2a.5.5 0 0 1 0-1z"/>
|
d="M8.646 5.646a.5.5 0 0 1 .708 0l2 2a.5.5 0 0 1 0 .708l-2 2a.5.5 0 0 1-.708-.708L10.293 8 8.646 6.354a.5.5 0 0 1 0-.708m-1.292 0a.5.5 0 0 0-.708 0l-2 2a.5.5 0 0 0 0 .708l2 2a.5.5 0 0 0 .708-.708L5.707 8l1.647-1.646a.5.5 0 0 0 0-.708" />
|
||||||
|
<path
|
||||||
|
d="M3 0h10a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2v-1h1v1a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1H3a1 1 0 0 0-1 1v1H1V2a2 2 0 0 1 2-2" />
|
||||||
|
<path
|
||||||
|
d="M1 5v-.5a.5.5 0 0 1 1 0V5h.5a.5.5 0 0 1 0 1h-2a.5.5 0 0 1 0-1zm0 3v-.5a.5.5 0 0 1 1 0V8h.5a.5.5 0 0 1 0 1h-2a.5.5 0 0 1 0-1zm0 3v-.5a.5.5 0 0 1 1 0v.5h.5a.5.5 0 0 1 0 1h-2a.5.5 0 0 1 0-1z" />
|
||||||
</svg>
|
</svg>
|
||||||
Logs
|
<span data-i18n="sidebar.logs">Logs</span>
|
||||||
</a>
|
</a>
|
||||||
|
<!-- Hidden: Not ready yet
|
||||||
<a class="nav-link text-white" href="map.html">
|
<a class="nav-link text-white" href="map.html">
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-geo-alt-fill" viewBox="0 0 16 16">
|
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-geo-alt-fill" viewBox="0 0 16 16">
|
||||||
<path d="M8 16s6-5.686 6-10A6 6 0 0 0 2 6c0 4.314 6 10 6 10m0-7a3 3 0 1 1 0-6 3 3 0 0 1 0 6"/>
|
<path d="M8 16s6-5.686 6-10A6 6 0 0 0 2 6c0 4.314 6 10 6 10m0-7a3 3 0 1 1 0-6 3 3 0 0 1 0 6"/>
|
||||||
</svg>
|
</svg>
|
||||||
Carte
|
<span data-i18n="sidebar.map">Carte</span>
|
||||||
</a>
|
</a>
|
||||||
<a class="nav-link text-white" href="admin.html">
|
<a class="nav-link text-white" href="terminal.html">
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-tools" viewBox="0 0 16 16">
|
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-terminal-fill" viewBox="0 0 16 16">
|
||||||
<path d="M1 0 0 1l2.2 3.081a1 1 0 0 0 .815.419h.07a1 1 0 0 1 .708.293l2.675 2.675-2.617 2.654A3.003 3.003 0 0 0 0 13a3 3 0 1 0 5.878-.851l2.654-2.617.968.968-.305.914a1 1 0 0 0 .242 1.023l3.27 3.27a.997.997 0 0 0 1.414 0l1.586-1.586a.997.997 0 0 0 0-1.414l-3.27-3.27a1 1 0 0 0-1.023-.242L10.5 9.5l-.96-.96 2.68-2.643A3.005 3.005 0 0 0 16 3q0-.405-.102-.777l-2.14 2.141L12 4l-.364-1.757L13.777.102a3 3 0 0 0-3.675 3.68L7.462 6.46 4.793 3.793a1 1 0 0 1-.293-.707v-.071a1 1 0 0 0-.419-.814zm9.646 10.646a.5.5 0 0 1 .708 0l2.914 2.915a.5.5 0 0 1-.707.707l-2.915-2.914a.5.5 0 0 1 0-.708M3 11l.471.242.529.026.287.445.445.287.026.529L5 13l-.242.471-.026.529-.445.287-.287.445-.529.026L3 15l-.471-.242L2 14.732l-.287-.445L1.268 14l-.026-.529L1 13l.242-.471.026-.529.445-.287.287-.445.529-.026z"/>
|
<path d="M0 3a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V3zm9.5 5.5h-3a.5.5 0 0 0 0 1h3a.5.5 0 0 0 0-1zm-6.354-.354a.5.5 0 1 0 .708.708l2-2a.5.5 0 0 0 0-.708l-2-2a.5.5 0 1 0-.708.708L4.793 6.5 3.146 8.146z"/>
|
||||||
</svg>
|
</svg>
|
||||||
Admin
|
<span data-i18n="sidebar.terminal">Terminal</span>
|
||||||
</a>
|
</a>
|
||||||
|
-->
|
||||||
|
<a class="nav-link text-white" href="admin.html">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-tools"
|
||||||
|
viewBox="0 0 16 16">
|
||||||
|
<path
|
||||||
|
d="M1 0 0 1l2.2 3.081a1 1 0 0 0 .815.419h.07a1 1 0 0 1 .708.293l2.675 2.675-2.617 2.654A3.003 3.003 0 0 0 0 13a3 3 0 1 0 5.878-.851l2.654-2.617.968.968-.305.914a1 1 0 0 0 .242 1.023l3.27 3.27a.997.997 0 0 0 1.414 0l1.586-1.586a.997.997 0 0 0 0-1.414l-3.27-3.27a1 1 0 0 0-1.023-.242L10.5 9.5l-.96-.96 2.68-2.643A3.005 3.005 0 0 0 16 3q0-.405-.102-.777l-2.14 2.141L12 4l-.364-1.757L13.777.102a3 3 0 0 0-3.675 3.68L7.462 6.46 4.793 3.793a1 1 0 0 1-.293-.707v-.071a1 1 0 0 0-.419-.814zm9.646 10.646a.5.5 0 0 1 .708 0l2.914 2.915a.5.5 0 0 1-.707.707l-2.915-2.914a.5.5 0 0 1 0-.708M3 11l.471.242.529.026.287.445.445.287.026.529L5 13l-.242.471-.026.529-.445.287-.287.445-.529.026L3 15l-.471-.242L2 14.732l-.287-.445L1.268 14l-.026-.529L1 13l.242-.471.026-.529.445-.287.287-.445.529-.026z" />
|
||||||
|
</svg>
|
||||||
|
<span data-i18n="sidebar.admin">Admin</span>
|
||||||
|
</a>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- New content at the bottom -->
|
<!-- New content at the bottom -->
|
||||||
<div class="sidebar-footer text-center text-white">
|
<div class="sidebar-footer text-center text-white">
|
||||||
<hr>
|
<hr>
|
||||||
<span class="sideBar_sensorName"> NebuleAir</span>
|
<span class="sideBar_sensorName">NebuleAir</span>
|
||||||
|
<div class="sidebar-hotspot-badge mt-2" style="display:none;">
|
||||||
|
<a href="wifi.html" class="text-decoration-none">
|
||||||
|
<span class="badge text-bg-warning w-100 py-2" style="font-size: 0.75rem;">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" fill="currentColor" class="bi bi-broadcast me-1" viewBox="0 0 16 16">
|
||||||
|
<path d="M3.05 3.05a7 7 0 0 0 0 9.9.5.5 0 0 1-.707.707 8 8 0 0 1 0-11.314.5.5 0 0 1 .707.707m2.122 2.122a4 4 0 0 0 0 5.656.5.5 0 1 1-.708.708 5 5 0 0 1 0-7.072.5.5 0 0 1 .708.708m5.656-.708a.5.5 0 0 1 .708 0 5 5 0 0 1 0 7.072.5.5 0 1 1-.708-.708 4 4 0 0 0 0-5.656.5.5 0 0 1 0-.708m2.122-2.12a.5.5 0 0 1 .707 0 8 8 0 0 1 0 11.313.5.5 0 0 1-.707-.707 7 7 0 0 0 0-9.9.5.5 0 0 1 0-.707zM10 8a2 2 0 1 1-4 0 2 2 0 0 1 4 0"/>
|
||||||
|
</svg>
|
||||||
|
Mode Hotspot
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
</nav>
|
</nav>
|
||||||
414
html/terminal.html
Normal file
414
html/terminal.html
Normal file
@@ -0,0 +1,414 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<title>NebuleAir - Terminal</title>
|
||||||
|
<link rel="stylesheet" href="assets/css/bootstrap.min.css">
|
||||||
|
<style>
|
||||||
|
body {
|
||||||
|
overflow-x: hidden;
|
||||||
|
}
|
||||||
|
#sidebar a.nav-link {
|
||||||
|
position: relative;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
#sidebar a.nav-link:hover {
|
||||||
|
background-color: rgba(0, 0, 0, 0.5);
|
||||||
|
}
|
||||||
|
#sidebar a.nav-link svg {
|
||||||
|
margin-right: 8px; /* Add spacing between icons and text */
|
||||||
|
}
|
||||||
|
#sidebar {
|
||||||
|
transition: transform 0.3s ease-in-out;
|
||||||
|
}
|
||||||
|
.offcanvas-backdrop {
|
||||||
|
z-index: 1040;
|
||||||
|
}
|
||||||
|
#terminal {
|
||||||
|
width: 100%;
|
||||||
|
min-height: 400px;
|
||||||
|
max-height: 400px;
|
||||||
|
overflow-y: auto;
|
||||||
|
background-color: #000;
|
||||||
|
color: #00ff00;
|
||||||
|
font-family: monospace;
|
||||||
|
padding: 10px;
|
||||||
|
border-radius: 5px;
|
||||||
|
white-space: pre-wrap;
|
||||||
|
word-wrap: break-word;
|
||||||
|
}
|
||||||
|
#cmdLine {
|
||||||
|
width: 100%;
|
||||||
|
background-color: #000;
|
||||||
|
color: #00ff00;
|
||||||
|
font-family: monospace;
|
||||||
|
padding: 10px;
|
||||||
|
border: none;
|
||||||
|
border-radius: 0 0 5px 5px;
|
||||||
|
margin-top: -1px;
|
||||||
|
}
|
||||||
|
#cmdLine:focus {
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
.command-container {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
.password-popup {
|
||||||
|
display: none;
|
||||||
|
position: fixed;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
background-color: rgba(0, 0, 0, 0.5);
|
||||||
|
z-index: 2000;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
.password-container {
|
||||||
|
background-color: white;
|
||||||
|
padding: 20px;
|
||||||
|
border-radius: 5px;
|
||||||
|
box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
|
||||||
|
width: 300px;
|
||||||
|
}
|
||||||
|
.limited-commands {
|
||||||
|
background-color: #f8f9fa;
|
||||||
|
padding: 15px;
|
||||||
|
border-radius: 5px;
|
||||||
|
margin-bottom: 15px;
|
||||||
|
}
|
||||||
|
.limited-commands code {
|
||||||
|
white-space: nowrap;
|
||||||
|
margin-right: 10px;
|
||||||
|
margin-bottom: 5px;
|
||||||
|
display: inline-block;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<!-- Topbar -->
|
||||||
|
<span id="topbar"></span>
|
||||||
|
|
||||||
|
<!-- Sidebar Offcanvas for Mobile -->
|
||||||
|
<div class="offcanvas offcanvas-start text-white bg-dark" tabindex="-1" id="sidebarOffcanvas" aria-labelledby="sidebarOffcanvasLabel">
|
||||||
|
<div class="offcanvas-header">
|
||||||
|
<h5 class="offcanvas-title" id="sidebarOffcanvasLabel">NebuleAir</h5>
|
||||||
|
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="offcanvas" aria-label="Close"></button>
|
||||||
|
</div>
|
||||||
|
<div class="offcanvas-body" id="sidebar_mobile">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="container-fluid mt-5">
|
||||||
|
<div class="row">
|
||||||
|
<!-- Side bar -->
|
||||||
|
<aside class="col-md-2 col-lg-1 d-none d-md-block vh-100 position-fixed bg-dark text-white" id="sidebar">
|
||||||
|
</aside>
|
||||||
|
<!-- Main content -->
|
||||||
|
<main class="col-md-10 ms-sm-auto col-lg-11 offset-md-2 offset-lg-1 px-md-4">
|
||||||
|
<h1 class="mt-4">Terminal Console</h1>
|
||||||
|
|
||||||
|
<div class="row mb-3">
|
||||||
|
<div class="col-12">
|
||||||
|
<div class="alert alert-warning">
|
||||||
|
<strong>Warning:</strong> This terminal provides direct access to system commands.
|
||||||
|
Use with caution as improper commands may affect system functionality.
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="limited-commands">
|
||||||
|
<h5>Quick Commands:</h5>
|
||||||
|
<div>
|
||||||
|
<code onclick="insertCommand('ls -la')">ls -la</code>
|
||||||
|
<code onclick="insertCommand('df -h')">df -h</code>
|
||||||
|
<code onclick="insertCommand('free -h')">free -h</code>
|
||||||
|
<code onclick="insertCommand('uptime')">uptime</code>
|
||||||
|
<code onclick="insertCommand('systemctl status master_nebuleair.service')">service status</code>
|
||||||
|
<code onclick="insertCommand('cat /var/www/nebuleair_pro_4g/config.json')">view config</code>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="card">
|
||||||
|
<div class="card-header d-flex justify-content-between align-items-center">
|
||||||
|
<h5 class="mb-0">Command Console</h5>
|
||||||
|
<div>
|
||||||
|
<button id="accessBtn" class="btn btn-primary me-2">Access Terminal</button>
|
||||||
|
<button id="clearBtn" class="btn btn-secondary" disabled>Clear</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="card-body p-0">
|
||||||
|
<div class="command-container" id="commandContainer">
|
||||||
|
<div id="terminal">Welcome to NebuleAir Terminal Console
|
||||||
|
Type your commands below. Type 'help' for a list of commands.
|
||||||
|
</div>
|
||||||
|
<input type="text" id="cmdLine" placeholder="Enter command..." disabled>
|
||||||
|
</div>
|
||||||
|
<div id="errorMsg" class="alert alert-danger m-3" style="display:none;"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Password Modal -->
|
||||||
|
<div class="password-popup" id="passwordModal">
|
||||||
|
<div class="password-container">
|
||||||
|
<h5>Authentication Required</h5>
|
||||||
|
<p>Please enter the admin password to access the terminal:</p>
|
||||||
|
<div class="mb-3">
|
||||||
|
<input type="password" class="form-control" id="adminPassword" placeholder="Password">
|
||||||
|
</div>
|
||||||
|
<div class="mb-3 d-flex justify-content-between">
|
||||||
|
<button class="btn btn-secondary" id="cancelPasswordBtn">Cancel</button>
|
||||||
|
<button class="btn btn-primary" id="submitPasswordBtn">Submit</button>
|
||||||
|
</div>
|
||||||
|
<div id="passwordError" class="text-danger mt-2" style="display:none;"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- JAVASCRIPT -->
|
||||||
|
<!-- Link Ajax locally -->
|
||||||
|
<script src="assets/jquery/jquery-3.7.1.min.js"></script>
|
||||||
|
<!-- Link Bootstrap JS and Popper.js locally -->
|
||||||
|
<script src="assets/js/bootstrap.bundle.js"></script>
|
||||||
|
<script src="assets/js/topbar-logo.js"></script>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
document.addEventListener('DOMContentLoaded', function () {
|
||||||
|
const elementsToLoad = [
|
||||||
|
{ id: 'topbar', file: 'topbar.html' },
|
||||||
|
{ id: 'sidebar', file: 'sidebar.html' },
|
||||||
|
{ id: 'sidebar_mobile', file: 'sidebar.html' }
|
||||||
|
];
|
||||||
|
|
||||||
|
elementsToLoad.forEach(({ id, file }) => {
|
||||||
|
fetch(file)
|
||||||
|
.then(response => response.text())
|
||||||
|
.then(data => {
|
||||||
|
const element = document.getElementById(id);
|
||||||
|
if (element) {
|
||||||
|
element.innerHTML = data;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(error => console.error(`Error loading ${file}:`, error));
|
||||||
|
});
|
||||||
|
|
||||||
|
// Initialize elements
|
||||||
|
initializeElements();
|
||||||
|
});
|
||||||
|
|
||||||
|
window.onload = function() {
|
||||||
|
|
||||||
|
//NEW way to get config (SQLite)
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=get_config_sqlite',
|
||||||
|
dataType:'json',
|
||||||
|
//dataType: 'json', // Specify that you expect a JSON response
|
||||||
|
method: 'GET', // Use GET or POST depending on your needs
|
||||||
|
success: function(response) {
|
||||||
|
console.log("Getting SQLite config table:");
|
||||||
|
console.log(response);
|
||||||
|
|
||||||
|
|
||||||
|
//device name_side bar
|
||||||
|
const elements = document.querySelectorAll('.sideBar_sensorName');
|
||||||
|
elements.forEach((element) => {
|
||||||
|
element.innerText = response.deviceName;
|
||||||
|
});
|
||||||
|
|
||||||
|
},
|
||||||
|
error: function(xhr, status, error) {
|
||||||
|
console.error('AJAX request failed:', status, error);
|
||||||
|
}
|
||||||
|
});//end AJAX
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add admin password (should be changed to something more secure)
|
||||||
|
const ADMIN_PASSWORD = "123plouf";
|
||||||
|
|
||||||
|
// Global variables
|
||||||
|
let terminal;
|
||||||
|
let cmdLine;
|
||||||
|
let commandContainer;
|
||||||
|
let accessBtn;
|
||||||
|
let clearBtn;
|
||||||
|
let passwordModal;
|
||||||
|
let adminPassword;
|
||||||
|
let submitPasswordBtn;
|
||||||
|
let cancelPasswordBtn;
|
||||||
|
let passwordError;
|
||||||
|
let errorMsg;
|
||||||
|
let commandHistory = [];
|
||||||
|
let historyIndex = -1;
|
||||||
|
|
||||||
|
// Initialize DOM references after document is loaded
|
||||||
|
function initializeElements() {
|
||||||
|
terminal = document.getElementById('terminal');
|
||||||
|
cmdLine = document.getElementById('cmdLine');
|
||||||
|
commandContainer = document.getElementById('commandContainer');
|
||||||
|
accessBtn = document.getElementById('accessBtn');
|
||||||
|
clearBtn = document.getElementById('clearBtn');
|
||||||
|
passwordModal = document.getElementById('passwordModal');
|
||||||
|
adminPassword = document.getElementById('adminPassword');
|
||||||
|
submitPasswordBtn = document.getElementById('submitPasswordBtn');
|
||||||
|
cancelPasswordBtn = document.getElementById('cancelPasswordBtn');
|
||||||
|
passwordError = document.getElementById('passwordError');
|
||||||
|
errorMsg = document.getElementById('errorMsg');
|
||||||
|
|
||||||
|
// Set up event listeners
|
||||||
|
accessBtn.addEventListener('click', function() {
|
||||||
|
passwordModal.style.display = 'flex';
|
||||||
|
adminPassword.value = ''; // Clear password field
|
||||||
|
passwordError.style.display = 'none';
|
||||||
|
adminPassword.focus();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Password submit button
|
||||||
|
submitPasswordBtn.addEventListener('click', function() {
|
||||||
|
if (adminPassword.value === ADMIN_PASSWORD) {
|
||||||
|
passwordModal.style.display = 'none';
|
||||||
|
enableTerminal();
|
||||||
|
} else {
|
||||||
|
passwordError.textContent = 'Invalid password';
|
||||||
|
passwordError.style.display = 'block';
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Enter key for password
|
||||||
|
adminPassword.addEventListener('keypress', function(e) {
|
||||||
|
if (e.key === 'Enter') {
|
||||||
|
submitPasswordBtn.click();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Cancel password button
|
||||||
|
cancelPasswordBtn.addEventListener('click', function() {
|
||||||
|
passwordModal.style.display = 'none';
|
||||||
|
});
|
||||||
|
|
||||||
|
// Clear button
|
||||||
|
clearBtn.addEventListener('click', function() {
|
||||||
|
terminal.innerHTML = 'Terminal cleared.\n';
|
||||||
|
});
|
||||||
|
|
||||||
|
// Command line input events
|
||||||
|
cmdLine.addEventListener('keypress', function(e) {
|
||||||
|
if (e.key === 'Enter') {
|
||||||
|
const command = cmdLine.value.trim();
|
||||||
|
if (command) {
|
||||||
|
executeCommand(command);
|
||||||
|
commandHistory.push(command);
|
||||||
|
historyIndex = commandHistory.length;
|
||||||
|
cmdLine.value = '';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Command history navigation with arrow keys
|
||||||
|
cmdLine.addEventListener('keydown', function(e) {
|
||||||
|
if (e.key === 'ArrowUp') {
|
||||||
|
if (historyIndex > 0) {
|
||||||
|
historyIndex--;
|
||||||
|
cmdLine.value = commandHistory[historyIndex];
|
||||||
|
}
|
||||||
|
e.preventDefault();
|
||||||
|
} else if (e.key === 'ArrowDown') {
|
||||||
|
if (historyIndex < commandHistory.length - 1) {
|
||||||
|
historyIndex++;
|
||||||
|
cmdLine.value = commandHistory[historyIndex];
|
||||||
|
} else {
|
||||||
|
historyIndex = commandHistory.length;
|
||||||
|
cmdLine.value = '';
|
||||||
|
}
|
||||||
|
e.preventDefault();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Enable terminal access
|
||||||
|
function enableTerminal() {
|
||||||
|
commandContainer.style.display = 'block';
|
||||||
|
cmdLine.disabled = false;
|
||||||
|
clearBtn.disabled = false;
|
||||||
|
accessBtn.textContent = 'Authenticated';
|
||||||
|
accessBtn.classList.remove('btn-primary');
|
||||||
|
accessBtn.classList.add('btn-success');
|
||||||
|
accessBtn.disabled = true;
|
||||||
|
cmdLine.focus();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Insert a predefined command
|
||||||
|
function insertCommand(cmd) {
|
||||||
|
// Only allow insertion if terminal is enabled
|
||||||
|
if (cmdLine.disabled === false) {
|
||||||
|
cmdLine.value = cmd;
|
||||||
|
cmdLine.focus();
|
||||||
|
} else {
|
||||||
|
// Alert user that they need to authenticate first
|
||||||
|
alert('Please access the terminal first by clicking "Access Terminal" and entering the password.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Execute a command
|
||||||
|
function executeCommand(command) {
|
||||||
|
// Add command to terminal with user prefix
|
||||||
|
terminal.innerHTML += `<span style="color: cyan;">user@nebuleair</span>:<span style="color: yellow;">~</span>$ ${command}\n`;
|
||||||
|
terminal.scrollTop = terminal.scrollHeight;
|
||||||
|
|
||||||
|
// Handle special commands
|
||||||
|
if (command === 'clear') {
|
||||||
|
terminal.innerHTML = 'Terminal cleared.\n';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Filter dangerous commands
|
||||||
|
const dangerousCommands = [
|
||||||
|
'rm -rf /', 'rm -rf /*', 'rm -rf ~', 'rm -rf ~/*',
|
||||||
|
'mkfs', 'dd if=/dev/zero', 'dd if=/dev/random',
|
||||||
|
'>>', '>', '|', ';', '&&', '||',
|
||||||
|
'wget', 'curl', 'ssh', 'scp', 'nc',
|
||||||
|
'chmod -R', 'chown -R'
|
||||||
|
];
|
||||||
|
|
||||||
|
// Check for dangerous commands or command chaining
|
||||||
|
const hasDangerousCommand = dangerousCommands.some(cmd => command.includes(cmd));
|
||||||
|
if (hasDangerousCommand || command.includes('&') || command.includes(';') || command.includes('|')) {
|
||||||
|
terminal.innerHTML += '<span style="color: red;">Error: This command is not allowed for security reasons.</span>\n';
|
||||||
|
terminal.scrollTop = terminal.scrollHeight;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Execute the command via AJAX
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=execute_command',
|
||||||
|
method: 'POST',
|
||||||
|
dataType:'json',
|
||||||
|
data: {
|
||||||
|
type: 'execute_command',
|
||||||
|
command: command
|
||||||
|
},
|
||||||
|
success: function(response) {
|
||||||
|
console.log(response);
|
||||||
|
|
||||||
|
if (response.success) {
|
||||||
|
// Add command output to terminal
|
||||||
|
terminal.innerHTML += `<span style="color: #00ff00;">${response.output}</span>\n`;
|
||||||
|
} else {
|
||||||
|
terminal.innerHTML += `<span style="color: red;">Error: ${response.message}</span>\n`;
|
||||||
|
}
|
||||||
|
terminal.scrollTop = terminal.scrollHeight;
|
||||||
|
},
|
||||||
|
error: function(xhr, status, error) {
|
||||||
|
terminal.innerHTML += `<span style="color: red;">Error executing command: ${error}</span>\n`;
|
||||||
|
terminal.scrollTop = terminal.scrollHeight;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
<nav class="navbar navbar-dark fixed-top" style="background-color: #8d8d8f;" id="topbar">
|
<nav class="navbar navbar-dark fixed-top" style="background-color: #8d8d8f;" id="topbar">
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<a class="navbar-brand" href="#">
|
<a class="navbar-brand" href="#">
|
||||||
<img src="assets/img/LogoNebuleAir.png" alt="Logo" height="30" class="d-inline-block align-text-top">
|
<img src="assets/img/LogoNebuleAir.png" alt="Logo" height="30" class="d-inline-block align-text-top" id="topbar-logo">
|
||||||
</a>
|
</a>
|
||||||
<div class="d-flex">
|
<div class="d-flex">
|
||||||
<button class="btn btn-outline-light d-md-none me-2" type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebarOffcanvas" aria-controls="sidebarOffcanvas" aria-label="Toggle Sidebar">☰</button>
|
<button class="btn btn-outline-light d-md-none me-2" type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebarOffcanvas" aria-controls="sidebarOffcanvas" aria-label="Toggle Sidebar">☰</button>
|
||||||
@@ -12,6 +12,12 @@
|
|||||||
<span id="pageTitle_plus_ID" class="position-absolute top-50 start-50 translate-middle">Texte au milieu</span>
|
<span id="pageTitle_plus_ID" class="position-absolute top-50 start-50 translate-middle">Texte au milieu</span>
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
<!-- Language Switcher -->
|
||||||
|
<select class="form-select form-select-sm me-2" id="languageSwitcher" style="width: auto; background-color: #6c757d; color: white; border-color: white;" onchange="i18n.setLanguage(this.value)">
|
||||||
|
<option value="fr" style="background-color: #6c757d; color: white;">🇫🇷 FR</option>
|
||||||
|
<option value="en" style="background-color: #6c757d; color: white;">🇬🇧 EN</option>
|
||||||
|
</select>
|
||||||
|
|
||||||
<button type="button" class="btn btn-outline-light" id="RTC_time">loading...</button>
|
<button type="button" class="btn btn-outline-light" id="RTC_time">loading...</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
375
html/wifi.html
375
html/wifi.html
@@ -54,39 +54,97 @@
|
|||||||
|
|
||||||
<h3>Status
|
<h3>Status
|
||||||
<span id="wifi-status" class="badge">Loading...</span>
|
<span id="wifi-status" class="badge">Loading...</span>
|
||||||
|
<button id="btn-forget-wifi" class="btn btn-outline-danger btn-sm ms-2" style="display:none;" onclick="wifi_forget()">Oublier le réseau</button>
|
||||||
</h3>
|
</h3>
|
||||||
|
|
||||||
<div class="row mb-3">
|
<div class="row mb-3">
|
||||||
|
|
||||||
<div class="col-sm-4">
|
<!-- Connection Info Card (shown when connected to WiFi) -->
|
||||||
<div class="card text-dark bg-light">
|
<div class="col-sm-6" id="card-connection-info" style="display:none;">
|
||||||
|
<div class="card border-success">
|
||||||
|
<div class="card-header bg-success text-white">
|
||||||
|
<h5 class="card-title mb-0">Connexion WiFi</h5>
|
||||||
|
</div>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<h5 class="card-title">WIFI / Ethernet</h5>
|
<div id="connection-info-loading" class="text-center py-3">
|
||||||
<p class="card-text">General information.</p>
|
<div class="spinner-border spinner-border-sm text-primary" role="status"></div>
|
||||||
<button class="btn btn-primary" onclick="get_internet()">Get Data</button>
|
<span class="ms-2">Chargement...</span>
|
||||||
<table class="table table-striped-columns">
|
</div>
|
||||||
<tbody id="data-table-body_internet_general"></tbody>
|
<table class="table table-sm mb-0" id="connection-info-table" style="display:none;">
|
||||||
|
<tbody>
|
||||||
|
<tr><td class="text-muted" style="width:40%">SSID</td><td><strong id="info-ssid">-</strong></td></tr>
|
||||||
|
<tr><td class="text-muted">Signal</td><td><span id="info-signal">-</span></td></tr>
|
||||||
|
<tr><td class="text-muted">Adresse IP</td><td><code id="info-ip">-</code></td></tr>
|
||||||
|
<tr><td class="text-muted">Passerelle</td><td><code id="info-gateway">-</code></td></tr>
|
||||||
|
<tr><td class="text-muted">Hostname</td><td><code id="info-hostname">-</code></td></tr>
|
||||||
|
<tr><td class="text-muted">Frequence</td><td id="info-freq">-</td></tr>
|
||||||
|
<tr><td class="text-muted">Securite</td><td id="info-security">-</td></tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<button class="btn btn-outline-primary btn-sm mt-2" onclick="get_internet()">Rafraichir</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Ethernet Card -->
|
||||||
|
<div class="col-sm-6" id="card-ethernet">
|
||||||
|
<div class="card">
|
||||||
|
<div class="card-header">
|
||||||
|
<h5 class="card-title mb-0">Ethernet</h5>
|
||||||
|
</div>
|
||||||
|
<div class="card-body">
|
||||||
|
<table class="table table-sm mb-0">
|
||||||
|
<tbody>
|
||||||
|
<tr><td class="text-muted" style="width:40%">Etat</td><td id="info-eth-status">-</td></tr>
|
||||||
|
<tr><td class="text-muted">Adresse IP</td><td><code id="info-eth-ip">-</code></td></tr>
|
||||||
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-sm-8">
|
<!-- Hotspot Info Card (shown when in hotspot mode) -->
|
||||||
<div class="card text-dark bg-light">
|
<div class="col-sm-6" id="card-hotspot-info" style="display:none;">
|
||||||
|
<div class="card border-warning">
|
||||||
|
<div class="card-header bg-warning">
|
||||||
|
<h5 class="card-title mb-0">Mode Hotspot</h5>
|
||||||
|
</div>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<h5 class="card-title">Wifi Scan</h5>
|
<p class="mb-1">Le capteur n'est connecte a aucun reseau WiFi.</p>
|
||||||
<p class="card-text">Scan des réseaux WIFI disponibles.</p>
|
<p class="text-muted mb-0">Utilisez le scan ci-dessous pour vous connecter a un reseau.</p>
|
||||||
<button class="btn btn-primary" onclick="wifi_scan()">Scan</button>
|
</div>
|
||||||
<table class="table">
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- WiFi Scan Card (hidden when connected) -->
|
||||||
|
<div class="row mb-3" id="card-wifi-scan" style="display:none;">
|
||||||
|
<div class="col-12">
|
||||||
|
<div class="card">
|
||||||
|
<div class="card-header d-flex justify-content-between align-items-center">
|
||||||
|
<h5 class="card-title mb-0">Reseaux WiFi disponibles</h5>
|
||||||
|
<button class="btn btn-primary btn-sm" onclick="wifi_scan()">Scan</button>
|
||||||
|
</div>
|
||||||
|
<div class="card-body">
|
||||||
|
<div id="wifi-scan-cache-notice" class="alert alert-info py-2 mb-2" style="display:none; font-size: 0.85rem;">
|
||||||
|
Scan effectue au demarrage du capteur (scan live indisponible en mode hotspot).
|
||||||
|
</div>
|
||||||
|
<div id="wifi-scan-empty" class="text-center text-muted py-3">
|
||||||
|
Cliquez sur "Scan" pour rechercher les reseaux WiFi.
|
||||||
|
</div>
|
||||||
|
<table class="table table-hover mb-0" id="wifi-scan-table" style="display:none;">
|
||||||
|
<thead>
|
||||||
|
<tr><th>SSID</th><th>Signal</th><th>Securite</th><th></th></tr>
|
||||||
|
</thead>
|
||||||
<tbody id="data-table-body_wifi_scan"></tbody>
|
<tbody id="data-table-body_wifi_scan"></tbody>
|
||||||
</table>
|
</table>
|
||||||
</table>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Modal WIFI PASSWORD -->
|
<!-- Modal WIFI PASSWORD -->
|
||||||
<!-- filled with JS -->
|
|
||||||
<div class="modal fade" id="myModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
|
<div class="modal fade" id="myModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
|
||||||
<div class="modal-dialog">
|
<div class="modal-dialog">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
@@ -117,6 +175,9 @@
|
|||||||
<script src="assets/jquery/jquery-3.7.1.min.js"></script>
|
<script src="assets/jquery/jquery-3.7.1.min.js"></script>
|
||||||
<!-- Link Bootstrap JS and Popper.js locally -->
|
<!-- Link Bootstrap JS and Popper.js locally -->
|
||||||
<script src="assets/js/bootstrap.bundle.js"></script>
|
<script src="assets/js/bootstrap.bundle.js"></script>
|
||||||
|
<!-- i18n translation system -->
|
||||||
|
<script src="assets/js/i18n.js"></script>
|
||||||
|
<script src="assets/js/topbar-logo.js"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
document.addEventListener('DOMContentLoaded', function () {
|
document.addEventListener('DOMContentLoaded', function () {
|
||||||
@@ -139,192 +200,280 @@
|
|||||||
})
|
})
|
||||||
.catch(error => console.error(`Error loading ${file}:`, error));
|
.catch(error => console.error(`Error loading ${file}:`, error));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function getSignalBadge(signal) {
|
||||||
|
const val = parseInt(signal, 10);
|
||||||
|
if (isNaN(val)) return '';
|
||||||
|
let color, label;
|
||||||
|
if (val >= 70) { color = 'success'; label = 'Excellent'; }
|
||||||
|
else if (val >= 50) { color = 'primary'; label = 'Bon'; }
|
||||||
|
else if (val >= 30) { color = 'warning'; label = 'Faible'; }
|
||||||
|
else { color = 'danger'; label = 'Tres faible'; }
|
||||||
|
return `<span class="badge text-bg-${color}">${val}% — ${label}</span>`;
|
||||||
|
}
|
||||||
|
|
||||||
function get_internet(){
|
function get_internet(){
|
||||||
console.log("Getting internet general infos");
|
console.log("Getting internet general infos");
|
||||||
|
document.getElementById('connection-info-loading').style.display = '';
|
||||||
|
document.getElementById('connection-info-table').style.display = 'none';
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: 'launcher.php?type=internet',
|
url: 'launcher.php?type=internet',
|
||||||
dataType: 'json', // Specify that you expect a JSON response
|
dataType: 'json',
|
||||||
method: 'GET', // Use GET or POST depending on your needs
|
method: 'GET',
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
console.log(response);
|
console.log(response);
|
||||||
let tableBody = document.getElementById('data-table-body_internet_general');
|
const wifi = response.wifi;
|
||||||
tableBody.innerHTML = ''; // Clear existing table content
|
const eth = response.ethernet;
|
||||||
|
|
||||||
// Iterate through the data and create rows
|
document.getElementById('info-ssid').textContent = wifi.ssid || '-';
|
||||||
for (let key in response) {
|
document.getElementById('info-signal').innerHTML = wifi.signal ? getSignalBadge(wifi.signal) : '-';
|
||||||
let row = `
|
document.getElementById('info-ip').textContent = wifi.IP || '-';
|
||||||
<tr>
|
document.getElementById('info-gateway').textContent = wifi.gateway || '-';
|
||||||
<td>${key}</td>
|
document.getElementById('info-hostname').textContent = wifi.hostname || '-';
|
||||||
<td>${response[key].connection}</td>
|
document.getElementById('info-freq').textContent = wifi.frequency ? wifi.frequency + ' MHz' : '-';
|
||||||
<td>${response[key].IP ? response[key].IP : "No IP"}</td>
|
document.getElementById('info-security').textContent = wifi.security || '-';
|
||||||
</tr>
|
|
||||||
`;
|
document.getElementById('info-eth-status').textContent = eth.connection || '-';
|
||||||
tableBody.innerHTML += row; // Append row to table body
|
document.getElementById('info-eth-ip').textContent = eth.IP || '-';
|
||||||
}
|
|
||||||
|
document.getElementById('connection-info-loading').style.display = 'none';
|
||||||
|
document.getElementById('connection-info-table').style.display = '';
|
||||||
},
|
},
|
||||||
error: function(xhr, status, error) {
|
error: function(xhr, status, error) {
|
||||||
console.error('AJAX request failed:', status, error);
|
console.error('AJAX request failed:', status, error);
|
||||||
|
document.getElementById('connection-info-loading').innerHTML = '<span class="text-danger">Erreur de chargement</span>';
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function wifi_connect(SSID, PASS){
|
||||||
function wifi_connect(SSID, PASS){
|
|
||||||
console.log("Connecting to wifi");
|
console.log("Connecting to wifi");
|
||||||
console.log(SSID);
|
|
||||||
console.log(PASS);
|
|
||||||
if (typeof PASS === 'undefined') {
|
if (typeof PASS === 'undefined') {
|
||||||
console.log("Need to add password");
|
|
||||||
//open bootstrap modal to ask for password
|
|
||||||
var myModal = new bootstrap.Modal(document.getElementById('myModal'));
|
var myModal = new bootstrap.Modal(document.getElementById('myModal'));
|
||||||
//modifiy modal title
|
|
||||||
document.getElementById('myModalLabel').innerHTML = "Enter password for "+SSID;
|
document.getElementById('myModalLabel').innerHTML = "Enter password for "+SSID;
|
||||||
//add input field to modal body
|
|
||||||
document.getElementById('myModalBody').innerHTML = "<input type='text' id='wifi_pass' class='form-control' placeholder='Password'>";
|
document.getElementById('myModalBody').innerHTML = "<input type='text' id='wifi_pass' class='form-control' placeholder='Password'>";
|
||||||
//add button to modal footer
|
|
||||||
document.getElementById('myModalFooter').innerHTML = "<button type='button' class='btn btn-secondary' data-bs-dismiss='modal'>Close</button><button type='button' class='btn btn-primary' onclick='wifi_connect(\""+SSID+"\", document.getElementById(\"wifi_pass\").value)'>Se connecter</button>";
|
document.getElementById('myModalFooter').innerHTML = "<button type='button' class='btn btn-secondary' data-bs-dismiss='modal'>Close</button><button type='button' class='btn btn-primary' onclick='wifi_connect(\""+SSID+"\", document.getElementById(\"wifi_pass\").value)'>Se connecter</button>";
|
||||||
myModal.show();
|
myModal.show();
|
||||||
} else {
|
} else {
|
||||||
console.log("Will try to connect to "+SSID+" with password "+PASS);
|
var myModal = bootstrap.Modal.getInstance(document.getElementById('myModal'));
|
||||||
console.log("Start PHP script:");
|
if (myModal) { myModal.hide(); }
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: 'launcher.php?type=wifi_connect&SSID='+SSID+'&pass='+PASS,
|
url: 'launcher.php?type=wifi_connect&SSID='+SSID+'&pass='+PASS,
|
||||||
dataType: 'text', // Specify that you expect a JSON response
|
dataType: 'json',
|
||||||
method: 'GET', // Use GET or POST depending on your needs
|
method: 'GET',
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
console.log(response);
|
console.log(response);
|
||||||
|
showConnectionStatus(response);
|
||||||
},
|
},
|
||||||
error: function(xhr, status, error) {
|
error: function(xhr, status, error) {
|
||||||
console.error('AJAX request failed:', status, error);
|
console.error('AJAX request failed:', status, error);
|
||||||
|
alert('Error: Could not start connection process');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function wifi_scan(){
|
function showConnectionStatus(response) {
|
||||||
|
const lang = localStorage.getItem('language') || 'fr';
|
||||||
|
const instructions = response.instructions[lang] || response.instructions['fr'];
|
||||||
|
|
||||||
|
const overlay = document.createElement('div');
|
||||||
|
overlay.id = 'connection-status-overlay';
|
||||||
|
overlay.style.cssText = 'position:fixed;top:0;left:0;width:100%;height:100%;background:rgba(0,0,0,0.9);z-index:9999;display:flex;align-items:center;justify-content:center;color:white;';
|
||||||
|
overlay.innerHTML = `
|
||||||
|
<div style="max-width: 600px; padding: 40px; text-align: center;">
|
||||||
|
<div class="spinner-border text-primary mb-4" role="status" style="width: 4rem; height: 4rem;"><span class="visually-hidden">Loading...</span></div>
|
||||||
|
<h2 class="mb-4">${instructions.title}</h2>
|
||||||
|
<div class="alert alert-info text-start" role="alert">
|
||||||
|
<ol class="mb-0" style="padding-left: 20px;">
|
||||||
|
<li class="mb-2"><strong>${instructions.step1}</strong></li>
|
||||||
|
<li class="mb-2">${instructions.step2}</li>
|
||||||
|
<li class="mb-2">${instructions.step3}</li>
|
||||||
|
<li class="mb-2">${instructions.step4}</li>
|
||||||
|
</ol>
|
||||||
|
</div>
|
||||||
|
<div class="alert alert-warning text-start" role="alert"><strong>Important:</strong> ${instructions.warning}</div>
|
||||||
|
<div class="mt-4">
|
||||||
|
<p class="text-muted">${lang === 'fr' ? 'Reconnexion à' : 'Reconnecting to'}: <strong class="text-white">${response.ssid}</strong></p>
|
||||||
|
<p class="text-muted">${lang === 'fr' ? 'Nom du capteur' : 'Sensor name'}: <strong class="text-white">${response.deviceName}</strong></p>
|
||||||
|
</div>
|
||||||
|
<div class="mt-4"><small class="text-muted">${lang === 'fr' ? 'Cette fenêtre va se fermer automatiquement...' : 'This window will close automatically...'}</small></div>
|
||||||
|
</div>`;
|
||||||
|
document.body.appendChild(overlay);
|
||||||
|
setTimeout(() => { const o = document.getElementById('connection-status-overlay'); if (o) o.remove(); }, 30000);
|
||||||
|
}
|
||||||
|
|
||||||
|
function wifi_forget(){
|
||||||
|
if (!confirm('Oublier le réseau WiFi actuel et passer en mode hotspot ?')) return;
|
||||||
|
$.ajax({
|
||||||
|
url: 'launcher.php?type=wifi_forget',
|
||||||
|
dataType: 'json',
|
||||||
|
method: 'GET',
|
||||||
|
success: function(response) {
|
||||||
|
console.log(response);
|
||||||
|
showForgetStatus(response);
|
||||||
|
},
|
||||||
|
error: function(xhr, status, error) {
|
||||||
|
console.error('AJAX request failed:', status, error);
|
||||||
|
alert('Error: Could not forget WiFi network');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function showForgetStatus(response) {
|
||||||
|
const lang = localStorage.getItem('language') || 'fr';
|
||||||
|
const instructions = response.instructions[lang] || response.instructions['fr'];
|
||||||
|
|
||||||
|
const overlay = document.createElement('div');
|
||||||
|
overlay.id = 'connection-status-overlay';
|
||||||
|
overlay.style.cssText = 'position:fixed;top:0;left:0;width:100%;height:100%;background:rgba(0,0,0,0.9);z-index:9999;display:flex;align-items:center;justify-content:center;color:white;';
|
||||||
|
overlay.innerHTML = `
|
||||||
|
<div style="max-width: 600px; padding: 40px; text-align: center;">
|
||||||
|
<div class="spinner-border text-warning mb-4" role="status" style="width: 4rem; height: 4rem;"><span class="visually-hidden">Loading...</span></div>
|
||||||
|
<h2 class="mb-4">${instructions.title}</h2>
|
||||||
|
<div class="alert alert-info text-start" role="alert">
|
||||||
|
<ol class="mb-0" style="padding-left: 20px;">
|
||||||
|
<li class="mb-2"><strong>${instructions.step1}</strong></li>
|
||||||
|
<li class="mb-2">${instructions.step2}</li>
|
||||||
|
<li class="mb-2">${instructions.step3}</li>
|
||||||
|
<li class="mb-2">${instructions.step4}</li>
|
||||||
|
</ol>
|
||||||
|
</div>
|
||||||
|
<div class="alert alert-warning text-start" role="alert"><strong>Important:</strong> ${instructions.warning}</div>
|
||||||
|
<div class="mt-4"><p class="text-muted">Hotspot: <strong class="text-white">${response.deviceName}</strong></p></div>
|
||||||
|
</div>`;
|
||||||
|
document.body.appendChild(overlay);
|
||||||
|
setTimeout(() => { const o = document.getElementById('connection-status-overlay'); if (o) o.remove(); }, 30000);
|
||||||
|
}
|
||||||
|
|
||||||
|
function wifi_scan(){
|
||||||
console.log("Scanning Wifi");
|
console.log("Scanning Wifi");
|
||||||
|
document.getElementById('wifi-scan-empty').innerHTML = '<div class="spinner-border spinner-border-sm text-primary" role="status"></div> Scan en cours...';
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: 'launcher.php?type=wifi_scan',
|
url: 'launcher.php?type=wifi_scan',
|
||||||
dataType: 'json', // Specify that you expect a JSON response
|
dataType: 'json',
|
||||||
method: 'GET', // Use GET or POST depending on your needs
|
method: 'GET',
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
console.log(response);
|
console.log(response);
|
||||||
const tableBody = document.getElementById("data-table-body_wifi_scan");
|
const tableBody = document.getElementById("data-table-body_wifi_scan");
|
||||||
|
|
||||||
// Clear the existing table body
|
|
||||||
tableBody.innerHTML = "";
|
tableBody.innerHTML = "";
|
||||||
|
|
||||||
// Loop through the wifiNetworks array and create rows
|
if (response.length === 0) {
|
||||||
|
document.getElementById('wifi-scan-empty').textContent = 'Aucun reseau WiFi trouve.';
|
||||||
|
document.getElementById('wifi-scan-empty').style.display = '';
|
||||||
|
document.getElementById('wifi-scan-table').style.display = 'none';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Show cached scan notice if in hotspot mode
|
||||||
|
const isCached = response.length > 0 && response[0].cached;
|
||||||
|
const cacheNotice = document.getElementById('wifi-scan-cache-notice');
|
||||||
|
if (cacheNotice) cacheNotice.style.display = isCached ? '' : 'none';
|
||||||
|
|
||||||
|
document.getElementById('wifi-scan-empty').style.display = 'none';
|
||||||
|
document.getElementById('wifi-scan-table').style.display = '';
|
||||||
|
|
||||||
response.forEach(network => {
|
response.forEach(network => {
|
||||||
const row = document.createElement("tr");
|
const row = document.createElement("tr");
|
||||||
|
|
||||||
// Create and append cells for SSID, BARS, and SIGNAL
|
|
||||||
const ssidCell = document.createElement("td");
|
const ssidCell = document.createElement("td");
|
||||||
// Truncate SSID to 25 characters
|
ssidCell.textContent = network.SSID.length > 25 ? network.SSID.substring(0, 25) + '...' : network.SSID;
|
||||||
const truncatedSSID = network.SSID.length > 20 ? network.SSID.substring(0, 20) + '...' : network.SSID;
|
|
||||||
ssidCell.textContent = truncatedSSID;
|
|
||||||
row.appendChild(ssidCell);
|
row.appendChild(ssidCell);
|
||||||
|
|
||||||
/*
|
|
||||||
const signalCell = document.createElement("td");
|
const signalCell = document.createElement("td");
|
||||||
signalCell.textContent = network.SIGNAL;
|
signalCell.innerHTML = getSignalBadge(network.SIGNAL);
|
||||||
row.appendChild(signalCell);
|
row.appendChild(signalCell);
|
||||||
*/
|
|
||||||
|
|
||||||
// Create a button
|
const securityCell = document.createElement("td");
|
||||||
|
securityCell.textContent = network.SECURITY || '--';
|
||||||
|
securityCell.classList.add('text-muted');
|
||||||
|
row.appendChild(securityCell);
|
||||||
|
|
||||||
const buttonCell = document.createElement("td");
|
const buttonCell = document.createElement("td");
|
||||||
|
buttonCell.classList.add('text-end');
|
||||||
const button = document.createElement("button");
|
const button = document.createElement("button");
|
||||||
button.textContent = "Connect"; // Button text
|
button.textContent = "Connecter";
|
||||||
button.classList.add("btn", "btn-primary"); // Bootstrap button classes
|
button.classList.add("btn", "btn-primary", "btn-sm");
|
||||||
|
|
||||||
// Determine button color based on SIGNAL value
|
|
||||||
const signalValue = parseInt(network.SIGNAL, 10); // Assuming SIGNAL is a numeric value
|
|
||||||
// Calculate color based on the signal strength
|
|
||||||
let buttonColor;
|
|
||||||
if (signalValue >= 100) {
|
|
||||||
buttonColor = "success"; // Green for strong signal
|
|
||||||
} else if (signalValue >= 50) {
|
|
||||||
buttonColor = "warning"; // Yellow for moderate signal
|
|
||||||
} else {
|
|
||||||
buttonColor = "danger"; // Red for weak signal
|
|
||||||
}
|
|
||||||
// Add Bootstrap button classes along with color
|
|
||||||
button.classList.add("btn", `btn-${buttonColor}`);
|
|
||||||
|
|
||||||
|
|
||||||
//Trigger function as soon as the button is clicked
|
|
||||||
button.addEventListener("click", () => wifi_connect(network.SSID));
|
button.addEventListener("click", () => wifi_connect(network.SSID));
|
||||||
|
|
||||||
|
|
||||||
// Append the button to the button cell
|
|
||||||
buttonCell.appendChild(button);
|
buttonCell.appendChild(button);
|
||||||
row.appendChild(buttonCell);
|
row.appendChild(buttonCell);
|
||||||
|
|
||||||
// Append the row to the table body
|
|
||||||
tableBody.appendChild(row);
|
tableBody.appendChild(row);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
error: function(xhr, status, error) {
|
error: function(xhr, status, error) {
|
||||||
console.error('AJAX request failed:', status, error);
|
console.error('AJAX request failed:', status, error);
|
||||||
|
document.getElementById('wifi-scan-empty').innerHTML = '<span class="text-danger">Erreur lors du scan</span>';
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function confirmSubmit() {
|
|
||||||
// You can display a simple confirmation message or customize the behavior
|
|
||||||
return confirm("Are you sure you want to connect to this Wi-Fi network?");
|
|
||||||
}
|
|
||||||
|
|
||||||
window.onload = function() {
|
window.onload = function() {
|
||||||
fetch('../config.json') // Replace 'deviceID.txt' with 'config.json'
|
$.ajax({
|
||||||
.then(response => response.json()) // Parse response as JSON
|
url: 'launcher.php?type=get_config_sqlite',
|
||||||
.then(data => {
|
dataType: 'json',
|
||||||
console.log("Getting config file (onload)");
|
method: 'GET',
|
||||||
//get device ID
|
success: function(data) {
|
||||||
const deviceID = data.deviceID.trim().toUpperCase();
|
console.log("Getting config (onload)");
|
||||||
//document.getElementById('pageTitle_plus_ID').innerText = 'token: ' + deviceID;
|
|
||||||
|
|
||||||
//get device Name
|
|
||||||
const deviceName = data.deviceName;
|
const deviceName = data.deviceName;
|
||||||
|
|
||||||
|
function updateSidebarDeviceName(deviceName) {
|
||||||
const elements = document.querySelectorAll('.sideBar_sensorName');
|
const elements = document.querySelectorAll('.sideBar_sensorName');
|
||||||
|
if (elements.length > 0) {
|
||||||
elements.forEach((element) => {
|
elements.forEach((element) => {
|
||||||
element.innerText = deviceName;
|
element.innerText = deviceName;
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (deviceName) {
|
||||||
|
updateSidebarDeviceName(deviceName);
|
||||||
|
setTimeout(() => updateSidebarDeviceName(deviceName), 100);
|
||||||
|
setTimeout(() => updateSidebarDeviceName(deviceName), 500);
|
||||||
|
document.title = deviceName;
|
||||||
|
}
|
||||||
|
|
||||||
//get wifi connection status
|
|
||||||
const WIFI_statusElement = document.getElementById("wifi-status");
|
const WIFI_statusElement = document.getElementById("wifi-status");
|
||||||
console.log("WIFI is: " + data.WIFI_status);
|
|
||||||
|
|
||||||
if (data.WIFI_status === "connected") {
|
if (data.WIFI_status === "connected") {
|
||||||
WIFI_statusElement.textContent = "Connected";
|
WIFI_statusElement.textContent = "Connected";
|
||||||
WIFI_statusElement.className = "badge text-bg-success";
|
WIFI_statusElement.className = "badge text-bg-success";
|
||||||
|
document.getElementById('btn-forget-wifi').style.display = 'inline-block';
|
||||||
|
document.getElementById('card-connection-info').style.display = '';
|
||||||
|
document.getElementById('card-hotspot-info').style.display = 'none';
|
||||||
|
document.getElementById('card-wifi-scan').style.display = 'none';
|
||||||
|
get_internet();
|
||||||
} else if (data.WIFI_status === "hotspot") {
|
} else if (data.WIFI_status === "hotspot") {
|
||||||
WIFI_statusElement.textContent = "Hotspot";
|
WIFI_statusElement.textContent = "Hotspot";
|
||||||
WIFI_statusElement.className = "badge text-bg-warning";
|
WIFI_statusElement.className = "badge text-bg-warning";
|
||||||
|
document.getElementById('btn-forget-wifi').style.display = 'none';
|
||||||
|
document.getElementById('card-connection-info').style.display = 'none';
|
||||||
|
document.getElementById('card-hotspot-info').style.display = '';
|
||||||
|
document.getElementById('card-wifi-scan').style.display = '';
|
||||||
|
wifi_scan();
|
||||||
} else {
|
} else {
|
||||||
WIFI_statusElement.textContent = "Unknown";
|
WIFI_statusElement.textContent = "Unknown";
|
||||||
WIFI_statusElement.className = "badge text-bg-secondary";
|
WIFI_statusElement.className = "badge text-bg-secondary";
|
||||||
|
document.getElementById('btn-forget-wifi').style.display = 'none';
|
||||||
|
document.getElementById('card-connection-info').style.display = 'none';
|
||||||
|
document.getElementById('card-hotspot-info').style.display = 'none';
|
||||||
|
document.getElementById('card-wifi-scan').style.display = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
//get local RTC
|
// Update hotspot badge in sidebar
|
||||||
|
document.querySelectorAll('.sidebar-hotspot-badge').forEach(function(badge) {
|
||||||
|
badge.style.display = (data.WIFI_status === 'hotspot') ? '' : 'none';
|
||||||
|
});
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: 'launcher.php?type=RTC_time',
|
url: 'launcher.php?type=RTC_time',
|
||||||
dataType: 'text', // Specify that you expect a JSON response
|
dataType: 'text',
|
||||||
method: 'GET', // Use GET or POST depending on your needs
|
method: 'GET',
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
console.log("Local RTC: " + response);
|
|
||||||
const RTC_Element = document.getElementById("RTC_time");
|
const RTC_Element = document.getElementById("RTC_time");
|
||||||
RTC_Element.textContent = response;
|
RTC_Element.textContent = response;
|
||||||
},
|
},
|
||||||
@@ -333,9 +482,11 @@ function get_internet(){
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
},
|
||||||
})
|
error: function(xhr, status, error) {
|
||||||
.catch(error => console.error('Error loading config.json:', error));
|
console.error('AJAX request failed:', status, error);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -23,40 +23,27 @@ fi
|
|||||||
|
|
||||||
# Update and install necessary packages
|
# Update and install necessary packages
|
||||||
info "Updating package list and installing necessary packages..."
|
info "Updating package list and installing necessary packages..."
|
||||||
sudo apt update && sudo apt install -y git gh apache2 php php-sqlite3 python3 python3-pip jq autossh i2c-tools python3-smbus || error "Failed to install required packages."
|
sudo apt update && sudo apt install -y git gh apache2 sqlite3 php php-sqlite3 python3 python3-pip jq autossh i2c-tools python3-smbus python3-rpi.gpio || error "Failed to install required packages."
|
||||||
|
|
||||||
# Install Python libraries
|
# Install Python libraries
|
||||||
info "Installing Python libraries..."
|
info "Installing Python libraries..."
|
||||||
sudo pip3 install pyserial requests RPi.GPIO adafruit-circuitpython-bme280 crcmod psutil ntplib pytz --break-system-packages || error "Failed to install Python libraries."
|
sudo pip3 install pyserial requests adafruit-circuitpython-bme280 crcmod psutil gpiozero ntplib adafruit-circuitpython-ads1x15 nsrt-mk3-dev pytz --break-system-packages || error "Failed to install Python libraries."
|
||||||
|
|
||||||
# Ask user if they want to set up SSH keys
|
|
||||||
read -p "Do you want to set up an SSH key for /var/www? (y/n): " answer
|
|
||||||
answer=${answer,,} # Convert to lowercase
|
|
||||||
|
|
||||||
if [[ "$answer" == "y" ]]; then
|
|
||||||
info "Setting up SSH keys..."
|
|
||||||
|
|
||||||
sudo mkdir -p /var/www/.ssh
|
|
||||||
sudo chmod 700 /var/www/.ssh
|
|
||||||
|
|
||||||
if [[ ! -f /var/www/.ssh/id_rsa ]]; then
|
|
||||||
sudo ssh-keygen -t rsa -b 4096 -f /var/www/.ssh/id_rsa -N ""
|
|
||||||
success "SSH key generated successfully."
|
|
||||||
else
|
|
||||||
warning "SSH key already exists. Skipping key generation."
|
|
||||||
fi
|
|
||||||
|
|
||||||
sudo ssh-copy-id -i /var/www/.ssh/id_rsa.pub -p 50221 airlab_server1@aircarto.fr || warning "Failed to copy SSH key. Please check the server connection."
|
|
||||||
|
|
||||||
success "SSH setup complete!"
|
|
||||||
else
|
|
||||||
warning "Skipping SSH key setup."
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Clone the repository (check if it exists first)
|
# Clone the repository (check if it exists first)
|
||||||
REPO_DIR="/var/www/nebuleair_pro_4g"
|
REPO_DIR="/var/www/nebuleair_pro_4g"
|
||||||
if [[ -d "$REPO_DIR" ]]; then
|
if [[ -d "$REPO_DIR" ]]; then
|
||||||
warning "Repository already exists. Skipping clone."
|
warning "Repository already exists. Will update instead of clone."
|
||||||
|
# Save current directory
|
||||||
|
local current_dir=$(pwd)
|
||||||
|
# Navigate to repository directory
|
||||||
|
cd "$REPO_DIR"
|
||||||
|
# Stash any local changes
|
||||||
|
sudo git stash || warning "Failed to stash local changes"
|
||||||
|
# Pull latest changes
|
||||||
|
sudo git pull || error "Failed to pull latest changes"
|
||||||
|
# Return to original directory
|
||||||
|
cd "$current_dir"
|
||||||
|
success "Repository updated successfully!"
|
||||||
else
|
else
|
||||||
info "Cloning the NebuleAir Pro 4G repository..."
|
info "Cloning the NebuleAir Pro 4G repository..."
|
||||||
sudo git clone http://gitea.aircarto.fr/PaulVua/nebuleair_pro_4g.git "$REPO_DIR" || error "Failed to clone repository."
|
sudo git clone http://gitea.aircarto.fr/PaulVua/nebuleair_pro_4g.git "$REPO_DIR" || error "Failed to clone repository."
|
||||||
@@ -66,7 +53,6 @@ fi
|
|||||||
info "Setting up repository files and permissions..."
|
info "Setting up repository files and permissions..."
|
||||||
sudo mkdir -p "$REPO_DIR/logs"
|
sudo mkdir -p "$REPO_DIR/logs"
|
||||||
sudo touch "$REPO_DIR/logs/app.log" "$REPO_DIR/logs/master.log" "$REPO_DIR/logs/master_errors.log" "$REPO_DIR/wifi_list.csv"
|
sudo touch "$REPO_DIR/logs/app.log" "$REPO_DIR/logs/master.log" "$REPO_DIR/logs/master_errors.log" "$REPO_DIR/wifi_list.csv"
|
||||||
sudo cp "$REPO_DIR/config.json.dist" "$REPO_DIR/config.json"
|
|
||||||
sudo chmod -R 755 "$REPO_DIR/"
|
sudo chmod -R 755 "$REPO_DIR/"
|
||||||
sudo chown -R www-data:www-data "$REPO_DIR/"
|
sudo chown -R www-data:www-data "$REPO_DIR/"
|
||||||
sudo git config --global core.fileMode false
|
sudo git config --global core.fileMode false
|
||||||
@@ -91,31 +77,96 @@ else
|
|||||||
warning "Database creation script not found."
|
warning "Database creation script not found."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Set config
|
||||||
|
info "Set config..."
|
||||||
|
if [[ -f "$REPO_DIR/sqlite/set_config.py" ]]; then
|
||||||
|
sudo /usr/bin/python3 "$REPO_DIR/sqlite/set_config.py" || error "Failed to set config."
|
||||||
|
success "Databases set configuration successfully."
|
||||||
|
else
|
||||||
|
warning "Database set configuration script not found."
|
||||||
|
fi
|
||||||
|
|
||||||
# Configure Apache
|
# Configure Apache
|
||||||
info "Configuring Apache..."
|
info "Configuring Apache..."
|
||||||
APACHE_CONF="/etc/apache2/sites-available/000-default.conf"
|
APACHE_CONF="/etc/apache2/sites-available/000-default.conf"
|
||||||
if grep -q "DocumentRoot /var/www/nebuleair_pro_4g" "$APACHE_CONF"; then
|
if grep -q "DocumentRoot /var/www/nebuleair_pro_4g" "$APACHE_CONF"; then
|
||||||
warning "Apache configuration already set. Skipping."
|
warning "Apache DocumentRoot already set. Skipping."
|
||||||
else
|
else
|
||||||
sudo sed -i 's|DocumentRoot /var/www/html|DocumentRoot /var/www/nebuleair_pro_4g|' "$APACHE_CONF"
|
sudo sed -i 's|DocumentRoot /var/www/html|DocumentRoot /var/www/nebuleair_pro_4g|' "$APACHE_CONF"
|
||||||
sudo systemctl reload apache2
|
success "Apache DocumentRoot updated."
|
||||||
success "Apache configuration updated and reloaded."
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Enable AllowOverride for .htaccess (needed for PHP upload limits)
|
||||||
|
APACHE_MAIN_CONF="/etc/apache2/apache2.conf"
|
||||||
|
if grep -q "AllowOverride All" "$APACHE_MAIN_CONF"; then
|
||||||
|
warning "AllowOverride already configured. Skipping."
|
||||||
|
else
|
||||||
|
# Replace AllowOverride None with AllowOverride All for /var/www/
|
||||||
|
sudo sed -i '/<Directory \/var\/www\/>/,/<\/Directory>/ s/AllowOverride None/AllowOverride All/' "$APACHE_MAIN_CONF"
|
||||||
|
success "AllowOverride All enabled for /var/www/."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Also increase PHP limits directly in php.ini as fallback
|
||||||
|
PHP_INI=$(php -r "echo php_ini_loaded_file();" 2>/dev/null)
|
||||||
|
if [[ -n "$PHP_INI" ]]; then
|
||||||
|
sudo sed -i 's/upload_max_filesize = .*/upload_max_filesize = 50M/' "$PHP_INI"
|
||||||
|
sudo sed -i 's/post_max_size = .*/post_max_size = 55M/' "$PHP_INI"
|
||||||
|
success "PHP upload limits set to 50M in $PHP_INI"
|
||||||
|
fi
|
||||||
|
|
||||||
|
sudo systemctl reload apache2
|
||||||
|
success "Apache configuration updated and reloaded."
|
||||||
|
|
||||||
# Add sudo authorization (prevent duplicate entries)
|
# Add sudo authorization (prevent duplicate entries)
|
||||||
info "Setting up sudo authorization..."
|
info "Setting up sudo authorization..."
|
||||||
if ! sudo grep -q "/usr/bin/nmcli" /etc/sudoers; then
|
SUDOERS_FILE="/etc/sudoers"
|
||||||
echo -e "ALL ALL=(ALL) NOPASSWD: /usr/bin/nmcli, /usr/sbin/reboot\nwww-data ALL=(ALL) NOPASSWD: /usr/bin/git pull\nwww-data ALL=(ALL) NOPASSWD: /usr/bin/ssh\nwww-data ALL=(ALL) NOPASSWD: /usr/bin/python3 *" | sudo tee -a /etc/sudoers > /dev/null
|
|
||||||
|
# First, fix any existing syntax errors
|
||||||
|
if sudo visudo -c 2>&1 | grep -q "syntax error"; then
|
||||||
|
warning "Syntax error detected in sudoers file. Attempting to fix..."
|
||||||
|
# Remove the problematic line if it exists
|
||||||
|
sudo sed -i '/www-data ALL=(ALL) NOPASSWD: \/usr\/bin\/python3 \* www-data/d' "$SUDOERS_FILE"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Add proper sudo rules (each on a separate line)
|
||||||
|
if ! sudo grep -q "/usr/bin/nmcli" "$SUDOERS_FILE"; then
|
||||||
|
# Create a temporary file with the new rules
|
||||||
|
cat <<EOF | sudo tee /tmp/sudoers_additions > /dev/null
|
||||||
|
# NebuleAir Pro 4G sudo rules
|
||||||
|
ALL ALL=(ALL) NOPASSWD: /usr/bin/nmcli, /usr/sbin/reboot
|
||||||
|
www-data ALL=(ALL) NOPASSWD: /usr/bin/git pull
|
||||||
|
www-data ALL=(ALL) NOPASSWD: /usr/bin/ssh
|
||||||
|
www-data ALL=(ALL) NOPASSWD: /usr/bin/python3 *
|
||||||
|
www-data ALL=(ALL) NOPASSWD: /bin/systemctl *
|
||||||
|
www-data ALL=(ALL) NOPASSWD: /usr/bin/pkill *
|
||||||
|
www-data ALL=(ALL) NOPASSWD: /var/www/nebuleair_pro_4g/*
|
||||||
|
EOF
|
||||||
|
|
||||||
|
# Validate the temporary file
|
||||||
|
if sudo visudo -c -f /tmp/sudoers_additions; then
|
||||||
|
# Append to sudoers if valid
|
||||||
|
sudo cat /tmp/sudoers_additions >> "$SUDOERS_FILE"
|
||||||
success "Sudo authorization added."
|
success "Sudo authorization added."
|
||||||
|
else
|
||||||
|
error "Failed to add sudo rules - syntax validation failed."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Clean up
|
||||||
|
sudo rm -f /tmp/sudoers_additions
|
||||||
else
|
else
|
||||||
warning "Sudo authorization already set. Skipping."
|
warning "Sudo authorization already set. Skipping."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Open all UART serial ports (avoid duplication)
|
# Validate sudoers file after changes
|
||||||
info "Configuring UART serial ports..."
|
if ! sudo visudo -c; then
|
||||||
|
error "Sudoers file has syntax errors! Please fix manually with 'sudo visudo'"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Open all UART serial ports and disable HDMI + Bluetooth (avoid duplication)
|
||||||
|
info "Configuring UART serial ports and disabling Bluetooth to save power..."
|
||||||
if ! grep -q "enable_uart=1" /boot/firmware/config.txt; then
|
if ! grep -q "enable_uart=1" /boot/firmware/config.txt; then
|
||||||
echo -e "\nenable_uart=1\ndtoverlay=uart0\ndtoverlay=uart1\ndtoverlay=uart2\ndtoverlay=uart3\ndtoverlay=uart4\ndtoverlay=uart5" | sudo tee -a /boot/firmware/config.txt > /dev/null
|
echo -e "\nenable_uart=1\ndtoverlay=uart0\ndtoverlay=uart1\ndtoverlay=uart2\ndtoverlay=uart3\ndtoverlay=uart4\ndtoverlay=uart5\n\n# Disable Bluetooth to save power (~20-30mA)\ndtoverlay=disable-bt" | sudo tee -a /boot/firmware/config.txt > /dev/null
|
||||||
success "UART configuration added."
|
success "UART configuration, HDMI and Bluetooth disable added."
|
||||||
else
|
else
|
||||||
warning "UART configuration already set. Skipping."
|
warning "UART configuration already set. Skipping."
|
||||||
fi
|
fi
|
||||||
@@ -129,10 +180,12 @@ info "Enabling I2C ports..."
|
|||||||
sudo raspi-config nonint do_i2c 0
|
sudo raspi-config nonint do_i2c 0
|
||||||
success "I2C ports enabled."
|
success "I2C ports enabled."
|
||||||
|
|
||||||
#creates databases
|
# Final sudoers check
|
||||||
info "Creates sqlites databases..."
|
if sudo visudo -c; then
|
||||||
/usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/create_db.py
|
success "Sudoers file is valid."
|
||||||
|
else
|
||||||
|
error "Sudoers file has errors! System may not function correctly."
|
||||||
|
fi
|
||||||
|
|
||||||
# Completion message
|
# Completion message
|
||||||
success "Setup completed successfully!"
|
success "Setup completed successfully!"
|
||||||
|
|||||||
@@ -22,46 +22,95 @@ error() { echo -e "${RED}[ERROR]${NC} $1"; exit 1; }
|
|||||||
if [[ "$EUID" -ne 0 ]]; then
|
if [[ "$EUID" -ne 0 ]]; then
|
||||||
error "This script must be run as root. Use 'sudo ./installation.sh'"
|
error "This script must be run as root. Use 'sudo ./installation.sh'"
|
||||||
fi
|
fi
|
||||||
|
REPO_DIR="/var/www/nebuleair_pro_4g"
|
||||||
#set up the RTC
|
#set up the RTC
|
||||||
info "Set up the RTC"
|
info "Set up the RTC"
|
||||||
/usr/bin/python3 /var/www/nebuleair_pro_4g/RTC/set_with_NTP.py
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/RTC/set_with_NTP.py
|
||||||
|
|
||||||
|
#Wake up SARA
|
||||||
|
info "Wake Up SARA"
|
||||||
|
pinctrl set 16 op
|
||||||
|
pinctrl set 16 dh
|
||||||
|
|
||||||
|
info "Waiting for SARA to wake up..."
|
||||||
|
for i in {1..8}; do
|
||||||
|
echo -ne " $i/8 seconds\r"
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
echo -e "\n"
|
||||||
|
|
||||||
|
#Check SARA connection (ATI)
|
||||||
|
info "Check SARA connection (ATI)"
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 ATI 2 || warning "SARA not detected (ATI). Continuing..."
|
||||||
|
|
||||||
|
sleep 1
|
||||||
|
|
||||||
#set up SARA R4 APN
|
#set up SARA R4 APN
|
||||||
info "Set up Monogoto APN"
|
#info "Set up Monogoto APN"
|
||||||
/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/sara_setAPN.py ttyAMA2 data.mono 2
|
#/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/sara_setAPN.py ttyAMA2 data.mono 2
|
||||||
|
|
||||||
#activate blue network led on the SARA R4
|
#activate blue network led on the SARA R4
|
||||||
info "Activate blue LED"
|
info "Activate blue LED"
|
||||||
/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 AT+UGPIOC=16,2 2
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 AT+UGPIOC=16,2 2 || warning "SARA LED activation failed. Continuing..."
|
||||||
|
|
||||||
|
sleep 1
|
||||||
|
|
||||||
|
#get SIM card CCID
|
||||||
|
info "Get SIM card CCID"
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 AT+CCID? 2 || warning "SARA CCID read failed. Continuing..."
|
||||||
|
|
||||||
|
sleep 1
|
||||||
|
|
||||||
|
#get SIM card IMSI
|
||||||
|
info "Get SIM card IMSI"
|
||||||
|
imsi_output=$(/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 AT+CIMI 2 2>&1) || warning "SARA IMSI read failed. Continuing..."
|
||||||
|
echo "$imsi_output"
|
||||||
|
# Extract IMSI (15-digit numeric string)
|
||||||
|
imsi_number=$(echo "$imsi_output" | grep -oP '^\d{15}$' || echo "N/A")
|
||||||
|
|
||||||
#Connect to network
|
#Connect to network
|
||||||
info "Connect SARA R4 to network"
|
#info "Connect SARA R4 to network"
|
||||||
python3 /var/www/nebuleair_pro_4g/SARA/sara_connectNetwork.py ttyAMA2 20810 60
|
#python3 /var/www/nebuleair_pro_4g/SARA/sara_connectNetwork.py ttyAMA2 20810 60
|
||||||
|
|
||||||
#Add master_nebuleair.service
|
#Need to create the two service
|
||||||
SERVICE_FILE="/etc/systemd/system/master_nebuleair.service"
|
# 1. start the scripts to set-up the services
|
||||||
info "Setting up systemd service for master_nebuleair..."
|
# 2. rtc_save_to_db
|
||||||
|
|
||||||
|
#1. set-up the services (SARA, NPM, BME280, etc)
|
||||||
|
info "Setting up systemd services..."
|
||||||
|
|
||||||
|
if [[ -f "$REPO_DIR/services/setup_services.sh" ]]; then
|
||||||
|
sudo chmod +x "$REPO_DIR/services/setup_services.sh"
|
||||||
|
sudo "$REPO_DIR/services/setup_services.sh" || warning "Failed to set up systemd services"
|
||||||
|
success "Systemd services set up successfully."
|
||||||
|
else
|
||||||
|
warning "Systemd services setup script not found."
|
||||||
|
fi
|
||||||
|
|
||||||
|
#2. Add rtc_save_to_db.service
|
||||||
|
SERVICE_FILE_2="/etc/systemd/system/rtc_save_to_db.service"
|
||||||
|
info "Setting up systemd service for rtc_save_to_db..."
|
||||||
|
|
||||||
# Create the systemd service file (overwrite if necessary)
|
# Create the systemd service file (overwrite if necessary)
|
||||||
sudo bash -c "cat > $SERVICE_FILE" <<EOF
|
sudo bash -c "cat > $SERVICE_FILE_2" <<EOF
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Master manager for the Python loop scripts
|
Description=RTC Save to DB Script
|
||||||
After=network.target
|
After=network.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/master.py
|
ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/RTC/save_to_db.py
|
||||||
Restart=always
|
Restart=always
|
||||||
|
RestartSec=1
|
||||||
User=root
|
User=root
|
||||||
WorkingDirectory=/var/www/nebuleair_pro_4g
|
WorkingDirectory=/var/www/nebuleair_pro_4g
|
||||||
StandardOutput=append:/var/www/nebuleair_pro_4g/logs/master.log
|
StandardOutput=append:/var/www/nebuleair_pro_4g/logs/rtc_save_to_db.log
|
||||||
StandardError=append:/var/www/nebuleair_pro_4g/logs/master_errors.log
|
StandardError=append:/var/www/nebuleair_pro_4g/logs/rtc_save_to_db_errors.log
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
success "Systemd service file created: $SERVICE_FILE"
|
success "Systemd service file created: $SERVICE_FILE_2"
|
||||||
|
|
||||||
# Reload systemd to recognize the new service
|
# Reload systemd to recognize the new service
|
||||||
info "Reloading systemd daemon..."
|
info "Reloading systemd daemon..."
|
||||||
@@ -69,8 +118,33 @@ sudo systemctl daemon-reload
|
|||||||
|
|
||||||
# Enable the service to start on boot
|
# Enable the service to start on boot
|
||||||
info "Enabling the service to start on boot..."
|
info "Enabling the service to start on boot..."
|
||||||
sudo systemctl enable master_nebuleair.service
|
sudo systemctl enable rtc_save_to_db.service
|
||||||
|
|
||||||
# Start the service immediately
|
# Start the service immediately
|
||||||
info "Starting the service..."
|
info "Starting the service..."
|
||||||
sudo systemctl start master_nebuleair.service
|
sudo systemctl start rtc_save_to_db.service
|
||||||
|
|
||||||
|
# Display device information
|
||||||
|
echo ""
|
||||||
|
echo "=========================================="
|
||||||
|
echo -e "${GREEN} Installation Complete!${NC}"
|
||||||
|
echo "=========================================="
|
||||||
|
|
||||||
|
# Get Raspberry Pi serial number (last 8 characters)
|
||||||
|
serial_number=$(cat /proc/cpuinfo | grep Serial | awk '{print substr($3, length($3) - 7)}' | tr '[:lower:]' '[:upper:]')
|
||||||
|
echo -e "${BLUE}Device ID (Serial):${NC} $serial_number"
|
||||||
|
|
||||||
|
# Display IMSI
|
||||||
|
echo -e "${BLUE}IMSI:${NC} ${imsi_number:-N/A}"
|
||||||
|
|
||||||
|
# Get IP address and make it a clickable link
|
||||||
|
ip_wlan0=$(ip -4 addr show wlan0 2>/dev/null | grep -oP '(?<=inet\s)\d+(\.\d+){3}' || echo "Not connected")
|
||||||
|
|
||||||
|
if [[ "$ip_wlan0" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
|
||||||
|
admin_url="http://${ip_wlan0}/html/admin.html"
|
||||||
|
echo -e "${BLUE}IP Address (wlan0):${NC} ${admin_url}"
|
||||||
|
else
|
||||||
|
echo -e "${BLUE}IP Address (wlan0):${NC} $ip_wlan0"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "=========================================="
|
||||||
|
|||||||
107
loop/AUDIT_SARA_send_data_v2.md
Normal file
107
loop/AUDIT_SARA_send_data_v2.md
Normal file
@@ -0,0 +1,107 @@
|
|||||||
|
# Audit SARA_send_data_v2.py
|
||||||
|
|
||||||
|
Date: 2026-03-14
|
||||||
|
|
||||||
|
## Correction deja appliquee
|
||||||
|
|
||||||
|
**Bug AT+USOWR leak dans payload UDP Miotiq** — Le device_id recu par Miotiq etait `41542b55534f5752` = `AT+USOWR` (la commande AT elle-meme).
|
||||||
|
|
||||||
|
Cause: desynchronisation serie entre le script et le modem. Le code envoyait les donnees binaires sans verifier que le modem avait bien envoye le prompt `@`.
|
||||||
|
|
||||||
|
Corrections appliquees dans la section UDP (send_miotiq):
|
||||||
|
- `ser_sara.reset_input_buffer()` avant chaque commande AT critique
|
||||||
|
- Verification que `"@" in response` avant d'envoyer les donnees binaires
|
||||||
|
- Abort propre a chaque etape via `socket_id = None` si creation socket, connexion, ou prompt `@` echoue
|
||||||
|
- Retry `AT+USOCR=17` apres un PDP reset reussi
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Bugs critiques restants
|
||||||
|
|
||||||
|
### 1. Double `\r` sur plusieurs commandes AT
|
||||||
|
|
||||||
|
Certaines commandes AT ont `\r` dans le f-string ET un `+ '\r'` lors du write, ce qui envoie `\r\r` au modem.
|
||||||
|
|
||||||
|
**Lignes concernees:**
|
||||||
|
- **Ligne 988**: `command = f'AT+CSQ\r'` puis `ser_sara.write((command + '\r')...)`
|
||||||
|
- **Lignes 588, 628, 646, 656, 666, 674, 682, 690, 698**: fonctions `reset_server_hostname` et `reset_server_hostname_https`
|
||||||
|
- **Lignes 1403, 1541, 1570, 1694, 1741**: sections AirCarto et uSpot
|
||||||
|
|
||||||
|
Le modem tolere souvent le double `\r`, mais ca peut generer des reponses parasites dans le buffer serie et contribuer a des bugs de desynchronisation.
|
||||||
|
|
||||||
|
**Correction**: retirer le `\r` du f-string OU retirer le `+ '\r'` dans le write. Choisir une convention unique.
|
||||||
|
|
||||||
|
### 2. Double guillemet dans AT+URDFILE (ligne 1402)
|
||||||
|
|
||||||
|
```python
|
||||||
|
command = f'AT+URDFILE="aircarto_server_response.txt""\r'
|
||||||
|
# ^^ double "
|
||||||
|
```
|
||||||
|
|
||||||
|
Le `"` en trop peut causer une erreur AT ou une reponse inattendue.
|
||||||
|
|
||||||
|
**Correction**: `command = f'AT+URDFILE="aircarto_server_response.txt"\r'`
|
||||||
|
|
||||||
|
### 3. Crash si table SQLite vide (lignes 781-786, 820-826, 868-880)
|
||||||
|
|
||||||
|
```python
|
||||||
|
rows = cursor.fetchall()
|
||||||
|
data_values = [row[2:] for row in rows]
|
||||||
|
averages = [round(sum(col) / len(col),1) for col in zip(*data_values)]
|
||||||
|
```
|
||||||
|
|
||||||
|
Si `data_NPM`, `data_NPM_5channels` ou `data_envea` est vide, `data_values` sera `[]` et le calcul d'average crashera (IndexError / division par zero).
|
||||||
|
|
||||||
|
**Correction**: ajouter un check `if rows:` avant le calcul, comme c'est deja fait pour BME280 (ligne 840), wind (ligne 912) et MPPT (ligne 936).
|
||||||
|
|
||||||
|
### 4. Overflow struct.pack sur valeurs negatives (class SensorPayload)
|
||||||
|
|
||||||
|
```python
|
||||||
|
def set_npm_core(self, pm1, pm25, pm10):
|
||||||
|
self.payload[10:12] = struct.pack('>H', int(pm1 * 10)) # H = unsigned 16-bit
|
||||||
|
```
|
||||||
|
|
||||||
|
Si un capteur retourne une valeur negative (erreur capteur, -1, etc.), `struct.pack('>H', -10)` leve `struct.error`. Concerne: `set_npm_core`, `set_noise`, `set_envea`, `set_npm_5channels`, `set_wind`, `set_mppt` (sauf battery_current et temperatures qui utilisent `'>h'` signe).
|
||||||
|
|
||||||
|
**Correction**: clamper les valeurs avant pack: `max(0, int(value * 10))` pour les champs unsigned, ou verifier `value >= 0` avant le pack.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Problemes importants
|
||||||
|
|
||||||
|
### 5. Port serie et SQLite jamais fermes
|
||||||
|
|
||||||
|
`ser_sara` (ligne 248) et `conn` (ligne 155) sont ouverts mais jamais fermes, meme dans le bloc `except` final (ligne 1755). Si le script crash, le port serie peut rester verrouille pour le prochain cycle.
|
||||||
|
|
||||||
|
**Correction**: ajouter un bloc `finally` apres le `except` (ligne 1757):
|
||||||
|
```python
|
||||||
|
finally:
|
||||||
|
ser_sara.close()
|
||||||
|
conn.close()
|
||||||
|
```
|
||||||
|
|
||||||
|
### 6. Code mort dans reset_server_hostname_https (lignes 717-722)
|
||||||
|
|
||||||
|
```python
|
||||||
|
if profile_id == 1: # ligne 613
|
||||||
|
...
|
||||||
|
elif profile_id == 1: # ligne 718 — jamais atteint car meme condition
|
||||||
|
pass
|
||||||
|
```
|
||||||
|
|
||||||
|
Copie-colle de `reset_server_hostname`. Le elif est mort.
|
||||||
|
|
||||||
|
**Correction**: supprimer le bloc elif (lignes 717-722).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Resume
|
||||||
|
|
||||||
|
| # | Type | Description | Lignes |
|
||||||
|
|----|----------|------------------------------------------|----------------|
|
||||||
|
| 1 | Bug | Double \r sur commandes AT | 988, 588+, ... |
|
||||||
|
| 2 | Bug | Double guillemet AT+URDFILE | 1402 |
|
||||||
|
| 3 | Crash | Table SQLite vide -> IndexError | 781, 820, 868 |
|
||||||
|
| 4 | Crash | struct.pack overflow valeur negative | SensorPayload |
|
||||||
|
| 5 | Cleanup | Serial/SQLite jamais fermes (finally) | 248, 155 |
|
||||||
|
| 6 | Cleanup | Code mort elif profile_id==1 | 717-722 |
|
||||||
File diff suppressed because it is too large
Load Diff
319
loop/error_flags.md
Normal file
319
loop/error_flags.md
Normal file
@@ -0,0 +1,319 @@
|
|||||||
|
# Error Flags — UDP Payload Miotiq (Bytes 66-68)
|
||||||
|
|
||||||
|
## Principe
|
||||||
|
|
||||||
|
Les bytes 66, 67 et 68 de la payload UDP (100 bytes) sont utilises comme registres d'erreurs
|
||||||
|
et d'etat. Chaque bit represente un etat independant. Plusieurs flags peuvent
|
||||||
|
etre actifs simultanement.
|
||||||
|
|
||||||
|
- **Byte 66** : erreurs systeme (RTC, capteurs)
|
||||||
|
- **Byte 67** : status NextPM (registre interne du capteur)
|
||||||
|
- **Byte 68** : status device (etat general du boitier)
|
||||||
|
|
||||||
|
## Position dans la payload
|
||||||
|
|
||||||
|
```
|
||||||
|
Bytes 0-65 : donnees capteurs (existant)
|
||||||
|
Byte 66 : error_flags (erreurs systeme)
|
||||||
|
Byte 67 : npm_status (status NextPM)
|
||||||
|
Byte 68 : device_status (etat general du boitier)
|
||||||
|
Bytes 69-99 : reserved (initialises a 0xFF)
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Byte 66 — Error Flags (erreurs systeme)
|
||||||
|
|
||||||
|
Chaque bit represente une erreur detectee par le script d'envoi (`SARA_send_data_v2.py`).
|
||||||
|
|
||||||
|
| Bit | Masque | Nom | Description | Source |
|
||||||
|
|-----|--------|-------------------|--------------------------------------------------|-------------------------------|
|
||||||
|
| 0 | 0x01 | RTC_DISCONNECTED | Module RTC DS3231 non detecte sur le bus I2C | timestamp_table → 'not connected' |
|
||||||
|
| 1 | 0x02 | RTC_RESET | RTC en date par defaut (annee 2000) | timestamp_table → annee 2000 |
|
||||||
|
| 2 | 0x04 | BME280_ERROR | Capteur BME280 non detecte ou erreur de lecture | data_BME280 → valeurs a 0 |
|
||||||
|
| 3 | 0x08 | NPM_ERROR | Capteur NextPM non detecte ou erreur communication| data_NPM → toutes valeurs a 0 |
|
||||||
|
| 4 | 0x10 | ENVEA_ERROR | Capteurs Envea non detectes ou erreur serie | data_envea → valeurs a 0 |
|
||||||
|
| 5 | 0x20 | NOISE_ERROR | Capteur bruit NSRT MK4 non detecte ou erreur | data_noise → valeurs a 0 |
|
||||||
|
| 6 | 0x40 | MPPT_ERROR | Chargeur solaire MPPT non detecte ou erreur | data_MPPT → valeurs a 0 |
|
||||||
|
| 7 | 0x80 | WIND_ERROR | Capteur vent non detecte ou erreur | data_windMeter → valeurs a 0 |
|
||||||
|
|
||||||
|
### Detection des erreurs
|
||||||
|
|
||||||
|
Les scripts de collecte (`get_data_modbus_v3.py`, `get_data_v2.py`, etc.) ecrivent des **0**
|
||||||
|
en base SQLite quand un capteur ne repond pas. Le script d'envoi (`SARA_send_data_v2.py`)
|
||||||
|
lit ces valeurs et peut detecter l'erreur quand toutes les valeurs d'un capteur sont a 0.
|
||||||
|
|
||||||
|
Pour le RTC, le champ `timestamp_table` contient directement `'not connected'` ou une date
|
||||||
|
en annee 2000 quand le module est deconnecte ou reinitialise.
|
||||||
|
|
||||||
|
### Exemples de valeurs
|
||||||
|
|
||||||
|
| Valeur dec | Hex | Signification |
|
||||||
|
|------------|------|---------------------------------------|
|
||||||
|
| 0 | 0x00 | Aucune erreur |
|
||||||
|
| 1 | 0x01 | RTC deconnecte |
|
||||||
|
| 2 | 0x02 | RTC reset (annee 2000) |
|
||||||
|
| 5 | 0x05 | RTC deconnecte + BME280 erreur |
|
||||||
|
| 9 | 0x09 | RTC deconnecte + NPM erreur |
|
||||||
|
| 255 | 0xFF | Toutes les erreurs (cas extreme) |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Byte 67 — NPM Status (registre interne NextPM)
|
||||||
|
|
||||||
|
Le capteur NextPM possede un registre de status sur 9 bits (registre Modbus).
|
||||||
|
On stocke les 8 bits bas dans le byte 67. Ce registre est lu directement depuis
|
||||||
|
le capteur via Modbus, pas depuis SQLite.
|
||||||
|
|
||||||
|
| Bit | Masque | Nom | Description | Severite |
|
||||||
|
|-----|--------|-----------------|-----------------------------------------------------------------------|----------------|
|
||||||
|
| 0 | 0x01 | SLEEP_STATE | Capteur en veille (commande sleep). Seule la lecture status autorisee | Info |
|
||||||
|
| 1 | 0x02 | DEGRADED_STATE | Erreur mineure confirmee. Mesures possibles mais precision reduite | Warning |
|
||||||
|
| 2 | 0x04 | NOT_READY | Demarrage en cours (15s apres mise sous tension). Mesures non fiables | Info |
|
||||||
|
| 3 | 0x08 | HEAT_ERROR | Humidite relative > 60% pendant > 10 minutes | Warning |
|
||||||
|
| 4 | 0x10 | TRH_ERROR | Capteur T/RH interne hors specification | Warning |
|
||||||
|
| 5 | 0x20 | FAN_ERROR | Vitesse ventilateur hors plage (tourne encore) | Warning |
|
||||||
|
| 6 | 0x40 | MEMORY_ERROR | Acces memoire impossible, fonctions internes limitees | Warning |
|
||||||
|
| 7 | 0x80 | LASER_ERROR | Aucune particule detectee pendant > 240s, possible erreur laser | Warning |
|
||||||
|
|
||||||
|
Note : le bit 8 du registre NextPM (DEFAULT_STATE — ventilateur arrete apres 3 tentatives)
|
||||||
|
ne tient pas dans un byte. Si necessaire, il peut etre combine avec le bit 0 (SLEEP_STATE)
|
||||||
|
car les deux indiquent un capteur inactif.
|
||||||
|
|
||||||
|
### Exemples de valeurs
|
||||||
|
|
||||||
|
| Valeur dec | Hex | Signification |
|
||||||
|
|------------|------|--------------------------------------------|
|
||||||
|
| 0 | 0x00 | Capteur OK, mesures fiables |
|
||||||
|
| 4 | 0x04 | Demarrage en cours (NOT_READY) |
|
||||||
|
| 8 | 0x08 | Erreur humidite (HEAT_ERROR) |
|
||||||
|
| 32 | 0x20 | Erreur ventilateur (FAN_ERROR) |
|
||||||
|
| 128 | 0x80 | Possible erreur laser (LASER_ERROR) |
|
||||||
|
| 40 | 0x28 | HEAT_ERROR + FAN_ERROR |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Byte 68 — Device Status (etat general du boitier)
|
||||||
|
|
||||||
|
Flags d'etat du device, determines par le script d'envoi (`SARA_send_data_v2.py`).
|
||||||
|
Ces flags donnent du contexte sur l'etat general du boitier pour le diagnostic a distance.
|
||||||
|
|
||||||
|
| Bit | Masque | Nom | Description | Source |
|
||||||
|
|-----|--------|----------------------|----------------------------------------------------------------|-------------------------------------|
|
||||||
|
| 0 | 0x01 | SARA_REBOOTED | Le modem a ete reboot hardware au cycle precedent | flag fichier ou SQLite |
|
||||||
|
| 1 | 0x02 | WIFI_CONNECTED | Le device est connecte en WiFi (atelier/maintenance) | nmcli device status |
|
||||||
|
| 2 | 0x04 | HOTSPOT_ACTIVE | Le hotspot WiFi est actif (configuration en cours) | nmcli device status |
|
||||||
|
| 3 | 0x08 | GPS_NO_FIX | Pas de position GPS valide | config_table latitude/longitude |
|
||||||
|
| 4 | 0x10 | BATTERY_LOW | Tension batterie sous seuil critique | data_MPPT → battery_voltage |
|
||||||
|
| 5 | 0x20 | DISK_FULL | Espace disque critique sur la Pi (< 5%) | os.statvfs ou shutil.disk_usage |
|
||||||
|
| 6 | 0x40 | DB_ERROR | Erreur d'acces a la base SQLite | try/except sur connexion SQLite |
|
||||||
|
| 7 | 0x80 | BOOT_RECENT | Le device a redemarre recemment (uptime < 5 min) | /proc/uptime |
|
||||||
|
|
||||||
|
### Exemples de valeurs
|
||||||
|
|
||||||
|
| Valeur dec | Hex | Signification |
|
||||||
|
|------------|------|--------------------------------------------------|
|
||||||
|
| 0 | 0x00 | Tout est normal |
|
||||||
|
| 1 | 0x01 | Modem reboot au cycle precedent |
|
||||||
|
| 2 | 0x02 | WiFi connecte (probablement en atelier) |
|
||||||
|
| 6 | 0x06 | WiFi + hotspot actifs (configuration en cours) |
|
||||||
|
| 128 | 0x80 | Boot recent (uptime < 5 min) |
|
||||||
|
| 145 | 0x91 | Modem reboot + batterie faible + boot recent |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Implementation
|
||||||
|
|
||||||
|
### Etape 1 : Lire le status NPM depuis le capteur
|
||||||
|
|
||||||
|
Le script `NPM/get_data_modbus_v3.py` doit etre modifie pour :
|
||||||
|
1. Lire le registre de status du NextPM (adresse Modbus a determiner)
|
||||||
|
2. Stocker le status byte dans une nouvelle colonne SQLite (ex: `npm_status` dans `data_NPM`)
|
||||||
|
|
||||||
|
### Etape 2 : Construire les flags dans SARA_send_data_v2.py
|
||||||
|
|
||||||
|
```python
|
||||||
|
# Constantes error_flags (byte 66)
|
||||||
|
ERR_RTC_DISCONNECTED = 0x01
|
||||||
|
ERR_RTC_RESET = 0x02
|
||||||
|
ERR_BME280 = 0x04
|
||||||
|
ERR_NPM = 0x08
|
||||||
|
ERR_ENVEA = 0x10
|
||||||
|
ERR_NOISE = 0x20
|
||||||
|
ERR_MPPT = 0x40
|
||||||
|
ERR_WIND = 0x80
|
||||||
|
|
||||||
|
# Constantes device_status (byte 68)
|
||||||
|
DEV_SARA_REBOOTED = 0x01
|
||||||
|
DEV_WIFI_CONNECTED = 0x02
|
||||||
|
DEV_HOTSPOT_ACTIVE = 0x04
|
||||||
|
DEV_GPS_NO_FIX = 0x08
|
||||||
|
DEV_BATTERY_LOW = 0x10
|
||||||
|
DEV_DISK_FULL = 0x20
|
||||||
|
DEV_DB_ERROR = 0x40
|
||||||
|
DEV_BOOT_RECENT = 0x80
|
||||||
|
|
||||||
|
# Construction byte 66
|
||||||
|
error_flags = 0x00
|
||||||
|
|
||||||
|
if rtc_status == "disconnected":
|
||||||
|
error_flags |= ERR_RTC_DISCONNECTED
|
||||||
|
if rtc_status == "reset":
|
||||||
|
error_flags |= ERR_RTC_RESET
|
||||||
|
if PM1 == 0 and PM25 == 0 and PM10 == 0:
|
||||||
|
error_flags |= ERR_NPM
|
||||||
|
# ... autres capteurs
|
||||||
|
|
||||||
|
payload.set_error_flags(error_flags)
|
||||||
|
|
||||||
|
# Construction byte 67 (lu depuis SQLite, ecrit par get_data_modbus_v3.py)
|
||||||
|
npm_status = get_npm_status_from_db() # 0-255
|
||||||
|
payload.set_npm_status(npm_status)
|
||||||
|
|
||||||
|
# Construction byte 68
|
||||||
|
device_status = 0x00
|
||||||
|
|
||||||
|
if sara_was_rebooted(): # flag fichier persistant
|
||||||
|
device_status |= DEV_SARA_REBOOTED
|
||||||
|
if check_wifi_connected(): # nmcli device status
|
||||||
|
device_status |= DEV_WIFI_CONNECTED
|
||||||
|
if check_hotspot_active(): # nmcli device status
|
||||||
|
device_status |= DEV_HOTSPOT_ACTIVE
|
||||||
|
if latitude == 0.0 and longitude == 0.0: # config_table
|
||||||
|
device_status |= DEV_GPS_NO_FIX
|
||||||
|
if battery_voltage < 11.0: # data_MPPT seuil a ajuster
|
||||||
|
device_status |= DEV_BATTERY_LOW
|
||||||
|
if check_disk_usage() > 95: # shutil.disk_usage
|
||||||
|
device_status |= DEV_DISK_FULL
|
||||||
|
# DEV_DB_ERROR: set dans le try/except de la connexion SQLite
|
||||||
|
if get_uptime_seconds() < 300: # /proc/uptime
|
||||||
|
device_status |= DEV_BOOT_RECENT
|
||||||
|
|
||||||
|
payload.set_device_status(device_status)
|
||||||
|
```
|
||||||
|
|
||||||
|
### Etape 3 : Ajouter les methodes dans SensorPayload
|
||||||
|
|
||||||
|
```python
|
||||||
|
def set_error_flags(self, flags):
|
||||||
|
"""Set system error flags (byte 66)"""
|
||||||
|
self.payload[66] = flags & 0xFF
|
||||||
|
|
||||||
|
def set_npm_status(self, status):
|
||||||
|
"""Set NextPM status register (byte 67)"""
|
||||||
|
self.payload[67] = status & 0xFF
|
||||||
|
|
||||||
|
def set_device_status(self, status):
|
||||||
|
"""Set device status flags (byte 68)"""
|
||||||
|
self.payload[68] = status & 0xFF
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Parser Miotiq
|
||||||
|
|
||||||
|
```
|
||||||
|
16|device_id|string|||W
|
||||||
|
2|signal_quality|hex2dec|dB||
|
||||||
|
2|version|hex2dec|||W
|
||||||
|
4|ISO_68|hex2dec|ugm3|x/10|
|
||||||
|
4|ISO_39|hex2dec|ugm3|x/10|
|
||||||
|
4|ISO_24|hex2dec|ugm3|x/10|
|
||||||
|
4|ISO_54|hex2dec|degC|x/100|
|
||||||
|
4|ISO_55|hex2dec|%|x/100|
|
||||||
|
4|ISO_53|hex2dec|hPa||
|
||||||
|
4|noise_cur_leq|hex2dec|dB|x/10|
|
||||||
|
4|noise_cur_level|hex2dec|dB|x/10|
|
||||||
|
4|max_noise|hex2dec|dB|x/10|
|
||||||
|
4|ISO_03|hex2dec|ppb||
|
||||||
|
4|ISO_05|hex2dec|ppb||
|
||||||
|
4|ISO_21|hex2dec|ppb||
|
||||||
|
4|ISO_04|hex2dec|ppb||
|
||||||
|
4|ISO_08|hex2dec|ppb||
|
||||||
|
4|npm_ch1|hex2dec|count||
|
||||||
|
4|npm_ch2|hex2dec|count||
|
||||||
|
4|npm_ch3|hex2dec|count||
|
||||||
|
4|npm_ch4|hex2dec|count||
|
||||||
|
4|npm_ch5|hex2dec|count||
|
||||||
|
4|npm_temp|hex2dec|°C|x/10|
|
||||||
|
4|npm_humidity|hex2dec|%|x/10|
|
||||||
|
4|battery_voltage|hex2dec|V|x/100|
|
||||||
|
4|battery_current|hex2dec|A|x/100|
|
||||||
|
4|solar_voltage|hex2dec|V|x/100|
|
||||||
|
4|solar_power|hex2dec|W||
|
||||||
|
4|charger_status|hex2dec|||
|
||||||
|
4|wind_speed|hex2dec|m/s|x/10|
|
||||||
|
4|wind_direction|hex2dec|degrees||
|
||||||
|
2|error_flags|hex2dec|||
|
||||||
|
2|npm_status|hex2dec|||
|
||||||
|
2|device_status|hex2dec|||
|
||||||
|
28|reserved|skip|||
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Lecture cote serveur (exemple Python)
|
||||||
|
|
||||||
|
```python
|
||||||
|
# Byte 66 — erreurs systeme
|
||||||
|
error_flags = int(parsed_error_flags)
|
||||||
|
|
||||||
|
rtc_disconnected = bool(error_flags & 0x01)
|
||||||
|
rtc_reset = bool(error_flags & 0x02)
|
||||||
|
bme280_error = bool(error_flags & 0x04)
|
||||||
|
npm_error = bool(error_flags & 0x08)
|
||||||
|
envea_error = bool(error_flags & 0x10)
|
||||||
|
noise_error = bool(error_flags & 0x20)
|
||||||
|
mppt_error = bool(error_flags & 0x40)
|
||||||
|
wind_error = bool(error_flags & 0x80)
|
||||||
|
|
||||||
|
# Byte 67 — status NextPM
|
||||||
|
npm_status = int(parsed_npm_status)
|
||||||
|
|
||||||
|
npm_sleep = bool(npm_status & 0x01)
|
||||||
|
npm_degraded = bool(npm_status & 0x02)
|
||||||
|
npm_not_ready = bool(npm_status & 0x04)
|
||||||
|
npm_heat_err = bool(npm_status & 0x08)
|
||||||
|
npm_trh_err = bool(npm_status & 0x10)
|
||||||
|
npm_fan_err = bool(npm_status & 0x20)
|
||||||
|
npm_mem_err = bool(npm_status & 0x40)
|
||||||
|
npm_laser_err = bool(npm_status & 0x80)
|
||||||
|
|
||||||
|
# Byte 68 — status device
|
||||||
|
device_status = int(parsed_device_status)
|
||||||
|
|
||||||
|
sara_rebooted = bool(device_status & 0x01)
|
||||||
|
wifi_connected = bool(device_status & 0x02)
|
||||||
|
hotspot_active = bool(device_status & 0x04)
|
||||||
|
gps_no_fix = bool(device_status & 0x08)
|
||||||
|
battery_low = bool(device_status & 0x10)
|
||||||
|
disk_full = bool(device_status & 0x20)
|
||||||
|
db_error = bool(device_status & 0x40)
|
||||||
|
boot_recent = bool(device_status & 0x80)
|
||||||
|
|
||||||
|
# Alertes
|
||||||
|
if rtc_disconnected:
|
||||||
|
alert("RTC module deconnecte — verifier pile/cables I2C")
|
||||||
|
if npm_fan_err:
|
||||||
|
alert("NextPM: ventilateur hors plage — maintenance requise")
|
||||||
|
if npm_laser_err:
|
||||||
|
alert("NextPM: possible erreur laser — verifier le capteur")
|
||||||
|
if battery_low:
|
||||||
|
alert("Batterie faible — verifier alimentation solaire")
|
||||||
|
if disk_full:
|
||||||
|
alert("Espace disque critique — verifier logs/DB")
|
||||||
|
if sara_rebooted:
|
||||||
|
alert("Modem reboot hardware au cycle precedent — instabilite reseau")
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Notes
|
||||||
|
|
||||||
|
- La payload est initialisee a 0xFF (tous bytes a 255). Le script doit explicitement
|
||||||
|
ecrire 0x00 dans les bytes 66-67 quand tout va bien, sinon Miotiq interpretera
|
||||||
|
255 = toutes les erreurs.
|
||||||
|
- Le NPM status n'est pas encore lu par `get_data_modbus_v3.py`. Il faut d'abord
|
||||||
|
ajouter la lecture du registre de status Modbus et le stocker en SQLite.
|
||||||
|
- Les flags du byte 66 sont determines par le script d'envoi en analysant les
|
||||||
|
valeurs lues depuis SQLite (toutes a 0 = capteur en erreur).
|
||||||
100
master.py
100
master.py
@@ -1,100 +0,0 @@
|
|||||||
'''
|
|
||||||
__ __ _
|
|
||||||
| \/ | __ _ ___| |_ ___ _ __
|
|
||||||
| |\/| |/ _` / __| __/ _ \ '__|
|
|
||||||
| | | | (_| \__ \ || __/ |
|
|
||||||
|_| |_|\__,_|___/\__\___|_|
|
|
||||||
|
|
||||||
Master Python script that will trigger other scripts at every chosen time pace
|
|
||||||
This script is triggered as a systemd service used as an alternative to cronjobs
|
|
||||||
|
|
||||||
Attention:
|
|
||||||
to do -> prevent SARA R4 Script to run again if it's taking more than 60 secs to finish (using a lock file ??)
|
|
||||||
|
|
||||||
First time: need to create the service file
|
|
||||||
|
|
||||||
--> sudo nano /etc/systemd/system/master_nebuleair.service
|
|
||||||
|
|
||||||
⬇️
|
|
||||||
[Unit]
|
|
||||||
Description=Master manager for the Python loop scripts
|
|
||||||
After=network.target
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/master.py
|
|
||||||
Restart=always
|
|
||||||
User=root
|
|
||||||
WorkingDirectory=/var/www/nebuleair_pro_4g
|
|
||||||
StandardOutput=append:/var/www/nebuleair_pro_4g/logs/master.log
|
|
||||||
StandardError=append:/var/www/nebuleair_pro_4g/logs/master_errors.log
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
||||||
⬆️
|
|
||||||
|
|
||||||
Reload systemd (first time after creating the service):
|
|
||||||
sudo systemctl daemon-reload
|
|
||||||
|
|
||||||
Enable (once), start (once and after stopping) and restart (after modification)systemd:
|
|
||||||
sudo systemctl enable master_nebuleair.service
|
|
||||||
sudo systemctl start master_nebuleair.service
|
|
||||||
sudo systemctl restart master_nebuleair.service
|
|
||||||
|
|
||||||
Check the service status:
|
|
||||||
sudo systemctl status master_nebuleair.service
|
|
||||||
|
|
||||||
|
|
||||||
Specific scripts can be disabled with config.json
|
|
||||||
Exemple: stop gathering data from NPM
|
|
||||||
Exemple: stop sending data with SARA R4
|
|
||||||
|
|
||||||
'''
|
|
||||||
import time
|
|
||||||
import threading
|
|
||||||
import subprocess
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
|
|
||||||
# Base directory where scripts are stored
|
|
||||||
SCRIPT_DIR = "/var/www/nebuleair_pro_4g/"
|
|
||||||
CONFIG_FILE = "/var/www/nebuleair_pro_4g/config.json"
|
|
||||||
|
|
||||||
def load_config():
|
|
||||||
"""Load the configuration file to determine which scripts to run."""
|
|
||||||
with open(CONFIG_FILE, "r") as f:
|
|
||||||
return json.load(f)
|
|
||||||
|
|
||||||
def run_script(script_name, interval, delay=0):
|
|
||||||
"""Run a script in a synchronized loop with an optional start delay."""
|
|
||||||
script_path = os.path.join(SCRIPT_DIR, script_name) # Build full path
|
|
||||||
next_run = time.monotonic() + delay # Apply the initial delay
|
|
||||||
|
|
||||||
while True:
|
|
||||||
config = load_config()
|
|
||||||
if config.get(script_name, True): # Default to True if not found
|
|
||||||
subprocess.run(["python3", script_path])
|
|
||||||
|
|
||||||
# Wait until the next exact interval
|
|
||||||
next_run += interval
|
|
||||||
sleep_time = max(0, next_run - time.monotonic()) # Prevent negative sleep times
|
|
||||||
time.sleep(sleep_time)
|
|
||||||
|
|
||||||
# Define scripts and their execution intervals (seconds)
|
|
||||||
SCRIPTS = [
|
|
||||||
#("RTC/save_to_db.py", 1, 0), # SAVE RTC time every 1 second, no delay
|
|
||||||
("NPM/get_data_modbus_v3.py", 10, 0), # Get NPM data (modbus 5 channels) every 10s, with 2s delay
|
|
||||||
("envea/read_value_v2.py", 10, 0), # Get NPM data (modbus 5 channels) every 10s, with 2s delay
|
|
||||||
("loop/SARA_send_data_v2.py", 60, 1), # Send data every 60 seconds, with 2s delay
|
|
||||||
("BME280/get_data_v2.py", 120, 0), # Get BME280 data every 120 seconds, no delay
|
|
||||||
("sqlite/flush_old_data.py", 86400, 0) # flush old data inside db every day ()
|
|
||||||
]
|
|
||||||
|
|
||||||
# Start threads for enabled scripts
|
|
||||||
for script_name, interval, delay in SCRIPTS:
|
|
||||||
thread = threading.Thread(target=run_script, args=(script_name, interval, delay), daemon=True)
|
|
||||||
thread.start()
|
|
||||||
|
|
||||||
# Keep the main script running
|
|
||||||
while True:
|
|
||||||
time.sleep(1)
|
|
||||||
|
|
||||||
5
config.json.dist → old/config.json.dist
Executable file → Normal file
5
config.json.dist → old/config.json.dist
Executable file → Normal file
@@ -5,8 +5,11 @@
|
|||||||
"RTC/save_to_db.py": true,
|
"RTC/save_to_db.py": true,
|
||||||
"BME280/get_data_v2.py": true,
|
"BME280/get_data_v2.py": true,
|
||||||
"envea/read_value_v2.py": false,
|
"envea/read_value_v2.py": false,
|
||||||
|
"MPPT/read.py": false,
|
||||||
|
"windMeter/read.py": false,
|
||||||
"sqlite/flush_old_data.py": true,
|
"sqlite/flush_old_data.py": true,
|
||||||
"deviceID": "XXXX",
|
"deviceID": "XXXX",
|
||||||
|
"npm_5channel": false,
|
||||||
"latitude_raw": 0,
|
"latitude_raw": 0,
|
||||||
"longitude_raw":0,
|
"longitude_raw":0,
|
||||||
"latitude_precision": 0,
|
"latitude_precision": 0,
|
||||||
@@ -25,7 +28,7 @@
|
|||||||
"SARA_R4_general_status": "connected",
|
"SARA_R4_general_status": "connected",
|
||||||
"SARA_R4_SIM_status": "connected",
|
"SARA_R4_SIM_status": "connected",
|
||||||
"SARA_R4_network_status": "connected",
|
"SARA_R4_network_status": "connected",
|
||||||
"SARA_R4_neworkID": 0,
|
"SARA_R4_neworkID": 20810,
|
||||||
"WIFI_status": "connected",
|
"WIFI_status": "connected",
|
||||||
"MQTT_GUI": false,
|
"MQTT_GUI": false,
|
||||||
"send_aircarto": true,
|
"send_aircarto": true,
|
||||||
0
install_software.yaml → old/install_software.yaml
Executable file → Normal file
0
install_software.yaml → old/install_software.yaml
Executable file → Normal file
166
old/master.py
Executable file
166
old/master.py
Executable file
@@ -0,0 +1,166 @@
|
|||||||
|
'''
|
||||||
|
__ __ _
|
||||||
|
| \/ | __ _ ___| |_ ___ _ __
|
||||||
|
| |\/| |/ _` / __| __/ _ \ '__|
|
||||||
|
| | | | (_| \__ \ || __/ |
|
||||||
|
|_| |_|\__,_|___/\__\___|_|
|
||||||
|
|
||||||
|
Master Python script that will trigger other scripts at every chosen time pace
|
||||||
|
This script is triggered as a systemd service used as an alternative to cronjobs
|
||||||
|
|
||||||
|
Attention:
|
||||||
|
to do -> prevent SARA R4 Script to run again if it's taking more than 60 secs to finish (using a lock file ??)
|
||||||
|
|
||||||
|
First time: need to create the service file
|
||||||
|
|
||||||
|
--> sudo nano /etc/systemd/system/master_nebuleair.service
|
||||||
|
|
||||||
|
⬇️
|
||||||
|
[Unit]
|
||||||
|
Description=Master manager for the Python loop scripts
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/master.py
|
||||||
|
Restart=always
|
||||||
|
User=root
|
||||||
|
WorkingDirectory=/var/www/nebuleair_pro_4g
|
||||||
|
StandardOutput=append:/var/www/nebuleair_pro_4g/logs/master.log
|
||||||
|
StandardError=append:/var/www/nebuleair_pro_4g/logs/master_errors.log
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
⬆️
|
||||||
|
|
||||||
|
Reload systemd (first time after creating the service):
|
||||||
|
sudo systemctl daemon-reload
|
||||||
|
|
||||||
|
Enable (once), start (once and after stopping) and restart (after modification)systemd:
|
||||||
|
sudo systemctl enable master_nebuleair.service
|
||||||
|
sudo systemctl start master_nebuleair.service
|
||||||
|
sudo systemctl restart master_nebuleair.service
|
||||||
|
|
||||||
|
Check the service status:
|
||||||
|
sudo systemctl status master_nebuleair.service
|
||||||
|
|
||||||
|
|
||||||
|
Specific scripts can be disabled with config.json
|
||||||
|
Exemple: stop gathering data from NPM
|
||||||
|
Exemple: stop sending data with SARA R4
|
||||||
|
|
||||||
|
'''
|
||||||
|
import time
|
||||||
|
import threading
|
||||||
|
import subprocess
|
||||||
|
import os
|
||||||
|
import sqlite3
|
||||||
|
|
||||||
|
|
||||||
|
# Base directory where scripts are stored
|
||||||
|
SCRIPT_DIR = "/var/www/nebuleair_pro_4g/"
|
||||||
|
DB_PATH = "/var/www/nebuleair_pro_4g/sqlite/sensors.db"
|
||||||
|
|
||||||
|
# Lock file path for SARA script
|
||||||
|
SARA_LOCK_FILE = "/var/www/nebuleair_pro_4g/sara_script.lock"
|
||||||
|
|
||||||
|
|
||||||
|
def is_script_enabled(script_name):
|
||||||
|
"""Check if a script is enabled in the database."""
|
||||||
|
try:
|
||||||
|
conn = sqlite3.connect(DB_PATH)
|
||||||
|
cursor = conn.cursor()
|
||||||
|
|
||||||
|
cursor.execute(
|
||||||
|
"SELECT enabled FROM config_scripts_table WHERE script_path = ?",
|
||||||
|
(script_name,)
|
||||||
|
)
|
||||||
|
|
||||||
|
result = cursor.fetchone()
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
if result is None:
|
||||||
|
return True # Default to enabled if not found in database
|
||||||
|
|
||||||
|
return bool(result[0])
|
||||||
|
except Exception:
|
||||||
|
# If any database error occurs, default to enabled
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def create_lock_file():
|
||||||
|
"""Create a lock file for the SARA script."""
|
||||||
|
with open(SARA_LOCK_FILE, 'w') as f:
|
||||||
|
f.write(str(int(time.time())))
|
||||||
|
|
||||||
|
|
||||||
|
def remove_lock_file():
|
||||||
|
"""Remove the SARA script lock file."""
|
||||||
|
if os.path.exists(SARA_LOCK_FILE):
|
||||||
|
os.remove(SARA_LOCK_FILE)
|
||||||
|
|
||||||
|
|
||||||
|
def is_script_locked():
|
||||||
|
"""Check if the SARA script is currently locked."""
|
||||||
|
if not os.path.exists(SARA_LOCK_FILE):
|
||||||
|
return False
|
||||||
|
|
||||||
|
# Check if lock is older than 60 seconds (stale)
|
||||||
|
with open(SARA_LOCK_FILE, 'r') as f:
|
||||||
|
try:
|
||||||
|
lock_time = int(f.read().strip())
|
||||||
|
if time.time() - lock_time > 60:
|
||||||
|
# Lock is stale, remove it
|
||||||
|
remove_lock_file()
|
||||||
|
return False
|
||||||
|
except ValueError:
|
||||||
|
# Invalid lock file content
|
||||||
|
remove_lock_file()
|
||||||
|
return False
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def run_script(script_name, interval, delay=0):
|
||||||
|
"""Run a script in a synchronized loop with an optional start delay."""
|
||||||
|
script_path = os.path.join(SCRIPT_DIR, script_name) # Build full path
|
||||||
|
next_run = time.monotonic() + delay # Apply the initial delay
|
||||||
|
|
||||||
|
while True:
|
||||||
|
if is_script_enabled(script_name):
|
||||||
|
# Special handling for SARA script to prevent concurrent runs
|
||||||
|
if script_name == "loop/SARA_send_data_v2.py":
|
||||||
|
if not is_script_locked():
|
||||||
|
create_lock_file()
|
||||||
|
try:
|
||||||
|
subprocess.run(["python3", script_path], timeout=200)
|
||||||
|
finally:
|
||||||
|
remove_lock_file()
|
||||||
|
else:
|
||||||
|
# Run other scripts normally
|
||||||
|
subprocess.run(["python3", script_path])
|
||||||
|
|
||||||
|
# Wait until the next exact interval
|
||||||
|
next_run += interval
|
||||||
|
sleep_time = max(0, next_run - time.monotonic()) # Prevent negative sleep times
|
||||||
|
time.sleep(sleep_time)
|
||||||
|
|
||||||
|
|
||||||
|
# Define scripts and their execution intervals (seconds)
|
||||||
|
SCRIPTS = [
|
||||||
|
# Format: (script_name, interval_in_seconds, start_delay_in_seconds)
|
||||||
|
("NPM/get_data_modbus_v3.py", 10, 0), # Get NPM data (modbus 5 channels) every 10s
|
||||||
|
("envea/read_value_v2.py", 10, 0), # Get Envea data every 10s
|
||||||
|
("loop/SARA_send_data_v2.py", 60, 1), # Send data every 60 seconds, with 1s delay
|
||||||
|
("BME280/get_data_v2.py", 120, 0), # Get BME280 data every 120 seconds
|
||||||
|
("MPPT/read.py", 120, 0), # Get MPPT data every 120 seconds
|
||||||
|
("sqlite/flush_old_data.py", 86400, 0) # Flush old data inside db every day
|
||||||
|
]
|
||||||
|
|
||||||
|
# Start threads for scripts
|
||||||
|
for script_name, interval, delay in SCRIPTS:
|
||||||
|
thread = threading.Thread(target=run_script, args=(script_name, interval, delay), daemon=True)
|
||||||
|
thread.start()
|
||||||
|
|
||||||
|
# Keep the main script running
|
||||||
|
while True:
|
||||||
|
time.sleep(1)
|
||||||
71
power/apply_cpu_mode_from_db.py
Normal file
71
power/apply_cpu_mode_from_db.py
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""
|
||||||
|
Apply CPU Power Mode from Database at Boot
|
||||||
|
|
||||||
|
This script is called by systemd at boot to apply the CPU power mode
|
||||||
|
stored in the database (cpu_power_mode config parameter).
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/power/apply_cpu_mode_from_db.py
|
||||||
|
"""
|
||||||
|
|
||||||
|
import sqlite3
|
||||||
|
import sys
|
||||||
|
import subprocess
|
||||||
|
|
||||||
|
DB_PATH = "/var/www/nebuleair_pro_4g/sqlite/sensors.db"
|
||||||
|
SET_MODE_SCRIPT = "/var/www/nebuleair_pro_4g/power/set_cpu_mode.py"
|
||||||
|
|
||||||
|
def get_cpu_mode_from_db():
|
||||||
|
"""Read cpu_power_mode from database"""
|
||||||
|
try:
|
||||||
|
conn = sqlite3.connect(DB_PATH)
|
||||||
|
cursor = conn.cursor()
|
||||||
|
cursor.execute("SELECT value FROM config_table WHERE key = 'cpu_power_mode'")
|
||||||
|
result = cursor.fetchone()
|
||||||
|
conn.close()
|
||||||
|
return result[0] if result else None
|
||||||
|
except sqlite3.Error as e:
|
||||||
|
print(f"Database error: {e}", file=sys.stderr)
|
||||||
|
return None
|
||||||
|
|
||||||
|
def main():
|
||||||
|
"""Main function"""
|
||||||
|
print("=== Applying CPU Power Mode from Database ===")
|
||||||
|
|
||||||
|
# Get mode from database
|
||||||
|
mode = get_cpu_mode_from_db()
|
||||||
|
|
||||||
|
if mode is None:
|
||||||
|
print("No cpu_power_mode found in database, using default: normal")
|
||||||
|
mode = "normal"
|
||||||
|
|
||||||
|
print(f"CPU power mode from database: {mode}")
|
||||||
|
|
||||||
|
# Call set_cpu_mode.py to apply the mode
|
||||||
|
try:
|
||||||
|
result = subprocess.run(
|
||||||
|
["/usr/bin/python3", SET_MODE_SCRIPT, mode],
|
||||||
|
capture_output=True,
|
||||||
|
text=True,
|
||||||
|
timeout=30
|
||||||
|
)
|
||||||
|
|
||||||
|
if result.returncode == 0:
|
||||||
|
print(f"Successfully applied CPU power mode: {mode}")
|
||||||
|
print(result.stdout)
|
||||||
|
return 0
|
||||||
|
else:
|
||||||
|
print(f"Failed to apply CPU power mode: {mode}", file=sys.stderr)
|
||||||
|
print(result.stderr, file=sys.stderr)
|
||||||
|
return 1
|
||||||
|
|
||||||
|
except subprocess.TimeoutExpired:
|
||||||
|
print("Timeout while applying CPU power mode", file=sys.stderr)
|
||||||
|
return 1
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error: {e}", file=sys.stderr)
|
||||||
|
return 1
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
sys.exit(main())
|
||||||
256
power/set_cpu_mode.py
Normal file
256
power/set_cpu_mode.py
Normal file
@@ -0,0 +1,256 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""
|
||||||
|
____ ____ _ _ ____ __ __ _
|
||||||
|
/ ___| _ \| | | | | _ \ _____ _____ _ _| \/ | ___ __| | ___
|
||||||
|
| | | |_) | | | | | |_) / _ \ \ /\ / / _ \ '__| |\/| |/ _ \ / _` |/ _ \
|
||||||
|
| |___| __/| |_| | | __/ (_) \ V V / __/ | | | | | (_) | (_| | __/
|
||||||
|
\____|_| \___/ |_| \___/ \_/\_/ \___|_| |_| |_|\___/ \__,_|\___|
|
||||||
|
|
||||||
|
CPU Power Mode Management Script
|
||||||
|
Switches between Normal and Power Saving CPU modes.
|
||||||
|
|
||||||
|
Modes:
|
||||||
|
- normal: CPU governor ondemand (600MHz-1500MHz dynamic)
|
||||||
|
- powersave: CPU governor powersave (600MHz fixed)
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/power/set_cpu_mode.py <mode>
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/power/set_cpu_mode.py normal
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/power/set_cpu_mode.py powersave
|
||||||
|
|
||||||
|
Or get current mode:
|
||||||
|
/usr/bin/python3 /var/www/nebuleair_pro_4g/power/set_cpu_mode.py get
|
||||||
|
"""
|
||||||
|
|
||||||
|
import sqlite3
|
||||||
|
import subprocess
|
||||||
|
import sys
|
||||||
|
import datetime
|
||||||
|
import json
|
||||||
|
|
||||||
|
# Paths
|
||||||
|
DB_PATH = "/var/www/nebuleair_pro_4g/sqlite/sensors.db"
|
||||||
|
LOG_PATH = "/var/www/nebuleair_pro_4g/logs/app.log"
|
||||||
|
|
||||||
|
# Available modes
|
||||||
|
MODES = {
|
||||||
|
"normal": {
|
||||||
|
"governor": "ondemand",
|
||||||
|
"description": "Normal mode - CPU 600MHz-1500MHz dynamic",
|
||||||
|
"min_freq": 600000, # 600 MHz in kHz
|
||||||
|
"max_freq": 1500000 # 1500 MHz in kHz
|
||||||
|
},
|
||||||
|
"powersave": {
|
||||||
|
"governor": "powersave",
|
||||||
|
"description": "Power saving mode - CPU 600MHz fixed",
|
||||||
|
"min_freq": 600000,
|
||||||
|
"max_freq": 600000
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def log_message(message):
|
||||||
|
"""Write message to log file with timestamp"""
|
||||||
|
timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
||||||
|
log_entry = f"[{timestamp}] [CPU Power Mode] {message}\n"
|
||||||
|
try:
|
||||||
|
with open(LOG_PATH, "a") as log_file:
|
||||||
|
log_file.write(log_entry)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Failed to write to log: {e}", file=sys.stderr)
|
||||||
|
print(log_entry.strip())
|
||||||
|
|
||||||
|
def get_cpu_count():
|
||||||
|
"""Get number of CPU cores"""
|
||||||
|
try:
|
||||||
|
result = subprocess.run(
|
||||||
|
["nproc"],
|
||||||
|
capture_output=True,
|
||||||
|
text=True,
|
||||||
|
timeout=5
|
||||||
|
)
|
||||||
|
return int(result.stdout.strip())
|
||||||
|
except Exception as e:
|
||||||
|
log_message(f"Failed to get CPU count: {e}")
|
||||||
|
return 4 # Default to 4 cores for CM4
|
||||||
|
|
||||||
|
def set_cpu_governor(governor, cpu_id):
|
||||||
|
"""Set CPU governor for specific CPU core"""
|
||||||
|
try:
|
||||||
|
with open(f"/sys/devices/system/cpu/cpu{cpu_id}/cpufreq/scaling_governor", "w") as f:
|
||||||
|
f.write(governor)
|
||||||
|
return True
|
||||||
|
except Exception as e:
|
||||||
|
log_message(f"Failed to set governor for CPU{cpu_id}: {e}")
|
||||||
|
return False
|
||||||
|
|
||||||
|
def set_cpu_freq(min_freq, max_freq, cpu_id):
|
||||||
|
"""Set CPU frequency limits for specific CPU core"""
|
||||||
|
try:
|
||||||
|
# Set min frequency
|
||||||
|
with open(f"/sys/devices/system/cpu/cpu{cpu_id}/cpufreq/scaling_min_freq", "w") as f:
|
||||||
|
f.write(str(min_freq))
|
||||||
|
|
||||||
|
# Set max frequency
|
||||||
|
with open(f"/sys/devices/system/cpu/cpu{cpu_id}/cpufreq/scaling_max_freq", "w") as f:
|
||||||
|
f.write(str(max_freq))
|
||||||
|
|
||||||
|
return True
|
||||||
|
except Exception as e:
|
||||||
|
log_message(f"Failed to set frequency for CPU{cpu_id}: {e}")
|
||||||
|
return False
|
||||||
|
|
||||||
|
def get_current_cpu_state():
|
||||||
|
"""Get current CPU governor and frequencies"""
|
||||||
|
try:
|
||||||
|
with open("/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor", "r") as f:
|
||||||
|
governor = f.read().strip()
|
||||||
|
|
||||||
|
with open("/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", "r") as f:
|
||||||
|
min_freq = int(f.read().strip())
|
||||||
|
|
||||||
|
with open("/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq", "r") as f:
|
||||||
|
max_freq = int(f.read().strip())
|
||||||
|
|
||||||
|
with open("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq", "r") as f:
|
||||||
|
cur_freq = int(f.read().strip())
|
||||||
|
|
||||||
|
return {
|
||||||
|
"governor": governor,
|
||||||
|
"min_freq_khz": min_freq,
|
||||||
|
"max_freq_khz": max_freq,
|
||||||
|
"current_freq_khz": cur_freq,
|
||||||
|
"min_freq_mhz": min_freq / 1000,
|
||||||
|
"max_freq_mhz": max_freq / 1000,
|
||||||
|
"current_freq_mhz": cur_freq / 1000
|
||||||
|
}
|
||||||
|
except Exception as e:
|
||||||
|
log_message(f"Failed to get current CPU state: {e}")
|
||||||
|
return None
|
||||||
|
|
||||||
|
def update_config_db(mode):
|
||||||
|
"""Update cpu_power_mode in database"""
|
||||||
|
try:
|
||||||
|
conn = sqlite3.connect(DB_PATH)
|
||||||
|
cursor = conn.cursor()
|
||||||
|
cursor.execute(
|
||||||
|
"UPDATE config_table SET value = ? WHERE key = 'cpu_power_mode'",
|
||||||
|
(mode,)
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
conn.close()
|
||||||
|
return True
|
||||||
|
except sqlite3.Error as e:
|
||||||
|
log_message(f"Database error: {e}")
|
||||||
|
return False
|
||||||
|
|
||||||
|
def get_config_from_db():
|
||||||
|
"""Read cpu_power_mode from database"""
|
||||||
|
try:
|
||||||
|
conn = sqlite3.connect(DB_PATH)
|
||||||
|
cursor = conn.cursor()
|
||||||
|
cursor.execute("SELECT value FROM config_table WHERE key = 'cpu_power_mode'")
|
||||||
|
result = cursor.fetchone()
|
||||||
|
conn.close()
|
||||||
|
return result[0] if result else None
|
||||||
|
except sqlite3.Error as e:
|
||||||
|
log_message(f"Database error: {e}")
|
||||||
|
return None
|
||||||
|
|
||||||
|
def apply_mode(mode):
|
||||||
|
"""Apply CPU power mode"""
|
||||||
|
if mode not in MODES:
|
||||||
|
log_message(f"Invalid mode: {mode}. Valid modes: {', '.join(MODES.keys())}")
|
||||||
|
return False
|
||||||
|
|
||||||
|
mode_config = MODES[mode]
|
||||||
|
log_message(f"Applying mode: {mode} - {mode_config['description']}")
|
||||||
|
|
||||||
|
cpu_count = get_cpu_count()
|
||||||
|
log_message(f"Detected {cpu_count} CPU cores")
|
||||||
|
|
||||||
|
success = True
|
||||||
|
|
||||||
|
# Apply settings to all CPU cores
|
||||||
|
for cpu_id in range(cpu_count):
|
||||||
|
# Set frequency limits first
|
||||||
|
if not set_cpu_freq(mode_config['min_freq'], mode_config['max_freq'], cpu_id):
|
||||||
|
success = False
|
||||||
|
|
||||||
|
# Then set governor
|
||||||
|
if not set_cpu_governor(mode_config['governor'], cpu_id):
|
||||||
|
success = False
|
||||||
|
|
||||||
|
if success:
|
||||||
|
log_message(f"Successfully applied {mode} mode to all {cpu_count} cores")
|
||||||
|
|
||||||
|
# Update database
|
||||||
|
if update_config_db(mode):
|
||||||
|
log_message(f"Updated database: cpu_power_mode = {mode}")
|
||||||
|
else:
|
||||||
|
log_message("Warning: Failed to update database")
|
||||||
|
|
||||||
|
# Log current state
|
||||||
|
state = get_current_cpu_state()
|
||||||
|
if state:
|
||||||
|
log_message(f"Current CPU state: {state['governor']} governor, "
|
||||||
|
f"{state['min_freq_mhz']:.0f}-{state['max_freq_mhz']:.0f} MHz "
|
||||||
|
f"(current: {state['current_freq_mhz']:.0f} MHz)")
|
||||||
|
else:
|
||||||
|
log_message(f"Failed to apply {mode} mode completely")
|
||||||
|
|
||||||
|
return success
|
||||||
|
|
||||||
|
def main():
|
||||||
|
"""Main function"""
|
||||||
|
if len(sys.argv) < 2:
|
||||||
|
print("Usage: set_cpu_mode.py <mode>")
|
||||||
|
print("Modes: normal, powersave")
|
||||||
|
print("Or: set_cpu_mode.py get (to get current state)")
|
||||||
|
return 1
|
||||||
|
|
||||||
|
command = sys.argv[1].lower()
|
||||||
|
|
||||||
|
# Handle "get" command to return current state
|
||||||
|
if command == "get":
|
||||||
|
state = get_current_cpu_state()
|
||||||
|
db_mode = get_config_from_db()
|
||||||
|
|
||||||
|
if state:
|
||||||
|
output = {
|
||||||
|
"success": True,
|
||||||
|
"cpu_state": state,
|
||||||
|
"config_mode": db_mode
|
||||||
|
}
|
||||||
|
print(json.dumps(output))
|
||||||
|
return 0
|
||||||
|
else:
|
||||||
|
output = {
|
||||||
|
"success": False,
|
||||||
|
"error": "Failed to read CPU state"
|
||||||
|
}
|
||||||
|
print(json.dumps(output))
|
||||||
|
return 1
|
||||||
|
|
||||||
|
# Handle mode setting
|
||||||
|
log_message("=== CPU Power Mode Script Started ===")
|
||||||
|
|
||||||
|
if apply_mode(command):
|
||||||
|
log_message("=== CPU Power Mode Script Completed Successfully ===")
|
||||||
|
output = {
|
||||||
|
"success": True,
|
||||||
|
"mode": command,
|
||||||
|
"description": MODES[command]['description']
|
||||||
|
}
|
||||||
|
print(json.dumps(output))
|
||||||
|
return 0
|
||||||
|
else:
|
||||||
|
log_message("=== CPU Power Mode Script Failed ===")
|
||||||
|
output = {
|
||||||
|
"success": False,
|
||||||
|
"error": f"Failed to apply mode: {command}"
|
||||||
|
}
|
||||||
|
print(json.dumps(output))
|
||||||
|
return 1
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
sys.exit(main())
|
||||||
40
screen_control/screen.py
Normal file
40
screen_control/screen.py
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
|
||||||
|
# Screen Control Script (Kivy)
|
||||||
|
#
|
||||||
|
# This script displays a simple "Bonjour" message on the HDMI screen using Kivy.
|
||||||
|
# It is designed to be run on a device without a desktop environment (headless/framebuffer).
|
||||||
|
#
|
||||||
|
# HOW TO RUN (CLI):
|
||||||
|
# -----------------
|
||||||
|
# 1. Ensure Kivy is installed (python3-kivy).
|
||||||
|
# 2. You may need to set the DISPLAY environment variable if running from SSH or outside a graphical session:
|
||||||
|
# export DISPLAY=:0
|
||||||
|
# 3. Run the script:
|
||||||
|
# python3 /var/www/nebuleair_pro_4g/screen_control/screen.py
|
||||||
|
#
|
||||||
|
# HOW TO RUN (BACKGROUND):
|
||||||
|
# ------------------------
|
||||||
|
# nohup python3 /var/www/nebuleair_pro_4g/screen_control/screen.py > /dev/null 2>&1 &
|
||||||
|
#
|
||||||
|
# HOW TO STOP:
|
||||||
|
# ------------
|
||||||
|
# pkill -f "screen_control/screen.py"
|
||||||
|
#
|
||||||
|
|
||||||
|
import os
|
||||||
|
os.environ['KIVY_GL_BACKEND'] = 'gl'
|
||||||
|
from kivy.app import App
|
||||||
|
from kivy.uix.label import Label
|
||||||
|
from kivy.core.window import Window
|
||||||
|
|
||||||
|
# Set background color to black (optional, but good for screens)
|
||||||
|
Window.clearcolor = (0, 0, 0, 1)
|
||||||
|
|
||||||
|
class ScreenApp(App):
|
||||||
|
def build(self):
|
||||||
|
# Create a label with large text "Bonjour" centered on the screen
|
||||||
|
label = Label(text='Bonjour', font_size='150sp', color=(1, 1, 1, 1))
|
||||||
|
return label
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
ScreenApp().run()
|
||||||
18
services/README.md
Normal file
18
services/README.md
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# NebuleAir Pro Services
|
||||||
|
|
||||||
|
Les scripts importants tournent à l'aide d'un service et d'un timer associé.
|
||||||
|
|
||||||
|
Pour les installer:
|
||||||
|
|
||||||
|
sudo chmod +x /var/www/nebuleair_pro_4g/services/setup_services.sh
|
||||||
|
sudo /var/www/nebuleair_pro_4g/services/setup_services.sh
|
||||||
|
|
||||||
|
Supprimer l'ancien master:
|
||||||
|
sudo systemctl stop master_nebuleair.service
|
||||||
|
sudo systemctl disable master_nebuleair.service
|
||||||
|
|
||||||
|
# Check les services
|
||||||
|
|
||||||
|
SARA:
|
||||||
|
sudo systemctl status nebuleair-sara-data.service
|
||||||
|
|
||||||
277
services/check_services.sh
Normal file
277
services/check_services.sh
Normal file
@@ -0,0 +1,277 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# File: /var/www/nebuleair_pro_4g/services/check_services.sh
|
||||||
|
# Purpose: Check status of all NebuleAir services and logs
|
||||||
|
# Version with fixed color handling for proper table display
|
||||||
|
|
||||||
|
# Colors for output
|
||||||
|
RED='\033[0;31m'
|
||||||
|
GREEN='\033[0;32m'
|
||||||
|
YELLOW='\033[1;33m'
|
||||||
|
BLUE='\033[0;34m'
|
||||||
|
CYAN='\033[0;36m'
|
||||||
|
BOLD='\033[1m'
|
||||||
|
DIM='\033[2m'
|
||||||
|
NC='\033[0m' # No Color
|
||||||
|
|
||||||
|
# Service list
|
||||||
|
SERVICES=("npm" "envea" "sara" "bme280" "mppt" "db-cleanup" "noise")
|
||||||
|
|
||||||
|
# Function to print header
|
||||||
|
print_header() {
|
||||||
|
local text="$1"
|
||||||
|
echo ""
|
||||||
|
echo -e "${BLUE}${BOLD}=== $text ===${NC}"
|
||||||
|
echo -e "${BLUE}$(printf '%.0s=' {1..70})${NC}"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Function to print section
|
||||||
|
print_section() {
|
||||||
|
local text="$1"
|
||||||
|
echo ""
|
||||||
|
echo -e "${CYAN}${BOLD}--- $text ---${NC}"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Function to print a separator line
|
||||||
|
print_separator() {
|
||||||
|
echo "+--------------------------+-----------+-----------+-------------+-------------+-------------------------+"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Clear screen for clean output
|
||||||
|
clear
|
||||||
|
|
||||||
|
# Main header
|
||||||
|
print_header "NebuleAir Services Status Report"
|
||||||
|
echo -e "Generated on: $(date '+%Y-%m-%d %H:%M:%S')"
|
||||||
|
|
||||||
|
# Timer Schedule
|
||||||
|
print_section "Active Timers Schedule"
|
||||||
|
echo ""
|
||||||
|
systemctl list-timers --no-pager | head -n 1
|
||||||
|
systemctl list-timers --no-pager | grep nebuleair || echo "No active nebuleair timers found"
|
||||||
|
|
||||||
|
# Service Status Overview with fixed color handling
|
||||||
|
print_section "Service Status Overview"
|
||||||
|
echo ""
|
||||||
|
print_separator
|
||||||
|
printf "| %-24s | %-9s | %-9s | %-11s | %-11s | %-23s |\n" "Service" "Svc State" "Svc Boot" "Timer State" "Timer Boot" "Health Status"
|
||||||
|
print_separator
|
||||||
|
|
||||||
|
for service in "${SERVICES[@]}"; do
|
||||||
|
# Check the actual service and timer names (with -data suffix)
|
||||||
|
full_service_name="nebuleair-${service}-data"
|
||||||
|
|
||||||
|
# Get raw status values
|
||||||
|
service_status=$(systemctl is-active ${full_service_name}.service 2>/dev/null | tr -d '\n' || echo "not-found")
|
||||||
|
service_enabled=$(systemctl is-enabled ${full_service_name}.service 2>/dev/null | tr -d '\n' || echo "not-found")
|
||||||
|
timer_status=$(systemctl is-active ${full_service_name}.timer 2>/dev/null | tr -d '\n' || echo "not-found")
|
||||||
|
timer_enabled=$(systemctl is-enabled ${full_service_name}.timer 2>/dev/null | tr -d '\n' || echo "not-found")
|
||||||
|
|
||||||
|
# Check if files exist and override if not found
|
||||||
|
if ! systemctl list-unit-files | grep -q "^${full_service_name}.service" &>/dev/null; then
|
||||||
|
service_status="not-found"
|
||||||
|
service_enabled="not-found"
|
||||||
|
fi
|
||||||
|
if ! systemctl list-unit-files | grep -q "^${full_service_name}.timer" &>/dev/null; then
|
||||||
|
timer_status="not-found"
|
||||||
|
timer_enabled="not-found"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Create display strings without embedded colors for table cells
|
||||||
|
case $service_status in
|
||||||
|
"active") svc_st_display="active"; svc_st_color="${GREEN}" ;;
|
||||||
|
"inactive") svc_st_display="inactive"; svc_st_color="${DIM}" ;;
|
||||||
|
"activating") svc_st_display="starting"; svc_st_color="${YELLOW}" ;;
|
||||||
|
"not-found") svc_st_display="missing"; svc_st_color="${RED}" ;;
|
||||||
|
*) svc_st_display="$service_status"; svc_st_color="${RED}" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
case $service_enabled in
|
||||||
|
"enabled"|"static") svc_en_display="enabled"; svc_en_color="${GREEN}" ;;
|
||||||
|
"disabled") svc_en_display="disabled"; svc_en_color="${YELLOW}" ;;
|
||||||
|
"not-found") svc_en_display="missing"; svc_en_color="${RED}" ;;
|
||||||
|
*) svc_en_display="$service_enabled"; svc_en_color="${YELLOW}" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
case $timer_status in
|
||||||
|
"active") tim_st_display="active"; tim_st_color="${GREEN}" ;;
|
||||||
|
"inactive") tim_st_display="inactive"; tim_st_color="${RED}" ;;
|
||||||
|
"not-found") tim_st_display="missing"; tim_st_color="${RED}" ;;
|
||||||
|
*) tim_st_display="$timer_status"; tim_st_color="${RED}" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
case $timer_enabled in
|
||||||
|
"enabled"|"static") tim_en_display="enabled"; tim_en_color="${GREEN}" ;;
|
||||||
|
"disabled") tim_en_display="disabled"; tim_en_color="${YELLOW}" ;;
|
||||||
|
"not-found") tim_en_display="missing"; tim_en_color="${RED}" ;;
|
||||||
|
*) tim_en_display="$timer_enabled"; tim_en_color="${YELLOW}" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# Determine health status
|
||||||
|
if [[ "$timer_status" == "active" ]]; then
|
||||||
|
if [[ "$timer_enabled" == "enabled" || "$timer_enabled" == "static" ]]; then
|
||||||
|
health_display="✓ OK"
|
||||||
|
health_color="${GREEN}"
|
||||||
|
else
|
||||||
|
health_display="⚠ Boot disabled"
|
||||||
|
health_color="${YELLOW}"
|
||||||
|
fi
|
||||||
|
elif [[ "$timer_status" == "inactive" ]]; then
|
||||||
|
health_display="✗ Timer stopped"
|
||||||
|
health_color="${RED}"
|
||||||
|
else
|
||||||
|
health_display="✗ Timer missing"
|
||||||
|
health_color="${RED}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Print row with colors applied outside of printf formatting
|
||||||
|
printf "| %-24s | " "$full_service_name"
|
||||||
|
printf "${svc_st_color}%-9s${NC} | " "$svc_st_display"
|
||||||
|
printf "${svc_en_color}%-9s${NC} | " "$svc_en_display"
|
||||||
|
printf "${tim_st_color}%-11s${NC} | " "$tim_st_display"
|
||||||
|
printf "${tim_en_color}%-11s${NC} | " "$tim_en_display"
|
||||||
|
printf "${health_color}%-23s${NC} |\n" "$health_display"
|
||||||
|
done
|
||||||
|
print_separator
|
||||||
|
|
||||||
|
# Understanding the table
|
||||||
|
echo ""
|
||||||
|
echo -e "${DIM}Note: For timer-based services, it's normal for the service to be 'inactive' and 'disabled'.${NC}"
|
||||||
|
echo -e "${DIM} What matters is that the timer is 'active' and 'enabled'.${NC}"
|
||||||
|
|
||||||
|
# Configuration Issues
|
||||||
|
print_section "Configuration Issues"
|
||||||
|
echo ""
|
||||||
|
issues_found=false
|
||||||
|
|
||||||
|
for service in "${SERVICES[@]}"; do
|
||||||
|
full_service_name="nebuleair-${service}-data"
|
||||||
|
|
||||||
|
timer_status=$(systemctl is-active ${full_service_name}.timer 2>/dev/null | tr -d '\n' || echo "not-found")
|
||||||
|
timer_enabled=$(systemctl is-enabled ${full_service_name}.timer 2>/dev/null | tr -d '\n' || echo "not-found")
|
||||||
|
|
||||||
|
# Check if timer exists
|
||||||
|
if ! systemctl list-unit-files | grep -q "^${full_service_name}.timer" &>/dev/null; then
|
||||||
|
timer_status="not-found"
|
||||||
|
timer_enabled="not-found"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$timer_status" != "active" || ("$timer_enabled" != "enabled" && "$timer_enabled" != "static") ]]; then
|
||||||
|
issues_found=true
|
||||||
|
echo -e " ${RED}•${NC} ${BOLD}$full_service_name${NC}"
|
||||||
|
if [[ "$timer_status" == "not-found" ]]; then
|
||||||
|
echo -e " ${RED}→${NC} Timer unit file is missing"
|
||||||
|
elif [[ "$timer_status" != "active" ]]; then
|
||||||
|
echo -e " ${RED}→${NC} Timer is not running (status: $timer_status)"
|
||||||
|
fi
|
||||||
|
if [[ "$timer_enabled" == "not-found" ]]; then
|
||||||
|
echo -e " ${RED}→${NC} Timer unit file is missing"
|
||||||
|
elif [[ "$timer_enabled" != "enabled" && "$timer_enabled" != "static" ]]; then
|
||||||
|
echo -e " ${YELLOW}→${NC} Timer won't start on boot (status: $timer_enabled)"
|
||||||
|
fi
|
||||||
|
echo ""
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if [[ "$issues_found" == "false" ]]; then
|
||||||
|
echo -e " ${GREEN}✓${NC} All timers are properly configured!"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Recent Executions - Simplified
|
||||||
|
print_section "Last Execution Status"
|
||||||
|
echo ""
|
||||||
|
printf " %-12s %-20s %s\n" "Service" "Last Run" "Status"
|
||||||
|
printf " %-12s %-20s %s\n" "-------" "--------" "------"
|
||||||
|
|
||||||
|
for service in "${SERVICES[@]}"; do
|
||||||
|
full_service_name="nebuleair-${service}-data"
|
||||||
|
|
||||||
|
# Get last execution time and status
|
||||||
|
last_log=$(journalctl -u ${full_service_name}.service -n 3 --no-pager 2>/dev/null | grep -E "(Started|Finished|Failed)" | tail -1)
|
||||||
|
|
||||||
|
if [[ -n "$last_log" ]]; then
|
||||||
|
timestamp=$(echo "$last_log" | awk '{print $1, $2, $3}')
|
||||||
|
if echo "$last_log" | grep -q "Finished"; then
|
||||||
|
status="${GREEN}✓ Success${NC}"
|
||||||
|
elif echo "$last_log" | grep -q "Failed"; then
|
||||||
|
status="${RED}✗ Failed${NC}"
|
||||||
|
elif echo "$last_log" | grep -q "Started"; then
|
||||||
|
status="${YELLOW}⟳ Running${NC}"
|
||||||
|
else
|
||||||
|
status="${DIM}- Unknown${NC}"
|
||||||
|
fi
|
||||||
|
printf " %-12s %-20s %b\n" "$service" "$timestamp" "$status"
|
||||||
|
else
|
||||||
|
printf " %-12s %-20s %b\n" "$service" "-" "${DIM}- No data${NC}"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
# Summary
|
||||||
|
print_section "Summary"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
working=0
|
||||||
|
needs_attention=0
|
||||||
|
|
||||||
|
for service in "${SERVICES[@]}"; do
|
||||||
|
full_service_name="nebuleair-${service}-data"
|
||||||
|
timer_status=$(systemctl is-active ${full_service_name}.timer 2>/dev/null | tr -d '\n')
|
||||||
|
timer_enabled=$(systemctl is-enabled ${full_service_name}.timer 2>/dev/null | tr -d '\n')
|
||||||
|
|
||||||
|
if [[ "$timer_status" == "active" ]] && [[ "$timer_enabled" == "enabled" || "$timer_enabled" == "static" ]]; then
|
||||||
|
((working++))
|
||||||
|
else
|
||||||
|
((needs_attention++))
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
total=${#SERVICES[@]}
|
||||||
|
|
||||||
|
# Visual progress bar
|
||||||
|
echo -n " Overall Health: ["
|
||||||
|
for ((i=1; i<=10; i++)); do
|
||||||
|
if ((i <= working * 10 / total)); then
|
||||||
|
echo -n -e "${GREEN}▰${NC}"
|
||||||
|
else
|
||||||
|
echo -n -e "${RED}▱${NC}"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
echo -e "] ${working}/${total}"
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo -e " ${GREEN}✓${NC} Working properly: ${BOLD}$working${NC} services"
|
||||||
|
echo -e " ${RED}✗${NC} Need attention: ${BOLD}$needs_attention${NC} services"
|
||||||
|
|
||||||
|
# Quick Commands
|
||||||
|
print_section "Quick Commands"
|
||||||
|
echo ""
|
||||||
|
echo -e " ${BOLD}Fix a timer that needs attention:${NC}"
|
||||||
|
echo " $ sudo systemctl enable --now nebuleair-[service]-data.timer"
|
||||||
|
echo ""
|
||||||
|
echo -e " ${BOLD}View live logs:${NC}"
|
||||||
|
echo " $ sudo journalctl -u nebuleair-[service]-data.service -f"
|
||||||
|
echo ""
|
||||||
|
echo -e " ${BOLD}Check timer details:${NC}"
|
||||||
|
echo " $ systemctl status nebuleair-[service]-data.timer"
|
||||||
|
echo ""
|
||||||
|
echo -e " ${BOLD}Run service manually:${NC}"
|
||||||
|
echo " $ sudo systemctl start nebuleair-[service]-data.service"
|
||||||
|
|
||||||
|
# Specific fixes needed
|
||||||
|
if [[ $needs_attention -gt 0 ]]; then
|
||||||
|
echo ""
|
||||||
|
echo -e "${YELLOW}${BOLD}Recommended Actions:${NC}"
|
||||||
|
for service in "${SERVICES[@]}"; do
|
||||||
|
full_service_name="nebuleair-${service}-data"
|
||||||
|
timer_status=$(systemctl is-active ${full_service_name}.timer 2>/dev/null | tr -d '\n')
|
||||||
|
timer_enabled=$(systemctl is-enabled ${full_service_name}.timer 2>/dev/null | tr -d '\n')
|
||||||
|
|
||||||
|
if [[ "$timer_status" != "active" ]] && [[ "$timer_status" != "not-found" ]]; then
|
||||||
|
echo -e " ${RED}→${NC} sudo systemctl start ${full_service_name}.timer"
|
||||||
|
fi
|
||||||
|
if [[ "$timer_enabled" != "enabled" ]] && [[ "$timer_enabled" != "static" ]] && [[ "$timer_enabled" != "not-found" ]]; then
|
||||||
|
echo -e " ${YELLOW}→${NC} sudo systemctl enable ${full_service_name}.timer"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo ""
|
||||||
15
services/nebuleair-cpu-power.service
Normal file
15
services/nebuleair-cpu-power.service
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=NebuleAir CPU Power Mode Service
|
||||||
|
After=multi-user.target
|
||||||
|
Wants=multi-user.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/power/apply_cpu_mode_from_db.py
|
||||||
|
User=root
|
||||||
|
StandardOutput=journal
|
||||||
|
StandardError=journal
|
||||||
|
RemainAfterExit=yes
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
14
services/nebuleair-wifi-powersave.service
Normal file
14
services/nebuleair-wifi-powersave.service
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=NebuleAir WiFi Power Save Service
|
||||||
|
After=network-online.target
|
||||||
|
Wants=network-online.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/wifi/power_save.py
|
||||||
|
User=root
|
||||||
|
StandardOutput=journal
|
||||||
|
StandardError=journal
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
12
services/nebuleair-wifi-powersave.timer
Normal file
12
services/nebuleair-wifi-powersave.timer
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=NebuleAir WiFi Power Save Timer (10 minutes after boot)
|
||||||
|
After=network-online.target
|
||||||
|
|
||||||
|
[Timer]
|
||||||
|
# Run 10 minutes after system boot
|
||||||
|
OnBootSec=10min
|
||||||
|
# Don't persist timer across reboots
|
||||||
|
Persistent=false
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=timers.target
|
||||||
354
services/setup_services.sh
Normal file
354
services/setup_services.sh
Normal file
@@ -0,0 +1,354 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# File: /var/www/nebuleair_pro_4g/services/setup_services.sh
|
||||||
|
# Purpose: Set up all systemd services for NebuleAir data collection
|
||||||
|
# to install:
|
||||||
|
# sudo chmod +x /var/www/nebuleair_pro_4g/services/setup_services.sh
|
||||||
|
# sudo /var/www/nebuleair_pro_4g/services/setup_services.sh
|
||||||
|
|
||||||
|
echo "Setting up NebuleAir systemd services and timers..."
|
||||||
|
|
||||||
|
# Create directory for logs if it doesn't exist
|
||||||
|
mkdir -p /var/www/nebuleair_pro_4g/logs
|
||||||
|
|
||||||
|
# Create service and timer files for NPM Data
|
||||||
|
cat > /etc/systemd/system/nebuleair-npm-data.service << 'EOL'
|
||||||
|
[Unit]
|
||||||
|
Description=NebuleAir NPM Data Collection Service
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/NPM/get_data_modbus_v3.py
|
||||||
|
User=root
|
||||||
|
WorkingDirectory=/var/www/nebuleair_pro_4g
|
||||||
|
StandardOutput=append:/var/www/nebuleair_pro_4g/logs/npm_service.log
|
||||||
|
StandardError=append:/var/www/nebuleair_pro_4g/logs/npm_service_errors.log
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
EOL
|
||||||
|
|
||||||
|
cat > /etc/systemd/system/nebuleair-npm-data.timer << 'EOL'
|
||||||
|
[Unit]
|
||||||
|
Description=Run NebuleAir NPM Data Collection every 10 seconds
|
||||||
|
Requires=nebuleair-npm-data.service
|
||||||
|
|
||||||
|
[Timer]
|
||||||
|
OnBootSec=10s
|
||||||
|
OnUnitActiveSec=10s
|
||||||
|
AccuracySec=1s
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=timers.target
|
||||||
|
EOL
|
||||||
|
|
||||||
|
# Create service and timer files for Envea Data
|
||||||
|
cat > /etc/systemd/system/nebuleair-envea-data.service << 'EOL'
|
||||||
|
[Unit]
|
||||||
|
Description=NebuleAir Envea Data Collection Service
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/envea/read_value_v2.py
|
||||||
|
User=root
|
||||||
|
WorkingDirectory=/var/www/nebuleair_pro_4g
|
||||||
|
StandardOutput=append:/var/www/nebuleair_pro_4g/logs/envea_service.log
|
||||||
|
StandardError=append:/var/www/nebuleair_pro_4g/logs/envea_service_errors.log
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
EOL
|
||||||
|
|
||||||
|
cat > /etc/systemd/system/nebuleair-envea-data.timer << 'EOL'
|
||||||
|
[Unit]
|
||||||
|
Description=Run NebuleAir Envea Data Collection every 10 seconds
|
||||||
|
Requires=nebuleair-envea-data.service
|
||||||
|
|
||||||
|
[Timer]
|
||||||
|
OnBootSec=10s
|
||||||
|
OnUnitActiveSec=10s
|
||||||
|
AccuracySec=1s
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=timers.target
|
||||||
|
EOL
|
||||||
|
|
||||||
|
# Create service and timer files for SARA Data (No Lock File Needed)
|
||||||
|
cat > /etc/systemd/system/nebuleair-sara-data.service << 'EOL'
|
||||||
|
[Unit]
|
||||||
|
Description=NebuleAir SARA Data Transmission Service
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/loop/SARA_send_data_v2.py
|
||||||
|
User=root
|
||||||
|
WorkingDirectory=/var/www/nebuleair_pro_4g
|
||||||
|
StandardOutput=append:/var/www/nebuleair_pro_4g/logs/sara_service.log
|
||||||
|
StandardError=append:/var/www/nebuleair_pro_4g/logs/sara_service_errors.log
|
||||||
|
RuntimeMaxSec=200s
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
EOL
|
||||||
|
|
||||||
|
cat > /etc/systemd/system/nebuleair-sara-data.timer << 'EOL'
|
||||||
|
[Unit]
|
||||||
|
Description=Run NebuleAir SARA Data Transmission every 60 seconds
|
||||||
|
Requires=nebuleair-sara-data.service
|
||||||
|
|
||||||
|
[Timer]
|
||||||
|
OnBootSec=60s
|
||||||
|
OnUnitActiveSec=60s
|
||||||
|
AccuracySec=1s
|
||||||
|
# This is the key setting that prevents overlap
|
||||||
|
Persistent=true
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=timers.target
|
||||||
|
EOL
|
||||||
|
|
||||||
|
# Create service and timer files for BME280 Data
|
||||||
|
cat > /etc/systemd/system/nebuleair-bme280-data.service << 'EOL'
|
||||||
|
[Unit]
|
||||||
|
Description=NebuleAir BME280 Data Collection Service
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/BME280/get_data_v2.py
|
||||||
|
User=root
|
||||||
|
WorkingDirectory=/var/www/nebuleair_pro_4g
|
||||||
|
StandardOutput=append:/var/www/nebuleair_pro_4g/logs/bme280_service.log
|
||||||
|
StandardError=append:/var/www/nebuleair_pro_4g/logs/bme280_service_errors.log
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
EOL
|
||||||
|
|
||||||
|
cat > /etc/systemd/system/nebuleair-bme280-data.timer << 'EOL'
|
||||||
|
[Unit]
|
||||||
|
Description=Run NebuleAir BME280 Data Collection every 120 seconds
|
||||||
|
Requires=nebuleair-bme280-data.service
|
||||||
|
|
||||||
|
[Timer]
|
||||||
|
OnBootSec=120s
|
||||||
|
OnUnitActiveSec=120s
|
||||||
|
AccuracySec=1s
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=timers.target
|
||||||
|
EOL
|
||||||
|
|
||||||
|
# Create service and timer files for MPPT Data
|
||||||
|
cat > /etc/systemd/system/nebuleair-mppt-data.service << 'EOL'
|
||||||
|
[Unit]
|
||||||
|
Description=NebuleAir MPPT Data Collection Service
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/MPPT/read.py
|
||||||
|
User=root
|
||||||
|
WorkingDirectory=/var/www/nebuleair_pro_4g
|
||||||
|
StandardOutput=append:/var/www/nebuleair_pro_4g/logs/mppt_service.log
|
||||||
|
StandardError=append:/var/www/nebuleair_pro_4g/logs/mppt_service_errors.log
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
EOL
|
||||||
|
|
||||||
|
cat > /etc/systemd/system/nebuleair-mppt-data.timer << 'EOL'
|
||||||
|
[Unit]
|
||||||
|
Description=Run NebuleAir MPPT Data Collection every 120 seconds
|
||||||
|
Requires=nebuleair-mppt-data.service
|
||||||
|
|
||||||
|
[Timer]
|
||||||
|
OnBootSec=120s
|
||||||
|
OnUnitActiveSec=120s
|
||||||
|
AccuracySec=1s
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=timers.target
|
||||||
|
EOL
|
||||||
|
|
||||||
|
# Create service and timer files for noise Data (every minutes)
|
||||||
|
cat > /etc/systemd/system/nebuleair-noise-data.service << 'EOL'
|
||||||
|
[Unit]
|
||||||
|
Description=NebuleAir noise Data Collection Service
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/sound_meter/NSRT_mk4_get_data.py
|
||||||
|
User=root
|
||||||
|
WorkingDirectory=/var/www/nebuleair_pro_4g
|
||||||
|
StandardOutput=append:/var/www/nebuleair_pro_4g/logs/noise_service.log
|
||||||
|
StandardError=append:/var/www/nebuleair_pro_4g/logs/noise_service_errors.log
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
EOL
|
||||||
|
|
||||||
|
cat > /etc/systemd/system/nebuleair-noise-data.timer << 'EOL'
|
||||||
|
[Unit]
|
||||||
|
Description=Run NebuleAir MPPT Data Collection every 120 seconds
|
||||||
|
Requires=nebuleair-noise-data.service
|
||||||
|
|
||||||
|
[Timer]
|
||||||
|
OnBootSec=60s
|
||||||
|
OnUnitActiveSec=60s
|
||||||
|
AccuracySec=1s
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=timers.target
|
||||||
|
EOL
|
||||||
|
|
||||||
|
# Create service and timer files for MH-Z19 CO2 Data
|
||||||
|
cat > /etc/systemd/system/nebuleair-mhz19-data.service << 'EOL'
|
||||||
|
[Unit]
|
||||||
|
Description=NebuleAir MH-Z19 CO2 Data Collection Service
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/MH-Z19/write_data.py
|
||||||
|
User=root
|
||||||
|
WorkingDirectory=/var/www/nebuleair_pro_4g
|
||||||
|
StandardOutput=append:/var/www/nebuleair_pro_4g/logs/mhz19_service.log
|
||||||
|
StandardError=append:/var/www/nebuleair_pro_4g/logs/mhz19_service_errors.log
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
EOL
|
||||||
|
|
||||||
|
cat > /etc/systemd/system/nebuleair-mhz19-data.timer << 'EOL'
|
||||||
|
[Unit]
|
||||||
|
Description=Run NebuleAir MH-Z19 CO2 Data Collection every 120 seconds
|
||||||
|
Requires=nebuleair-mhz19-data.service
|
||||||
|
|
||||||
|
[Timer]
|
||||||
|
OnBootSec=120s
|
||||||
|
OnUnitActiveSec=120s
|
||||||
|
AccuracySec=1s
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=timers.target
|
||||||
|
EOL
|
||||||
|
|
||||||
|
# Create service and timer files for Database Cleanup
|
||||||
|
cat > /etc/systemd/system/nebuleair-db-cleanup-data.service << 'EOL'
|
||||||
|
[Unit]
|
||||||
|
Description=NebuleAir Database Cleanup Service
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/flush_old_data.py
|
||||||
|
User=root
|
||||||
|
WorkingDirectory=/var/www/nebuleair_pro_4g
|
||||||
|
StandardOutput=append:/var/www/nebuleair_pro_4g/logs/db_cleanup_service.log
|
||||||
|
StandardError=append:/var/www/nebuleair_pro_4g/logs/db_cleanup_service_errors.log
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
EOL
|
||||||
|
|
||||||
|
cat > /etc/systemd/system/nebuleair-db-cleanup-data.timer << 'EOL'
|
||||||
|
[Unit]
|
||||||
|
Description=Run NebuleAir Database Cleanup daily
|
||||||
|
Requires=nebuleair-db-cleanup-data.service
|
||||||
|
|
||||||
|
[Timer]
|
||||||
|
OnBootSec=1h
|
||||||
|
OnUnitActiveSec=24h
|
||||||
|
AccuracySec=1h
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=timers.target
|
||||||
|
EOL
|
||||||
|
|
||||||
|
# Create service and timer files for WiFi Power Save
|
||||||
|
cat > /etc/systemd/system/nebuleair-wifi-powersave.service << 'EOL'
|
||||||
|
[Unit]
|
||||||
|
Description=NebuleAir WiFi Power Save Service
|
||||||
|
After=network-online.target
|
||||||
|
Wants=network-online.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/wifi/power_save.py
|
||||||
|
User=root
|
||||||
|
StandardOutput=journal
|
||||||
|
StandardError=journal
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
EOL
|
||||||
|
|
||||||
|
cat > /etc/systemd/system/nebuleair-wifi-powersave.timer << 'EOL'
|
||||||
|
[Unit]
|
||||||
|
Description=NebuleAir WiFi Power Save Timer (10 minutes after boot)
|
||||||
|
After=network-online.target
|
||||||
|
|
||||||
|
[Timer]
|
||||||
|
# Run 10 minutes after system boot
|
||||||
|
OnBootSec=10min
|
||||||
|
# Don't persist timer across reboots
|
||||||
|
Persistent=false
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=timers.target
|
||||||
|
EOL
|
||||||
|
|
||||||
|
# Create service file for CPU Power Mode (runs once at boot)
|
||||||
|
cat > /etc/systemd/system/nebuleair-cpu-power.service << 'EOL'
|
||||||
|
[Unit]
|
||||||
|
Description=NebuleAir CPU Power Mode Service
|
||||||
|
After=multi-user.target
|
||||||
|
Wants=multi-user.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/power/apply_cpu_mode_from_db.py
|
||||||
|
User=root
|
||||||
|
StandardOutput=journal
|
||||||
|
StandardError=journal
|
||||||
|
RemainAfterExit=yes
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
EOL
|
||||||
|
|
||||||
|
# Reload systemd to recognize new services
|
||||||
|
systemctl daemon-reload
|
||||||
|
|
||||||
|
# Enable and start all timers
|
||||||
|
echo "Enabling and starting all services..."
|
||||||
|
for service in npm envea sara bme280 mppt mhz19 db-cleanup noise; do
|
||||||
|
systemctl enable nebuleair-$service-data.timer
|
||||||
|
systemctl start nebuleair-$service-data.timer
|
||||||
|
echo "Started nebuleair-$service-data timer"
|
||||||
|
done
|
||||||
|
|
||||||
|
# Enable and start WiFi power save timer (separate naming convention)
|
||||||
|
systemctl enable nebuleair-wifi-powersave.timer
|
||||||
|
systemctl start nebuleair-wifi-powersave.timer
|
||||||
|
echo "Started nebuleair-wifi-powersave timer"
|
||||||
|
|
||||||
|
# Enable and start CPU power mode service (runs once at boot)
|
||||||
|
systemctl enable nebuleair-cpu-power.service
|
||||||
|
systemctl start nebuleair-cpu-power.service
|
||||||
|
echo "Started nebuleair-cpu-power service"
|
||||||
|
|
||||||
|
echo "Checking status of all timers..."
|
||||||
|
systemctl list-timers | grep nebuleair
|
||||||
|
|
||||||
|
echo "Setup complete. All NebuleAir services are now running."
|
||||||
|
echo "To check the status of a specific service:"
|
||||||
|
echo " sudo systemctl status nebuleair-npm-data.service"
|
||||||
|
echo "To view logs for a specific service:"
|
||||||
|
echo " sudo journalctl -u nebuleair-npm-data.service"
|
||||||
|
echo "To restart a specific timer:"
|
||||||
|
echo " sudo systemctl restart nebuleair-npm-data.timer"
|
||||||
55
sound_meter/NSRT_MK4_change_config.py
Normal file
55
sound_meter/NSRT_MK4_change_config.py
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
'''
|
||||||
|
____ ___ _ _ _ _ ____
|
||||||
|
/ ___| / _ \| | | | \ | | _ \
|
||||||
|
\___ \| | | | | | | \| | | | |
|
||||||
|
___) | |_| | |_| | |\ | |_| |
|
||||||
|
|____/ \___/ \___/|_| \_|____/
|
||||||
|
|
||||||
|
python3 /var/www/nebuleair_pro_4g/sound_meter/NSRT_MK4_change_config.py
|
||||||
|
|
||||||
|
1.Intervalle d'enregistrement
|
||||||
|
L'intervalle d'enregistrement définit le temps entre deux points successifs enregistrés.
|
||||||
|
Cela définit également la période d'intégration pour le LEQ, et la période d'observation pour L-min et L-max et Lpeak.
|
||||||
|
L'intervalle d'enregistrement peut être réglé de 125 ms (1/8ème) à 2 H par incréments de 125 ms.
|
||||||
|
|
||||||
|
some parameters can be changed:
|
||||||
|
write_tau(tau: float) -> time constant
|
||||||
|
write_fs(frequency: int) -> sampling freq
|
||||||
|
|
||||||
|
'''
|
||||||
|
|
||||||
|
import nsrt_mk3_dev
|
||||||
|
#from nsrt_mk3_dev import Weighting
|
||||||
|
#from nsrt_mk3_dev.nsrt_mk3_dev import NsrtMk3Dev, Weighting
|
||||||
|
from enum import Enum
|
||||||
|
|
||||||
|
class Weighting(Enum):
|
||||||
|
DB_A = 1
|
||||||
|
DB_C = 2
|
||||||
|
DB_Z = 3
|
||||||
|
|
||||||
|
nsrt = nsrt_mk3_dev.NsrtMk3Dev('/dev/ttyACM0')
|
||||||
|
|
||||||
|
#####################
|
||||||
|
#change time constant
|
||||||
|
nsrt.write_tau(1)
|
||||||
|
#####################
|
||||||
|
|
||||||
|
#####################
|
||||||
|
#change Weighting curve
|
||||||
|
# - Weighting.DB_A (A-weighting - most common for environmental noise)
|
||||||
|
# - Weighting.DB_C (C-weighting - for peak measurements)
|
||||||
|
# - Weighting.DB_Z (Z-weighting - linear/flat response)
|
||||||
|
nsrt.write_weighting(Weighting.DB_A)
|
||||||
|
#####################
|
||||||
|
|
||||||
|
freq_level = nsrt.read_fs() #current sampling frequency
|
||||||
|
time_constant = nsrt.read_tau() #reads the current time constant
|
||||||
|
leq_level = nsrt.read_leq() #current running LEQ and starts the integration of a new LEQ.
|
||||||
|
weighting = nsrt.read_weighting() #weighting curve that is currently selected
|
||||||
|
weighted_level = nsrt.read_level() #current running level in dB.
|
||||||
|
|
||||||
|
print(f'current sampling freq : {freq_level} Hz')
|
||||||
|
print(f'current time constant : {time_constant} s')
|
||||||
|
print(f'current LEQ level: {leq_level:0.2f} dB')
|
||||||
|
print(f'{weighting} value: {weighted_level:0.2f} dBA')
|
||||||
72
sound_meter/NSRT_mk4_get_data.py
Normal file
72
sound_meter/NSRT_mk4_get_data.py
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
'''
|
||||||
|
____ ___ _ _ _ _ ____
|
||||||
|
/ ___| / _ \| | | | \ | | _ \
|
||||||
|
\___ \| | | | | | | \| | | | |
|
||||||
|
___) | |_| | |_| | |\ | |_| |
|
||||||
|
|____/ \___/ \___/|_| \_|____/
|
||||||
|
|
||||||
|
python3 /var/www/nebuleair_pro_4g/sound_meter/NSRT_mk4_get_data.py
|
||||||
|
|
||||||
|
Script to get data from the NSRT_MK4 Sound Level Meter
|
||||||
|
|
||||||
|
triggered by a systemd service
|
||||||
|
sudo systemctl status nebuleair-noise-data.service
|
||||||
|
|
||||||
|
Need to install "nsrt_mk3_dev"
|
||||||
|
|
||||||
|
1.Intervalle d'enregistrement
|
||||||
|
L'intervalle d'enregistrement définit le temps entre deux points successifs enregistrés.
|
||||||
|
Cela définit également la période d'intégration pour le LEQ, et la période d'observation pour L-min et L-max et Lpeak.
|
||||||
|
L'intervalle d'enregistrement peut être réglé de 125 ms (1/8ème) à 2 H par incréments de 125 ms.
|
||||||
|
|
||||||
|
some parameters can be changed:
|
||||||
|
write_tau(tau: float) -> time constant
|
||||||
|
write_fs(frequency: int) -> sampling freq
|
||||||
|
|
||||||
|
'''
|
||||||
|
|
||||||
|
import nsrt_mk3_dev
|
||||||
|
import sqlite3
|
||||||
|
|
||||||
|
nsrt = nsrt_mk3_dev.NsrtMk3Dev('/dev/ttyACM0')
|
||||||
|
|
||||||
|
# Connect to the SQLite database
|
||||||
|
conn = sqlite3.connect("/var/www/nebuleair_pro_4g/sqlite/sensors.db")
|
||||||
|
cursor = conn.cursor()
|
||||||
|
|
||||||
|
#GET RTC TIME from SQlite
|
||||||
|
cursor.execute("SELECT * FROM timestamp_table LIMIT 1")
|
||||||
|
row = cursor.fetchone() # Get the first (and only) row
|
||||||
|
rtc_time_str = row[1] # '2025-02-07 12:30:45'
|
||||||
|
|
||||||
|
freq_level = nsrt.read_fs() #current sampling frequency
|
||||||
|
time_constant = nsrt.read_tau() #reads the current time constant
|
||||||
|
leq_level = nsrt.read_leq() #current running LEQ and starts the integration of a new LEQ.
|
||||||
|
weighting = nsrt.read_weighting() #weighting curve that is currently selected ( A ou C)
|
||||||
|
weighted_level = nsrt.read_level() #current running level in dB.
|
||||||
|
|
||||||
|
#print(f'current sampling freq : {freq_level} Hz')
|
||||||
|
#print(f'current time constant : {time_constant} s')
|
||||||
|
#print(f'current LEQ level: {leq_level:0.2f} dB')
|
||||||
|
#print(f'{weighting} value: {weighted_level:0.2f} dBA')
|
||||||
|
# Round values to 2 decimal places before saving
|
||||||
|
leq_level_rounded = round(leq_level, 2)
|
||||||
|
weighted_level_rounded = round(weighted_level, 2)
|
||||||
|
|
||||||
|
#save to db
|
||||||
|
#save to sqlite database
|
||||||
|
try:
|
||||||
|
cursor.execute('''
|
||||||
|
INSERT INTO data_NOISE (timestamp,current_LEQ, DB_A_value) VALUES (?,?,?)'''
|
||||||
|
, (rtc_time_str,leq_level_rounded,weighted_level_rounded))
|
||||||
|
|
||||||
|
# Commit and close the connection
|
||||||
|
conn.commit()
|
||||||
|
|
||||||
|
#print("Sensor data saved successfully!")
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Database error: {e}")
|
||||||
|
|
||||||
|
|
||||||
|
conn.close()
|
||||||
0
sound_meter/sound_meter → sound_meter/old/sound_meter
Executable file → Normal file
0
sound_meter/sound_meter → sound_meter/old/sound_meter
Executable file → Normal file
0
sound_meter/sound_meter.c → sound_meter/old/sound_meter.c
Executable file → Normal file
0
sound_meter/sound_meter.c → sound_meter/old/sound_meter.c
Executable file → Normal file
0
sound_meter/sound_meter_moving_avg → sound_meter/old/sound_meter_moving_avg
Executable file → Normal file
0
sound_meter/sound_meter_moving_avg → sound_meter/old/sound_meter_moving_avg
Executable file → Normal file
0
sound_meter/sound_meter_moving_avg.c → sound_meter/old/sound_meter_moving_avg.c
Executable file → Normal file
0
sound_meter/sound_meter_moving_avg.c → sound_meter/old/sound_meter_moving_avg.c
Executable file → Normal file
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user