From 7677e987ff5eed3b39d7342540c51ba063546761 Mon Sep 17 00:00:00 2001
From: Nicolas Rabault <nicolas.rabault@luos.io>
Date: Tue, 13 Feb 2024 16:51:10 +0100
Subject: [PATCH] clean compilation, prints, and gitignore

---
 .gitignore                                             |  2 ++
 engine/HAL/BROWSER/hal_script.py                       |  2 +-
 .../projects/browser/led/lib/Led/{led.c => led.cpp}    | 10 ++++------
 network/ws_network/HAL/BROWSER/ws_hal.cpp              |  9 +++------
 4 files changed, 10 insertions(+), 13 deletions(-)
 rename examples/projects/browser/led/lib/Led/{led.c => led.cpp} (98%)

diff --git a/.gitignore b/.gitignore
index e4450ea08..f3512c210 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,5 @@ examples/projects/ESP32/button/sdkconfig.esp32dev
 examples/projects/ESP32/led/sdkconfig.esp32dev
 tool_services/pipe/WS/ARDUINO/arduinoWebSockets/
 mongoose/
+examples/projects/browser/**/node_modules/
+*.pyc
diff --git a/engine/HAL/BROWSER/hal_script.py b/engine/HAL/BROWSER/hal_script.py
index 2db88146a..c0d3ec5c6 100644
--- a/engine/HAL/BROWSER/hal_script.py
+++ b/engine/HAL/BROWSER/hal_script.py
@@ -38,7 +38,7 @@
 
 for e in [env, genv]:
     # Add the cheerp-wasm target to the compiler flags
-    e.Append(CCFLAGS=["--target=cheerp-wasm", "-Wno-cheerp", "-cheerp-make-module=commonjs", "-DPUBLIC=__attribute__\(\(cheerp_jsexport\)\)"])
+    e.Append(CCFLAGS=["--target=cheerp-wasm", "-Wno-cheerp", "-DPUBLIC=__attribute__\(\(cheerp_jsexport\)\)"])
 
     # Add the cheerp-wasm target to the linker flags
     e.Append(LINKFLAGS=["--target=cheerp-wasm", "-cheerp-make-module=commonjs", "-cheerp-pretty-code"])
diff --git a/examples/projects/browser/led/lib/Led/led.c b/examples/projects/browser/led/lib/Led/led.cpp
similarity index 98%
rename from examples/projects/browser/led/lib/Led/led.c
rename to examples/projects/browser/led/lib/Led/led.cpp
index dfb37daf7..2fa3b6f2d 100644
--- a/examples/projects/browser/led/lib/Led/led.c
+++ b/examples/projects/browser/led/lib/Led/led.cpp
@@ -14,6 +14,8 @@
 #include "led.h"
 #include <stdlib.h>
 
+#include <cheerp/clientlib.h>
+
 /*******************************************************************************
  * Definitions
  ******************************************************************************/
@@ -55,12 +57,8 @@ static void Led_MsgHandler(service_t *service, const msg_t *msg);
 
 void clear_screen(void)
 {
-#ifdef _WIN32
-    system("cls");
-#else
-    // Assume POSIX
-    system("clear");
-#endif
+    // clear the console
+    printf("\x1B[2J\x1B[H");
 }
 
 /******************************************************************************
diff --git a/network/ws_network/HAL/BROWSER/ws_hal.cpp b/network/ws_network/HAL/BROWSER/ws_hal.cpp
index 3243135bb..24cdd18c3 100644
--- a/network/ws_network/HAL/BROWSER/ws_hal.cpp
+++ b/network/ws_network/HAL/BROWSER/ws_hal.cpp
@@ -38,17 +38,17 @@ static const char *s_url = WS_NETWORK_BROKER_ADDR;
 
 [[cheerp::genericjs]] void openEventCallback()
 {
-    console.log("Websocket opened!");
+    console.log("Websocket opened on", s_url);
 }
 
 [[cheerp::genericjs]] void closeEventCallback()
 {
-    console.log("Websocket closed!");
+    console.log("Websocket closed.");
 }
 
 [[cheerp::genericjs]] void errorEventCallback()
 {
-    console.log("Websocket error!");
+    console.log("Websocket error.");
 }
 
 void WsHAL_ReceptionWeb(const std::vector<uint8_t> &data)
@@ -65,7 +65,6 @@ void WsHAL_ReceptionWeb(const std::vector<uint8_t> &data)
 
 [[cheerp::genericjs]] void WsHAL_InitWeb()
 {
-    console.log("TEST!", s_url);
     __asm__("const WebSocket = require('ws')");
     clientWebsocket = new WebSocket(s_url);
     clientWebsocket->addEventListener(
@@ -83,7 +82,6 @@ void WsHAL_ReceptionWeb(const std::vector<uint8_t> &data)
         cheerp::Callback(
             [](MessageEvent *e)
             {
-                console.log("message");
                 auto *dataArray = (Uint8Array *)e->get_data();
                 std::vector<uint8_t> wasmData(dataArray->get_length());                               // allocate some linear memory
                 Uint8Array *wasmDataArray = cheerp::MakeTypedArray(wasmData.data(), wasmData.size()); // create a Uint8Array wrapper ove the linear memory held by the vector
@@ -110,7 +108,6 @@ void WsHAL_Init(void)
  * @param None
  * @return None
  ******************************************************************************/
-PUBLIC
 void WsHAL_Loop(void)
 {
     // Nothing to do here