From ea0abc88332830e363c45f172000656376ad5249 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Thu, 15 Oct 2020 20:21:48 -0700 Subject: [PATCH] inline a single-use cunction --- bin/kaleidoscope-builder | 3 ++- etc/kaleidoscope-builder.conf | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder index 868f51fb..19c16a60 100755 --- a/bin/kaleidoscope-builder +++ b/bin/kaleidoscope-builder @@ -108,9 +108,10 @@ firmware_size () { return fi + MAX_PROG_SIZE=${MAX_PROG_SIZE:-$(get_arduino_pref 'upload.maximum_size')} + ## This is a terrible hack, please don't hurt me. - algernon - find_max_prog_size set +e raw_output=$("$@" 2> /dev/null) rc=$? diff --git a/etc/kaleidoscope-builder.conf b/etc/kaleidoscope-builder.conf index e63278e8..36fda7a7 100644 --- a/etc/kaleidoscope-builder.conf +++ b/etc/kaleidoscope-builder.conf @@ -44,11 +44,6 @@ uname_S=$(uname -s 2>/dev/null || echo not) uname_O=$(uname -o 2>/dev/null || echo not) -find_max_prog_size() { - MAX_PROG_SIZE=${MAX_PROG_SIZE:-$(get_arduino_pref 'upload.maximum_size')} - -} - find_device_vid_pid() { VID=${VID:-$(get_arduino_pref 'build.vid')} SKETCH_PID=${SKETCH_PID:-$(get_arduino_pref 'build.pid')}