0000000000000000000000000000000000000000 fc9ba69b97d3f724ee52dcf0037d11d8224758f2 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1334167519 -0500	commit (initial): Initial Commit
fc9ba69b97d3f724ee52dcf0037d11d8224758f2 9ed3a50c9a6055ffb146ba81a57d12bf5e4c760f Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1334258251 -0500	commit: In App Settings Kit added successfully to "Utility" controller shell. IASK pops up in "flip side" controller (modal view) when the info button is pushed. Nothing is "saved," or tied yet to these values. This is simply getting the UI connections made.
9ed3a50c9a6055ffb146ba81a57d12bf5e4c760f 6f21e4ca17b13fa52667bba6ae1c5aa041ece59f Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1334671625 -0500	commit: Successfully added deadman switch and preference which determines (and reloads) its position on the display. Incorporated a double click for settings access but may progress to a slider or something more obvious as development continues.
6f21e4ca17b13fa52667bba6ae1c5aa041ece59f cc654b6e0c26684b9b29aa48cd79b9d042821c3b Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1334691799 -0500	commit: Accelerometer input slider is working
cc654b6e0c26684b9b29aa48cd79b9d042821c3b 7c6c16ae806682517364135d4c730268723a52b2 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1335201748 -0500	commit: Slider first appears at start up for 5 seconds, then disappears and reappears only on screen tap. Now trying to add in "animation".
7c6c16ae806682517364135d4c730268723a52b2 e4086f827fe0f3b6809b06c908d347b7073c5f8b Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1335216526 -0500	commit: Added all WiRC functionality and conducted successful test with robot. Have not made any revisions to the convertedMotion function or the reference frame. This is simply Control+IASK and WiRC combined into one project. I did move cameraImg to load only upon connection and not before so that hopefully I am able to still run certain UI tests in the simulator. To do this with the cameraImg I had to be sure to load it in to the "back" of the view so that it was not covering up any of the buttons (deadmanSwitch and touchWholeScreen).
e4086f827fe0f3b6809b06c908d347b7073c5f8b 2147b7891803a0b92752c9792a02855930baed75 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1335288975 -0500	commit: Updated the look of the slider but did not implement animation or timer corrections. Additionally, checking for +/- z-vector gravity to determine reference frame. Not sure what to do with this information (yet) but consider multiplying the rotation matrix by the gravity matrix instead of using Euler angles?
2147b7891803a0b92752c9792a02855930baed75 2b16a388173862f3a06d75f1e9298b17b4b7ca90 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1335379035 -0500	commit: 1) Have added driving lights and blinking reverse light---UNTESTED, as I am working only in simulator
2b16a388173862f3a06d75f1e9298b17b4b7ca90 7c3a74289d0d2e04b94e6701e89ed3032d647a2e Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1336156854 -0500	commit: Working version with all connections active. Check issues with driving light not always remaining visible. Checks for gimbal lock and time lag reverse still due.
7c3a74289d0d2e04b94e6701e89ed3032d647a2e 024f515fef846287499fa0c32000f7ef5fa092ed Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1336423963 -0500	commit: Added gimbal lock check and tested it for use :) Also added code for reverse lag but commented out while troubleshooting the gimbal lock check.
024f515fef846287499fa0c32000f7ef5fa092ed 951ba978982da7793b9ffac50e52ddd2c4786003 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1336757551 -0500	commit: Corrected issues with driving light disappearing. Still attempting to address issues with motionLoop re. checkGimbalLock. Also successfully added screenshot + camera shot tool. One button currently does both; however, these functions could be separated out (or presented as a setting) for the user. Work some more to ensure exponential scaling is correct and to identify issues with steering/yaw/trim.
951ba978982da7793b9ffac50e52ddd2c4786003 79f636285a1fc0d3c21f49c5ea1e21cf5a8d8f43 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1338846911 -0500	commit: Got the links between Preferences/AttititudeUpdate/MainViewController working. Trim is utilized but not tested on device. Attempting to add a placeholder camera image for when device is not connected...
79f636285a1fc0d3c21f49c5ea1e21cf5a8d8f43 5b5140140b077662f30f3f7b7a01dd8ea0d8a9e7 Amber Walker <AMWalker@ip-10-195-121-174.wireless-wmc.nor.ou.edu> 1339003059 -0500	commit: Added camera pan/tilt functions. Still need to work on their directionality, etc.
5b5140140b077662f30f3f7b7a01dd8ea0d8a9e7 84d2c2f110042b08324fbd6e619cc931b296d096 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1340034265 -0500	commit: Made a LOT of changes regarding how I WANT to handle trim; however, none of them are currently active in code for the Robotics Rodeo. Additionally, I have added time lag reverse for the 4WD profile and I seem to have addressed connectivity issues related to the app going into a "background" mode.
84d2c2f110042b08324fbd6e619cc931b296d096 1449809d035a1e4fb9e06ffc1377cc302909ce51 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1343665590 -0500	commit: Lots of updates. Most notably, WiFi network name is added to tilt control display. Getting ready to make major revisions and add a target for joystick control; hence the commit.
1449809d035a1e4fb9e06ffc1377cc302909ce51 a85079d1d6b53203f9763ba9046d2fe6344520f1 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1343771930 -0500	commit: This version is ALL screwed up. I attempted to add cocos2d features and a 2nd target for the joystick application, but have decided to revert to a working version and separate the 2 apps into different Xcode projects.
a85079d1d6b53203f9763ba9046d2fe6344520f1 c54f31ba02814903542d3929e1faba97e7c47523 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1343771946 -0500	commit: Screwed up version of Preferences.
c54f31ba02814903542d3929e1faba97e7c47523 c54f31ba02814903542d3929e1faba97e7c47523 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1343772033 -0500	checkout: moving from master to Trash
c54f31ba02814903542d3929e1faba97e7c47523 eec4278c0eb0c93af8ac4b5ff6df942ca80325f6 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1343772075 -0500	commit: Screwed up changes that will not allow me to discard. Committing instead to revert to older version.
eec4278c0eb0c93af8ac4b5ff6df942ca80325f6 71094f32bad7c964fe4ca0f8800dda5695f8c527 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1343772940 -0500	commit: xxx
71094f32bad7c964fe4ca0f8800dda5695f8c527 c54f31ba02814903542d3929e1faba97e7c47523 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1343773017 -0500	checkout: moving from Trash to master
c54f31ba02814903542d3929e1faba97e7c47523 c54f31ba02814903542d3929e1faba97e7c47523 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1343774787 -0500	checkout: moving from master to v1.0
c54f31ba02814903542d3929e1faba97e7c47523 c54f31ba02814903542d3929e1faba97e7c47523 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1343774829 -0500	checkout: moving from v1.0 to v1.0
c54f31ba02814903542d3929e1faba97e7c47523 c54f31ba02814903542d3929e1faba97e7c47523 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1343774858 -0500	checkout: moving from v1.0 to v1.0
c54f31ba02814903542d3929e1faba97e7c47523 1449809d035a1e4fb9e06ffc1377cc302909ce51 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1343775093 -0500	reset: moving to 1449809d035a1e4fb9e06ffc1377cc302909ce51
1449809d035a1e4fb9e06ffc1377cc302909ce51 0cf608254108e9f4cde24333569e6cc5c4aeea77 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1343775200 -0500	commit: Reverted to Robot Rodeo-ready application.
0cf608254108e9f4cde24333569e6cc5c4aeea77 1449809d035a1e4fb9e06ffc1377cc302909ce51 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1343857122 -0500	reset: moving to 1449809d035a1e4fb9e06ffc1377cc302909ce51
1449809d035a1e4fb9e06ffc1377cc302909ce51 74c26b3e7b4928895ed94e1d7de42e38656f1f64 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1343867525 -0500	commit: Re-structured all files in XCode to make multiple targets easier
74c26b3e7b4928895ed94e1d7de42e38656f1f64 b50b17efbbfbf2646a77db1fe474373bb55b1f85 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1343877562 -0500	commit: Successfully added second target, Tilt v1, which should serve as Controller B in the Experiment Phase 1. Tested on simulator, but not on device.
b50b17efbbfbf2646a77db1fe474373bb55b1f85 5edff4eded1a35ebd38d7bd9d98320e8f97c7c2b Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1348772149 -0500	commit: Added Tilt + Joy v2 target to combine functionality. Need to find the appropriate build settings to overcome the issues with the Quaternion.h package; otherwise it is ready for its first build. Will need to extensively test the camera function via joystick, as controls are mapped from tilt controls which may not be appropriate based on axes.
5edff4eded1a35ebd38d7bd9d98320e8f97c7c2b bd4f824160863553ec287456a804f2e13be8be40 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1349285540 -0500	commit: Current version is running and both joystick and deadman switch are active. Joystick currently hidden by camera placeholder. Will have to figure out how to make UIView and CCScene play nice. Also, scaling of camera inputs needs to be done and references to stopMotion need to be checked for bugs.
bd4f824160863553ec287456a804f2e13be8be40 180c5238eaaa73c5d4fbc0f143f8049600e93d96 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1349822005 -0500	commit: Attempting to change CCScene to CCGLView to play nice with .xib file. Had it working, now it's not!!!
180c5238eaaa73c5d4fbc0f143f8049600e93d96 d98e3ef6e28ad6ecdfad8d4079243cfcece03601 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1350270000 -0500	commit: Completed checks of dual control and added instructions for when those controls ARE activated simultaneously. This requires brief testing but is otherwise ready for Phase 2.
d98e3ef6e28ad6ecdfad8d4079243cfcece03601 7f4f04bf87c8627ea61e6f7b5ee41cf1de7d1004 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1350270062 -0500	commit: Tilt v2 is ready for Phase 2!
7f4f04bf87c8627ea61e6f7b5ee41cf1de7d1004 090b86ec78bee1a0fe187dda60d04e3e4c683b9b Amber Walker <AMWalker@ip-10-195-105-242.wireless-wmc.nor.ou.edu> 1350512141 -0500	commit: Removed touch whole screen button that triggers the settings slider (not currently active). Touching it without an IBAction was causing the program to crash. Additionally, I included a stopMotion command in captureScreen: method which prevents camera from continuing to move if cameraSwitch and screenshot button are touched simultaneously.
090b86ec78bee1a0fe187dda60d04e3e4c683b9b 81b6e1ca152aa50a9765e26038c5fbe143266e08 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1351022259 -0500	commit: Re-activated IASK for Control + IASK target. Will add all customizable options from here; build settings will need updated to add Joystick.
81b6e1ca152aa50a9765e26038c5fbe143266e08 b81aae0d6d9df404026bcb3974f03c00cdf4ff80 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1351531136 -0500	commit: Made all changes necessary for project to build with dependencies on both Objective-C (cocos2d) and Objective-C++ (everything that uses the MainViewController + Math library for Quaternion.h). cocosView created in main .xib, but links, loads, etc. have not been made for UI. Adding method in checkSettings to reloadUI based on changes, if any. Using switch statements since all .plist dictionary entries are integers.
b81aae0d6d9df404026bcb3974f03c00cdf4ff80 9095eb3026d9158fe4706f607a71e72f024f7cf1 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1351565111 -0500	commit: Can successfully swap between joystick and deadman switch for DRIVING controls. Now need to identify ways to pass information TO InputLayer to determine 1) location of joystick 2) size of joystick? and 3) # of joysticks.
9095eb3026d9158fe4706f607a71e72f024f7cf1 a905a287c9b7c90adbfdcb918a42405185762d7d Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1351572327 -0500	commit: Everything UI wise is working. Numbers need tweaked so that switches and joysticks pop up in the appropriate locations; however, that is minor. CCGLView takes up majority of page, so background gray view can remain, but only is needed when dMode ==1 && cMode == 1. The biggest problem now is how to pull the animation information from the joysticks. Previously their tag was one and creating a node on the sprite worked perfectly. Now, however, because presentation of the joystick is much more complicated, I need to figure out how the tagging works (if at all).
a905a287c9b7c90adbfdcb918a42405185762d7d b37a532a1caaf60d2a9b3dfe2153f184dab45dae Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1351616058 -0500	commit: Reverted back to approach from Tilt + Joy v2 to grab joystick input data. Now going to re-look how to customize joystick type and location.
b37a532a1caaf60d2a9b3dfe2153f184dab45dae c3b79cedf3b9c6fcb97bd3033b9a4f08cd02f4f5 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1351698252 -0500	commit: Have all joystick/tilt choice functionality for the UI coded and debugged. Only one scene needed--joystick doesn't change. cocosView is hidden and repositioned where necessary. For 2 joystick control, a UISegmentedControl is used to choose between drive and camera. It can also be repositioned on the screen via the Camera Channel interface.
c3b79cedf3b9c6fcb97bd3033b9a4f08cd02f4f5 7632898bebc1103b788514c81cab8b6606fb036c Amber Walker <AMWalker@ip-10-195-109-188.wireless-wmc.nor.ou.edu> 1351799619 -0500	commit: Have volume buttons working as deadman switches and motion is stopping appropriately when released.
7632898bebc1103b788514c81cab8b6606fb036c 0f10f705450cb19c041c05dafb566c2e4a80d7a4 Amber Walker <AMWalker@walkers-time-capsule.gateway.2wire.net> 1351823977 -0500	commit: Updated project settings for all .mm implementation. Added some images.
0f10f705450cb19c041c05dafb566c2e4a80d7a4 19a58b56a593ad646516eaa0025cacdf3f5a904d Amber Walker <AMWalker@walkers-time-capsule.gateway.2wire.net> 1351824169 -0500	commit: Debugged most all issues resulting from overlapping timer problems. Have press to hold volume button tilt controls active and added lights indicating when the buttons are depressed. Moved the screenshot button to the bottom center of the screen instead of the bottom right corner. displaySettingsSlider: now requires a double tap in the center of the display. Joystick reverse problems were solved by moving [checkDirection] IN FRONT of [sendValuesToDevice:].
19a58b56a593ad646516eaa0025cacdf3f5a904d 29acc5c725465e92deb516188465a8b09e8aed8b Amber Walker <AMWalker@walkers-time-capsule.gateway.2wire.net> 1351824224 -0500	commit: Changes to these files are less important but necessary for compiling. Root.plist is the settings bundle read in by IASK.
29acc5c725465e92deb516188465a8b09e8aed8b f0b4275a534ad0da3971be21cda4ef33ff954cfc Amber Walker <AMWalker@walkers-time-capsule.gateway.2wire.net> 1351828863 -0500	commit: Got .plist save to file working and added userID to filename. Ready to start coding for joystick scale factor (part of joystick sensitivity). That scale factor will effect 1) joystick appearance, 2) cocosView frame, 3) scale of raw input values.
f0b4275a534ad0da3971be21cda4ef33ff954cfc 8e3f091c3f41594b85b0637a1c867c8c0c8577a4 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1351909908 -0500	commit: Changes made in preparation for joystick scaling. Problems earlier today prevented implementation. Re-did animation starts and stops. Now ready to re-implement and try again.
8e3f091c3f41594b85b0637a1c867c8c0c8577a4 548f7fad9abea0888c28f5964b10bd3181cf2c48 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1351912927 -0500	commit: Fixed size of cocosView to accommodate largest joystick scaling. Updated "pads" for cocosView locations to ensure they are online (roughly) with deadman switches and each other!
548f7fad9abea0888c28f5964b10bd3181cf2c48 a1665aaf9d270cb4eaa2e513e6549e2f61a47d0d Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1352236215 -0600	commit: Included default setting for user name (4x4). Also worked on stopping joystick and attitude motion separately based on inputs. Attempted to alleviate issues with simultaneous control. Still need to look closely at joystick for problems with animation/node reattaching to thumb sprite. All in all this is the FINAL version for phase 3, barring any unforeseen (major) issues.
