From e80c00e85030700d2f5a089444eb1d34d20eddb8 Mon Sep 17 00:00:00 2001 From: Martin Donnelly Date: Tue, 7 Jun 2016 16:45:07 +0100 Subject: [PATCH] =?UTF-8?q?=E2=80=9D2016-06-07=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/device/CC2650/cc2650_accelerometer.js | 42 +++++++++++++----- .../sensortoy/app/js/standards/capability.js | 3 ++ .../2.2.1/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .../2.2.1/taskArtifacts/fileHashes.bin | Bin 148764 -> 148764 bytes .../2.2.1/taskArtifacts/fileSnapshots.bin | Bin 10918810 -> 10918810 bytes .../2.2.1/taskArtifacts/taskArtifacts.bin | Bin 61031 -> 61031 bytes .../js/device/CC2650/cc2650_accelerometer.js | 42 +++++++++++++----- .../assets/www/js/standards/capability.js | 3 ++ 8 files changed, 68 insertions(+), 22 deletions(-) diff --git a/sensortoy/sensortoy/app/js/device/CC2650/cc2650_accelerometer.js b/sensortoy/sensortoy/app/js/device/CC2650/cc2650_accelerometer.js index 1c596dc..a488a2f 100644 --- a/sensortoy/sensortoy/app/js/device/CC2650/cc2650_accelerometer.js +++ b/sensortoy/sensortoy/app/js/device/CC2650/cc2650_accelerometer.js @@ -68,23 +68,34 @@ CC2650_ACCEL = function(p) { var message; var calcData; + function gString(v) { + return [v.toFixed(3),'G'].join(''); + } + + function aString(v) { + return [v.toFixed(3),'\'/s'].join(''); + } + + function mString(v) { + return [v.toFixed(3),'mT'].join(''); + } calcData = this.processData(data); message = 'Gyro
' + 'X: ' + calcData.gyro.x + '
' + 'Y: ' + calcData.gyro.y + '
' + 'Z: ' + calcData.gyro.z + '
' + 'Accel
' + 'X: ' + calcData.accel.x + '
' + 'Y: ' + calcData.accel.y + '
' + 'Z: ' + calcData.accel.z + '
' + 'Mag
' + 'X: ' + calcData.mag.x + '
' + 'Y: ' + calcData.mag.y + '
' + 'Z: ' + calcData.mag.z + '
'; this.state = message; - this.$result[this.frames.gyroID + '-x'].text(calcData.gyro.x.toFixed(5)); - this.$result[this.frames.gyroID + '-y'].text(calcData.gyro.y.toFixed(5)); - this.$result[this.frames.gyroID + '-z'].text(calcData.gyro.z.toFixed(5)); + this.$result[this.frames.gyroID + '-x'].text(gString(calcData.gyro.x)); + this.$result[this.frames.gyroID + '-y'].text(gString(calcData.gyro.y)); + this.$result[this.frames.gyroID + '-z'].text(gString(calcData.gyro.z)); - this.$result[this.frames.accelID + '-x'].text(calcData.accel.x.toFixed(5)); - this.$result[this.frames.accelID + '-y'].text(calcData.accel.y.toFixed(5)); - this.$result[this.frames.accelID + '-z'].text(calcData.accel.z.toFixed(5)); + this.$result[this.frames.accelID + '-x'].text(aString(calcData.accel.x)); + this.$result[this.frames.accelID + '-y'].text(aString(calcData.accel.y)); + this.$result[this.frames.accelID + '-z'].text(aString(calcData.accel.z)); - this.$result[this.frames.magID + '-x'].text(calcData.mag.x); - this.$result[this.frames.magID + '-y'].text(calcData.mag.y); - this.$result[this.frames.magID + '-z'].text(calcData.mag.z); + this.$result[this.frames.magID + '-x'].text(mString(calcData.mag.x)); + this.$result[this.frames.magID + '-y'].text(mString(calcData.mag.y)); + this.$result[this.frames.magID + '-z'].text(mString(calcData.mag.z)); this.data.gyro.x = this.storeData(calcData.gyro.x, this.data.gyro.x); this.data.gyro.y = this.storeData(calcData.gyro.y, this.data.gyro.y); @@ -158,6 +169,7 @@ CC2650_ACCEL = function(p) { var lineID; var max; + var parts = ['x', 'y', 'z']; _data = data || this.data; @@ -186,9 +198,16 @@ CC2650_ACCEL = function(p) { } } - console.log('accel max:', max) + + console.log('accel max:', max); ceiling = max; - floor = max * -1; + + /* if (ceiling < this.previousCeil) { + ceiling = ceiling + ((this.previousCeil - ceiling) / 2); + ceiling = (Math.ceil((Math.round(ceiling) + 1) / 10)); + }*/ + + floor = ceiling * -1; ceilingLimit = ceiling; var scalePos = (124 / 2) / ceiling; @@ -225,6 +244,7 @@ CC2650_ACCEL = function(p) { } + this.previousCeil = ceiling; }; this.animateGraph = function() { diff --git a/sensortoy/sensortoy/app/js/standards/capability.js b/sensortoy/sensortoy/app/js/standards/capability.js index f636fe7..deb83a7 100644 --- a/sensortoy/sensortoy/app/js/standards/capability.js +++ b/sensortoy/sensortoy/app/js/standards/capability.js @@ -45,6 +45,9 @@ var CAPABILITY = function(p) { this.target = null; this.$frame = null; + + this.previousCeil = 0; + capabilityManager.register({id: this.capabilityID, module: this}); }; diff --git a/sensortoy/sensortoy/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/sensortoy/sensortoy/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock index 075c00ceb1d13c83b0e3a18422fd4df67f52fb0f..6f33c7163864d0326eeb51f4042112ab3206552e 100644 GIT binary patch literal 17 WcmZQx&{6#8*tO}73?RUK{TBd1S_a7g literal 17 WcmZQx&{6#8*tO}73?RUKG9CaxqXr-V diff --git a/sensortoy/sensortoy/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/sensortoy/sensortoy/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin index e1add62a91ca6e64d1f9c554a140397385f88b3f..146d3d692f6117a71f59d601dc8c485a4c681cc1 100644 GIT binary patch delta 15467 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 delta 3552 zcmbu=2UHZ-8UWy(-5r|X&H^sG)TOAP(gH}aEg}L6EFc6_ihxo?3?)m4R``@|upQV&4 z#Y;iHmJ=SqX0cee0E@-(+z!`XddR{fdf?hi4_Wf5)^P2mhb)de1=knMnC+0jGL?n7>}GPyZ1P6O&m7gyH++qksv64zT~6dI zjlQ-dc~ zGqI{gugMn8DB_Oe?}FD(>rI&;9}SUWtu$VmxqpR0oDCBbJlsr{Xo-o3wYvk(akh0c zLG{bIWSy3sot5bOps9NL&Mj&Fb*q8|$_MCJ)XJsvQK*pA zp)N(?k(h{>UnPxG=-xjl*O}5}?Uvj|Cq*QzO+=xdT22kbA4C!ADNwv7yf&ceSol-v zZ(7rj?=-o4#e>fKMzloloyjx_m)}i$Po}nNy?CBhx_Do~FrBm(O-j;6@ryVb6yd|^ zVpD|(Yd(f<7bsp8KKVnXI&oJGDnO1s z4id6#c!I7$zK4Q+hgndS+R?MO0yuhfhQ*<|Pul5EyAMg-*=MJg6{$@LElK_*=eMDXKK)pd(Y=|d#)GqlFrTJh`r@{0_MPEP5f1KZt>|zl z?#GSocAkxTBJlIN<`=5gEx1bF#tk}_$zPa$lzuvUQ@J}`6kVb^yxEqRu-Ht)a*|Jz zT6J5KiKfj`reRyYm_`1z6{=WzuQ!M4_2vqsRQy7Y8AcgZaCxWY*eNU)JB2D(Cm+K` zmEpL-$X(=BsHlzgJ@f@4Z5^nz%CGBRRuoexg@V+;UB2|AvqauTELC zEE67bp<{BQ;|Pnu6A77;6Yt%d%xfuq-#L)W>{b`D48>!K_d9^eQphWEE#G-Py^3m% z#5b_Vd^z1PYNij@R)8<&q9OY!31A5q#Hb7!U>#_D(e(%Eg?N?;sN1}b1Y-~od2D&#kC@C+7)XHb?!I^LcHZ&CIR2jjKJ z{h#dF(fqu^0C@-SKSwQ{JY%Zoq;~KzBBkB@;QI9kzDj`KsYgK%^{BM*qB(4NZs#^j zrI#Dg<(Fbhs&0q9IgiTko1mqZE@)8&YLuWwJ&liNLaEG8Diw50mCrhucDXvBdV94+ z-j+19NKH}B8d~X4 zGg1N1kn8SmMfF@c3p5~5&_TUCQ7%0;Gk#U-uwF&G3y?C zR_^NB2chq*`t1%$tVHP&D@~vUw1E!L1$saX^nn2|1V&&Ym;@#RV_*WNfT>^_Fa>77 z99RHL@ENcI*1!f#2e!Zt*aHVJ1Iz@oz-%xFNPr`l3!K0_;0)#i7vKuqzyh!kxC0O1 z38cUacmp4>2>1d&@Hy}Y0bns$0+xb65CnoLiB-tyD%^{O&GsseG`v8~@d`V5f2^h` zkE}3MDjw9AA(?YY9E!WCO;CGNmnVxp=w>SZgo^}6;&VbiB`K_MSEbzkvm!%FuE2Wm zLcw*!55)!Pi5j6)qDI)TEiQ%9($Uh@_djg?|GTh!V{YfhOEnb2w=bVK#)f`+y-(dxJa<8Bl?Yjev4!c6l_EeShyu}IC5Qp5 zKrC1dz5sC`9;^WgAQ7wuUxFl%4Az15U<23)QotsV3S=M+YzAAvR} zU#jD6i{B}Of|V;(@W(LwV|w<0{xKW=Q|6XeOW$pnZIp$|W0yEm7HtwA3=J)+Qo;Ye f^s)NxQ>Mok4<(APA}lCZ^6e`}UyPgm^eOcx?Td6T diff --git a/sensortoy/sensortoy/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/sensortoy/sensortoy/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin index bdeb7e9b9f5decdeeec7b007a919c8dabf15a95b..5eb306ead23e39cdc264a82a7d44956a2e90634c 100644 GIT binary patch delta 352 zcmaEUhxz#(<_%Np1iVj)Yixbs^tjecYkR^?_8FVXRT%|TxY>Hk)9ZbM`0i;GXfEjh z3l{43B(!bHoOqk@ef#8PGcIl_*JNbL(JANKEVtk!<7U>DRsn(Zf~2B|B=-{vFN2N%MfB39Kr)t-{r3j2RfXPXX~E5N58Kzije( zJ=RG9vaQn}2UQ5}nLIIEVRPKRUCe^LjR!=(w;r8vV8c3BMeW;NNK(HquC%?=!Mw@) c+7r9$lPZJ}Qj;&NWMN5Iw=sV+_pula0N6yGrT_o{ delta 352 zcmaEUhxz#(<_%Np1h%fVwziyhdD%+K_|}!lF)5qMRT%};-r5W7ym8rcPUEu|RiU#W zf+ssnS7a;@zu&|EP%co~- z4U-icoF}iFB{unNgVE+M(>@CcBu$F+oq70vIQPwGBH_8Y7dD^Y62mHR^Q6D%CYA@T zLb>Oxn4faBLPYIEnf#}*q}JNs)?Mi1b;|-Mn!u_Oe=2^-8Djh($ diff --git a/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_accelerometer.js b/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_accelerometer.js index 1c596dc..a488a2f 100644 --- a/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_accelerometer.js +++ b/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_accelerometer.js @@ -68,23 +68,34 @@ CC2650_ACCEL = function(p) { var message; var calcData; + function gString(v) { + return [v.toFixed(3),'G'].join(''); + } + + function aString(v) { + return [v.toFixed(3),'\'/s'].join(''); + } + + function mString(v) { + return [v.toFixed(3),'mT'].join(''); + } calcData = this.processData(data); message = 'Gyro
' + 'X: ' + calcData.gyro.x + '
' + 'Y: ' + calcData.gyro.y + '
' + 'Z: ' + calcData.gyro.z + '
' + 'Accel
' + 'X: ' + calcData.accel.x + '
' + 'Y: ' + calcData.accel.y + '
' + 'Z: ' + calcData.accel.z + '
' + 'Mag
' + 'X: ' + calcData.mag.x + '
' + 'Y: ' + calcData.mag.y + '
' + 'Z: ' + calcData.mag.z + '
'; this.state = message; - this.$result[this.frames.gyroID + '-x'].text(calcData.gyro.x.toFixed(5)); - this.$result[this.frames.gyroID + '-y'].text(calcData.gyro.y.toFixed(5)); - this.$result[this.frames.gyroID + '-z'].text(calcData.gyro.z.toFixed(5)); + this.$result[this.frames.gyroID + '-x'].text(gString(calcData.gyro.x)); + this.$result[this.frames.gyroID + '-y'].text(gString(calcData.gyro.y)); + this.$result[this.frames.gyroID + '-z'].text(gString(calcData.gyro.z)); - this.$result[this.frames.accelID + '-x'].text(calcData.accel.x.toFixed(5)); - this.$result[this.frames.accelID + '-y'].text(calcData.accel.y.toFixed(5)); - this.$result[this.frames.accelID + '-z'].text(calcData.accel.z.toFixed(5)); + this.$result[this.frames.accelID + '-x'].text(aString(calcData.accel.x)); + this.$result[this.frames.accelID + '-y'].text(aString(calcData.accel.y)); + this.$result[this.frames.accelID + '-z'].text(aString(calcData.accel.z)); - this.$result[this.frames.magID + '-x'].text(calcData.mag.x); - this.$result[this.frames.magID + '-y'].text(calcData.mag.y); - this.$result[this.frames.magID + '-z'].text(calcData.mag.z); + this.$result[this.frames.magID + '-x'].text(mString(calcData.mag.x)); + this.$result[this.frames.magID + '-y'].text(mString(calcData.mag.y)); + this.$result[this.frames.magID + '-z'].text(mString(calcData.mag.z)); this.data.gyro.x = this.storeData(calcData.gyro.x, this.data.gyro.x); this.data.gyro.y = this.storeData(calcData.gyro.y, this.data.gyro.y); @@ -158,6 +169,7 @@ CC2650_ACCEL = function(p) { var lineID; var max; + var parts = ['x', 'y', 'z']; _data = data || this.data; @@ -186,9 +198,16 @@ CC2650_ACCEL = function(p) { } } - console.log('accel max:', max) + + console.log('accel max:', max); ceiling = max; - floor = max * -1; + + /* if (ceiling < this.previousCeil) { + ceiling = ceiling + ((this.previousCeil - ceiling) / 2); + ceiling = (Math.ceil((Math.round(ceiling) + 1) / 10)); + }*/ + + floor = ceiling * -1; ceilingLimit = ceiling; var scalePos = (124 / 2) / ceiling; @@ -225,6 +244,7 @@ CC2650_ACCEL = function(p) { } + this.previousCeil = ceiling; }; this.animateGraph = function() { diff --git a/sensortoy/sensortoy/platforms/android/assets/www/js/standards/capability.js b/sensortoy/sensortoy/platforms/android/assets/www/js/standards/capability.js index f636fe7..deb83a7 100644 --- a/sensortoy/sensortoy/platforms/android/assets/www/js/standards/capability.js +++ b/sensortoy/sensortoy/platforms/android/assets/www/js/standards/capability.js @@ -45,6 +45,9 @@ var CAPABILITY = function(p) { this.target = null; this.$frame = null; + + this.previousCeil = 0; + capabilityManager.register({id: this.capabilityID, module: this}); };