Revision 3:53cc107bcff1, committed 2017-06-01

Comitter:

jah128

Date:

Thu Jun 01 23:04:49 2017 +0000

Parent:

2:5d37e5fd7141

Child:

4:3af6e6afbfef

Commit message:

Initial commit for v0.9

Changed in this revision

--- a/PsiSwarmV8_CPP.lib	Mon Oct 17 13:20:23 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-https://developer.mbed.org/teams/Psi-Swarm-Robot/code/PsiSwarmV8_CPP/#adbd827234a4

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/PsiSwarmV9.lib	Thu Jun 01 23:04:49 2017 +0000
@@ -0,0 +1,1 @@
+https://developer.mbed.org/teams/Psi-Swarm-Robot/code/PsiSwarmV9/#50686c07ad07

--- a/main.cpp	Mon Oct 17 13:20:23 2016 +0000
+++ b/main.cpp	Thu Jun 01 23:04:49 2017 +0000
@@ -6,10 +6,10 @@
 **  ██║     ███████║██║███████║╚███╔███╔╝██║  ██║██║  ██║██║ ╚═╝ ██║  **
 **  ╚═╝     ╚══════╝╚═╝╚══════╝ ╚══╝╚══╝ ╚═╝  ╚═╝╚═╝  ╚═╝╚═╝     ╚═╝  **
 ************************************************************************
-** Copyright 2016 University of York - See notice at end of file      **
+** Copyright 2017 University of York - See notice at end of file      **
 ***********************************************************************/
 
-/// PsiSwarm C++ Blank Example Code - Version 0.8
+/// PsiSwarm C++ Blank Example Code - Version 0.9 - June 2017
 /// James Hilder, Alan Millard, Alexander Horsfield, Homero Elizondo, Jon Timmis
 
 /// Include main.h - this includes psiswarm.h all the other necessary core files
@@ -19,23 +19,23 @@
 
 char * program_name = "Blank";
 char * author_name  = "YRL";
-char * version_name = "0.80";
+char * version_name = "0.90";
+
+///Place user code here that should be run after initialisation but before the main loop
+void user_code_setup()
+{
+    wait(0.8); // The display is still updating from init so wait a short while
+    display.clear_display();
+    display.set_position(0,0);
+    display.write_string(" [  No Code   ]");
+}
 
 ///User code loop:  This is where user code should go; it is run as an infinite loop
 void user_code_loop()
 {
-    // Example:
-    // animations.led_run1();
-    // wait(1.2);   
-}
-
-///Place user code here that should be run after initialisation but before the main loop
-void user_code_setup()
-{
-    wait(1);
-    display.clear_display();
-    display.set_position(0,0);
-    display.write_string("No Code");  
+    // Replace this code with your main loop
+    animations.led_run1();
+    wait(1.2);
 }
 
 /// Code goes here to handle what should happen when the user switch is pressed
@@ -67,15 +67,15 @@
 
 
 /***********************************************************************
-** Copyright 2016 University of York                                  **
+** Copyright 2017 University of York                                  **
 **                                                                    **
 ** Licensed under the Apache License, Version 2.0 (the "License")     **
 ** You may not use this file except in compliance with the License.   **
 ** You may obtain a copy of the License at                            **
 ** http://www.apache.org/licenses/LICENSE-2.0   Unless required by    **
 ** applicable law or agreed to in writing, software distributed under **
-** under the License is distributed on an "AS IS" BASIS WITHOUT       **  
-** WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   ** 
-** See the License for the specific language governing permissions    ** 
+** under the License is distributed on an "AS IS" BASIS WITHOUT       **
+** WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   **
+** See the License for the specific language governing permissions    **
 ** and limitations under the License.                                 **
 ***********************************************************************/
\ No newline at end of file