Commit Graph

396 Commits

Author SHA1 Message Date
Etheri
544f2b05b8 Improves convergance
Improve convergance by simply sending the propper y values
2023-06-23 02:32:09 +02:00
Etheri
0c825af3e4 Fixes calibration values
There was a bug that made calibration values all default to 1 if there was a failure of the try/except, fixed the code so it does error checking before running
2023-06-18 00:13:10 +02:00
Prohurtz
c784918531 black format ep 2023-06-17 12:33:26 -05:00
Prohurtz
635173f42a black format IBO 2023-06-17 12:32:56 -05:00
Prohurtz
41b11fe134 Expose IBO settings, Fix UVC cameras 2023-06-17 12:25:06 -05:00
Etheri
7081723ac0 Osc had a different name than settings 2023-06-17 17:16:17 +02:00
Etheri
a1aecc9cdb Added eyelids to config
Adding the eyelids to config and adding an invert bool makes this work with most peoples currently setup eyelids if they used eyetracking before native
2023-06-17 15:56:45 +02:00
Etheri
80af953b29 Fixed left and right squeeze sending same value 2023-06-17 15:36:15 +02:00
Etheri
6bfdc8a08f Param rename 2023-06-16 13:12:51 +02:00
Etheri
9284f97b09 Adds new config vars fixes filter pop error
In additon resets caibration data for IBO on recalibrate
2023-06-16 13:06:36 +02:00
Etheri
8569009fb1 Fixes numpy type error 2023-06-16 13:00:59 +02:00
Etheri
203ac58b16 Remove globals to restore dual eye 2023-06-16 13:00:16 +02:00
Prohurtz
fe02b86cbf bump brightness on rotation background 2023-06-02 16:23:24 -05:00
Prohurtz
a38cd4369e remove debug prints 2023-06-02 16:15:50 -05:00
Prohurtz
5fa9b3a07c remove debug print, fix IBO eye saves 2023-06-02 16:14:54 -05:00
Prohurtz
d5252124a4 fis HSRAC, fix HSF radius sliders 2023-06-02 16:06:05 -05:00
Prohurtz
056e21d6e2 Merge remote-tracking branch 'origin/HSF-and-new-algos-feature-branch' into HSF-and-new-algos-feature-branch 2023-06-02 10:58:42 -05:00
Prohurtz
373c29ceb6 fix ransac thresh add, add setup config 2023-06-02 10:58:18 -05:00
Prohurtz
f5f836ae75 [Dazbme] fix IBO filter 2023-06-02 08:42:16 -07:00
Prohurtz
2465df6697 fix BLOB remove debug prints 2023-06-01 12:12:12 -05:00
Prohurtz
1c7c6d964b IBO fix, HSRAC fix 2023-06-01 12:03:04 -05:00
Prohurtz
ea33273b73 remove debug print, add t & e back 2023-05-31 20:37:53 -05:00
Prohurtz
c97c498d62 remove HSRAC.py use HSF and RANSAC sep calls, HSRAC circle crop with avg color 2023-05-31 20:37:18 -05:00
Prohurtz
507283ed7e sep settings pages, eyelid visualizations 2023-05-31 19:37:16 -05:00
Prohurtz
4c0c907a07 [NOT WORKING] start work on algo settings page 2023-05-31 17:27:36 -05:00
Prohurtz
73fef266c6 fit circle crop in ransac3d 2023-05-31 17:14:10 -05:00
Prohurtz
786c9e3d5f fit wired fps calc 2023-05-31 16:29:30 -05:00
Prohurtz
c965756f27 fit wireless fps calc 2023-05-29 17:57:52 -05:00
Prohurtz
d310b0a8b9 print cleanup 2023-05-11 16:07:27 -05:00
Prohurtz
30077496e3 fix cams, bump ver 2023-05-11 16:00:07 -05:00
Prohurtz
3c451b41a8
clean 2023-05-11 11:31:48 -07:00
Prohurtz
a526c29960
cleanup 2023-05-11 09:39:38 -07:00
Prohurtz
22e9c6df85
cleanup, update credits, rename 2023-05-11 09:04:30 -07:00
Prohurtz
8d29d24127
complete implimentation of per eye cirlcle crop in ransac 2023-05-11 08:58:07 -07:00
Prohurtz
e554d8bf2c
circle crop back in settings 2023-05-11 08:46:06 -07:00
Prohurtz
3c9c8b2eb8
flip tab layout to make sense 2023-05-11 08:18:08 -07:00
Prohurtz
f42d64bf02
part of re imp circle crop, settings placement change 2023-05-11 08:16:42 -07:00
Prohurtz
478b2e198f
remove ibo call causing crash 2023-05-11 07:42:11 -07:00
Prohurtz
8ff33f0461
rename functions to be more correct 2023-05-11 07:37:42 -07:00
Prohurtz
9d2de778b0
fix wireless cam fps and image size reporting 2023-05-11 07:36:06 -07:00
Sebastian Fitt
61637442c6 feat: show bitrate, fps, latency in tracking mode 2023-04-29 15:48:29 +02:00
Sebastian Fitt
2efa3c3589 feat: more readable logging with colorama 2023-04-29 14:40:44 +02:00
Sebastian Fitt
6d7630cf60 fix: when address is set but no devices connected 2023-04-29 14:32:54 +02:00
Sebastian Fitt
3b5582de6e feat: slightly reduce dropped frame count 2023-04-29 14:32:54 +02:00
Sebastian Fitt
4def965759 fix: ensure serial is closed when thread crashed 2023-04-29 14:32:54 +02:00
Sebastian Fitt
ca56222445 fix: pinv for pseudo inverse when singular matrix 2023-04-29 14:32:54 +02:00
Sebastian Fitt
446a20cea8 refactor: cleanup imports 2023-04-29 14:32:54 +02:00
Sebastian Fitt
d6d19383bd refactor: extract EyeInfo enums and dataclasses 2023-04-29 14:32:54 +02:00
Prohurtz
4ce8531136 fix blob and ransac outputs 2023-04-27 18:14:40 -05:00
Prohurtz
52297424de fix HSRAC crash 2023-04-23 16:47:12 -05:00
Prohurtz
70eeb54e5c fix HSRAC crash 2023-04-23 16:29:58 -05:00
Prohurtz
29f75b2054 one euro filter in IBO
blink algo recalibrates when tracking does
2023-04-22 17:44:33 -05:00
Prohurtz
e5469cf42c one euro filter in IBO
messing around in IBO
2023-04-22 17:41:57 -05:00
Prohurtz
a763098bad fix algos, ransac crash fix 2023-04-16 17:36:26 -05:00
Prohurtz
25d7417c62 fix disk usage 2023-04-16 13:20:37 -05:00
Prohurtz
28a306454b native vrc ET
spelling fixes
2023-04-15 21:39:34 -05:00
Prohurtz
89365ba730 fix ransac bug and auto radius fix 2023-04-15 19:34:38 -05:00
Prohurtz
0b5f10d9a6 fix single eye to dual eye not working 2023-04-14 16:07:46 -05:00
Prohurtz
d0fcfe7f9a add HSRAC visualizations.
(something might be wrong with IBO)
2023-04-12 21:04:38 -05:00
Prohurtz
87c2f1f7eb fix daddy files
update .spec
2023-04-12 20:36:30 -05:00
Prohurtz
bbd8b96978 fix rotation edge bug?
revert HSRAC crop output to normal szie
2023-04-12 17:29:20 -05:00
Prohurtz
e3a932fb5d
Merge pull request #80 from Blu3u/HSF-and-new-algos-feature-branch
Fix issues in existing USB-based eye tracker implementation to enable proper functionality.
2023-04-09 18:18:20 -05:00
Sebastian Fitt
c2aad0e859 feat: add v2 serial comms with packet headers
* feat: serial read no longer drops frames on buffer reset
* fix: fps now calculated properly
* fix: remove unnecessary logs
2023-04-09 11:05:50 +02:00
Prohurtz
dd29a6834f add basic filter to IBO to help jitters 2023-04-08 20:55:51 -05:00
Sebastian Fitt
295f10476d fix: identify and mitigate latency issues 2023-04-08 19:58:13 +02:00
Sebastian Fitt
b3f444ee3a fix: bring the existing impl to a usable state
* fix: existing impl always passed None as the port, it never worked
* feat: initial handling of unplugging usb serial device
* feat: check if port exists before trying to open it
* fix: existing impl caused division by zero when calculating fps
* fix: existing impl did not exit when image not found then crashed
* fix: warn logs were marked as info
2023-04-08 18:30:19 +02:00
Prohurtz
e2ff11a081 format, vrc native ET test init 2023-04-06 18:14:11 -05:00
Prohurtz
cdba5a55e4 Update osc.py 2023-04-06 17:55:09 -05:00
Prohurtz
33ec3f20d7
Merge branch 'HSF-and-new-algos-feature-branch' into feature/dev_container 2023-04-06 14:00:39 -07:00
Prohurtz
4121789875 format settings page better for high res screens 2023-04-01 15:38:25 -07:00
Prohurtz
e621c8197c fix linux compatibility, add requests to poetry 2023-04-01 15:23:11 -07:00
ZanzyTHEbar
a5e36ad4c4 feat: add dev container 2023-03-30 12:22:29 +01:00
Prohurtz
c1f63dd400 finish save calib after restart 2023-03-22 17:15:16 -05:00
Prohurtz
cbd20fdac8 save calib values (NOT FINISHED) 2023-03-20 21:23:12 -05:00
Prohurtz
cca9536b0b force calib stop 2023-03-20 20:43:58 -05:00
Prohurtz
2293f74bfb allow videos to be played (if they have .mp4 in the name) 2023-03-19 18:34:45 -05:00
Prohurtz
c90517b6c0 bd_blink from HSRAC aid IBO 2023-03-19 18:15:19 -05:00
Prohurtz
68a0a291d3 remove unused imports 2023-03-19 17:32:59 -05:00
Prohurtz
fe01805c1f remove useless function 2023-03-19 17:32:38 -05:00
Prohurtz
8bd6848ba0 Update requirements.txt 2023-03-19 17:30:31 -05:00
Prohurtz
f6905c48eb fix update check, replace win10toast with winotify 2023-03-19 17:30:01 -05:00
Prohurtz
137f3004f7 fix flip right axis, fix http add 2023-03-19 17:07:05 -05:00
Prohurtz
5c0b1b45fd cleaning 2023-03-19 16:46:10 -05:00
Prohurtz
7836a5022b long needed osc.py re-write 2023-03-19 16:31:59 -05:00
Prohurtz
c5c809af1f depreciate sync blink in favor of dual eye falloff 2023-03-19 15:48:59 -05:00
Prohurtz
0e0ea2df4a toggle for OSC recieve 2023-03-19 15:45:17 -05:00
Prohurtz
b6683b3038 fix DADDY tooltip 2023-03-19 15:31:39 -05:00
Prohurtz
2495a66704 lower thresh add 2023-03-19 15:24:08 -05:00
Prohurtz
cc304f855d make auto radius on by default 2023-03-19 15:11:17 -05:00
Prohurtz
5610297d3e Create requirements.txt 2023-03-19 15:08:57 -05:00
Prohurtz
8c668555b8 fix serial cam, cleaning 2023-03-19 15:03:45 -05:00
Prohurtz
57f854ec44 HSF/HSRAC update settings when changed in settings tab 2023-03-19 15:01:37 -05:00
Prohurtz
d2d934c496 cleanup 2023-03-18 19:11:54 -05:00
Prohurtz
d94c71c26f fix algo output data 2023-03-18 19:10:58 -05:00
Prohurtz
5ea1a39209 add http to camera address if not found 2023-03-18 19:04:30 -05:00
Prohurtz
65f6aa7181 Seaweed Serial cam support 2023-03-18 18:50:43 -05:00
Prohurtz
fdb4e7eb1f Merge branch 'HSF-and-new-algos-feature-branch' of https://github.com/RedHawk989/EyeTrackVR into HSF-and-new-algos-feature-branch 2023-03-18 17:30:58 -05:00
Prohurtz
5f46519cac IBO bump adjustment 2023-03-18 17:30:57 -05:00
PallasNeko
43c216ff1f Daddy's output is changed 2023-03-19 02:58:14 +09:00
Prohurtz
c91eb003a8
Merge pull request #76 from PallasNeko/fix/HSRAC-GUIThreshold
Fix HSRAC&GUI
2023-03-18 12:03:56 -05:00
PallasNeko
299db700c1 Use value of setting 2023-03-19 01:52:42 +09:00
PallasNeko
33ee1fc31d temporary fix 2023-03-18 23:39:26 +09:00
Prohurtz
8d0e9eb45f remove IBO print 2023-03-17 17:14:10 -05:00
Prohurtz
bfa147b292 small tweaks 2023-03-17 16:40:56 -05:00
Prohurtz
3d08b8a4da make sure crop is not out of bounds 2023-03-17 16:37:56 -05:00
Prohurtz
3525aed134 safe crop on IBO 2023-03-17 16:26:01 -05:00
Prohurtz
bc1c2d1f68 add INNO setup script 2023-03-17 14:41:03 -05:00
Prohurtz
dcf87e492d update .spec to 3.10 2023-03-17 14:29:39 -05:00
Prohurtz
e149db16e0 remove debug prints in IBO 2023-03-17 14:29:05 -05:00
Prohurtz
bfb588ef6f tuning, minor adjustments 2023-03-17 14:27:44 -05:00
Prohurtz
4b361a74db adjust thresh, IBO 2023-03-17 11:14:13 -05:00
Prohurtz
ae4c49d49c
Merge pull request #74 from PallasNeko/feature/HSRAC-Stabilized
hsrac stabilized
2023-03-17 10:56:15 -05:00
Prohurtz
237209ccf9 add DADDY to settings 2023-03-17 10:53:35 -05:00
PallasNeko
17cc788b07 UPDATE hsrac 2023-03-18 00:50:12 +09:00
PallasNeko
86a5c8a4ae UPDATE bench_hsrac 2023-03-18 00:42:39 +09:00
Prohurtz
55f12c56c5
Merge pull request #68 from PallasNeko/feature/DeepEyeLandmark
deep eye landmark
2023-03-17 10:40:54 -05:00
Prohurtz
a116f7afc7 use radius to crop for IBO 2023-03-17 10:37:47 -05:00
PallasNeko
fa57746f99 Fixed PyCharm detection 2023-03-17 16:22:48 +09:00
PallasNeko
3e7a1083e2 Temporary symptomatic fix 2023-03-17 16:08:29 +09:00
PallasNeko
100c17c912 DADDY got BEER 2023-03-17 00:04:41 +09:00
Prohurtz
9b7beb413d
Merge pull request #73 from PallasNeko/fix/IBO-saveload
Fix IBO Save and Load
2023-03-16 10:01:18 -05:00
PallasNeko
647b2a9aed Fix Save and Load 2023-03-16 19:45:25 +09:00
PallasNeko
83d9698db9 Remove second contour detection 2023-03-16 03:33:54 +09:00
PallasNeko
6019f44177 Fixes import to work correctly in non-PyCharm environments 2023-03-16 03:15:31 +09:00
PallasNeko
7e1c138136 Improve hsrac using bench_hsrac 2023-03-16 02:15:55 +09:00
PallasNeko
5bf696cf6f Improve haar_surround_feature using bench_hsrac 2023-03-15 21:13:01 +09:00
PallasNeko
d54893e7fc improvement 2023-03-15 20:49:17 +09:00
PallasNeko
30bee44dd8 improvement 2023-03-14 23:20:06 +09:00
PallasNeko
50f489ec63 clean up and improvement 2023-03-14 23:11:57 +09:00
PallasNeko
1c3f382f40 clean up 2023-03-14 20:31:52 +09:00
PallasNeko
c6413f8ee1 Remove unused functions 2023-03-14 17:46:46 +09:00
PallasNeko
56509d60fe Temporary experimental code 2023-03-14 17:43:38 +09:00
Prohurtz
1045f7b180 correct frame shape 2023-02-18 16:27:30 -06:00
Prohurtz
a3657a223f fix typos 2023-02-18 16:09:23 -06:00
PallasNeko
cb70e960cf add DADDY 2023-02-18 16:26:03 +09:00
Prohurtz
ad0857f8eb minor fixes/cleanup 2023-02-17 18:52:59 -06:00
PallasNeko
aadb016796 Support for both eyes.
Modified to initialise data if the ROI saved in the image is different from the current ROI.
Fixed calculation.
2023-02-13 18:55:21 +09:00
Prohurtz
3f2742717c Update intensity_eye_open.py 2023-02-12 18:55:06 -08:00
Prohurtz
0d300a43d5 fix IBO dual eye 2023-02-12 18:28:54 -08:00
Prohurtz
5ec32e5b96 Merge branch 'HSF-and-new-algos-feature-branch' of https://github.com/RedHawk989/EyeTrackVR into HSF-and-new-algos-feature-branch 2023-02-12 17:45:18 -06:00
Prohurtz
de5c71af3d small 2023-02-12 17:45:16 -06:00
Prohurtz
9a7a376ae8
Merge pull request #70 from PallasNeko/feature/Wrapper-PlaySound
Easier to use PlaySound functions.
2023-02-12 10:56:18 -06:00
PallasNeko
adf3d86401 Added code to determine if the OS is Win or Linux.
Changed so that if Linux, PlaySound does nothing when executed.
2023-02-12 23:36:03 +09:00
PallasNeko
7faf4b2ae5 Prevents configuration files from failing to load. 2023-02-12 22:40:55 +09:00
PallasNeko
0504e01a9e Fixed Autoradius not working. 2023-02-10 20:39:10 +09:00
Prohurtz
c7f39646fa Merge branch 'HSF-and-new-algos-feature-branch' of https://github.com/RedHawk989/EyeTrackVR into HSF-and-new-algos-feature-branch 2023-02-09 21:19:34 -06:00
Prohurtz
32c31d293b bug fixes 2023-02-09 21:19:30 -06:00
Prohurtz
12304b5b3a
Merge branch 'HSF-and-new-algos-feature-branch' into HSF-and-new-algos-feature-branch 2023-02-09 20:27:04 -06:00
Prohurtz
975cb80dec IBO stuff 2023-02-05 18:21:59 -06:00
Prohurtz
67ae604a8f
Merge pull request #64 from PallasNeko/Remove-pandas
Remove pandas
2023-02-05 17:16:51 -06:00