Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
3875827
Color code update, added +3 and -3 buttons on high goal
IfElifElse Jan 23, 2017
c08d6e3
fixed colors on team number and added auton and tele labels, added au…
IfElifElse Jan 24, 2017
1c915ea
renamed test to rounddat.db, added areYouSure to team reselect
IfElifElse Jan 25, 2017
18c9a43
added a few comments, added integration with mysql and pi server
IfElifElse Jan 28, 2017
5f02ca0
added scouting programs. data is the onr running off the pie, scout r…
Jan 31, 2017
ddc15aa
saves name and fixed data to work with the pi
Feb 1, 2017
9ecc62e
their is now a team button in the menu screen but doesn't work in ful…
Feb 2, 2017
c7ae8e1
beging of color selection
Feb 2, 2017
dc79ced
added AptGears
Feb 4, 2017
4204020
fixed small label
Feb 4, 2017
a8d9434
Merge https://github.com/Team74/CHAOS_Scouting_2017_App into scouting…
IfElifElse Feb 6, 2017
71d144a
Merge branch 'scoutingbase' of https://github.com/Team74/CHAOS_Scouti…
IfElifElse Feb 8, 2017
88192da
added missed gears and miss high goals and scouting systum tracks bot…
Feb 8, 2017
4acfd6c
Merge branch 'scoutingbase' of https://github.com/Team74/CHAOS_Scouti…
IfElifElse Feb 8, 2017
5d9b070
same
Feb 8, 2017
b7e13cf
Merge branch 'scoutingbase' of https://github.com/Team74/CHAOS_Scouti…
IfElifElse Feb 8, 2017
b496fce
add position and notes
Feb 11, 2017
4bd6910
Merge branch 'scoutingbase' of https://github.com/Team74/CHAOS_Scouti…
IfElifElse Feb 11, 2017
57d28c4
Made it so that it compiled on the android tablets with the new version
IfElifElse Feb 11, 2017
2f051ce
add position and notes
Feb 11, 2017
f8e6fe3
Merge branch 'scoutingbase' of https://github.com/Team74/CHAOS_Scouti…
Feb 11, 2017
1e40f4e
it now applys data in the right colums
Feb 11, 2017
ff600ff
Changes to choose method
IfElifElse Feb 11, 2017
0e91198
resolved main.py order conflict
IfElifElse Feb 11, 2017
bd793d7
capacity carrys over past rounds
Feb 11, 2017
2a7dd32
got it working with android, made faster on android, cleaned up misc …
IfElifElse Feb 11, 2017
4abbd57
Merge branch 'scoutingbase' of https://github.com/Team74/CHAOS_Scouti…
IfElifElse Feb 11, 2017
500dacd
resolving things
Feb 11, 2017
04b072e
resolving things
Feb 11, 2017
b6d9530
capacity, pickupballs, and pickupGears transfer over rounds
Feb 11, 2017
9b197e9
fixed bugs
Feb 13, 2017
2618f01
fixing things up
IfElifElse Feb 13, 2017
579df50
fixing things up
IfElifElse Feb 13, 2017
1995beb
fixed bugs
Feb 13, 2017
829a6a7
added a upload all button
Feb 14, 2017
c873c56
working on getting android app working
IfElifElse Feb 14, 2017
2b25ca0
added a upload all button
Feb 14, 2017
73eea13
working on getting android app working
IfElifElse Feb 14, 2017
3bfecb4
working on getting android app working
IfElifElse Feb 14, 2017
7ebe73a
missed gears back to Apt gears
Feb 14, 2017
c22de4c
missed gears back to Apt gears
Feb 14, 2017
b6aa6d5
test camera
Feb 16, 2017
1dacfca
commenting code
IfElifElse Feb 16, 2017
d1b5b8c
fixing bug in self.choose()
Feb 17, 2017
652ba48
pulling
IfElifElse Feb 17, 2017
949d68d
pulling
IfElifElse Feb 17, 2017
12104e7
updated app to work offline (UNSTABLE, MAY NOT WORK)
IfElifElse Feb 21, 2017
be0a058
agears is now 3tog to made, missed, and never apt
Feb 21, 2017
9fe2eb4
added failsafes for upload functions in case of no connection
IfElifElse Feb 21, 2017
d6a8ad1
bug fixes
Feb 21, 2017
851a248
bug fixes
Feb 21, 2017
5b231a8
added failsafes for upload functions in case of no connection
IfElifElse Feb 21, 2017
d33fb4a
Merge branch 'scoutingbase' of https://github.com/Team74/CHAOS_Scouti…
Feb 21, 2017
2e98388
MADE IT WORK AGAIN on wifi
IfElifElse Feb 22, 2017
12c6c27
working version for test run
IfElifElse Feb 25, 2017
d69f5fd
added foul and TFoul and made a few changes to the home screen to fit…
Mar 1, 2017
2623aec
bug fixes
Mar 1, 2017
705e96c
bug fixes
Mar 1, 2017
068cf6f
bug fixes
Mar 1, 2017
4c78399
lol
IfElifElse Mar 1, 2017
72f4330
lol
IfElifElse Mar 1, 2017
9e1444d
started to add time
Mar 3, 2017
784b4e7
yeet
IfElifElse Mar 3, 2017
b85ded5
yeeeeeeeeeeet
IfElifElse Mar 3, 2017
b0df17c
Working version, compatTableau still in process
IfElifElse Mar 6, 2017
cb02d9e
update for jacob g
IfElifElse Mar 7, 2017
fe33273
bug fixes
Mar 9, 2017
eabbff7
Work in progress
IfElifElse Mar 9, 2017
bac23d7
transferring computers
IfElifElse Mar 9, 2017
14ff627
does not work, terminare mi vida
IfElifElse Mar 15, 2017
37589b2
kms
Mar 15, 2017
974c256
WORKING VERSION, fixed bug during St Joseph
IfElifElse Mar 15, 2017
ed3c02e
yeah
Mar 15, 2017
a1d5c23
yeah
Mar 15, 2017
b55e019
starting to get compatTableau working
IfElifElse Mar 16, 2017
75ad43c
easter eggs are now a thing
Mar 16, 2017
ae59dd9
easter eggs are now a thing
Mar 16, 2017
0a24bce
Working as far as I know, post-West-Michigan
IfElifElse Mar 29, 2017
179e3f0
yeet lol
IfElifElse Mar 30, 2017
68ee094
yeet lol
Mar 30, 2017
466688c
yeet lol
Apr 3, 2017
068afb6
not working, updating to Jacob's version
IfElifElse Apr 3, 2017
cd704dd
fixed pi ip
IfElifElse Apr 3, 2017
d66cf82
updating
Apr 3, 2017
bc63195
Merge branch 'scoutingbase' of https://github.com/Team74/CHAOS_Scouti…
Apr 3, 2017
e79c1f8
updateing
Apr 3, 2017
dbdb2cc
updateing
Apr 4, 2017
bf5c517
updating to Jacob's
IfElifElse Apr 4, 2017
4184d89
fixed round and team changing
IfElifElse Apr 4, 2017
45137b2
updateing
Apr 5, 2017
7e5aafd
updateing
Apr 5, 2017
4ded993
updateing
Apr 11, 2017
393cde6
updating
IfElifElse Apr 11, 2017
a650a68
updating to Jacob's version
IfElifElse Apr 11, 2017
f031281
updateing
Apr 12, 2017
ef264d7
updateing
Apr 12, 2017
009c0ee
updating
IfElifElse Apr 12, 2017
e113993
working version, LAST COMMIT UNTIL UTTER DESTRUCTION
IfElifElse Apr 18, 2017
8a877e1
updating
Apr 18, 2017
43c2998
Merge branch 'scoutingbase' of https://github.com/Team74/CHAOS_Scouti…
Apr 18, 2017
3dc695a
bug fixing
Apr 19, 2017
a7b16fa
removed low goal and put climb timer in its place, MAJOR UPDATE
IfElifElse Apr 19, 2017
5c5cd00
fixed conflicts, timer version
IfElifElse Apr 19, 2017
5aeda4a
rounding time to 1 decimal to fix app on android
IfElifElse Apr 19, 2017
7f3c376
compatibility updates to the builedozer spec file
Dec 16, 2017
084e988
last year's final code
IfElifElse Jan 12, 2018
f691390
Merge branch 'scoutingbase' of https://github.com/Team74/CHAOS_Scouti…
IfElifElse Jan 12, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .~lock.match#
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
,jgareau,chaosprog4.haworthinc.com,01.03.2017 19:01,file:///home/jgareau/.config/libreoffice/4;
1 change: 1 addition & 0 deletions CHAOS_Scouting_2017_App
Submodule CHAOS_Scouting_2017_App added at af3591
Binary file added backup.db
Binary file not shown.
Binary file modified bin/Scouting-0.1-debug.apk
Binary file not shown.
Binary file added bin/Scouting-0.1-release-unsigned.apk
Binary file not shown.
1 change: 1 addition & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
buildozer android_new debug deploy
16 changes: 8 additions & 8 deletions buildozer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ version = 0.1

