feat: create upload_reset binary for windows

to remove java dependecy on Windows

fixes stm32duino#67

Signed-off-by: Frederic Pillon <[email protected]>

Author: fpistm

linux/upload-reset renamed to linux/upload_reset

@@ -1,5 +1,5 @@
 /* Copyright (C) 2015 Roger Clark <www.rogerclark.net>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -17,7 +17,7 @@
 
 
 /* Copyright (C) 2003 Heiko Noordhof <heikyAusers.sf.net>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <termios.h>
-#include <unistd.h>  
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -38,7 +38,7 @@
 int   openserial(char *devicename);
 void  closeserial(void);
 int   setDTR(unsigned short level);
-int   setRTS(unsigned short level); 
+int   setRTS(unsigned short level);
 
 
 /* Two globals for use by this module only */
@@ -53,19 +53,19 @@ void closeserial(void)
 }
 
 
-int openserial(char *devicename) 
+int openserial(char *devicename)
 {
      struct termios attr;
 
-     if ((fd = open(devicename, O_RDWR)) == -1) return 0; /* Error */ 
+     if ((fd = open(devicename, O_RDWR)) == -1) return 0; /* Error */
      atexit(closeserial);
 
      if (tcgetattr(fd, &oldterminfo) == -1) return 0; /* Error */
      attr = oldterminfo;
      attr.c_cflag |= CRTSCTS | CLOCAL;
      attr.c_oflag = 0;
      if (tcflush(fd, TCIOFLUSH) == -1) return 0; /* Error */
-     if (tcsetattr(fd, TCSANOW, &attr) == -1) return 0; /* Error */ 
+     if (tcsetattr(fd, TCSANOW, &attr) == -1) return 0; /* Error */
 
      /* Set the lines to a known state, and */
      /* finally return non-zero is successful. */
@@ -114,13 +114,13 @@ int setDTR(unsigned short level)
 }
 
 /* This portion of code was written by Roger Clark
- * It was informed by various other pieces of code written by Leaflabs to reset their 
- * Maple and Maple mini boards 
+ * It was informed by various other pieces of code written by Leaflabs to reset their
+ * Maple and Maple mini boards
  */
 
 main(int argc, char *argv[])
 {
- 	
+
 	if (argc<2 || argc >3)
 	{
 		printf("Usage upload-reset <serial_device> <Optional_delay_in_milliseconds>\n\r");
@@ -147,7 +147,7 @@ main(int argc, char *argv[])
 		usleep(50000L);
 
 		write(fd,"1EAF",4);
- 		
+
 		closeserial();
 		if (argc==3)
 		{

macosx/upload-reset renamed to macosx/upload_reset

@@ -0,0 +1,23 @@
+CC = gcc
+SRC = $(wildcard *.c)
+LIBSRC = $(wildcard ../../libserialport/*.c)
+OBJ = $(SRC:.c=.o) $(LIBSRC:.c=.o)
+CFLAGS = -DLIBSERIALPORT_MSBUILD -Wall -I../../libserialport
+LDFLAGS = -lsetupapi
+DEST = ../../../win
+BIN = $(SRC:.c=)
+
+.PHONY: all clean
+
+all: $(BIN) install
+
+$(BIN): $(OBJ)
+	$(CC) -o $@ $^ $(LDFLAGS)
+
+install: $(BIN)
+	@echo "$@ $^..."
+	@mv $(BIN) $(DEST)/
+
+clean:
+	rm -f $(OBJ) $(DEST)/$(BIN)
+

src/upload-reset/upload-reset.c renamed to src/upload_reset/unix/upload_reset.c

@@ -0,0 +1,85 @@
+#include <libserialport.h>
+#include <stdio.h>
+#include <windows.h>
+/*
+ * Utility to send the reset sequence on RTS and DTR and chars
+ * which resets the libmaple and causes the bootloader to be run
+ */
+
+/* Helper function for error handling. */
+int check(enum sp_return result)
+{
+  char *error_message;
+
+  switch (result) {
+  case SP_ERR_ARG:
+    printf("Error: Invalid argument.\n");
+    exit(SP_ERR_ARG);
+  case SP_ERR_FAIL:
+    error_message = sp_last_error_message();
+    printf("Error: Failed: %s\n", error_message);
+    sp_free_error_message(error_message);
+    exit(SP_ERR_FAIL);
+  case SP_ERR_SUPP:
+    printf("Error: Not supported.\n");
+    exit(SP_ERR_SUPP);
+  case SP_ERR_MEM:
+    printf("Error: Couldn't allocate memory.\n");
+    exit(SP_ERR_MEM);
+  case SP_OK:
+  default:
+    return result;
+  }
+}
+
+int main(int argc, char **argv)
+{
+  if (argc<2 || argc >3)
+  {
+    printf("Usage %s <serial port> <Optional delay in milliseconds>\n", argv[0]);
+    return -1;
+  }
+
+  char *port_name = argv[1];
+  /* A pointer to a struct sp_port, which will refer to
+   * the port found. */
+  struct sp_port *port;
+  printf("Looking for port %s.\n", port_name);
+  /* Call sp_get_port_by_name() to find the port. The port
+   * pointer will be updated to refer to the port found. */
+  check(sp_get_port_by_name(port_name, &port));
+
+  /* Display some basic information about the port. */
+  printf("Port name: %s\n", sp_get_port_name(port));
+  printf("Description: %s\n", sp_get_port_description(port));
+
+  /* The port must be open to access its configuration. */
+  printf("Opening port.\n");
+  check(sp_open(port, SP_MODE_READ_WRITE));
+  check(sp_set_flowcontrol(port, SP_FLOWCONTROL_RTSCTS));
+  check(sp_flush(port, SP_BUF_BOTH));
+  // check(sp_set_rts(port, SP_RTS_OFF));
+  // check(sp_set_dtr(port, SP_DTR_OFF));
+
+  // Send magic sequence of DTR and RTS followed by the magic word "1EAF"
+  check(sp_set_rts(port, SP_RTS_OFF));
+  check(sp_set_dtr(port, SP_DTR_OFF));
+  check(sp_set_dtr(port, SP_DTR_ON));
+  Sleep(50);
+  check(sp_set_dtr(port, SP_DTR_OFF));
+  check(sp_set_rts(port, SP_RTS_ON));
+  check(sp_set_dtr(port, SP_DTR_ON));
+  Sleep(50);
+  check(sp_set_dtr(port, SP_DTR_OFF));
+  Sleep(50);
+  check(sp_blocking_write(port, "1EAF", 4, 1000));
+
+  /* Now clean up by closing the port and freeing structures. */
+  check(sp_close(port));
+  sp_free_port(port);
+  if (argc==3)
+  {
+    Sleep(atol(argv[2]));
+  }
+  return 0;
+}