GNOME.org
 

chronojump r484 - in trunk: . build/data src src/gui web/data web/html_created_no_edit/print

Author: xaviblas
Date: Wed Apr 15 09:59:13 2009
New Revision: 484
URL: http://svn.gnome.org/viewvc/chronojump?rev=484&view=rev

Log:
	Important: created new firmware (unvalidated yet) with 10ms of minimal detected
	time. We created first the 50ms because chronopic is focussed on jumps
	and minimal tc in a drop is close to 200ms. Now that chronopic is used
	for other things like reaction times, rhythms, ... 10ms is ok.
	Note this firware is not tested yet.

	DetectPorts in chronojump_mini (linux) now better formatting


Modified:
   trunk/TODO.txt
   trunk/build/data/chronojump.prg
   trunk/build/data/chronojump_mini.prg
   trunk/changelog.txt
   trunk/src/chronojump_mini.cs
   trunk/src/gui/helpPorts.cs
   trunk/src/util.cs
   trunk/web/data/photos.txt
   trunk/web/html_created_no_edit/print/screenshots.html
   trunk/web/html_created_no_edit/print/screenshots_ca.html
   trunk/web/html_created_no_edit/print/screenshots_es.html
   trunk/web/html_created_no_edit/print/screenshots_gl.html
   trunk/web/html_created_no_edit/print/screenshots_pt.html

Modified: trunk/TODO.txt
==============================================================================
--- trunk/TODO.txt	(original)
+++ trunk/TODO.txt	Wed Apr 15 09:59:13 2009
@@ -1,5 +1,16 @@
 TODO: 
 
+new multichronopic tests:
+- padu runAnalysis (2cp)
+- discrimitative reaction time with two lights and two fotocells (or platforms)
+(4cp) when evaluator push left or right button, cp 1 or cp2 lights, person has to cross fotocell a or b (connected to cp 3, 4)
+better with only two chronopics, if evaluator push cp1, light1 gets on and person has tocross fotocell1 (or platform). Then with two we have all.
+we can also have three or four to have more discriminative
+
+finish button bigger
+change infrared icon (put velleman)
+see flickering on dj eventExecute graphs
+
 fix graph problems on multichronopic (also when there's only a chronopic)
 
 

Modified: trunk/build/data/chronojump.prg
==============================================================================
Binary files. No diff available.

Modified: trunk/build/data/chronojump_mini.prg
==============================================================================
Binary files. No diff available.

Modified: trunk/changelog.txt
==============================================================================
--- trunk/changelog.txt	(original)
+++ trunk/changelog.txt	Wed Apr 15 09:59:13 2009
@@ -1,5 +1,14 @@
 CHANGELOG.txt
 
+15 apr 2009
+	Important: created new firmware (unvalidated yet) with 10ms of minimal detected
+	time. We created first the 50ms because chronopic is focussed on jumps
+	and minimal tc in a drop is close to 200ms. Now that chronopic is used
+	for other things like reaction times, rhythms, ... 10ms is ok.
+	Note this firware is not tested yet.
+
+	DetectPorts in chronojump_mini (linux) now better formatting
+
 3 apr 2009
 	eventExecute graphs bars done for simple events: jump simple, run, reaction time
 	main window shows in task bar again

Modified: trunk/src/chronojump_mini.cs
==============================================================================
--- trunk/src/chronojump_mini.cs	(original)
+++ trunk/src/chronojump_mini.cs	Wed Apr 15 09:59:13 2009
@@ -105,7 +105,7 @@
 
 		if(portName == "") {
 			if( ! Util.IsWindows()) {
-				Console.WriteLine(Util.DetectPortsLinux());
+				Console.WriteLine(Util.DetectPortsLinux(false)); //formatting
 			}
 			Console.WriteLine(Catalog.GetString("Print the port name where chronopic is connected:"));
 			portName=Console.ReadLine();

Modified: trunk/src/gui/helpPorts.cs
==============================================================================
--- trunk/src/gui/helpPorts.cs	(original)
+++ trunk/src/gui/helpPorts.cs	Wed Apr 15 09:59:13 2009
@@ -64,7 +64,7 @@
 			messageDetected = string.Format(Catalog.GetString("Auto-Detection currently disabled"));
 		} else {
 			messageInfo = Constants.PortNamesLinux;
-			messageDetected = Util.DetectPortsLinux();
+			messageDetected = Util.DetectPortsLinux(true); //formatting
 			button_check_port.Hide();
 			button_force_port.Hide();
 		}

Modified: trunk/src/util.cs
==============================================================================
--- trunk/src/util.cs	(original)
+++ trunk/src/util.cs	Wed Apr 15 09:59:13 2009
@@ -960,21 +960,27 @@
 	}
 */
 	