# (str) Application versioning (method 2)
# version.regex = __version__ = ['"](.*)['"]
# version.filename = %(source.dir)s/main.py
#version.filename = %(source.dir)s/main.py

# (list) Application requirements
# comma seperated e.g. requirements = kivy
requirements = sqlite3,kivy,hostpython3,python3crystax
requirements = sqlite3, kivy, python3crystax, mysql-connector-python, plyer, android

# (str) Custom source folders for requirements
# Sets custom source for any requirements with recipes
Expand Down Expand Up @@ -72,7 +72,7 @@ orientation = landscape
fullscreen = 1

# (list) Permissions
#android.permissions = INTERNET
android.permissions = INTERNET, CAMERA

# (int) Android API to use
android.api = 19
Expand All @@ -84,19 +84,19 @@ android.minapi = 19
#android.sdk =

# (str) Android NDK version to use
#android.ndk = 9c
android.ndk = 10.3.2

# (bool) Use --private data storage (True) or --dir public storage (False)
#android.private_storage = True

# (str) Android NDK directory (if empty, it will be automatically downloaded.)
android.ndk_path = /home/cbest/Downloads/crystax-ndk-10.3.2
android.ndk_path = /usr/lib/crystax-ndk-10.3.2

# (str) Android SDK directory (if empty, it will be automatically downloaded.)
#android.sdk_path =
android.sdk_path = /usr/lib/android-sdk-linux

