Skip to content
This repository has been archived by the owner on Oct 27, 2020. It is now read-only.

Updating for Ultimate Goal #761

Open
wants to merge 278 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
278 commits
Select commit Hold shift + click to select a range
3edd893
I don't even know
prototypicalpro Nov 19, 2016
76407c5
Added autolib fixes, swapped to a line following opmode
prototypicalpro Nov 22, 2016
f47e7eb
Added some thresholding code
prototypicalpro Nov 23, 2016
c754668
Swapped to opencv based image processing, started using otsu's bianar…
prototypicalpro Nov 23, 2016
683abdb
finished libne following algorithm, need to rewrite algorithm
prototypicalpro Nov 24, 2016
d9cc82d
decluttered autonomous menu, rewrote line following for third time, m…
prototypicalpro Nov 24, 2016
d461c59
removed some clutter again, added a retry method to pushypushy (untes…
prototypicalpro Nov 25, 2016
26e5c72
line following works, added 10^n layers of abstraction
WilsonRobotics Dec 3, 2016
275a570
got line following, finding, and stopping working
prototypicalpro Dec 6, 2016
fe09606
added sweeper
WilsonRobotics Dec 6, 2016
f745d1e
added navx code, moved some code around, more fun stuff
prototypicalpro Dec 6, 2016
0a06361
created gyro based drive with fancy wheels, moved auto into regular o…
prototypicalpro Dec 7, 2016
774a8ad
fixed some bugs
prototypicalpro Dec 7, 2016
2c52ba2
got gyro based sideways driving working, starting to put it all together
prototypicalpro Dec 8, 2016
2d50967
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA…
prototypicalpro Dec 9, 2016
7aa5449
finished optical flow stuff and moved it to a different file, re-enab…
prototypicalpro Dec 9, 2016
4806834
thing
prototypicalpro Dec 13, 2016
df384cb
did some optical testing, it doesn't really work
prototypicalpro Dec 13, 2016
b26bc05
added mux color to bot hardware
prototypicalpro Dec 19, 2016
24165ce
added multiplex color sensor
prototypicalpro Dec 19, 2016
90e9758
added thing
prototypicalpro Dec 19, 2016
f6c34bb
more things!
prototypicalpro Dec 19, 2016
2ba6e5e
yay
prototypicalpro Dec 19, 2016
6979678
Did some things
prototypicalpro Dec 19, 2016
1b82209
fixed some problems in theory
prototypicalpro Dec 20, 2016
f882e7c
Sort of works!
prototypicalpro Dec 21, 2016
afda0b1
Looking good! Added ultrasonic driving again.
prototypicalpro Dec 22, 2016
67adf1d
added some trig to the ultrasonic sensor
prototypicalpro Dec 22, 2016
522904e
fixed bugs, added angle correction to ultra driving
prototypicalpro Dec 23, 2016
3c1cb2f
Added red sides
prototypicalpro Dec 26, 2016
a2e09c4
added some testing usb mouse code
prototypicalpro Dec 27, 2016
c00e35c
Almost finished! Fixed timing problems.
prototypicalpro Dec 27, 2016
3882db8
tried to use USB MANAGER api to catch mouse, didn't work
prototypicalpro Dec 27, 2016
1e5b628
tried to use USB MANAGER api to catch mouse, didn't work (reverted fr…
prototypicalpro Dec 28, 2016
265fc0f
Refactored a bit, removed some unnecessary files
prototypicalpro Dec 28, 2016
73c029c
added some pseuydo code
prototypicalpro Dec 28, 2016
15249be
Working! (Do not break)
prototypicalpro Dec 28, 2016
91c5204
tried teleop assist, doesn't work at high speeds
prototypicalpro Dec 28, 2016
e656363
Merge remote-tracking branch 'upstream/master' into test
prototypicalpro Dec 31, 2016
88f7366
added additional step in 180 turning
prototypicalpro Jan 4, 2017
1552c56
Minor improvements
prototypicalpro Jan 5, 2017
5d4ae3e
Mas minor improvements
prototypicalpro Jan 7, 2017
2b3259d
driver stuff
prototypicalpro Jan 21, 2017
f44d60d
AAAAAAAAGH okaydriver stuff
prototypicalpro Jan 22, 2017
ab8beec
Stupid AutoLib Fixes
prototypicalpro Jan 26, 2017
52f851a
stuff
prototypicalpro Jan 28, 2017
c1dce11
added a velocity correcting step, added a shoot only auto
prototypicalpro Feb 3, 2017
292d8c7
fixed some oreintation stuff, need to reverse everything
prototypicalpro Feb 4, 2017
b6dd830
motors should be reversible, added A button toggle, removed unused mo…
prototypicalpro Feb 5, 2017
e9e2596
edits
prototypicalpro Feb 8, 2017
02ae258
updated stuff
prototypicalpro Feb 10, 2017
17edcc2
tried to get auto to work
WilsonRobotics Feb 10, 2017
c9ce926
Noah loves 11625
WilsonRobotics Feb 11, 2017
95c2085
WHEEEEEEEE
prototypicalpro Feb 12, 2017
1bd7e37
some minor automation changes
prototypicalpro Feb 16, 2017
69e591f
new motors
prototypicalpro Feb 18, 2017
f1c8492
I committed this time
WilsonRobotics Feb 18, 2017
87a3353
reworked auto, works now
WilsonRobotics Feb 22, 2017
aee9a81
lotta stuff, revert if broken
WilsonRobotics Feb 23, 2017
969ff2f
more reliebility tweaks, ITS SO SKETCHY
WilsonRobotics Feb 25, 2017
3443b5d
yaynew motors
prototypicalpro Feb 26, 2017
a10465f
help me
WilsonRobotics Feb 26, 2017
1b99196
added 20sec wait to just shoot auto
prototypicalpro Feb 26, 2017
0524151
YAYAYAYAYAYAYAYDASCUSYHVFDBYHPOID
WilsonRobotics Mar 2, 2017
e974837
minor stuff
WilsonRobotics Mar 7, 2017
f2eb798
lots o little autos, teleop tweaks
WilsonRobotics Mar 8, 2017
b163781
thing mcTHing
prototypicalpro Mar 11, 2017
1717955
things
prototypicalpro Mar 11, 2017
d94adbe
more commitment
prototypicalpro Mar 11, 2017
8f0918e
rest in feces
prototypicalpro Mar 12, 2017
d022b86
yay!
prototypicalpro Mar 20, 2017
2ebe541
updated build tools for opencv
prototypicalpro Apr 2, 2017
db86300
fixed opmode regestration issue, added telemetry sdcard logging util,…
prototypicalpro Apr 2, 2017
bf99d67
Merge remote-tracking branch 'upstream/beta'
prototypicalpro Apr 2, 2017
35b3f89
Added MPChartLib w/ two test opmodes, need to package into library
prototypicalpro Apr 3, 2017
5aeb9fe
hmmmmm
prototypicalpro Apr 9, 2017
a3e4ad6
hmmmm
prototypicalpro Apr 9, 2017
57a5a81
Merge remote-tracking branch 'ftc_app/master'
prototypicalpro Sep 10, 2017
91d6ac4
updated OpenCV
prototypicalpro Sep 10, 2017
30e17a2
♪It's a new season, a new day, a new life...♪
prototypicalpro Sep 10, 2017
6317674
stuffnthings
prototypicalpro Sep 13, 2017
fe200a8
got openCV integration working with vuforia
prototypicalpro Sep 13, 2017
897c1fd
added FOV constants for nexus 5x
prototypicalpro Sep 27, 2017
9142e9f
trying to pull magic 3d-2d stuff, kinda looks like it might work
prototypicalpro Sep 28, 2017
10ed578
Messing with 3d to 2d, need to add rotation, kinda close?
prototypicalpro Sep 29, 2017
59a07c4
broke displaying, swapped to vuforia point projection
prototypicalpro Oct 2, 2017
f4b86e4
friggin nothun works
prototypicalpro Oct 2, 2017
166f25e
stuffadded FOV constants for nexus 5x
prototypicalpro Oct 5, 2017
6908812
additional sensor testing for the ratbot
prototypicalpro Oct 12, 2017
0d368e2
git commit --useless --ignore
prototypicalpro Oct 13, 2017
9451d0d
finished writing ratbot sensor grapher
prototypicalpro Oct 14, 2017
45f30bf
ADPS driver n stuff
prototypicalpro Oct 17, 2017
2ac7516
graphing edits
prototypicalpro Oct 19, 2017
2428835
Worked on TeleOp, need to add tewo motors, program was designed for 2…
Scott3-0 Oct 7, 2017
465b26a
made entire code base
Scott3-0 Oct 21, 2017
10b297e
half finished changes, need to fix
prototypicalpro Oct 26, 2017
0a3b498
apds stuff, sensor failed to distinguish pillars, so on to the next
prototypicalpro Oct 26, 2017
1a1c7f0
more vuforia changes
prototypicalpro Oct 26, 2017
ef77f1c
build updates, nothing quite works but it's getting there
prototypicalpro Oct 26, 2017
7592a69
got vuforia demo working, need to transplant to openCV and determine …
prototypicalpro Oct 27, 2017
abfeca2
fixed a couple of memory leaks
prototypicalpro Oct 27, 2017
42a7581
stupid software stuff
prototypicalpro Oct 28, 2017
0cd482a
build updates, nothing quite works but it's getting there (reverted f…
prototypicalpro Oct 28, 2017
6da4e28
fixed box measurements to spec with FTC guidelines
prototypicalpro Oct 28, 2017
8b26018
Merge remote-tracking branch 'upstream/master'
prototypicalpro Nov 3, 2017
cd6b9c6
teleop and vuforia changes
prototypicalpro Nov 3, 2017
483794f
well it's frustratingly close but not quite
prototypicalpro Nov 3, 2017
a252db8
got it working!
prototypicalpro Nov 4, 2017
e5d79ac
Leuge meet zero: fixed lift mech, tried auto, need to fix autolib steps
prototypicalpro Nov 5, 2017
fdbd1da
uncluttered opmode list, started programming autonomous
prototypicalpro Nov 10, 2017
e3aec6a
opencv peakfinding stuff
prototypicalpro Nov 11, 2017
2b9bcc1
some more fun image processing stuffums
prototypicalpro Nov 14, 2017
90030f7
pastarization and autonomous tweaks
prototypicalpro Nov 15, 2017
144caa4
tried to get a better graphing library, failed
prototypicalpro Nov 16, 2017
0b8ea19
added graph library...?
prototypicalpro Nov 17, 2017
a3c0353
got pillar detection mostly working
prototypicalpro Nov 18, 2017
6d9d998
got pilliar finder stuff working
prototypicalpro Nov 18, 2017
4ee67c3
triaged autonomi
prototypicalpro Nov 18, 2017
621735e
got ball auto working, didn't use it, went 4-1 anyway ¯\_(ツ)_/¯
prototypicalpro Nov 19, 2017
653df40
changes, fixes, version increments
prototypicalpro Nov 30, 2017
e67cc9e
holy crap leuge meet two is going to be a sh!tshow
prototypicalpro Dec 2, 2017
12a5cce
smashed all the code together at the last minute, scored the jewel once
prototypicalpro Dec 3, 2017
5652828
pilliar code fixed and enhancements
prototypicalpro Dec 7, 2017
9066ab6
Fixed autonomous, need to check if red side is working properly
prototypicalpro Dec 9, 2017
7b250cf
finalized auto, made some teleop changes
prototypicalpro Dec 13, 2017
c92e2b6
tweaks
prototypicalpro Dec 14, 2017
b18fd8d
teleop changes, additional auto permutations
prototypicalpro Dec 16, 2017
c68e52c
adjusted luminance threshold for low light, went 4-1
prototypicalpro Dec 17, 2017
50bfbab
garage day 2: auto fix
prototypicalpro Dec 21, 2017
5e84931
APDS Linearization jesus magic by god this is it
prototypicalpro Dec 22, 2017
4357e8e
abstraction changes, gonna start doing magic now
prototypicalpro Dec 22, 2017
c2f2395
it's getting there
prototypicalpro Dec 22, 2017
32b0055
moved bothardware, more APDS opmode changes
prototypicalpro Dec 23, 2017
a7f36a0
auto tweaks
prototypicalpro Dec 23, 2017
688475d
more gyro!
prototypicalpro Dec 28, 2017
7c671aa
refining APDS
prototypicalpro Dec 28, 2017
38ed884
servo and distance stuff
prototypicalpro Dec 29, 2017
7b6db02
APDS Stuff
prototypicalpro Dec 30, 2017
e2f47eb
It's bad, it's real bad
prototypicalpro Dec 31, 2017
67bf74f
autonomous reliability tweaks
prototypicalpro Jan 1, 2018
f2174f0
BUGFIXES
prototypicalpro Jan 4, 2018
2e4a41f
lib updates
prototypicalpro Jan 6, 2018
b27cf69
Merge remote-tracking branch 'upstream/master'
prototypicalpro Jan 6, 2018
2d9c9ef
teleop tweaks
prototypicalpro Jan 6, 2018
8a837d6
readability changes
prototypicalpro Jan 10, 2018
afb8c95
APDS stuff
prototypicalpro Jan 10, 2018
d7e7d45
APDS9930 driver started
prototypicalpro Jan 11, 2018
19261ac
yeah that too
prototypicalpro Jan 11, 2018
03f37a0
APDS9930 switchover
prototypicalpro Jan 13, 2018
5fb7b52
adjusted coefficients
prototypicalpro Jan 13, 2018
d8d793a
more APDS fixes
prototypicalpro Jan 17, 2018
5b7bbb5
teleop tweaks
prototypicalpro Jan 19, 2018
868fbc4
pre tournament callibration
prototypicalpro Jan 20, 2018
700dc6f
disabled all the opmodes, tweaked teleop, won inspire award
prototypicalpro Jan 21, 2018
411614a
unproductive stuff
prototypicalpro Jan 30, 2018
7df3b76
switched back to APDS9960, added color sensing to APDS9960
prototypicalpro Jan 31, 2018
b0603e7
modified auto to switch sensors and abstract more
prototypicalpro Feb 1, 2018
fea8175
wrote matbotix ultrasound driver
prototypicalpro Feb 1, 2018
a8cf32d
modified matbotix driver, fixed autonomous
prototypicalpro Feb 2, 2018
e1981fc
added TODO notes, PX4FLOW driver
prototypicalpro Feb 2, 2018
3381b0e
teleop changes
prototypicalpro Feb 3, 2018
5f379b5
switch sucker to rev motors
prototypicalpro Feb 6, 2018
f1d5a06
hardfware and auto changes
prototypicalpro Feb 7, 2018
232b8a1
auto tweaks
prototypicalpro Feb 7, 2018
6626034
auto tweaks
prototypicalpro Feb 8, 2018
8f566f0
java files
prototypicalpro Feb 9, 2018
bceeb17
pointers, tweaks, and pruning
prototypicalpro Feb 10, 2018
c0d9ccc
mid-tournament saftey commit
prototypicalpro Feb 11, 2018
a00883e
2nd place, pretty good
prototypicalpro Feb 12, 2018
96d4f89
teleop shaking stuff
prototypicalpro Feb 14, 2018
38f8516
autonomous tweaks, need to finish gyro turn PID
prototypicalpro Feb 15, 2018
1e56cae
added procedurally generated ultra fallback, some failing fallback se…
prototypicalpro Feb 15, 2018
1fd2637
finished red rear auto, tweaked teleop
prototypicalpro Feb 17, 2018
44675fe
servo timing tweaks, failable sequence finishing touches
prototypicalpro Feb 19, 2018
e5de1dd
snow can't stop me
prototypicalpro Feb 21, 2018
18ecd33
tweaked auto to perfection, removed MPChartLib since it was taking up…
prototypicalpro Feb 21, 2018
ebf139b
added a shake-n-bake for the blocks
prototypicalpro Feb 21, 2018
5c86d96
halfway through adding a color sensor on the same bus as a APDS sensor
prototypicalpro Feb 22, 2018
3857101
testing color sensors
prototypicalpro Feb 23, 2018
1faad9f
last min tweaks before state
prototypicalpro Feb 24, 2018
a10d3e0
magic into science
prototypicalpro Feb 24, 2018
f0d8e44
experimental teleop changes
prototypicalpro Feb 24, 2018
7f45c36
state auto tweaks
prototypicalpro Feb 25, 2018
b796a0c
turned that annoying LED on the color sensors off
prototypicalpro Feb 25, 2018
ad92d4f
color, teleop, and tiny auto tweaks
prototypicalpro Feb 26, 2018
590b484
added dogecv library
prototypicalpro Feb 28, 2018
7d3786d
added CV demos
prototypicalpro Feb 28, 2018
67c82c7
added openCV detection as a fallback to vuforia detection
prototypicalpro Mar 1, 2018
aa3f26f
almoset finished blinky
prototypicalpro Mar 6, 2018
9580443
finished stupid LED stuff
prototypicalpro Mar 6, 2018
b9b1828
added servo calibrate stuff
prototypicalpro Mar 6, 2018
4a5c544
servo saftey commit
prototypicalpro Mar 7, 2018
efa3e99
teleop tweaks, revertyed leds
prototypicalpro Mar 7, 2018
85f8ada
small changes to teleop
prototypicalpro Mar 8, 2018
4f176ee
minor auto changes saftey commit
prototypicalpro Mar 9, 2018
d8ebac8
end of day one commit
prototypicalpro Mar 10, 2018
18d988f
day 2: minor teleop tweaks
prototypicalpro Mar 11, 2018
d4ea263
post tournament commit, 2nd place control and advancement to worlds!
prototypicalpro Mar 12, 2018
9428865
teleop changes, started messing with current settings
prototypicalpro Mar 15, 2018
d23c7ea
PROTOTYPING ALGORITHMS, SOME TELEOP CHANGES
prototypicalpro Mar 20, 2018
dadb1e2
teleop assitance tweaks
prototypicalpro Mar 21, 2018
c78d593
Merge remote-tracking branch 'ftc_app/master'
prototypicalpro Mar 21, 2018
604202e
encoder integration funsies, need to implement glyph shimmying and co…
prototypicalpro Mar 24, 2018
b20505b
attempted to determine ultra to encoder coeff, need more data
prototypicalpro Mar 25, 2018
aee8dd6
more encoder and ultrasonic nonsense
prototypicalpro Mar 26, 2018
34939a7
more code, litte work, my head hurts
prototypicalpro Mar 26, 2018
8be62f6
auto prep, made testing modes to proof components of code
prototypicalpro Mar 27, 2018
1945bfe
fixed teleop for one lift motor
prototypicalpro Mar 28, 2018
ee4b651
lift reversal
prototypicalpro Mar 29, 2018
276c624
autonomous things!
prototypicalpro Mar 30, 2018
56dff94
More auto stuff
prototypicalpro Mar 31, 2018
cab36a8
added relic arm code, finally fixed auto
prototypicalpro Mar 31, 2018
09527d9
attempted to add back averaging encoders
prototypicalpro Apr 2, 2018
e840bf7
glyphhuntingcode
prototypicalpro Apr 2, 2018
5d88cc2
slight auto tweaks with salted teleop tweaks
prototypicalpro Apr 3, 2018
d1a36a1
auto tweaking again
prototypicalpro Apr 4, 2018
91c2ea3
apparently my trig works? Added more preciseness to futz with later
prototypicalpro Apr 4, 2018
d7a72b8
auto tweaks, finally got the 10 second dream
prototypicalpro Apr 5, 2018
4c7943e
mostly teleop changes, but some auto tweaks
prototypicalpro Apr 7, 2018
840cb6b
switched the sensors back?
prototypicalpro Apr 7, 2018
0cafcf0
minor teleop tweaks
prototypicalpro Apr 7, 2018
995257f
wrote jewel code for ultra auto, split critical steps into separate f…
prototypicalpro Apr 8, 2018
5936bd0
organizational tweaks, turns out java file count is up to 142
prototypicalpro Apr 8, 2018
64acbdb
added stupid thresholds
prototypicalpro Apr 8, 2018
24d2625
stupid fixes, need to put the relic stops back
prototypicalpro Apr 9, 2018
98fc69b
Added back relic stops
prototypicalpro Apr 10, 2018
c7d909e
teleop relic arm tweaks, need to fix relic arm automation
prototypicalpro Apr 11, 2018
5fb5cb7
untested relic arm automation changes
prototypicalpro Apr 12, 2018
7bfe474
deregistered useless opmodes, dialed in auto, still working on relic …
prototypicalpro Apr 13, 2018
2f7a568
final auto and teleop tweaks before worlds
prototypicalpro Apr 14, 2018
446ec1d
stupid inspection commit
prototypicalpro Apr 18, 2018
c84087a
stupid inspection commit (reverted from commit 446ec1db872326804f535b…
prototypicalpro Apr 18, 2018
27b9409
Post Worlds Commit: 31 consecutive competition runs and 2 partial fai…
prototypicalpro Apr 23, 2018
6d91a8f
renamed opmodes appropriately, started making feedback accelerator op…
prototypicalpro Apr 26, 2018
6dfce4c
tried to make it fast
prototypicalpro May 3, 2018
60f30f9
stupid bulk command stuff
prototypicalpro May 10, 2018
f0d81ec
modified readme for the new repository owner
prototypicalpro Jul 20, 2018
90f4b66
New TeleOp for Rover Ruckus
Scott3-0 Oct 29, 2018
f5bf16d
Merge branch 'master' of https://github.com/Scott3-0/7776-ftc_app
Oct 29, 2018
27e05ae
random auto stuff
orifriesen Oct 29, 2018
503ca52
Encoders yay
Scott3-0 Oct 29, 2018
d5b6724
Merge branch 'master' of https://github.com/ftctechnh/ftc_app
orifriesen Oct 29, 2018
719f867
Working TeleOp!
Scott3-0 Oct 29, 2018
45f9816
Improved TeleOp
Scott3-0 Oct 29, 2018
adfec02
All of Scott's changes for October 29 practice
Scott3-0 Oct 30, 2018
564f4bc
fixed Telemetry
Scott3-0 Nov 3, 2018
2f166c6
hi
Scott3-0 Nov 3, 2018
65036da
Added Comments and Removed unnecessary stuff
Scott3-0 Nov 3, 2018
adf677b
Improved LM0 Changes
Scott3-0 Nov 4, 2018
993b35f
Switched repos for this season and added new stuff, also updated auto…
Scott3-0 Oct 10, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
79 changes: 66 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,81 @@
# built application files
# Built application files
*.apk
*.aar
*.ap_
*.aab

# Java class files
*.class
# Files for the ART/Dalvik VM
*.dex

# generated files
# Generated files
bin/
gen/
out/
# Uncomment the following line in case you need and you don't have the release build type files in your app
# release/

# Gradle files
.gradle/

# Local configuration file (sdk path, etc)
local.properties

# Windows thumbnail db
Thumbs.db
# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log

# OSX files
.DS_Store
# Android Studio Navigation editor temp files
.navigation/

# Android Studio
# Android Studio captures folder
captures/

# IntelliJ
*.iml
.idea
.gradle
build/
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/assetWizardSettings.xml
.idea/dictionaries
.idea/libraries
# Android Studio 3 in .gitignore file.
.idea/caches
.idea/modules.xml
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
.idea/navEditor.xml

# Keystore files
# Uncomment the following lines if you do not want to check your keystore files in.
#*.jks
#*.keystore

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
.cxx/

# Google Services (e.g. APIs or Firebase)
# google-services.json

# Freeline
freeline.py
freeline/
freeline_project_description.json

# fastlane
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/readme.md

*ASUS_PC_01*
# Version control
vcs.xml

# lint
lint/intermediates/
lint/generated/
lint/outputs/
lint/tmp/
# lint/reports/
1 change: 1 addition & 0 deletions DogeCV/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
26 changes: 26 additions & 0 deletions DogeCV/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 23
buildToolsVersion '26.0.2'

defaultConfig {
minSdkVersion 19
targetSdkVersion 19
versionCode 1
versionName "1.0"


}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(path: ':openCVLibrary330')
}
25 changes: 25 additions & 0 deletions DogeCV/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in /home/guinea/Android/Sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# Add any project specific keep options here:

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
10 changes: 10 additions & 0 deletions DogeCV/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

package="org.corningrobotics.enderbots.endercv">

<application android:allowBackup="true" android:label="@string/app_name"
android:supportsRtl="true">

</application>

</manifest>
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package com.disnodeteam.dogecv;

import android.app.Activity;
import android.content.Context;
import android.view.View;

/**
* Created by guinea on 6/23/17.
* This ViewDisplay displays a View over the entire screen.
* As a singleton, you'll want to pass ActivityViewDisplay.getInstance() instead of directly instantiating it.
*/

public class ActivityViewDisplay implements ViewDisplay {
private static ActivityViewDisplay instance;
private static View main = null;

private ActivityViewDisplay() {
}

public static ActivityViewDisplay getInstance() {
if (instance == null) instance = new ActivityViewDisplay();
return instance;
}

public void setCurrentView(final Context context, final View view) {
final Activity activity = (Activity) context;
activity.runOnUiThread(new Runnable() {
@Override
public void run() {
if (main == null)
main = activity.getCurrentFocus();
activity.setContentView(view);
}
});
}

public void removeCurrentView(final Context context) {
final Activity activity = (Activity) context;
activity.runOnUiThread(new Runnable() {
@Override
public void run() {
activity.setContentView(main.getRootView());
}
});
}
}
62 changes: 62 additions & 0 deletions DogeCV/src/main/java/com/disnodeteam/dogecv/CameraViewDisplay.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
package com.disnodeteam.dogecv;

import android.app.Activity;
import android.content.Context;
import android.view.View;
import android.view.ViewGroup;


/**
* Created by guinea on 6/23/17.
* Nicely adds/removes a View from the main body of the robot controller app screen.
* As a singleton, you'll want to pass CameraViewDisplay.getInstance() instead of directly instantiating it.
*/

public class CameraViewDisplay implements ViewDisplay {
private static CameraViewDisplay instance;

View view;
private CameraViewDisplay() {
}

public static CameraViewDisplay getInstance() {
if (instance == null) instance = new CameraViewDisplay();

return instance;
}

public void setCurrentView(Context context, View newView) {
// finding the resID dynamically allows this class to exist outside of the TeamCode module
final int resID = context.getResources().getIdentifier("RelativeLayout", "id", context.getPackageName());
final Activity activity = (Activity) context;
final View queuedView = newView;
activity.runOnUiThread(new Runnable() {
@Override
public void run() {
ViewGroup l = (ViewGroup) activity.findViewById(resID); //R.id.RelativeLayout);
if (view != null) {
l.removeView(view);
}
l.addView(queuedView);
view = queuedView;

}
});
}

public void removeCurrentView(Context context) {
final int resID = context.getResources().getIdentifier("RelativeLayout", "id", context.getPackageName());
final Activity activity = (Activity) context;
activity.runOnUiThread(new Runnable() {
@Override
public void run() {
//cameraMonitorViewId
ViewGroup l = (ViewGroup) activity.findViewById(resID); // .id.RelativeLayout);
if (view != null) {
l.removeView(view);
}
view = null;
}
});
}
}
15 changes: 15 additions & 0 deletions DogeCV/src/main/java/com/disnodeteam/dogecv/DogeCV.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.disnodeteam.dogecv;

import android.util.Log;

import org.opencv.core.Core;
import org.opencv.core.Mat;
import org.opencv.core.Scalar;
import org.opencv.core.Size;
import org.opencv.imgproc.Imgproc;

import java.util.ArrayList;
import java.util.List;

public class DogeCV {
}
Loading