Merge pull request #663 from VILLASframework/fix-fpga

Fix release builds

fpga

@@ -1 +1 @@
-Subproject commit 4a2c860e05b94825000627c0b115f627a2e666b9
+Subproject commit ce8612379de62f50a52e172fe8eaee924d5d8822

packaging/nix/flake.lock

@@ -19,16 +19,17 @@
     "fpga": {
       "flake": false,
       "locked": {
-        "lastModified": 1679417867,
-        "narHash": "sha256-HHIsOnuQOq0Ytd22VMSHpTbecHpcheF1xLkslqxXOsk=",
-        "ref": "refs/heads/master",
-        "rev": "29f81016b2317667a2b21fbcf74ea66986a84c03",
-        "revCount": 530,
+        "lastModified": 1686871446,
+        "narHash": "sha256-pRFFr72NVge4UgwBvc8gYygnvOHghTSUGI+JtqpRlxo=",
+        "ref": "refs/heads/villas-node",
+        "rev": "ce8612379de62f50a52e172fe8eaee924d5d8822",
+        "revCount": 481,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/VILLASframework/fpga.git"
       },
       "original": {
+        "ref": "refs/heads/villas-node",
         "submodules": true,
         "type": "git",
         "url": "https://github.com/VILLASframework/fpga.git"

packaging/nix/flake.nix

@@ -10,7 +10,10 @@
     };
 
     fpga = {
-      url = "git+https://github.com/VILLASframework/fpga.git?submodules=1";
+      type = "git";
+      url = "https://github.com/VILLASframework/fpga.git";
+      ref = "refs/heads/villas-node";
+      submodules = true;
       flake = false;
     };
 

packaging/nix/villas.nix

@@ -13,7 +13,7 @@
   withHookLua ? withAllHooks,
   withNodeAmqp ? withAllNodes,
   withNodeComedi ? withAllNodes,
-  withNodeFpga ? false, # submodule commit has warnings and master broke the interface
+  withNodeFpga ? withAllNodes,
   withNodeIec60870 ? withAllNodes,
   withNodeIec61850 ? withAllNodes,
   withNodeInfiniband ? withAllNodes,
@@ -86,6 +86,10 @@ stdenv.mkDerivation {
     ${lib.optionalString withNodeFpga "ln -s ${fpga} fpga"}
   '';
   postInstall = ''
+    if [ -d $out/include/villas/ ] && [ -d $dev/include/villas/ ]; then
+      mv $out/include/villas/* $dev/include/villas/
+      rm -d $out/include/villas
+    fi
     wrapProgram $out/bin/villas \
       --set PATH ${lib.makeBinPath [(placeholder "out") gnugrep coreutils]}
     wrapProgram $out/bin/villas-api \

src/villas-relay.hpp

@@ -31,6 +31,7 @@ typedef std::string Identifier;
 class Frame : public std::vector<uint8_t> {
 public:
 	Frame() {
+    		reserve(LWS_PRE);
 		/* lws_write() requires LWS_PRE bytes in front of the payload */
 		insert(end(), LWS_PRE, 0);
 	}