sven/dc-sensor
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modified: app.php

Browse Source 
modified:   database/sqlite.php
	modified:   device-api.php
This commit is contained in:
Sven Luethi committed 2024-07-13 13:47:52 +02:00
1 parent 9759ab5ee4
commit 7f93508eb3
3 files changed
+37 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

software/database/sqlite.php
+8 -9
View File
@@ -3,7 +3,7 @@
interface DBIface
{
public function __construct();
public function addDevice(DeviceData $deviceData);
public function addDevice($deviceData);
public function getDevices();
public function getDeviceById($id);
public function updateDevice($id, $deviceData);
@@ -39,17 +39,17 @@ class DB implements DBIface {
id INTEGER PRIMARY KEY,
mac_address TEXT NOT NULL,
ip_address TEXT NOT NULL,
seen_ip_address TEXT NOT NULL,
firmware_version TEXT NOT NULL,
ip_address_seen TEXT NOT NULL,
firmware_version INTEGER NOT NULL,
temperature_offset INTEGER DEFAULT 0,
humidity_offset INTEGER DEFAULT 0,
last_updated TEXT DEFAULT CURRENT_TIMESTAMP,
last_seen TEXT DEFAULT CURRENT_TIMESTAMP
);
CREATE TABLE IF NOT EXISTS readings (
dev_id INTEGER PRIMARY KEY,
temperature INTEGER NOT NULL,
humidity INTEGER NOT NULL,
updated_at TEXT DEFAULT CURRENT_TIMESTAMP
FOREIGN KEY(dev_id) REFERENCES devices(id) ON UPDATE CASCADE ON DELETE CASCADE
);
@@ -64,8 +64,8 @@ class DB implements DBIface {
public function addDevice($deviceData) {
$sql = "
INSERT INTO devices (mac_address, ip_address, seen_ip_address, firmware_version, temperature_offset, humidity_offset, last_updated, last_seen)
VALUES (:mac_address, :ip_address, seen_ip_address, :firmware_version, :temperature_offset, :humidity_offset, :last_updated, :last_seen)
INSERT INTO devices (mac_address, ip_address, ip_address_seen, firmware_version, temperature_offset, humidity_offset, last_seen)
VALUES (:mac_address, :ip_address, :ip_address_seen, :firmware_version, :temperature_offset, :humidity_offset, :last_seen)
";
try {
$stmt = $this->pdo->prepare($sql);
@@ -103,11 +103,10 @@ class DB implements DBIface {
SET id = :id,
mac_address = :mac_address,
ip_address = :ip_address,
seen_ip_address = :seen_ip_address,
ip_address_seen = :ip_address_seen,
firmware_version = :firmware_version,
temperature_offset = :temperature_offset,
humidity_offset = :humidity_offset,
last_updated = :last_updated,
last_seen = :last_seen
WHERE id = :id
";
@@ -169,7 +168,7 @@ $newDevice = [
'id' => 'device123',
'mac_address' => '00:1B:44:11:3A:B7',
'ip_address' => '192.168.1.2',
'seen_ip_address' => '212.71.123.123',
'ip_address_seen' => '212.71.123.123',
'firmware_version' => '1.0.1',
'temperature_offset' => 0,
'humidity_offset' => 0,