la ça marche pas trop mal

.idea/.name

@@ -0,0 +1 @@
+CyberCuisine

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="15" />
+    <bytecodeTargetLevel target="14" />
   </component>
 </project>

.idea/misc.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_15" default="true" project-jdk-name="openjdk-15" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_14" default="true" project-jdk-name="adopt-openjdk-14" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/CyberCuisineWebServer.iml" filepath="$PROJECT_DIR$/.idea/CyberCuisineWebServer.iml" />
+    </modules>
+  </component>
+</project>

arduino/cybergaziniere.ino → arduino/cybergaziniere/cybergaziniere.ino

@@ -1,12 +1,23 @@
 #include "WiFi.h"
+//https://github.com/orgua/OneWireHub or
+//https://www.pjrc.com/teensy/td_libs_OneWire.html or
+//https://github.com/RobTillaart/DS18B20_RT
 #include <OneWire.h>
 #include <DS18B20.h>
+//https://github.com/avishorp/TM1637
 #include <TM1637Display.h>
 
-//const char* ssid = "Antenne 5G";           
-//const char* password = "Un Truc Moins Chiant"; 
-const char* ssid = "Livebox-8DA0";           
-const char* password = "C3F3EE221002051A31382FFAF7"; 
+char* ssid = "Antenne 5G";           
+char* password = "Un Truc Moins Chiant"; 
+//char* ssid = "Livebox-8DA0";           
+//char* password = "C3F3EE221002051A31382FFAF7"; 
+
+char* serverHost = "192.168.0.24";
+int serverPort = 6868;
+WiFiClient tcpClient;
+bool tcpClientConnected;
+
+
 
 #define CLK 18
 #define DIO 5
@@ -40,7 +51,22 @@ void loop() {
   int temp = temperatureTrucs();
   //Serial.println(temp);
   display.showNumberDecEx(temp, 0x20);
-  
+
+  if( !tcpClient.connected() )
+  {
+    if(tcpClient.connect(serverHost,serverPort))
+    {
+     tcpClientConnected = true; 
+    }else
+    {
+      Serial.println("Could not connect to server");
+    }
+  }else
+  {
+    tcpClient.println(temp);
+    Serial.println("Connected loop");
+  }
+  delay(500);
   //;
 }
 

build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'org.example'
-version '1.0-SNAPSHOT'
+version '1.0'
 
 repositories {
     mavenCentral()
@@ -12,9 +12,27 @@ repositories {
 dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-    implementation 'io.undertow:undertow-core:2.1.0.Final'
+    compile 'io.undertow:undertow-core:2.1.0.Final'
 }
 
 test {
     useJUnitPlatform()
+}
+
+//create a single Jar with all dependencies
+task fatJar(type: Jar) {
+    manifest {
+        attributes 'Implementation-Title': 'Gradle Jar File Example',
+                    'Implementation-Version': version,
+                    'Main-Class': 'Application'
+    }
+    baseName = project.name + '-all'
+    from {
+        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+
+    }
+    from('src/main/java'){
+        include 'resources/*'
+    }
+    with jar
 }

src/main/java/Application.java

@@ -4,6 +4,5 @@ public class Application {
     {
         CuisineHTTPServer vServer = new CuisineHTTPServer();
         vServer.startServer();
-        System.out.println("COUCOU");
     }
 }

src/main/java/CuisineHTTPServer.java

@@ -9,27 +9,37 @@ import io.undertow.websockets.core.WebSocketChannel;
 import io.undertow.websockets.core.WebSockets;
 import io.undertow.websockets.spi.WebSocketHttpExchange;
 
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Scanner;
+import java.util.stream.Stream;
+
 import static io.undertow.Handlers.*;
 
 public class CuisineHTTPServer extends Thread
 {
     final int webPagePort = 8080;
     final int webSocketPort = 42069;
+    final int tcpSocketPort = 6868;
     final String HOST = "localhost" ;
 
+    private static CuisineTCPServer fCuisineTCPServer;
 
     public void startServer()
     {
+        initResources();
+
         //Create CuisineTCPServers
-        CuisineTCPServer vTCPServer = new CuisineTCPServer();
-        CuisineWebSocketMessageHandler vWebSocketMessageHandler         = new CuisineWebSocketMessageHandler( vTCPServer );
+        fCuisineTCPServer = new CuisineTCPServer(tcpSocketPort);
+        CuisineWebSocketMessageHandler vWebSocketMessageHandler         = new CuisineWebSocketMessageHandler( fCuisineTCPServer );
         CuisineWebSocketConnectionHandler vWebSocketConnectionHandler   = new CuisineWebSocketConnectionHandler( vWebSocketMessageHandler );
 
         //Start HTTP Server : serve webpage with JS that calls the websocket
         Undertow WebPageServer = Undertow.builder()
                 .addHttpListener(webPagePort, HOST)
                 .setHandler(
-                        new CuisineResponseHandler()
+                        new CuisineResponseHandler("ws://"+HOST+":"+webSocketPort+"/data")
                             ).build();
         WebPageServer.start();
 
@@ -47,14 +57,38 @@ public class CuisineHTTPServer extends Thread
 
     }
 
+    static String sHtml_ASCII_title;
+    static String sHtml_CSS;
+    static void initResources()
+    {
+        try {
+            sHtml_ASCII_title = new Scanner(CuisineHTTPServer.class.getResourceAsStream("html_ascii_title"), "UTF-8").useDelimiter("\\A").next();
+            sHtml_CSS = new Scanner(CuisineHTTPServer.class.getResourceAsStream("style.css"), "UTF-8").useDelimiter("\\A").next();
+        }
+        catch(Exception vex)
+        {
+            vex.printStackTrace();
+            sHtml_ASCII_title = "Galère les resources";
+        }
+    }
+
     private class CuisineResponseHandler implements HttpHandler
     {
+        private String fWebSocketConnectionUri;
 
+        public CuisineResponseHandler(String iWebSocketConnectionUri)
+        {
+            super();
+
+            fWebSocketConnectionUri = iWebSocketConnectionUri;
+        }
         @Override
         public void handleRequest(HttpServerExchange exchange) throws Exception {
             //Serve webpage
-            exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, "text/plain");
-            exchange.getResponseSender().send("Salut, gropd!");
+            exchange.getResponseHeaders()
+                    .put(Headers.CONTENT_TYPE, "text/html")
+                    .put(Headers.CONTENT_ENCODING,"utf-8");
+            exchange.getResponseSender().send(getHTMLFrontPage(fWebSocketConnectionUri));
         }
     }
 
@@ -80,6 +114,7 @@ public class CuisineHTTPServer extends Thread
 
         protected CuisineWebSocketMessageHandler( CuisineTCPServer iTCPServer)
         {
+
             fTCPServer = iTCPServer;
         }
 
@@ -88,6 +123,41 @@ public class CuisineHTTPServer extends Thread
             //Handle message on webSocket
             WebSockets.sendText(String.valueOf(fTCPServer.getCurrentTemperature()), iChannel, null);
         }