# (str) ANT directory (if empty, it will be automatically downloaded.)
#android.ant_path =
android.ant_path = /usr/lib/apache-ant-1.9.4

# (str) python-for-android git clone directory (if empty, it will be automatically cloned from github)
#android.p4a_dir =
Expand Down Expand Up @@ -183,7 +183,7 @@ log_level = 2
warn_on_root = 1

# (str) Path to build artifact storage, absolute or relative to spec file
# build_dir = ./.buildozer
# build_dir = ./buildapp

# (str) Path to build output (i.e. .apk, .ipa) storage
# bin_dir = ./bin
Expand Down
43 changes: 43 additions & 0 deletions camera.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
from kivy.app import App #for the main app
from kivy.uix.floatlayout import FloatLayout #the UI layout
from kivy.uix.label import Label #a label to show information
from plyer import camera #object to read the camera

[app]
title = Python Camera
package.name = camera
package.domain = com.wordpress.bytedebugger
source.dir = .
source.include_exts = py,png,jpg,kv,atlas
version = 1.0
requirements = kivy, plyer
fullscreen = 1
[buildozer]
log_level = 2

class UI(FloatLayout):#the app ui
def __init__(self, **kwargs):
super(UI, self).__init__(**kwargs)
self.lblCam = Label(text="Click to take a picture!") #create a label at the center
self.add_widget(self.lblCam) #add the label at the screen

def on_touch_down(self, e):
camera.take_picture('/storage/sdcard0/example.jpg', self.done) #Take a picture and save at this location. After will call done() callback

def done(self, e): #receive e as the image location
self.lblCam.text = e; #update the label to the image location

class Camera(App): #our app
def build(self):
ui = UI()# create the UI
return ui #show it

def on_pause(self):
#when the app open the camera, it will need to pause this script. So we need to enable the pause mode with this method
return True

def on_resume(self):
#after close the camera, we need to resume our app.
pass

Camera().run() #start our app
Loading