From a0a40d6ea68d48f7b4ea0901655c7af8088c14d8 Mon Sep 17 00:00:00 2001
From: Amira Abdel-Rahman <amira-rahman@aucegypt.edu>
Date: Sun, 13 Sep 2020 23:47:39 -0400
Subject: [PATCH] DEM Integration
---
01_Code/physical_computing_interface/setup/serve.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/01_Code/physical_computing_interface/setup/serve.js b/01_Code/physical_computing_interface/setup/serve.js
index 77e2d63..7fbc829 100644
--- a/01_Code/physical_computing_interface/setup/serve.js
+++ b/01_Code/physical_computing_interface/setup/serve.js
@@ -58,7 +58,7 @@ function runPython_urx(setup){
console.log("didn't run the UR10");
}
- if(integratedSetup.DEMSetup.parameters.run){
+ if(setup.DEMSetup.parameters.run){
var root="../simulation/dice_firmware/build/x86/src/sim/vis/";
let outputFile = editJsonFile(`${__dirname}/`+root+`sim_config.json`);
outputFile.set("setup", setup.DEMSetup);
@@ -67,7 +67,7 @@ function runPython_urx(setup){
console.log();
console.log("Compile and run the DEM simulator:")
var commands=[];
- if(integratedSetup.DEMSetup.parameters.make){
+ if(setup.DEMSetup.parameters.make){
//make first
commands.push("cd " + "../simulation/dice_firmware/build/x86");
commands.push("make");
--
GitLab