Skip to content

Free Motion Capture for Everyone πŸ’€βœ¨

TypeScript

Auto stash before merge of "main" and "origin/main"

Jon Matthised813fcccd07
diff --git a/.gitignore b/.gitignore
index 4e6abd4a..7a1377dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,7 +131,12 @@ dmypy.json
# Pyre type checker
.pyre/
.vscode/launch.json
+<<<<<<< HEAD
Cam4
Cam3
Cam2
-Cam1
\ No newline at end of file
+Cam1
+=======
+Cam2
+Cam1
+>>>>>>> 8f1fbc8... runme file reorganization
diff --git a/runme_fmc_staged.py b/runme_fmc_staged.py
index 18a4e91e..83cd02da 100644
--- a/runme_fmc_staged.py
+++ b/runme_fmc_staged.py
@@ -21,6 +21,11 @@ if not sesh.sessionID:
dataFolder = Path.cwd()/'Data'
subfolders = [ f.path for f in os.scandir(dataFolder) if f.is_dir() ] #copy-pasta from who knows where
sesh.sessionID = Path(subfolders[-1]).stem #grab the name of the last folder in the list of subfolders
+=======
+stage = 1 #set your starting stage here (stage = 1 will run the pipeline from webcams)
+sesh.debug = True
+sesh.sessionID = '' #fill in if you are running from Stage 2 onwards
+>>>>>>> 8f1fbc8... runme file reorganization
board = CharucoBoard(7, 5,
#square_length=1, # here, in mm but any unit works (JSM NOTE - just using '1' so resulting units will be in 'charuco squarelenghts`)