Skip to content

Commit

Permalink
Merge branch 'main' of github.com:misko/spf
Browse files Browse the repository at this point in the history
  • Loading branch information
misko committed Sep 19, 2024
2 parents cc5e8be + 1fce0b1 commit c549150
Show file tree
Hide file tree
Showing 5 changed files with 165 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ reboot_plutos () {


export ROOT="../../../"
config=${ROOT}/spf/v5_configs/wall_array_v2_external_75.yaml
config=${ROOT}/spf/v5_configs/wall_array_v2_external_35.yaml

#reboot_plutos
sleep 3
Expand Down
2 changes: 2 additions & 0 deletions run.sh
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
python spf/notebooks/simple_train.py --device cuda --seed 0 --nthetas 11 --datasets /mnt/md0/spf/2d_wallarray_v2_data/june/*.zarr --batch 1024 --workers 16 --act leaky --shuffle --segmentation-level downsampled --type direct --seg-net conv --epochs 1200 --shuffle --symmetry --no-sigmoid --block --n-radios 2 --skip-qc --wandb-project test123 --val-every 500 --val-holdout-fraction 0.15 --lr 0.001 --paired-start 0 --seg-start 0 --paired-lambda 0.2
#python spf/grbl_radio_collection.py -c spf/v5_configs/wall_array_v2_external.yaml -r rx_circle -s /dev/ttyACM0
python spf/grbl_radio_collection.py -c spf/v5_configs/wall_array_v2_external.yaml -r bounce -s /dev/ttyACM0
54 changes: 54 additions & 0 deletions spf/v5_configs/wall_array_v2_external_35.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# The ip of the emitter
# When the emitter is brought online it is verified
# by a receiver that it actually is broadcasting
emitter:
type: esp32
motor_channel: 1

# Two receivers each with two antennas
# When a receiver is brought online it performs
# phase calibration using an emitter equidistant from
# both receiver antenna
# The orientation of the receiver is described in
# multiples of pi
receivers:
- receiver-uri: ip:192.168.1.17
theta-in-pis: -0.25
antenna-spacing-m: 0.035 # 40 mm
nelements: 2
array-type: linear
rx-gain-mode: fast_attack
rx-buffers: 2
rx-gain: -3
buffer-size: 524288
f-intermediate: 100000 #1.0e5
f-carrier: 2412000000 #2.5e9
f-sampling: 16000000 # 16.0e6
bandwidth: 300000 #3.0e5
motor_channel: 0
- receiver-uri: ip:192.168.1.18
theta-in-pis: 1.25
antenna-spacing-m: 0.035 # 40 mm
nelements: 2
array-type: linear
rx-gain-mode: fast_attack
rx-buffers: 2
rx-gain: -3
buffer-size: 524288
f-intermediate: 100000 #1.0e5
f-carrier: 2412000000 #2.5e9
f-sampling: 16000000 # 16.0e6
bandwidth: 300000 #3.0e5
motor_channel: 0


n-thetas: 65
n-records-per-receiver: 5000
width: 4000
calibration-frames: 10
routine: null
skip_phase_calibration: true


data-version: 5
seconds-per-sample: 1.0
54 changes: 54 additions & 0 deletions spf/v5_configs/wall_array_v2_external_70.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# The ip of the emitter
# When the emitter is brought online it is verified
# by a receiver that it actually is broadcasting
emitter:
type: esp32
motor_channel: 1

# Two receivers each with two antennas
# When a receiver is brought online it performs
# phase calibration using an emitter equidistant from
# both receiver antenna
# The orientation of the receiver is described in
# multiples of pi
receivers:
- receiver-uri: ip:192.168.1.17
theta-in-pis: -0.25
antenna-spacing-m: 0.070 # 40 mm
nelements: 2
array-type: linear
rx-gain-mode: fast_attack
rx-buffers: 2
rx-gain: -3
buffer-size: 524288
f-intermediate: 100000 #1.0e5
f-carrier: 2412000000 #2.5e9
f-sampling: 16000000 # 16.0e6
bandwidth: 300000 #3.0e5
motor_channel: 0
- receiver-uri: ip:192.168.1.18
theta-in-pis: 1.25
antenna-spacing-m: 0.070 # 40 mm
nelements: 2
array-type: linear
rx-gain-mode: fast_attack
rx-buffers: 2
rx-gain: -3
buffer-size: 524288
f-intermediate: 100000 #1.0e5
f-carrier: 2412000000 #2.5e9
f-sampling: 16000000 # 16.0e6
bandwidth: 300000 #3.0e5
motor_channel: 0


n-thetas: 65
n-records-per-receiver: 5000
width: 4000
calibration-frames: 10
routine: null
skip_phase_calibration: true


data-version: 5
seconds-per-sample: 1.0
54 changes: 54 additions & 0 deletions spf/v5_configs/wall_array_v2_external_75.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# The ip of the emitter
# When the emitter is brought online it is verified
# by a receiver that it actually is broadcasting
emitter:
type: esp32
motor_channel: 1

# Two receivers each with two antennas
# When a receiver is brought online it performs
# phase calibration using an emitter equidistant from
# both receiver antenna
# The orientation of the receiver is described in
# multiples of pi
receivers:
- receiver-uri: ip:192.168.1.17
theta-in-pis: -0.25
antenna-spacing-m: 0.075 # 40 mm
nelements: 2
array-type: linear
rx-gain-mode: fast_attack
rx-buffers: 2
rx-gain: -3
buffer-size: 524288
f-intermediate: 100000 #1.0e5
f-carrier: 2412000000 #2.5e9
f-sampling: 16000000 # 16.0e6
bandwidth: 300000 #3.0e5
motor_channel: 0
- receiver-uri: ip:192.168.1.18
theta-in-pis: 1.25
antenna-spacing-m: 0.075 # 40 mm
nelements: 2
array-type: linear
rx-gain-mode: fast_attack
rx-buffers: 2
rx-gain: -3
buffer-size: 524288
f-intermediate: 100000 #1.0e5
f-carrier: 2412000000 #2.5e9
f-sampling: 16000000 # 16.0e6
bandwidth: 300000 #3.0e5
motor_channel: 0


n-thetas: 65
n-records-per-receiver: 5000
width: 4000
calibration-frames: 10
routine: null
skip_phase_calibration: true


data-version: 5
seconds-per-sample: 1.0

0 comments on commit c549150

Please sign in to comment.