Adding offset-able start position.

- Useful for jittery distance measurement (when stationary)

Author: haata

fcv/KiibohdForce.py

@@ -131,16 +131,19 @@ def processCommandLineArgs( varContainer ):
 	pArgs.add_argument( 'switch_name',  help=argparse.SUPPRESS ) # Suppressed help output, because Python output is verbosely ugly
 
 	# Optional Arguments
+	pArgs.add_argument( '-o', '--start-offset', type=int, default=0,
+		help="Specify a start offset, useful if measurement sensor is being jittery for whatever reason.\n  Use base sensor units." )
 	pArgs.add_argument( '-h', '--help', action="help",
 		help="This message." )
 
 	# Process Arguments
 	args = pArgs.parse_args()
 
 	# Parameters
-	varContainer['SwitchName'] = args.switch_name
-	varContainer['SerialPort'] = args.serial_port
-	varContainer['Filename']   = "{0}.raw".format( varContainer['SwitchName'] )
+	varContainer['StartOffset'] = args.start_offset
+	varContainer['SwitchName']  = args.switch_name
+	varContainer['SerialPort']  = args.serial_port
+	varContainer['Filename']    = "{0}.raw".format( varContainer['SwitchName'] )
 
 	# Check file existance, and rename if necessary
 	counter = 1
@@ -169,8 +172,8 @@ def recordData( varContainer, forceData ):
 	# Initialize serial port, USB serial port is used, speed does not have to be negotiated
 	ser = serial.Serial( varContainer['SerialPort'], timeout=2 )
 
-	# Mark the start/end position of the reading
-	cmdOut = sendCmd( ser, "start" )
+	# Mark the start/end position of the reading give, with a given offset
+	cmdOut = sendCmd( ser, "start {0}".format( varContainer['StartOffset'] ) )
 
 	# Start the free recording
 	print "Initiating force curve reading..."

main.c

@@ -75,7 +75,7 @@ CLIDictItem forceGaugeCLIDict[] = {
 	{ "gaugeHelp",     "Description on how to use the force gauge firmware.", cliFunc_gaugeHelp },
 	{ "imadaComm",     "Send specific commands to the Imada force gauge. See \033[35mgaugeHelp\033[0m for more details.", cliFunc_imadaComm },
 	{ "read",          "Query a force/distance measurement. See \033[35mgaugeHelp\033[0m for more details.", cliFunc_read },
-	{ "start",         "Mark the current distance as the start/end position.", cliFunc_start },
+	{ "start",         "Mark the current distance as the start/end position, offset is optional.", cliFunc_start },
 	{ "stop",          "Stop free reporting or read loop.", cliFunc_stop },
 	{ "zeroForce",     "Zero out the force gauge.", cliFunc_zeroForce },
 	{ "zeroPosition",  "Mark the minimum distance for this measurement (bottom).", cliFunc_zeroPosition },
@@ -589,6 +589,7 @@ void cliFunc_gaugeHelp( char* args )
 "     Distance marker \033[35m[start]\033[0m for the start/end of a force curve measurement." NL
 "     While in free running mode, a special message is displayed when reaching the \033[35m[start]\033[0m point." NL
 "       \033[35m[start]\033[0m is defined by positioning the distance sensor at the position to start and running this command." NL
+"     The argument is an offset integer." NL
 		);
 }
 
@@ -617,8 +618,17 @@ void cliFunc_read( char* args )
 
 void cliFunc_start( char* args )
 {
+	// Parse number from argument
+	//  NOTE: Only first argument is used
+	char* arg1Ptr;
+	char* arg2Ptr;
+	argumentIsolation_cli( args, &arg1Ptr, &arg2Ptr );
+
+	// Convert the argument into an int
+	int offset = decToInt( arg1Ptr ) + 1;
+
 	// Read the current distance and set the new start/end position
-	distanceStart = readDistanceGauge();
+	distanceStart = readDistanceGauge() + offset;
 
 	print( NL );
 	info_msg("New start/end position: ");