Skip to content

Commit

Permalink
updates for field calibration rotation
Browse files Browse the repository at this point in the history
  • Loading branch information
@dat4087
dat4087 committed Jan 12, 2025
1 parent 798466b commit 6e207be
Show file tree
Hide file tree
Showing 11 changed files with 495 additions and 128 deletions.
2 changes: 1 addition & 1 deletion Coordinate Transformations.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.12.6"
"version": "3.12.6 (tags/v3.12.6:a4a2d2b, Sep 6 2024, 20:11:23) [MSC v.1940 64 bit (AMD64)]"
},
"vscode": {
"interpreter": {
Expand Down
Binary file modified __pycache__/trackercal.cpython-312.pyc
View file
Binary file not shown.
1 change: 1 addition & 0 deletions circle_samples.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[(-0.33586010336875916, -2.7751126289367676), (-0.35890698432922363, -2.824063539505005), (-0.3822115957736969, -2.8773152828216553), (-0.4002203941345215, -2.9250471591949463), (-0.41739851236343384, -2.9750592708587646), (-0.4348708987236023, -3.0377004146575928), (-0.44546759128570557, -3.088052988052368), (-0.4544447660446167, -3.142852306365967), (-0.46014195680618286, -3.1969923973083496), (-0.4632839560508728, -3.265570640563965), (-0.4613221287727356, -3.3196418285369873), (-0.45516976714134216, -3.3867781162261963), (-0.445527046918869, -3.4458656311035156), (-0.43221765756607056, -3.5074851512908936), (-0.41511473059654236, -3.5714497566223145), (-0.393525630235672, -3.6298828125), (-0.36732688546180725, -3.6900475025177), (-0.33479610085487366, -3.751631021499634), (-0.2968883514404297, -3.814582347869873), (-0.2556522488594055, -3.8707668781280518), (-0.21557587385177612, -3.9188098907470703), (-0.18058457970619202, -3.955697536468506), (-0.12722496688365936, -4.005831718444824), (-0.07738640159368515, -4.0456767082214355), (-0.02012910135090351, -4.086273670196533), (0.034848928451538086, -4.119880676269531), (0.08856970071792603, -4.1470866203308105), (0.14951391518115997, -4.172483921051025), (0.2105916291475296, -4.193023681640625), (0.27091512084007263, -4.209332466125488), (0.3295126259326935, -4.221631050109863), (0.38568851351737976, -4.229846954345703), (0.4471082389354706, -4.234403610229492), (0.4976525902748108, -4.234608173370361), (0.5577480792999268, -4.234564304351807), (0.6272339224815369, -4.227652549743652), (0.69347083568573, -4.2171630859375), (0.7477948069572449, -4.205892086029053), (0.8027849793434143, -4.189815521240234), (0.860622227191925, -4.1687211990356445), (0.9154700040817261, -4.145083904266357), (0.9710306525230408, -4.118152141571045), (1.0204241275787354, -4.08997106552124), (1.0640522241592407, -4.060217380523682), (1.1053920984268188, -4.029297828674316), (1.1462867259979248, -3.9930620193481445), (1.1863627433776855, -3.9589993953704834), (1.2195643186569214, -3.920581817626953), (1.2571842670440674, -3.880460739135742), (1.285730004310608, -3.838834285736084), (1.3169491291046143, -3.7934255599975586), (1.3499730825424194, -3.745330810546875), (1.3825656175613403, -3.6908133029937744), (1.4173920154571533, -3.61975359916687), (1.4405326843261719, -3.571455717086792), (1.4529715776443481, -3.5068204402923584), (1.4621925354003906, -3.445859432220459), (1.4696481227874756, -3.3845913410186768), (1.478743553161621, -3.3287954330444336), (1.4859535694122314, -3.257941246032715), (1.472756266593933, -3.2041163444519043), (1.4633924961090088, -3.1349267959594727), (1.4500012397766113, -3.066941261291504), (1.437774658203125, -3.0114526748657227), (1.4236478805541992, -2.957245349884033), (1.4005985260009766, -2.8862483501434326), (1.3668832778930664, -2.8327548503875732), (1.3409987688064575, -2.7783243656158447), (1.305558681488037, -2.7186291217803955), (1.2625666856765747, -2.6671671867370605), (1.223608374595642, -2.6215524673461914), (1.1885194778442383, -2.5819077491760254), (1.1466963291168213, -2.5439562797546387), (1.1069247722625732, -2.507383346557617), (1.0573101043701172, -2.476118803024292), (0.990514874458313, -2.435497283935547), (0.9223076105117798, -2.3979856967926025), (0.8527050018310547, -2.3662281036376953), (0.8010571002960205, -2.351175308227539), (0.746703028678894, -2.333078384399414), (0.6888381242752075, -2.3227035999298096), (0.6372402906417847, -2.317063570022583), (0.5862922668457031, -2.313762664794922), (0.5067326426506042, -2.3056931495666504), (0.43727535009384155, -2.3149993419647217), (0.3684924840927124, -2.3208975791931152), (0.3159947693347931, -2.3324058055877686), (0.2658810615539551, -2.332509994506836), (0.1984042078256607, -2.352609634399414), (0.13402092456817627, -2.3685243129730225), (0.07870516180992126, -2.3919057846069336), (0.02057606913149357, -2.420473098754883), (-0.036281101405620575, -2.4536631107330322), (-0.0942876860499382, -2.494248151779175), (-0.14071820676326752, -2.535139322280884), (-0.18406587839126587, -2.57611083984375), (-0.23000402748584747, -2.6269919872283936), (-0.2682756185531616, -2.6720261573791504), (-0.2985803782939911, -2.720405340194702), (-0.32440006732940674, -2.767744541168213)]
365 changes: 365 additions & 0 deletions fieldCalibrateDebug.ipynb
View file

Large diffs are not rendered by default.

218 changes: 109 additions & 109 deletions lighthouse/lighthousedb.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,44 +23,6 @@
"serialNumber" : 4541212
},
"dynamic_states" : [
{
"dynamic_state" : {
"basestation_mode" : 4,
"faults" : 0,
"firmware_version" : 3002,
"gravity_vector" : [ 0, 1, 0 ],
"nonce" : 56957,
"reset_count" : 12,
"sobChannel" : 10
},
"first_id" : 1,
"last_id" : 1,
"tilt" : {
"pitch" : -0.0168661065,
"roll" : 0.0147994896,
"variance" : 39.4784203
},
"time_last_seen" : "1731794293"
},
{
"dynamic_state" : {
"basestation_mode" : 4,
"faults" : 0,
"firmware_version" : 3002,
"gravity_vector" : [ -0.00787352771, 0.999938011, -0.00787352771 ],
"nonce" : 56957,
"reset_count" : 14,
"sobChannel" : 10
},
"first_id" : 1,
"last_id" : 1,
"tilt" : {
"pitch" : -0.0254743006,
"roll" : 0.00379654998,
"variance" : 1.85356366e-05
},
"time_last_seen" : "1731794764"
},
{
"dynamic_state" : {
"basestation_mode" : 4,
Expand Down Expand Up @@ -199,7 +161,7 @@
"basestation_mode" : 4,
"faults" : 0,
"firmware_version" : 3002,
"gravity_vector" : [ 0, 0.999504328, -0.0314804502 ],
"gravity_vector" : [ 0, 0.999504387, -0.0314804539 ],
"nonce" : 55632,
"reset_count" : 1,
"sobChannel" : 10
Expand All @@ -211,7 +173,45 @@
"roll" : -0.0208184123,
"variance" : 1.15057592e-05
},
"time_last_seen" : "1736484146"
"time_last_seen" : "1736484616"
},
{
"dynamic_state" : {
"basestation_mode" : 4,
"faults" : 0,
"firmware_version" : 3002,
"gravity_vector" : [ 0, 0.99972111, -0.023615459 ],
"nonce" : 59905,
"reset_count" : 1,
"sobChannel" : 10
},
"first_id" : 1,
"last_id" : 1,
"tilt" : {
"pitch" : -0.0285139494,
"roll" : 0.00117830269,
"variance" : 1.67884264e-06
},
"time_last_seen" : "1736631762"
},
{
"dynamic_state" : {
"basestation_mode" : 4,
"faults" : 0,
"firmware_version" : 3002,
"gravity_vector" : [ 0, 0.99888593, -0.0471914597 ],
"nonce" : 59905,
"reset_count" : 2,
"sobChannel" : 10
},
"first_id" : 1,
"last_id" : 1,
"tilt" : {
"pitch" : -0.00833235681,
"roll" : 0.05202315,
"variance" : 5.94494668e-05
},
"time_last_seen" : "1736639005"
}
]
},
Expand All @@ -238,63 +238,6 @@
"serialNumber" : 2397018737
},
"dynamic_states" : [
{
"dynamic_state" : {
"basestation_mode" : 4,
"faults" : 0,
"firmware_version" : 3002,
"gravity_vector" : [ 0.0314561091, 0.998731434, -0.0393201336 ],
"nonce" : 1879,
"reset_count" : 8,
"sobChannel" : 0
},
"first_id" : 1,
"last_id" : 1,
"tilt" : {
"pitch" : 0.0208939649,
"roll" : -0.0304162968,
"variance" : 39.4784203
},
"time_last_seen" : "1731787686"
},
{
"dynamic_state" : {
"basestation_mode" : 4,
"faults" : 0,
"firmware_version" : 3002,
"gravity_vector" : [ 0.0235971883, 0.99894768, -0.0393286496 ],
"nonce" : 1879,
"reset_count" : 11,
"sobChannel" : 0
},
"first_id" : 1,
"last_id" : 1,
"tilt" : {
"pitch" : -0.0329699367,
"roll" : 0.0220026542,
"variance" : 1.41595892e-05
},
"time_last_seen" : "1731788203"
},
{
"dynamic_state" : {
"basestation_mode" : 4,
"faults" : 0,
"firmware_version" : 3002,
"gravity_vector" : [ 0.0236088801, 0.999442518, -0.0236088801 ],
"nonce" : 1879,
"reset_count" : 12,
"sobChannel" : 0
},
"first_id" : 1,
"last_id" : 1,
"tilt" : {
"pitch" : -0.0329699367,
"roll" : 0.0220026542,
"variance" : 39.4784203
},
"time_last_seen" : "1731789450"
},
{
"dynamic_state" : {
"basestation_mode" : 4,
Expand Down Expand Up @@ -395,7 +338,7 @@
"basestation_mode" : 4,
"faults" : 0,
"firmware_version" : 3002,
"gravity_vector" : [ 0, 0.997498333, -0.0706888512 ],
"gravity_vector" : [ 0, 0.997498453, -0.0706888586 ],
"nonce" : 8931,
"reset_count" : 1,
"sobChannel" : 0
Expand All @@ -414,7 +357,7 @@
"basestation_mode" : 4,
"faults" : 0,
"firmware_version" : 3002,
"gravity_vector" : [ 0, 0.997498333, -0.0706888512 ],
"gravity_vector" : [ 0, 0.997498453, -0.0706888586 ],
"nonce" : 31677,
"reset_count" : 1,
"sobChannel" : 0
Expand All @@ -426,7 +369,64 @@
"roll" : 0.0230259802,
"variance" : 1.20298455e-06
},
"time_last_seen" : "1736484146"
"time_last_seen" : "1736484616"
},
{
"dynamic_state" : {
"basestation_mode" : 4,
"faults" : 0,
"firmware_version" : 3002,
"gravity_vector" : [ 0.0392413437, 0.996730089, -0.0706344098 ],
"nonce" : 1896,
"reset_count" : 2,
"sobChannel" : 0
},
"first_id" : 1,
"last_id" : 1,
"tilt" : {
"pitch" : -0.0640022606,
"roll" : -0.00755012454,
"variance" : 1.69813702e-05
},
"time_last_seen" : "1736629469"
},
{
"dynamic_state" : {
"basestation_mode" : 4,
"faults" : 0,
"firmware_version" : 3002,
"gravity_vector" : [ 0.0314454101, 0.998391807, -0.047168117 ],
"nonce" : 5908,
"reset_count" : 1,
"sobChannel" : 0
},
"first_id" : 1,
"last_id" : 1,
"tilt" : {
"pitch" : -0.0891451985,
"roll" : -0.0401377082,
"variance" : 3.56570968e-06
},
"time_last_seen" : "1736637121"
},
{
"dynamic_state" : {
"basestation_mode" : 4,
"faults" : 0,
"firmware_version" : 3002,
"gravity_vector" : [ 0.0471390001, 0.997775495, -0.0471390001 ],
"nonce" : 5908,
"reset_count" : 2,
"sobChannel" : 0
},
"first_id" : 1,
"last_id" : 1,
"tilt" : {
"pitch" : -0.0865000859,
"roll" : -0.0340628996,
"variance" : 7.84593067e-06
},
"time_last_seen" : "1736637407"
}
]
}
Expand All @@ -435,9 +435,9 @@
{
"deviceClass" : "generic_tracker",
"imu" : {
"acc_bias" : [ 0.0719806403, -0.0269524027, -0.0159120932 ],
"acc_scale" : [ 0.977979898, 0.986636281, 0.987624705 ],
"gyro_bias" : [ 0.0136327734, 0.00910489541, -0.00463129207 ]
"acc_bias" : [ -1.78245366, 0.24181664, -0.0678588301 ],
"acc_scale" : [ 1.23234856, 1.15006113, 0.995609701 ],
"gyro_bias" : [ 0.0116998395, 0.0129497712, -0.00302021159 ]
},
"serialNumber" : "LHR-732AA606"
},
Expand All @@ -460,20 +460,20 @@
{
"base_serial_number" : 2397018737,
"target_pose" : {
"pose" : [ -0.0045337202, -0.868543029, 0.0500580035, 0.493058473, -2.36280966, -0.361834377, -4.57561588 ],
"pose" : [ 0.00457327627, 0.745523393, -0.0549658313, 0.664193273, 4.70305872, -0.485919476, -5.25966311 ],
"target_serial_number" : 0,
"variance" : 5.4290238e-05
"variance" : 6.70967274e-05
}
}
],
"id" : "1729370987",
"tilt" : {
"pitch" : -0.0277742837,
"roll" : -0.0103841173,
"variance" : 5.5493223e-05
"pitch" : -0.0443556234,
"roll" : -0.0156777799,
"variance" : 7.49426545e-05
},
"tilt_to_pose_method" : 0
}
],
"revision" : 307
"revision" : 421
}
16 changes: 8 additions & 8 deletions simgui-window.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"MainWindow": {
"GLOBAL": {
"fps": "120",
"height": "0",
"height": "900",
"maximized": "0",
"style": "0",
"userScale": "2",
"width": "0",
"width": "1600",
"xpos": "-32000",
"ypos": "-32000"
}
Expand All @@ -36,12 +36,12 @@
"###FMS": {
"Collapsed": "0",
"Pos": "10,749",
"Size": "46,32"
"Size": "336,158"
},
"###Joysticks": {
"Collapsed": "0",
"Pos": "500,749",
"Size": "46,32"
"Size": "976,82"
},
"###NetworkTables": {
"Collapsed": "0",
Expand All @@ -55,7 +55,7 @@
},
"###Other Devices": {
"Collapsed": "0",
"Pos": "1901,98",
"Pos": "1581,98",
"Size": "500,1390"
},
"###RoboRIO": {
Expand All @@ -66,12 +66,12 @@
"###System Joysticks": {
"Collapsed": "0",
"Pos": "10,700",
"Size": "46,32"
"Size": "232,254"
},
"###Timing": {
"Collapsed": "0",
"Pos": "10,300",
"Size": "46,32"
"Size": "162,142"
},
"Debug##Default": {
"Collapsed": "0",
Expand All @@ -81,7 +81,7 @@
"Robot State": {
"Collapsed": "0",
"Pos": "5,20",
"Size": "46,32"
"Size": "109,134"
}
}
}
2 changes: 1 addition & 1 deletion steamvr.vrsettings
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"DesktopUI" : {
"pairing" : "569,261,800,600,0",
"settings_desktop" : "222,211,800,600,0"
"settings_desktop" : "231,249,800,600,0"
},
"DismissedWarnings" : {
"DismissableWarning_UnknownHardwareDetected" : true
Expand Down
2 changes: 1 addition & 1 deletion steamvr.vrstats
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"0":"33d3882ebd9f7d3c8e52ebf316daab19","1":1729370985,"2":1731794871,"3":0,"4":0,"5":0}
{"0":"193aec7ea41596cd2e766c73215e2db7","1":1729370985,"2":1736484616,"3":0,"4":0,"5":0}
Loading

0 comments on commit 6e207be

Please sign in to comment.