+    }
+
 
+    static String getHTMLFrontPage(String iWsUri)
+    {
+        StringBuilder vBuilder = new StringBuilder();
+        vBuilder
+            .append("<head>")
+            .append("<meta charset=\"UTF-8\">")
+            .append("<style>")
+            .append(sHtml_CSS)
+            .append("</style>")
+            .append("</head>")
+            .append("<div class=\"pre\">")
+            .append(sHtml_ASCII_title)
+            .append("</div>")
+            .append("<h1 id=\"tempValue\">None</h1>")
+            .append("<script>")
+            .append("var socket=new WebSocket(\""+iWsUri+"\");\n")
+            .append("let connected=false;")
+            .append("let view=document.getElementById(\"tempValue\");")
+            .append("socket.onerror=function(error){connected=false;view.innerHTML=\"oups :(\";};")
+            .append("socket.onmessage=function(event){view.innerHTML=event.data+\"&deg;C\"};")
+            .append("socket.onopen=function(e){")
+            .append("connected=true;")
+            .append("callServer();")
+            .append("};")
+            .append("var callServer=function(){")
+            .append("socket.send(\"coucou\");")
+            .append("};")
+            .append("let timer=setInterval(callServer,100);")
+            .append("</script>")
+            .append("")
+
+            ;
+        return vBuilder.toString();
     }
 }

src/main/java/CuisineTCPServer.java

@@ -7,10 +7,10 @@ public class CuisineTCPServer extends Thread{
     private float fCurrentTemperature;
     private ServerSocket fServerSocket;
 
-    public CuisineTCPServer()
+    public CuisineTCPServer(int iPort)
     {
         try {
-            fServerSocket = new ServerSocket(6868);
+            fServerSocket = new ServerSocket(iPort);
             start();
 
             fCurrentTemperature = 0.0f;
@@ -28,11 +28,11 @@ public class CuisineTCPServer extends Thread{
 
     public void run()
     {
+        System.out.println("TCP Server Started");
         while(true)
         {
             try{
                 Socket vConnection = fServerSocket.accept();
-                System.out.println("Accepted new connection");
                 new CuisineTalker(vConnection).start();
             }
             catch(Exception ve)
@@ -61,9 +61,9 @@ public class CuisineTCPServer extends Thread{
                 {
                     InputStream vInputStream    = fSocket.getInputStream();
                     BufferedReader vBuffReader  = new BufferedReader(new InputStreamReader(vInputStream));
-
                     try{
-                        fCurrentTemperature = Float.parseFloat(vBuffReader.readLine());
+                        String vReceived = vBuffReader.readLine();
+                        fCurrentTemperature = Float.parseFloat(vReceived)/10;
                     }
                     catch(Exception ve)
                     {

src/main/resources/html_ascii_title

@@ -0,0 +1,8 @@
+   _____      _                  _____      _     _
+  / ____|    | |                / ____|    (_)   (_)
+ | |    _   _| |__   ___ _ __  | |    _   _ _ ___ _ _ __   ___
+ | |   | | | | '_ \ / _ \ '__| | |   | | | | / __| | '_ \ / _ \
+ | |___| |_| | |_) |  __/ |    | |___| |_| | \__ \ | | | |  __/
+  \_____\__, |_.__/ \___|_|     \_____\__,_|_|___/_|_| |_|\___|
+         __/ |
+        |___/

src/main/resources/style.css

@@ -0,0 +1,4 @@
+.pre{
+    font-family: monospace;
+    white-space: pre;
+}