stm32duino · fpistm · May 3, 2019 · Apr 24, 2019 · Apr 26, 2019
diff --git a/linux/49-stlinkv1.rules b/linux/49-stlinkv1.rules
diff --git a/linux/49-stlinkv2-1.rules b/linux/49-stlinkv2-1.rules
diff --git a/linux/49-stlinkv2.rules b/linux/49-stlinkv2.rules
diff --git a/linux/install.sh b/linux/install.sh
@@ -5,15 +5,6 @@ if sudo [ -w /etc/udev/rules.d ]; then
     sudo cp -v 45-maple.rules /etc/udev/rules.d/45-maple.rules
     sudo chown root:root /etc/udev/rules.d/45-maple.rules
     sudo chmod 644 /etc/udev/rules.d/45-maple.rules
-    sudo cp -v 49-stlinkv1.rules /etc/udev/rules.d/49-stlinkv1.rules
-    sudo chown root:root /etc/udev/rules.d/49-stlinkv1.rules
-    sudo chmod 644 /etc/udev/rules.d/49-stlinkv1.rules
-    sudo cp -v 49-stlinkv2.rules /etc/udev/rules.d/49-stlinkv2.rules
-    sudo chown root:root /etc/udev/rules.d/49-stlinkv2.rules
-    sudo chmod 644 /etc/udev/rules.d/49-stlinkv2.rules
-    sudo cp -v 49-stlinkv2-1.rules /etc/udev/rules.d/49-stlinkv2-1.rules
-    sudo chown root:root /etc/udev/rules.d/49-stlinkv2-1.rules
-    sudo chmod 644 /etc/udev/rules.d/49-stlinkv2-1.rules
     echo "Reloading udev rules"
     sudo udevadm control --reload-rules
     echo "Adding current user to dialout group"

diff --git a/linux/readme.txt b/linux/readme.txt
diff --git a/linux/serial_upload b/linux/serial_upload
diff --git a/linux/stlink/lib/libstlink.a b/linux/stlink/lib/libstlink.a
diff --git a/linux/stlink/lib/libstlink.so b/linux/stlink/lib/libstlink.so
diff --git a/linux/stlink/lib/libstlink.so.1 b/linux/stlink/lib/libstlink.so.1
diff --git a/linux/stlink/lib/libstlink.so.1.5.1 b/linux/stlink/lib/libstlink.so.1.5.1
diff --git a/linux/stlink/st-flash b/linux/stlink/st-flash
diff --git a/linux/stlink/st-info b/linux/stlink/st-info
diff --git a/linux/stlink/st-util b/linux/stlink/st-util
diff --git a/linux/stlink_upload b/linux/stlink_upload
diff --git a/linux/stm32CubeProg.sh b/linux/stm32CubeProg.sh
@@ -0,0 +1,94 @@
+#!/bin/bash
+set -o nounset                              # Treat unset variables as an error
+#set -x
+STM32CP_CLI=STM32_Programmer.sh
+ADDRESS=0x8000000
+FILEPATH=
+MODE=
+PORT=
+OPTS=
+
+###############################################################################
+## Help function
+usage()
+{
+  echo "############################################################"
+  echo "##"
+  echo "## `basename $0` <protocol> <file_path> [OPTIONS]"
+  echo "##"
+  echo "## protocol: "
+  echo "##   0: SWD"
+  echo "##   1: Serial "
+  echo "##   2: DFU"
+  echo "## file_path: file path name to be downloaded: (bin, hex)"
+  echo "## Options:"
+  echo "##   For SWD: -rst"
+  echo "##     -rst: Reset system (default)"
+  echo "##   For Serial: <com_port> -s"
+  echo "##     com_port: serial identifier. Ex: /dev/ttyS0"
+  echo "##     -s: start automatically"
+  echo "##   For DFU: none"
+  echo "############################################################"
+  exit $1
+}
+
+
+check_tool() {
+  command -v $STM32CP_CLI >/dev/null 2>&1
+  if [ $? != 0 ]; then
+    export PATH="$HOME/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin":$PATH
+  fi
+  command -v $STM32CP_CLI >/dev/null 2>&1
+  if [ $? != 0 ]; then
+    echo "$STM32CP_CLI not found."
+    echo "Please install it or add '<STM32CubeProgrammer path>/bin' to your PATH environment:"
+    echo "https://www.st.com/en/development-tools/stm32cubeprog.html"
+    echo "Aborting!"
+    exit 1
+  fi
+}
+
+check_tool
+
+if [ $# -lt 2 ]; then
+    echo "Not enough arguments!"
+    usage 2
+fi
+
+FILEPATH=$2
+
+# Parse options
+# Protocol $1
+# 0: SWD
+# 1: Serial
+# 2: DFU
+case $1 in
+  0)
+    PORT='SWD'
+    MODE='mode=UR'
+    if [ $# -lt 3 ]; then
+      OPTS=-rst
+    else
+      OPTS=$3
+    fi;;
+  1)
+    if [ $# -lt 3 ]; then
+      usage 3
+    else
+      PORT=$3
+      if [ $# -gt 3 ]; then
+        shift 3
+        OPTS="$@"
+      fi
+    fi;;
+  2)
+    PORT='USB1';;
+  *)
+    echo "Protocol unknown!"
+    usage 4;;
+esac
+
+${STM32CP_CLI} -c port=${PORT} ${MODE} -q -d ${FILEPATH} ${ADDRESS} ${OPTS}
+
+exit 0
+
diff --git a/linux/stm32flash/stm32flash b/linux/stm32flash/stm32flash
diff --git a/linux64/49-stlinkv1.rules b/linux64/49-stlinkv1.rules
diff --git a/linux64/49-stlinkv2-1.rules b/linux64/49-stlinkv2-1.rules
diff --git a/linux64/49-stlinkv2.rules b/linux64/49-stlinkv2.rules
diff --git a/linux64/install.sh b/linux64/install.sh
@@ -5,15 +5,6 @@ if sudo [ -w /etc/udev/rules.d ]; then
     sudo cp -v 45-maple.rules /etc/udev/rules.d/45-maple.rules
     sudo chown root:root /etc/udev/rules.d/45-maple.rules
     sudo chmod 644 /etc/udev/rules.d/45-maple.rules
