lift find_device_pid_vid to builder

4 years ago · fea85506ec
parent 20c371f14a
commit fea85506ec
2 changed files with 7 additions and 8 deletions
--- a/bin/kaleidoscope-builder
+++ b/bin/kaleidoscope-builder
@ -195,6 +195,13 @@ find_sketch () {
 }


+find_device_vid_pid() {
+    : ${VID:=$(get_arduino_pref 'build.vid')}
+    : ${SKETCH_PID:=$(get_arduino_pref 'build.pid')}
+    : ${BOOTLOADER_PID:=$(get_arduino_pref 'bootloader.pid')}
+    : ${BOOTLOADER_VID:=$(get_arduino_pref 'bootloader.vid')}
+}
+

 prompt_before_flashing () {
    flashing_instructions=$(get_arduino_pref 'build.flashing_instructions')
--- a/etc/kaleidoscope-builder.conf
+++ b/etc/kaleidoscope-builder.conf
@ -44,14 +44,6 @@ uname_S=$(uname -s 2>/dev/null || echo not)
 uname_O=$(uname -o 2>/dev/null || echo not)


-find_device_vid_pid() {
-    : ${VID:=$(get_arduino_pref 'build.vid')}
-    : ${SKETCH_PID:=$(get_arduino_pref 'build.pid')}
-    : ${BOOTLOADER_PID:=$(get_arduino_pref 'bootloader.pid')}
-    : ${BOOTLOADER_VID:=$(get_arduino_pref 'bootloader.vid')}
-}
-
-

 find_device_port() {
    find_device_vid_pid