-	public static string DetectPortsLinux() {
+	public static string DetectPortsLinux(bool formatting) {
+		string startStr = "";
+		string endStr = "";
+		if(formatting) {
+			startStr = "<i>";
+			endStr = "</i>";
+		}
 		string detected = "";
 		string [] usbSerial = Directory.GetFiles("/dev/", "ttyUSB*");
 		if(usbSerial.Length > 0) {
-			detected += "\n" + Constants.FoundUSBSerialPortsString + " " + usbSerial.Length + "\n<i>";
+			detected += "\n" + Constants.FoundUSBSerialPortsString + " " + usbSerial.Length + "\n" + startStr;
 			foreach(string myPort in usbSerial)
 				detected += "\t" + myPort;
-			detected += "</i>";
+			detected += endStr;
 		} else {
 			detected += Constants.NotFoundUSBSerialPortsString + "\n";
 			string [] serial = Directory.GetFiles("/dev/", "ttyS*");
-			detected += Constants.FoundSerialPortsString + " " + serial.Length + "\n<i>";
+			detected += Constants.FoundSerialPortsString + " " + serial.Length + "\n" + startStr;
 			foreach(string myPort in serial)
 				detected += "\t" + myPort;
-			detected += "</i>";
+			detected += endStr;
 		}
 		return detected;
 	}

Modified: trunk/web/data/photos.txt
==============================================================================
--- trunk/web/data/photos.txt	(original)
+++ trunk/web/data/photos.txt	Wed Apr 15 09:59:13 2009
@@ -16,7 +16,7 @@
 h-3;<a href=":::imageLink:::/Chronopic_v3.0_PCB.jpg"><img src=":::imageLink:::/Chronopic_v3.0_PCB_small.jpg" width="250" height="238"></a>
 h-4;<a href=":::webLink:::/chronopic_2_0_usb_front.jpg"><img src="chronopic_2_0_usb_front_mini.jpg"></a>
 h-5;<a href=":::imageLink:::/chronopic_foto.jpg"><img src=":::imageLink:::/chronopic_foto_small.png" width="250" height="188"></a>
-h-10;<a href=":::imageLink:::/modular_platform_with_chronopic.jpg"><img src=":::imageLink:::/modular_platform_with_chronopic_mini.jpg" width="250" height="188"></a>
+h-10;<a href=":::imageLink:::/modular_platform_with_chronopic.jpg"><img src=":::imageLink:::/modular_platform_with_chronopic_mini.jpg" width="250" height="150"></a>
 h-6;<a href=":::imageLink:::/plataforma_contactos_final.jpg"><img src=":::imageLink:::/plataforma_contactos_final_small.png" width="250" height="188"></a>
 c-1;<a href=":::imageLink:::/adria1.jpg"><img src=":::imageLink:::/adria1_small.jpg" width="125" height="94"></a>
 c-2;<a href=":::imageLink:::/adria2.jpg"><img src=":::imageLink:::/adria2_small.jpg" width="125" height="94"></a>

Modified: trunk/web/html_created_no_edit/print/screenshots.html
==============================================================================
--- trunk/web/html_created_no_edit/print/screenshots.html	(original)
+++ trunk/web/html_created_no_edit/print/screenshots.html	Wed Apr 15 09:59:13 2009
@@ -102,7 +102,7 @@
 v.0.1 graphs (english)
 </td>
 
-<td width="250"><a href="http://projects.gnome.org/chronojump/images/modular_platform_with_chronopic.jpg";><img src="http://projects.gnome.org/chronojump/images/modular_platform_with_chronopic_mini.jpg"; width="250" height="188"></a> 
+<td width="250"><a href="http://projects.gnome.org/chronojump/images/modular_platform_with_chronopic.jpg";><img src="http://projects.gnome.org/chronojump/images/modular_platform_with_chronopic_mini.jpg"; width="250" height="150"></a> 
 Modular platform build following these <a href="construction_modular_circuit_platform.html">instructions</a>
 </td></tr>
 

Modified: trunk/web/html_created_no_edit/print/screenshots_ca.html
==============================================================================
--- trunk/web/html_created_no_edit/print/screenshots_ca.html	(original)
+++ trunk/web/html_created_no_edit/print/screenshots_ca.html	Wed Apr 15 09:59:13 2009
@@ -102,7 +102,7 @@
 v.0.1 gr&agrave;fiques (angl&egrave;s) 
 </td>
 
-<td width="250"><a href="http://projects.gnome.org/chronojump/images/modular_platform_with_chronopic.jpg";><img src="http://projects.gnome.org/chronojump/images/modular_platform_with_chronopic_mini.jpg"; width="250" height="188"></a> 
+<td width="250"><a href="http://projects.gnome.org/chronojump/images/modular_platform_with_chronopic.jpg";><img src="http://projects.gnome.org/chronojump/images/modular_platform_with_chronopic_mini.jpg"; width="250" height="150"></a> 
 Platforma modular construida seguint aquestes <a href="construction_modular_circuit_platform_es.html">instruccions</a> (castell&agrave;)
 </td></tr>
 

Modified: trunk/web/html_created_no_edit/print/screenshots_es.html
==============================================================================
--- trunk/web/html_created_no_edit/print/screenshots_es.html	(original)
+++ trunk/web/html_created_no_edit/print/screenshots_es.html	Wed Apr 15 09:59:13 2009
@@ -102,7 +102,7 @@
 v.0.1 gr&aacute;ficas (ingl&eacute;s)
 </td>
 
-<td width="250"><a href="http://projects.gnome.org/chronojump/images/modular_platform_with_chronopic.jpg";><img src="http://projects.gnome.org/chronojump/images/modular_platform_with_chronopic_mini.jpg"; width="250" height="188"></a> 
+<td width="250"><a href="http://projects.gnome.org/chronojump/images/modular_platform_with_chronopic.jpg";><img src="http://projects.gnome.org/chronojump/images/modular_platform_with_chronopic_mini.jpg"; width="250" height="150"></a> 
 Platforma modular construida siguiendo estas <a href="construction_modular_circuit_platform_es.html">instrucciones</a>
 </td></tr>
 

Modified: trunk/web/html_created_no_edit/print/screenshots_gl.html
==============================================================================
--- trunk/web/html_created_no_edit/print/screenshots_gl.html	(original)
+++ trunk/web/html_created_no_edit/print/screenshots_gl.html	Wed Apr 15 09:59:13 2009
@@ -102,7 +102,7 @@
 v.0.1 Gr&aacute;ficas (ingl&eacute;s)
 </td>
 
-<td width="250"><a href="http://projects.gnome.org/chronojump/images/modular_platform_with_chronopic.jpg";><img src="http://projects.gnome.org/chronojump/images/modular_platform_with_chronopic_mini.jpg"; width="250" height="188"></a> 
+<td width="250"><a href="http://projects.gnome.org/chronojump/images/modular_platform_with_chronopic.jpg";><img src="http://projects.gnome.org/chronojump/images/modular_platform_with_chronopic_mini.jpg"; width="250" height="150"></a> 
 Modular platform build following these <a href="construction_modular_circuit_platform_es.html">instructions</a> (spanish) (TRANSLATE)
 </td></tr>
 

Modified: trunk/web/html_created_no_edit/print/screenshots_pt.html
==============================================================================
--- trunk/web/html_created_no_edit/print/screenshots_pt.html	(original)
+++ trunk/web/html_created_no_edit/print/screenshots_pt.html	Wed Apr 15 09:59:13 2009
@@ -102,7 +102,7 @@
 v.0.1 Gr&aacute;ficos (Ingl&ecirc;s)
 </td>
 
-<td width="250"><a href="http://projects.gnome.org/chronojump/images/modular_platform_with_chronopic.jpg";><img src="http://projects.gnome.org/chronojump/images/modular_platform_with_chronopic_mini.jpg"; width="250" height="188"></a> 
+<td width="250"><a href="http://projects.gnome.org/chronojump/images/modular_platform_with_chronopic.jpg";><img src="http://projects.gnome.org/chronojump/images/modular_platform_with_chronopic_mini.jpg"; width="250" height="150"></a> 
 Modular platform build following these <a href="construction_modular_circuit_platform_es.html">instructions</a> (spanish) (TRANSLATE)
 </td></tr>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]