-    sudo cp -v 49-stlinkv1.rules /etc/udev/rules.d/49-stlinkv1.rules
-    sudo chown root:root /etc/udev/rules.d/49-stlinkv1.rules
-    sudo chmod 644 /etc/udev/rules.d/49-stlinkv1.rules
-    sudo cp -v 49-stlinkv2.rules /etc/udev/rules.d/49-stlinkv2.rules
-    sudo chown root:root /etc/udev/rules.d/49-stlinkv2.rules
-    sudo chmod 644 /etc/udev/rules.d/49-stlinkv2.rules
-    sudo cp -v 49-stlinkv2-1.rules /etc/udev/rules.d/49-stlinkv2-1.rules
-    sudo chown root:root /etc/udev/rules.d/49-stlinkv2-1.rules
-    sudo chmod 644 /etc/udev/rules.d/49-stlinkv2-1.rules
     echo "Reloading udev rules"
     sudo udevadm control --reload-rules
     echo "Adding current user to dialout group"

diff --git a/linux64/readme.txt b/linux64/readme.txt
diff --git a/linux64/serial_upload b/linux64/serial_upload
diff --git a/linux64/stlink/lib/libstlink.a b/linux64/stlink/lib/libstlink.a
diff --git a/linux64/stlink/lib/libstlink.so b/linux64/stlink/lib/libstlink.so
diff --git a/linux64/stlink/lib/libstlink.so.1 b/linux64/stlink/lib/libstlink.so.1
diff --git a/linux64/stlink/lib/libstlink.so.1.5.1 b/linux64/stlink/lib/libstlink.so.1.5.1
diff --git a/linux64/stlink/st-flash b/linux64/stlink/st-flash
diff --git a/linux64/stlink/st-info b/linux64/stlink/st-info
diff --git a/linux64/stlink/st-util b/linux64/stlink/st-util
diff --git a/linux64/stlink_upload b/linux64/stlink_upload
diff --git a/linux64/stm32flash/stm32flash b/linux64/stm32flash/stm32flash
diff --git a/macosx/serial_upload b/macosx/serial_upload
diff --git a/macosx/stlink/lib/libstlink.1.5.1.dylib b/macosx/stlink/lib/libstlink.1.5.1.dylib
diff --git a/macosx/stlink/lib/libstlink.1.dylib b/macosx/stlink/lib/libstlink.1.dylib
diff --git a/macosx/stlink/lib/libstlink.a b/macosx/stlink/lib/libstlink.a
diff --git a/macosx/stlink/lib/libstlink.dylib b/macosx/stlink/lib/libstlink.dylib
diff --git a/macosx/stlink/st-flash b/macosx/stlink/st-flash
diff --git a/macosx/stlink/st-info b/macosx/stlink/st-info
diff --git a/macosx/stlink/st-util b/macosx/stlink/st-util
diff --git a/macosx/stlink_upload b/macosx/stlink_upload