From cb3644b51411233f0523f571844684a7fc90c0d6 Mon Sep 17 00:00:00 2001
From: "Kevin Veen-Birkenbach [aka. Frantz]" <kevin@veen.world>
Date: Mon, 11 May 2020 12:24:23 +0200
Subject: [PATCH] Implemented last recieved ir type

---
 main/homepage_template.h |  2 +-
 main/main.ino            | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/main/homepage_template.h b/main/homepage_template.h
index 05e5737..4c56c76 100644
--- a/main/homepage_template.h
+++ b/main/homepage_template.h
@@ -19,7 +19,7 @@ return
       "<h3>Remote Plug Controller<i class=\"fas fa-plug\"></i></h3>"
       "<form method=\"get\" >"
         "<div class=\"form-group\">"
-          "<label for=\""+ parameter_plug_id +"\">Plug-ID:</label>"
+          "<label for=\""+ parameter_plug_id +"\">"+ parameter_plug_id +":</label>"
           "<input type=\"number\" class= \"form-control\" id=\""+ parameter_plug_id +"\" name=\""+ parameter_plug_id +"\">"
         "</div>"
         "<div class=\"form-group\">"
diff --git a/main/main.ino b/main/main.ino
index b5b7a12..0fe1b52 100644
--- a/main/main.ino
+++ b/main/main.ino
@@ -38,6 +38,9 @@ const char* parameter_ir_bits="ir_bits";
 
 // Define variables
 decode_results results;
+decode_type_t last_recieved_ir_type;
+int last_recieved_ir_data;
+int last_recieved_ir_bits;
 
 // Setup classes
 ESP8266WebServer server ( 80 );
@@ -80,6 +83,9 @@ String getDecodeType(decode_type_t decode_type){
 }
 
 void dump(decode_results *results) {
+  last_recieved_ir_type = results->decode_type;
+  last_recieved_ir_data = results->value;
+  last_recieved_ir_bits = results->bits;
   uint16_t count = results->rawlen;
   Serial.print(getDecodeType(results->decode_type));
   serialPrintUint64(results->value, 16);
@@ -154,8 +160,12 @@ String getJsonPir(void){
   return "{\"motion\":\""+String(digitalRead(pin_pir))+"\"}";
 }
 
+String getJsonIr(void){
+  return "{\"last_recieved\":{\"bits\":\""+String(last_recieved_ir_bits)+"\",\"type\":\""+String(last_recieved_ir_type)+"\",\"data\":\""+String(last_recieved_ir_data)+"\"}}";
+}
+
 String getJson(void){
-  return "{\"DHT\":"+String(getJsonDht())+",\"PIR\":"+String(getJsonPir())+"}";
+  return "{\"DHT\":"+String(getJsonDht())+",\"PIR\":"+String(getJsonPir())+",\"IR\":"+String(getJsonIr())+"}";
 }
 
 #include "homepage_template.h"
@@ -187,10 +197,8 @@ void setup(void)
       Serial.print(".");
       delay(500);
   }
-  Serial.print("Connected to :");
-  Serial.println(ssid);
-  Serial.print("IP address: ");
-  Serial.println(WiFi.localIP());
+  Serial.println("Connected to :" + String(ssid));
+  Serial.println("IP address: " + WiFi.localIP());
   server.onNotFound(handleRequest);
   server.begin();
   Serial.println("HTTP server started.");