diff --git a/Makefile b/Makefile index 25485fd4..8f21a084 100644 --- a/Makefile +++ b/Makefile @@ -55,16 +55,7 @@ remote-flamegraph: backup-printed-programs: cd ~/folk-printed-programs && timestamp=$$(date '+%Y-%m-%d_%H-%M-%S%z') && tar -zcvf ~/"folk-printed-programs_$$timestamp.tar.gz" . && echo "Saved to: ~/folk-printed-programs_$$timestamp.tar.gz" -calibrate: - tclsh8.6 calibrate.tcl -calibrate-debug: - gdb --args tclsh8.6 calibrate.tcl -remote-calibrate: sync - ssh folk@$(FOLK_SHARE_NODE) -- make -C /home/folk/folk calibrate -remote-calibrate-debug: sync - ssh folk@$(FOLK_SHARE_NODE) -- make -C /home/folk/folk calibrate-debug - -.PHONY: test sync start journal repl calibrate remote-calibrate enable-pubkey install-deps +.PHONY: test sync start journal repl enable-pubkey install-deps enable-pubkey: ssh folk-live -- 'sudo sed -i "s/.*PubkeyAuthentication.*/PubkeyAuthentication yes/g" /etc/ssh/sshd_config && sudo systemctl restart ssh' diff --git a/README.md b/README.md index 83799746..bfdfcdb6 100644 --- a/README.md +++ b/README.md @@ -208,10 +208,7 @@ not the PS for it to work, probably) ### Projector-camera calibration -1. Print at least 4 AprilTags (either print throwaway programs from Folk or - manually print tagStandard52h13 tags yourself). - -1. Let's position the camera. Make sure Folk is running (ssh in, `cd +1. Position the camera. Make sure Folk is running (ssh in, `cd ~/folk`, `./folk.tcl start`). Go to your Folk server's Web page http://whatever.local:4273 and make a new program and save it: @@ -235,15 +232,9 @@ not the PS for it to work, probably) Go to http://whatever.local:4273/frame-image/ to see the camera's current field of view. Reposition your camera to cover your table. -1. Place the 4 AprilTags around your table. On the tabletop, run - `./folk.tcl calibrate`. Wait. - -1. You should see red triangles projected on each of your 4 tags. Then - you're done! Run Folk! If not, rerun calibration until you do see a - red triangle on each tag. - -1. When you've successfully calibrated, start Folk back up with - `./folk.tcl start`. +1. Go to the Folk calibration page at + http://whatever.local:4273/calibrate and follow the instructions + (print calibration board & run calibration process). ### Connect a keyboard diff --git a/docs/code.md b/docs/code.md index 05bfc6de..d722a5d9 100644 --- a/docs/code.md +++ b/docs/code.md @@ -16,9 +16,6 @@ 6. `virtual-programs` 1. Our own high-level Folk programs 2. They could be printed out... Perhaps, should be. -8. `calibrate.tcl` - 1. Calibrates the `pi` projector and dumps a bunch of homography metadata - to disk 9. `replmain.tcl` 1. A front-end to the statements database, like `laptop` or `pi` 2. Should there just be a `/clients` directory, where all of the possible diff --git a/folk.tcl b/folk.tcl index b747cd59..a8da92fa 100755 --- a/folk.tcl +++ b/folk.tcl @@ -15,10 +15,6 @@ proc manage_folk {action} { } } -proc calibrate_folk {} { - exec -ignorestderr tclsh8.6 ~/folk/calibrate.tcl >@stdout -} - if {$argc == 0} { puts "Usage: folk " puts $availableActions @@ -33,9 +29,6 @@ switch -- $command { "restart" { manage_folk $command } - "calibrate" { - calibrate_folk - } default { puts $availableActions }