Ready for release

Author: karurochari

README.md

@@ -1,6 +1,3 @@
-> [!WARNING]  
-> This module is a work in progress. Not functional yet.
-
 > [!WARNING]  
 > This module will only work on the for [stable-gluegunfw](https://github.com/KaruroChori/txiki.js/tree/stable-gluegunfw)
 

TODO.md

@@ -0,0 +1,2 @@
+- [ ] ls to search for all available serials
+- [ ] reconfiguration of the serial 

src/dev/main.cpp

@@ -3,9 +3,11 @@
 #include <sow.h>
 using namespace std;
 
+using namespace __MODULE__;
+
 int main(){
     cfg_serial cfg;
-    int fd = __MODULE___configure("/dev/serial/by-id/usb-1a86_USB2.0-Serial-if00-port0",cfg);
+    int fd = configure("/dev/serial/by-id/usb-1a86_USB2.0-Serial-if00-port0",cfg);
     cout<<"Hello world!";
     close(fd);
     return 0;

src/native/module.cpp

@@ -1,26 +1,57 @@
 #include "module.h"
 #include "sow.h"
 
+using namespace __MODULE__;
+
 extern "C" {
 
+//Most checks are skipped since the json schema is validated before running this.
+//So structure is assumed to be enforced.
 static void tjs_obj2cfg(JSContext *ctx, JSValue obj, cfg_serial *cfg) {
-    /*JSValue parity = JS_GetPropertyStr(ctx, obj, "parity");
-    if (!JS_IsUndefined(parity)){
-        JS
-        JSToCString(ctx, &cfg->parity, family);
+    {
+        JSValue value = JS_GetPropertyStr(ctx, obj, "parity");
+        const char* buffer;
+        if (!JS_IsUndefined(value)){
+            buffer = JS_ToCString(ctx, value);
+            if(strcmp("enabled",buffer)==0) cfg->parity = feature_t::ENABLED;
+            else if(strcmp("disabled",buffer)==0) cfg->parity = feature_t::DISABLED;
+            JS_FreeCString(ctx, buffer);
+        }
+        JS_FreeValue(ctx, value);
+    }
+
+    {
+        JSValue value = JS_GetPropertyStr(ctx, obj, "bits");
+        uint32_t buffer;
+        if (!JS_IsUndefined(value)){
+            JS_ToUint32(ctx, &buffer, value);
+            cfg->bits = static_cast<bits_t>((uint8_t)buffer-5);
+        }
+        JS_FreeValue(ctx, value);
     }
-    JS_FreeValue(ctx, parity);
 
-    JSValue socktype = JS_GetPropertyStr(ctx, obj, "socktype");
-    if (!JS_IsUndefined(socktype))
-        JS_ToInt32(ctx, &ai->ai_socktype, socktype);
-    JS_FreeValue(ctx, socktype);
 
-    JSValue protocol = JS_GetPropertyStr(ctx, obj, "protocol");
-    if (!JS_IsUndefined(protocol))
-        JS_ToInt32(ctx, &ai->ai_protocol, protocol);
-    JS_FreeValue(ctx, protocol);
-    */
+    {
+        JSValue value = JS_GetPropertyStr(ctx, obj, "stop");
+        uint32_t buffer;
+        if (!JS_IsUndefined(value)){
+            JS_ToUint32(ctx, &buffer, value);
+            cfg->stop = static_cast<stop_t>((uint8_t)buffer-1);
+        }
+        JS_FreeValue(ctx, value);
+    }
+
+    {
+        JSValue value = JS_GetPropertyStr(ctx, obj, "hardware_flow");
+        const char* buffer;
+        if (!JS_IsUndefined(value)){
+            buffer = JS_ToCString(ctx, value);
+            if(strcmp("enabled",buffer)==0) cfg->hardware_flow = feature_t::ENABLED;
+            else if(strcmp("disabled",buffer)==0) cfg->hardware_flow = feature_t::DISABLED;
+            JS_FreeCString(ctx, buffer);
+        }
+        JS_FreeValue(ctx, value);
+    }
 
     {
         JSValue value = JS_GetPropertyStr(ctx, obj, "vtime");
@@ -37,7 +68,7 @@ static void tjs_obj2cfg(JSContext *ctx, JSValue obj, cfg_serial *cfg) {
         uint32_t buffer;
         if (!JS_IsUndefined(value)){
             JS_ToUint32(ctx, &buffer, value);
-            cfg->vtime = (uint8_t)buffer;
+            cfg->vmin = (uint8_t)buffer;
         }
         JS_FreeValue(ctx, value);
     }
@@ -50,7 +81,7 @@ static void tjs_obj2cfg(JSContext *ctx, JSValue obj, cfg_serial *cfg) {
     }
 
     {
-        JSValue value = JS_GetPropertyStr(ctx, obj, "ispeed");
+        JSValue value = JS_GetPropertyStr(ctx, obj, "ospeed");
         if (!JS_IsUndefined(value))
             JS_ToUint32(ctx, &cfg->ospeed, value);
         JS_FreeValue(ctx, value);
@@ -73,7 +104,7 @@ static JSValue tjs___MODULE___configure(JSContext *ctx, JSValue this_val, int ar
 
     tjs_obj2cfg(ctx,argv[1],&cfg);
 
-    int fd = __MODULE___configure(name,cfg);
+    int fd = configure(name,cfg);
     if(fd==-1) return JS_ThrowPlainError(ctx, "Unable to open file [%s] as serial", name);
     return JS_NewInt32(ctx,fd);
 }

src/native/sow.cpp

@@ -21,7 +21,9 @@
 #include <sys/file.h>
 
 
-int __MODULE___configure(const char* path, const cfg_serial& cfg){
+namespace __MODULE__{
+
+int configure(const char* path, const cfg_serial& cfg){
     printf(
         "Opening [%s] with cfg {parity:%i,stop:%i,bits:%i,hardware_flow:%i,vtime:%i,vmin:%i,ispeed:%i,ospeed:%i}\n",
         path,
@@ -114,3 +116,5 @@ int __MODULE___configure(const char* path, const cfg_serial& cfg){
 
     return serial_port;
 }
+
+}

src/native/sow.h

@@ -6,6 +6,7 @@
 
 #include <cstdint>
 
+namespace __MODULE__{
 
 enum class feature_t : uint8_t {DISABLED, ENABLED};
 enum class stop_t : uint8_t  {ONE_BIT, TWO_BITS};
@@ -26,5 +27,6 @@ struct cfg_serial {
 };
 
 
-int __MODULE___configure(const char* path, const cfg_serial& cfg);
+int configure(const char* path, const cfg_serial& cfg);
 
+}

src/ts/index.ts

@@ -10,6 +10,7 @@ const speeds_t = t.Union([
 
 const serial_cfg_schema = t.Object({
     parity: t.Union([t.Literal("disabled"), t.Literal("enabled")], { default: 'disabled' }),
+    bits: t.Union([t.Literal(5), t.Literal(6), t.Literal(7), t.Literal(8)], { default: 8 }),
     stop: t.Union([t.Literal(1), t.Literal(2)], { default: 1 }),
     hardware_flow: t.Union([t.Literal("disabled"), t.Literal("enabled")], { default: 'enabled' }),
     vtime: t.Integer({ default: 0 }),