From 2678dff52f7de77cc206377d84c0c68f079a3052 Mon Sep 17 00:00:00 2001 From: Tyler Spadgenske Date: Mon, 23 May 2016 16:44:00 +0000 Subject: [PATCH] 0.5.6, camera app fixes --- .gitignore | 1 - README.md | 2 +- apps/camera/app.py | 12 ++++++------ apps/camera/yuv2rgb.so | Bin 0 -> 3995 bytes src/main.py | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 apps/camera/yuv2rgb.so diff --git a/.gitignore b/.gitignore index ba9b17d..2955ea6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ __pycache__/ *.py[cod] # C extensions -*.so # Distribution / packaging .Python diff --git a/README.md b/README.md index 772fece..27c50ff 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # TYOS -0.5.2
+0.5.6
A mobile operating system for the TyTelli. copyright :copyright: 2015 Tyler Spadgenske diff --git a/apps/camera/app.py b/apps/camera/app.py index 3631417..2dc46df 100644 --- a/apps/camera/app.py +++ b/apps/camera/app.py @@ -19,14 +19,14 @@ def __init__(self): self.no_files = False #Get current photo name index try: - index_file = open('/home/pi/tyos/apps/camera/index.dat', 'r') + index_file = open('/home/pi/index.dat', 'r') except: #Create new file if needed - index_file = open('/home/pi/tyos/apps/camera/index.dat', 'w+') + index_file = open('/home/pi/index.dat', 'w+') index_file.write('0') index_file.close() - index_file = open('/home/pi/tyos/apps/camera/index.dat') - print 'NO INDEX FILE. CREATED /home/pi/tyos/apps/camera/index.dat' + index_file = open('/home/pi/index.dat') + print 'NO INDEX FILE. CREATED /home/pi/index.dat' self.index = int(index_file.readline()) index_file.close() @@ -154,8 +154,8 @@ def display(self): if event.pos[0] > 255: if self.mode == 'capture': print 'exiting...' - os.remove('/home/pi/tyos/apps/camera/index.dat') - new = open('/home/pi/tyos/apps/camera/index.dat', 'w+') + os.remove('/home/pi/index.dat') + new = open('/home/pi/index.dat', 'w+') new.write(str(self.index)) new.close() cam = Popen(['sudo', 'python', '/home/pi/tyos/src/main.py']) diff --git a/apps/camera/yuv2rgb.so b/apps/camera/yuv2rgb.so new file mode 100644 index 0000000000000000000000000000000000000000..b39c3fabb5b9da1fd230fe41e77c5e9c7829b832 GIT binary patch literal 3995 zcma)9e{56N6+X{Ns0mqc(}bo4F$+aoMiXObgsQ31!f%Q~=h1ZKk8QRSJH(x1d-h98 zHk6uC5OkQ(t?N3qDDE_AmG%c{Vx?P4<1H;+5$&3dRT%>5+UA+GR3e?|g!ZFv-}mg- zc^POs(dTo{J>NU$zIV^P@8$7LJ)1R66I*JeUFa>V6X}BPT_oZVsp}HA)FF1a+-1dW zKJ|>V3|u0T7AtOz9mF``L&9EQK_!lSav9fLMvRz)PcU9v!FgyKZLkSD_7y`9!Tm3( zzP=gJ8eq$V56gYaAJyIpoO^wPxBgVi-&ei#@;}$Ua64k;P;iS<4=khu`Ak_^zr3f# z0Bbh_cK{7Q6JXsB^n7t)fcdNCwu-|!-AeFCEFp*U;d5e*L*ia7uWviVG0u(o<#^ZZ z`b~fO@Rj2C_q=xDk)<==+PUmknU5MrdhdVwgFjwt+9M*H`7U?w)x*d&L$vjG*m6lmDf8{ykN`8}=!n_u{nGsrh<8Ibai#tKT|@DhKcxqg zy5BGUNGzg@e*g-h{@p>E!D!^$VexMp@$U%lilp>#aziwjN`+J68(o*&<@W`Xsc`Rb zA{xfP`r(0ra1zXDIGDm!zES^!@mTmFJvrR33)7DdkE}`V>I2vR0Nm~I&~P-|CDBM< zzb6&JKx7XzUoY$o~>1#My;AK8r8UR&b?;bcmny( zj2E0|4;OA+f7P(RS z>9-=zIXK+osvCT9|H0ym>?mSRtzN|KYw>jJ+rX)ji7PXvd370V&7CbWzqqFi-op&? z?gre*eGvM2z$@h%BIByvs&TZshO@P*268y>HCN@Ct79M52iJEXm%e7gnEP_)`-k7% zUeF|)Z*^x1HLh`$R++*RxlEzQn<8B5a`sX_;hHS{#+}WNdCk(|+#Lm%cVAOYF6v6U&C(u4&fB+->?K}!QkS#U@GKLFC3a|4O9g>~) zfiHMoj$AhH2wb@0NX%eOrj4|3b0Mv^6ov!GOJnMI=|J}Z_2b6dRPBzCdT!+NYX7rGXX0n36PVjb0ONt|l!-a!7U!l-A?MnAT42hM#FXKX zDMP~?HTQQ54%gm-`1UL54xv74JzQjc2^>*x_}`e;74jkfun#$X%=wMtJJ;TsPN4pn z!kFS%xi)LEcCDH+YJ5{h9qMV_hYMUIJ!h5{c=r|dAYY<;veYQO`Cpjk+3UZ%l*jYS zH>hKHw#P89&NP4BDw#qD z`lAPWC3LeKGpwF=9lgT7lH60c*TV&I?==p;n<>nVpPqdgjei2Ycm^+vcJyKg`nkh3 zfxX&^{erbdPr7sHH}s>!iyY{4$z_Zdr!6^Y0G!|@}Q3`fZ?8;Phc9_xke(Zjo8Td!?TGH$&-J>fzBKr%QKE_3|B zWHLBf=GgY5{YZ&)!J$Y$O2v_)d?{YM;^~hM4TWPETeoAoC#dVmNZ+uIm;V1Ni$LTn zk9~5!f;MPduymHJz%SRIJoX{M?;bl&O)Llgie4d)eMg*-|SuzB{L@mZ1b4|zlsuzCDH ziFlR|sv>s2Bz&94bB5r&ZLxW~F+koL;8hTaR+|J(9^>hX=5sj@4q@lO(5E)Gvvt;S zO8oze|BKy>_YC6v--bMXuU)(a?w_NPk++@ literal 0 HcmV?d00001 diff --git a/src/main.py b/src/main.py index a056cc2..c65b3a1 100644 --- a/src/main.py +++ b/src/main.py @@ -11,7 +11,7 @@ current version of TYOS. If higher, you can update. To get your version of TYOS run the command sudo python /home/pi/tyos/src/main.py --version ''' -VERSION = '0.5.4' +VERSION = '0.5.6' #Set to True if you do not want the time modified off the FONA USE_RAW_TIME = False