added: new -c option to resume a connection, baud rate MUST be the same as the initial init for this to work

added: new init parameter to stm32_init to bypass the INIT handshake
added: call to stm32_erase_memory on program, seems that programming fails without it on occasion

Author: Geoffrey McRae

main.c

@@ -50,6 +50,7 @@ char		verify		= 0;
 int		retry		= 10;
 char		exec_flag	= 0;
 uint32_t	execute		= 0;
+char		init_flag	= 1;
 char		*filename;
 
 /* functions */
@@ -96,7 +97,7 @@ int main(int argc, char* argv[]) {
 	}
 
 	printf("Serial Config: %s\n", serial_get_setup_str(serial));
-	if (!(stm = stm32_init(serial))) goto close;
+	if (!(stm = stm32_init(serial, init_flag))) goto close;
 
 	printf("Version      : 0x%02x\n", stm->bl_version);
 	printf("Option 1     : 0x%02x\n", stm->option1);
@@ -152,6 +153,8 @@ int main(int argc, char* argv[]) {
 			goto close;
 		}
 
+		stm32_erase_memory(stm);
+
 		addr = stm->dev->fl_start;
 		fprintf(stdout, "\x1B[s");
 		fflush(stdout);
@@ -234,7 +237,7 @@ int main(int argc, char* argv[]) {
 
 int parse_options(int argc, char *argv[]) {
 	int c;
-	while((c = getopt(argc, argv, "b:r:w:vn:g:h")) != -1) {
+	while((c = getopt(argc, argv, "b:r:w:vn:g:ch")) != -1) {
 		switch(c) {
 			case 'b':
 				baudRate = serial_get_baud(strtoul(optarg, NULL, 0));
@@ -270,6 +273,10 @@ int parse_options(int argc, char *argv[]) {
 				execute   = strtoul(optarg, NULL, 0);
 				break;
 
+			case 'c':
+				init_flag = 0;
+				break;
+
 			case 'h':
 				show_help(argv[0]);
 				return 1;
@@ -302,14 +309,16 @@ int parse_options(int argc, char *argv[]) {
 
 void show_help(char *name) {
 	fprintf(stderr,
-		"Usage: %s [-bvnhg] [-[rw] filename] /dev/ttyS0\n"
+		"Usage: %s [-bvnhgc] [-[rw] filename] /dev/ttyS0\n"
 		"	-b rate		Baud rate (default 57600)\n"
 		"	-r filename	Read flash to file\n"
 		"	-w filename	Write flash to file\n"
 		"	-v		Verify writes\n"
 		"	-n count	Retry failed writes up to count times (default 10)\n"
 		"	-g address	Start execution at specified address (0 = flash start)\n"
 		"	-h		Show this help\n"
+		"	-c		Resume the connection (don't send initial INIT)\n"
+		"			*Baud rate must be kept the same as the first init*\n"
 		"\n"
 		"Examples:\n"
 		"	Get device information:\n"

serial_linux.c

@@ -134,7 +134,7 @@ serial_err_t serial_setup(serial_t *h, const serial_baud_t baud, const serial_bi
 	h->newtio.c_cflag &= ~(CSIZE | CRTSCTS);
 	h->newtio.c_iflag &= ~(IXON | IXOFF | IXANY | IGNPAR);
 	h->newtio.c_lflag &= ~(ECHOK | ECHOCTL | ECHOKE);
-	h->newtio.c_oflag &= ~(OPOST);
+	h->newtio.c_oflag &= ~(OPOST | ONLCR);
 
 	/* setup the new settings */
 	cfsetispeed(&h->newtio, port_baud);

stm32.c

@@ -99,20 +99,22 @@ char stm32_send_command(const stm32_t *stm, const uint8_t cmd) {
 	return 1;
 }
 
-stm32_t* stm32_init(const serial_t *serial) {
+stm32_t* stm32_init(const serial_t *serial, const char init) {
 	uint8_t len;
 	stm32_t *stm;
 
 	stm      = calloc(sizeof(stm32_t), 1);
 	stm->cmd = calloc(sizeof(stm32_cmd_t), 1);
 	stm->serial = serial;
 
-	stm32_send_byte(stm, STM32_CMD_INIT);
-	if (stm32_read_byte(stm) != STM32_ACK) {
-		free(stm->cmd);
-		free(stm);
-		fprintf(stderr, "Failed to get init ACK from device\n");
-		return NULL;
+	if (init) {
+		stm32_send_byte(stm, STM32_CMD_INIT);
+		if (stm32_read_byte(stm) != STM32_ACK) {
+			free(stm->cmd);
+			free(stm);
+			fprintf(stderr, "Failed to get init ACK from device\n");
+			return NULL;
+		}
 	}
 
 	/* get the bootloader information */

stm32.h

@@ -49,7 +49,7 @@ struct stm32_dev {
 	uint32_t	mem_start, mem_end;
 };
 
-stm32_t* stm32_init    (const serial_t *serial);
+stm32_t* stm32_init    (const serial_t *serial, const char init);
 void stm32_close       (stm32_t *stm);
 char stm32_read_memory (const stm32_t *stm, uint32_t address, uint8_t data[], unsigned int len);
 char stm32_write_memory(const stm32_t *stm, uint32_t address, uint8_t data[], unsigned int len);