auto-program cycle for Pico on Mac. added -showPath option to serial2xsbug

Author: mkellner

build/devices/pico/config/programmingMode

@@ -4,11 +4,17 @@ VENDOR_ID=$1
 PRODUCT_ID=$2
 VOLUME_NAME=$3
 
-if [[ ! -d $VOLUME_NAME ]]
+if [[ ! -d ${VOLUME_NAME} ]]
 then 
-	serial2xsbug ${VENDOR_ID}:${PRODUCT_ID} 921600 8N1 -programming
+	DEVICE_NAME=`serial2xsbug ${VENDOR_ID}:${PRODUCT_ID} -showPath`
+	if [[ "timeout" != "${DEVICE_NAME}" ]]
+	then
+		serial2xsbug ${VENDOR_ID}:${PRODUCT_ID} 921600 8N1 -programming
+	else
+		echo -n "Hold the BOOTSEL button and power-cycle the device."
+	fi
 	echo -n "Waiting for ${VOLUME_NAME}."
-	while [ ! -d "${VOLUME_NAME}" ]; do
+	while [[ ! -d "${VOLUME_NAME}" ]]; do
 		echo -n "."
 	    sleep 1
 	done

tools/serial2xsbug/serial2xsbug.c

@@ -99,19 +99,26 @@ static char* gExceptionList[33] = {
 int fxArguments(txSerialTool self, int argc, char* argv[])
 {
 	int argi;
-	if (argc < 4) {
+	if (argc < 3) {
 		fprintf(stderr, "### serial2xsbug <port name> <baud rate> <data bits><parity><stop bits>\n");
+		fprintf(stderr, "### serial2xsbug <vid:pid> -showPath [-timeout <ms>]\n");
 		return 1;
 	}
 	memset(self, 0, sizeof(txSerialToolRecord));
 	self->path = argv[1];
-	self->baud = atoi(argv[2]);
-	self->data = argv[3][0] - '0';
-	self->parity = argv[3][1];
-	self->stop = argv[3][2] - '0';
+	if (argc > 2) {
+		self->baud = atoi(argv[2]);
+		if (argc > 3) {
+			self->data = argv[3][0] - '0';
+			self->parity = argv[3][1];
+			self->stop = argv[3][2] - '0';
+		}
+	}
 	self->host = "localhost";
 	self->port = 5002;
 	self->restartOnConnect = 1;
+	self->showPath = 0;
+	self->timeout = 5000;	// for showpath
 
 	if (9 == strlen(self->path) && (':' == self->path[4])) {
 			self->vendorID = (mapHex(self->path[0]) << 12) | (mapHex(self->path[1]) << 8) | (mapHex(self->path[2]) << 4) | mapHex(self->path[3]);
@@ -122,8 +129,16 @@ int fxArguments(txSerialTool self, int argc, char* argv[])
 	TOOLS_BIN = NULL;
 	elfPath = NULL;
 	gCmd = NULL;
-	for (argi = 4; argi < argc; argi++) {
-		if (!strcmp(argv[argi], "-elf") && ((argi + 1) < argc)) {
+
+	for (argi = 2; argi < argc; argi++) {
+		if (argv[argi][0] != '-')
+			continue;
+		if (!strcmp(argv[argi], "-showPath"))
+			self->showPath = 1;
+		else if (!strcmp(argv[argi], "-timeout") && ((argi + 1) < argc)) {
+			self->timeout = atoi(argv[++argi]);
+		}
+		else if (!strcmp(argv[argi], "-elf") && ((argi + 1) < argc)) {
 			elfPath = argv[++argi];
 		}
 		else if (!strcmp(argv[argi], "-bin") && ((argi + 1) < argc)) {

tools/serial2xsbug/serial2xsbug.h

@@ -158,6 +158,8 @@ struct txSerialToolStruct {
 	int dtr;
 	int programming;
 	int restartOnConnect;
+	int showPath;
+	int timeout;
 	txSerialMachine firstMachine;
 	txSerialMachine currentMachine;
 	int index;

tools/serial2xsbug/serial2xsbug_mac.c

@@ -278,7 +278,7 @@ void fxRegisterSerial(void *refcon, io_iterator_t iterator)
 		if (productRef)
 			CFNumberGetValue(productRef , kCFNumberIntType, &productID);
 
-fprintf(stderr, "checking productID %04x:%04x\n", vendorID, productID);
+//fprintf(stderr, "checking productID %04x:%04x\n", vendorID, productID);
 		match = (!self->productID || (productID == self->productID)) &&
 			 		(!self->vendorID || (vendorID == self->vendorID));
 
@@ -292,8 +292,15 @@ fprintf(stderr, "checking productID %04x:%04x\n", vendorID, productID);
 				if (!strcmp(self->path, "") && match) {
 					self->path = malloc(strlen(description->path) + 1);
 					strcpy(self->path, description->path);
-					 fprintf(stderr, "product/vendor match: %s\n", description->path);
-					fxOpenSerial(self);
+
+					if (self->showPath) {
+						fprintf(stderr, "%s\n", description->path);
+						exit(0);
+					}
+					else {
+						fprintf(stderr, "product/vendor match: %s\n", description->path);
+						fxOpenSerial(self);
+					}
 				}
 				else
 				if (!strcmp(self->path, description->path)
@@ -358,6 +365,12 @@ static void fxSignalHandler(int s) {
 	exit(1);
 }
 
+static void timeoutHandler(CFRunLoopTimerRef cfTimer, void *info)
+{
+	printf("timeout\n");
+	exit(1);
+}
+
 int main(int argc, char* argv[])
 {
 	txSerialToolRecord tool;
@@ -372,9 +385,16 @@ int main(int argc, char* argv[])
 	IOServiceAddMatchingNotification(self->notificationPort, kIOPublishNotification, matchingDict, fxRegisterSerial, self, &self->ioIterator);
 	fxRegisterSerial(self, self->ioIterator);
 
-	signal(SIGINT, fxSignalHandler);
+	if (self->showPath) {
+		CFRunLoopTimerRef cfTimer;
+		CFRunLoopTimerContext context = {0};
 
-	CFRunLoopRun();
+		cfTimer = CFRunLoopTimerCreate(kCFAllocatorDefault, CFAbsoluteTimeGetCurrent() + (self->timeout / 1000.0), 0, 0, 0, timeoutHandler, &context);
+		CFRunLoopAddTimer(CFRunLoopGetCurrent(), cfTimer, kCFRunLoopCommonModes);
+	}
 
-	return result;
-}
+	signal(SIGINT, fxSignalHandler);
+	
+	CFRunLoopRun();
+	
+}