Convert pinout info to JSON while building pages (#2775)

* try converting to json first

* fix command

* try

* try

* convert to json in js

misc/jenkins/generate_pinouts/gen_upload_pinouts.sh

@@ -15,9 +15,9 @@ for c in $CONNECTORS; do
   echo "NAME "$NAME
   mkdir -p $DIR
   if [ -f $DIR/index.html ]; then
-    bash misc/pinout-gen/append.sh $c $DIR/index.html
+    bash misc/pinout-gen/append.sh "$(yq -j r $c)" $DIR/index.html
   else
-    bash misc/pinout-gen/gen.sh $c $DIR/index.html
+    bash misc/pinout-gen/gen.sh "$(yq -j r $c)" $DIR/index.html
   fi
   file $DIR/index.html
   IMG=$(yq r $c 'info.image.file')
@@ -29,8 +29,6 @@ for c in $CONNECTORS; do
     cp $(dirname $c)/$IMG $DIR
   fi
   ls $DIR
-  cp misc/pinout-gen/yaml.min.js $DIR
-  ls $DIR
 done
 
 if [ -n "$RUSEFI_FTP_SERVER" ]; then

misc/pinout-gen/append.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 DIR=$(cd -P -- "$(dirname -- "$0")" && pwd -P)"/"
-TEXT=$(sed -e "/\/\/\/DATA\/\/\//{a \ \`" -e "r $1"  -e "a \ \`,\n///DATA///" -e "d}" $2)
+TEXT=$(sed -e "/\/\/\/DATA\/\/\//{a \ \`$1\ \`,\n///DATA///" -e "d}" $2)
 echo "$TEXT" > $2

misc/pinout-gen/gen.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 DIR=$(cd -P -- "$(dirname -- "$0")" && pwd -P)"/"
-TEXT=$(sed -e "/###CSS###/{r ${DIR}style.css" -e 'd}' -e "/###JS###/{r ${DIR}script.js" -e 'd}' ${DIR}pinout.html | sed -e "/\/\/\/DATA\/\/\//{a \ \`" -e "r $1"  -e "a \ \`,\n///DATA///" -e "d}")
+TEXT=$(sed -e "/###CSS###/{r ${DIR}style.css" -e 'd}' -e "/###JS###/{r ${DIR}script.js" -e 'd}' ${DIR}pinout.html | sed -e "s/\/\/\/DATA\/\/\//`$(echo ${1//\//\\/} | tr -d '\n')`,\n\/\/\/DATA\/\/\//")
 echo "$TEXT" > $2

misc/pinout-gen/script.js

@@ -1,4 +1,4 @@
-var connectorYaml = [
+var connectorData = [
 ///DATA///
 ];
 
@@ -43,8 +43,8 @@ function clickPin(table, pin, pdiv) {
 }
 
 window.addEventListener('load', function() {
-  for (var c = 0; c < connectorYaml.length; c++) {
-    var connector = YAML.parse(connectorYaml[c]);
+  for (var c = 0; c < connectorData.length; c++) {
+    var connector = JSON.parse(connectorData[c]);
     var template = document.getElementById("connector-template");
     var clone = template.content.cloneNode(true);
     document.body.appendChild(clone);