Compare commits

..

No commits in common. "fdd1bd94c197f1e9b7bc31217f9984ab2fcac1fd" and "7575193024627e6b012ad3505fb7e4fc29646979" have entirely different histories.

2 changed files with 6 additions and 20 deletions

15
main.go
View File

@ -6,16 +6,13 @@ import (
"log"
"net/http"
"sync"
"time"
mqtt "github.com/eclipse/paho.mqtt.golang"
)
type temperature struct {
Value float64 `json:"value"`
Unit string `json:"unit"`
Time time.Time `json:"time"`
Valid bool `json:"valid"`
Value float64 `json:"value"`
Unit string `json:"unit"`
}
var (
@ -36,15 +33,11 @@ var saunaHandler mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message
log.Printf("Received message: %s from topic: %s\n", msg.Payload(), msg.Topic())
sauna_mutex.Lock()
err := json.Unmarshal(msg.Payload(), &sauna_temperature)
sauna_temperature.Time = time.Now()
sauna_mutex.Unlock()
if err != nil {
sauna_temperature.Valid = false
sauna_mutex.Unlock()
logger.Print(err)
return
}
sauna_temperature.Valid = true
sauna_mutex.Unlock()
}
var connectHandler mqtt.OnConnectHandler = func(client mqtt.Client) {
@ -106,7 +99,7 @@ func main() {
// Serve files from static folder
http.Handle("/", http.FileServer(http.Dir(webui_path)))
http.HandleFunc("/api/sauna", http_endpoint_sauna)
http.HandleFunc("/sauna/sample", http_endpoint_sauna)
port := ":5000"
logger.Println("Server is running on port" + port)

View File

@ -2,12 +2,10 @@
import { onMount } from "../../../node_modules/svelte/internal";
import icon from "$lib/images/sauna.svg"
let backend_url = "https://home.blackfinn.de/api/sauna";
let backend_url = "https://home.blackfinn.de/sauna/sample";
let temperature_value = 0.0
let temperature_unit = "°C"
let time = "00:00:00";
let updated = false;
function get_temperature() {
fetch(backend_url)
@ -15,8 +13,6 @@
.then(data => {
temperature_unit = data.unit
temperature_value = data.value
time = data.time.slice(11, 19)
updated = JSON.parse(data.valid);
}).catch(error => {
console.log(error);
return [];
@ -42,8 +38,5 @@
<figure>
<img src={icon} alt="Sauna" width=150/>
</figure>
{#if updated}
<div>{time} Uhr:</div>
<h1>{temperature_value} {temperature_unit}</h1>
{/if}
<h1>{temperature_value} {temperature_unit}</h1>
</section>