alpha
/
Kaleidoscope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kaleidoscope-builder: Remove extraneous whitespace

Browse Source 
Drop a bunch of empty lines, trailing spaces, and similar things.

Signed-off-by: Gergely Nagy <algernon@keyboard.io>
pull/264/head
Gergely Nagy 7 years ago
parent 7a423ced8b
commit a2cee84455
3 changed files with 31 additions and 64 deletions
Show Stats Download Patch File Download Diff File

11
bin/find-device-port-linux-udev
Unescape View File

@ -21,13 +21,10 @@ for my $path (@paths) {
($devices{$path}{'ID_MODEL_ID'} == $pid) ) { ($devices{$path}{'ID_MODEL_ID'} == $pid) ) {
if ($devices{$path}{'ID_MM_CANDIDATE'}) { if ($devices{$path}{'ID_MM_CANDIDATE'}) {
warn "Yikes. ModemManager wants to pwn your keyboard"; warn "Yikes. ModemManager wants to pwn your keyboard";
} }
print $devices{$path}{DEVNAME}; print $devices{$path}{DEVNAME};
exit(0); exit(0);
} }
} }

22
bin/kaleidoscope-builder
Unescape View File

@ -2,7 +2,6 @@
set -e set -e
###### ######
###### Build and output configuration ###### Build and output configuration
###### ######
@ -23,17 +22,13 @@ build_filenames () {
ELF_FILE_PATH="${OUTPUT_PATH}/${OUTPUT_FILE_PREFIX}.elf" ELF_FILE_PATH="${OUTPUT_PATH}/${OUTPUT_FILE_PREFIX}.elf"
} }
firmware_size () { firmware_size () {
if [ "${BOARD}" = "virtual" ]; then if [ "${BOARD}" = "virtual" ]; then
echo "[Size not computed for virtual build]" echo "[Size not computed for virtual build]"
return return
fi fi
## This is a terrible hack, please don't hurt me. - algernon ## This is a terrible hack, please don't hurt me. - algernon
MAX_PROG_SIZE=28672 MAX_PROG_SIZE=28672
@ -81,13 +76,11 @@ flash () {
sleep 3s sleep 3s
find_bootloader_ports find_bootloader_ports
flash_over_usb || flash_over_usb flash_over_usb || flash_over_usb
} }
flash_over_usb () { flash_over_usb () {
sleep 1s sleep 1s
${AVRDUDE} -q -q -C ${AVRDUDE_CONF} -p${MCU} -cavr109 -D -P ${DEVICE_PORT_BOOTLOADER} -b57600 "-Uflash:w:${HEX_FILE_PATH}:i" ${AVRDUDE} -q -q -C ${AVRDUDE_CONF} -p${MCU} -cavr109 -D -P ${DEVICE_PORT_BOOTLOADER} -b57600 "-Uflash:w:${HEX_FILE_PATH}:i"
} }
flash_from_bootloader() { flash_from_bootloader() {
@ -96,14 +89,12 @@ flash_from_bootloader() {
flash_over_usb || flash_over_usb flash_over_usb || flash_over_usb
} }
program() { program() {
prepare_to_flash prepare_to_flash
flash_with_programmer flash_with_programmer
} }
flash_with_programmer() { flash_with_programmer() {
${AVRDUDE} -v \ ${AVRDUDE} -v \
-C ${AVRDUDE_CONF} \ -C ${AVRDUDE_CONF} \
-p${MCU} \ -p${MCU} \
@ -152,7 +143,7 @@ compile () {
ARDUINO_PACKAGES="" ARDUINO_PACKAGES=""
if [ -d ${ARDUINO_PACKAGE_PATH} ]; then if [ -d ${ARDUINO_PACKAGE_PATH} ]; then
ARDUINO_PACKAGES="-hardware \"${ARDUINO_PACKAGE_PATH}\"" ARDUINO_PACKAGES="-hardware \"${ARDUINO_PACKAGE_PATH}\""
fi fi
${ARDUINO_BUILDER} \ ${ARDUINO_BUILDER} \
@ -238,9 +229,9 @@ clean () {
} }
reset_device() { reset_device() {
find_device_port find_device_port
check_device_port check_device_port
reset_device_cmd reset_device_cmd
} }
check_device_port () { check_device_port () {
@ -254,7 +245,6 @@ check_device_port () {
fi fi
} }
usage () { usage () {
cat <<EOF cat <<EOF
Usage: $0 SKETCH commands... Usage: $0 SKETCH commands...
@ -327,7 +317,6 @@ if [ -e "${SOURCEDIR}/kaleidoscope-builder.conf" ]; then
. "${SOURCEDIR}/kaleidoscope-builder.conf" . "${SOURCEDIR}/kaleidoscope-builder.conf"
fi fi
. ${ROOT}/etc/kaleidoscope-builder.conf . ${ROOT}/etc/kaleidoscope-builder.conf
if [ ! -z "${VERBOSE}" ] && [ "${VERBOSE}" -gt 0 ]; then if [ ! -z "${VERBOSE}" ] && [ "${VERBOSE}" -gt 0 ]; then
@ -336,7 +325,6 @@ else
ARDUINO_VERBOSE="-quiet" ARDUINO_VERBOSE="-quiet"
fi fi
cmds="" cmds=""
## Export vars ## Export vars

56
etc/kaleidoscope-builder.conf
Unescape View File

@ -4,8 +4,6 @@
SKETCH="${SKETCH:-${DEFAULT_SKETCH}}" SKETCH="${SKETCH:-${DEFAULT_SKETCH}}"
LIBRARY="${LIBRARY:-${SKETCH}}" LIBRARY="${LIBRARY:-${SKETCH}}"
######## ########
######## Keyboard hardware definitions ######## Keyboard hardware definitions
######## ########
@ -18,12 +16,10 @@ else
FQBN="${FQBN:-keyboardio:avr:${BOARD}}" FQBN="${FQBN:-keyboardio:avr:${BOARD}}"
fi fi
######## ########
######## Host OS specific commands ######## Host OS specific commands
######## ########
## Platform-specific overrides ## Platform-specific overrides
# Shamelessly stolen from git's Makefile # Shamelessly stolen from git's Makefile
uname_S=$(uname -s 2>/dev/null || echo not) uname_S=$(uname -s 2>/dev/null || echo not)
@ -48,55 +44,46 @@ find_device_port() {
DEVICE_PORT="$(perl ${DEVICE_PORT_PROBER} ${VID} ${SKETCH_PID})" DEVICE_PORT="$(perl ${DEVICE_PORT_PROBER} ${VID} ${SKETCH_PID})"
} }
reset_device_cmd() { reset_device_cmd() {
stty -F ${DEVICE_PORT} 1200 hupcl stty -F ${DEVICE_PORT} 1200 hupcl
} }
MD5="md5sum"
find_bootloader_ports() { find_bootloader_ports() {
find_device_vid_pid find_device_vid_pid
DIR=$(dirname "$(readlink -f "$0")") DIR=$(dirname "$(readlink -f "$0")")
DEVICE_PORT_PROBER="${DIR}/find-device-port-linux-udev" DEVICE_PORT_PROBER="${DIR}/find-device-port-linux-udev"
DEVICE_PORT_BOOTLOADER="$(perl ${DEVICE_PORT_PROBER} ${VID} ${BOOTLOADER_PID})" DEVICE_PORT_BOOTLOADER="$(perl ${DEVICE_PORT_PROBER} ${VID} ${BOOTLOADER_PID})"
} }
MD5="md5sum"
if [ "${uname_S}" = "Darwin" ]; then if [ "${uname_S}" = "Darwin" ]; then
find_device_port() { find_device_port() {
DEVICE_PORT="$(ls /dev/cu.usbmodemkbio* 2> /dev/null || echo '')" DEVICE_PORT="$(ls /dev/cu.usbmodemkbio* 2> /dev/null || echo '')"
DEVICE_PORT="${DEVICE_PORT:-$(ls /dev/cu.usbmodemCkbio* 2> /dev/null || echo '')}" DEVICE_PORT="${DEVICE_PORT:-$(ls /dev/cu.usbmodemCkbio* 2> /dev/null || echo '')}"
DEVICE_PORT="${DEVICE_PORT:-$(ls /dev/cu.usbmodemHID* 2> /dev/null || echo '')}" DEVICE_PORT="${DEVICE_PORT:-$(ls /dev/cu.usbmodemHID* 2> /dev/null || echo '')}"
DEVICE_PORT="${DEVICE_PORT:-$(ls /dev/cu.usbmodemCHID* 2> /dev/null || echo '')}" DEVICE_PORT="${DEVICE_PORT:-$(ls /dev/cu.usbmodemCHID* 2> /dev/null || echo '')}"
DEVICE_PORT="${DEVICE_PORT:-$(ls /dev/cu.usbmodem14* 2> /dev/null || echo '')}" DEVICE_PORT="${DEVICE_PORT:-$(ls /dev/cu.usbmodem14* 2> /dev/null || echo '')}"
} }
reset_device_cmd() {
/bin/stty -f ${DEVICE_PORT} 1200
}
reset_device_cmd() {
/bin/stty -f ${DEVICE_PORT} 1200
}
ARDUINO_PATH="${ARDUINO_PATH:-/Applications/Arduino.app/Contents/Java/}" ARDUINO_PATH="${ARDUINO_PATH:-/Applications/Arduino.app/Contents/Java/}"
ARDUINO_PACKAGE_PATH="${ARDUINO_PACKAGE_PATH:-${HOME}/Library/Arduino15/packages}" ARDUINO_PACKAGE_PATH="${ARDUINO_PACKAGE_PATH:-${HOME}/Library/Arduino15/packages}"
ARDUINO_LOCAL_LIB_PATH="${ARDUINO_LOCAL_LIB_PATH:-${HOME}/Documents/Arduino}" ARDUINO_LOCAL_LIB_PATH="${ARDUINO_LOCAL_LIB_PATH:-${HOME}/Documents/Arduino}"
MD5="md5" MD5="md5"
find_bootloader_ports() { find_bootloader_ports() {
DEVICE_PORT_BOOTLOADER="$(ls /dev/cu.usbmodemkbio* 2> /dev/null || echo '')" DEVICE_PORT_BOOTLOADER="$(ls /dev/cu.usbmodemkbio* 2> /dev/null || echo '')"
DEVICE_PORT_BOOTLOADER="${DEVICE_PORT_BOOTLOADER:-$(ls /dev/cu.usbmodem14* 2> /dev/null || echo '')}" DEVICE_PORT_BOOTLOADER="${DEVICE_PORT_BOOTLOADER:-$(ls /dev/cu.usbmodem14* 2> /dev/null || echo '')}"
} }
fi fi
###### ######
###### Arduino tools configuration ###### Arduino tools configuration
###### ######
@ -119,17 +106,13 @@ AVR_OBJDUMP="${AVR_OBJDUMP:-${ARDUINO_TOOLS_PATH}/avr/bin/avr-objdump}"
AVRDUDE="${AVRDUDE:-${ARDUINO_TOOLS_PATH}/avr/bin/avrdude}" AVRDUDE="${AVRDUDE:-${ARDUINO_TOOLS_PATH}/avr/bin/avrdude}"
AVRDUDE_CONF="${AVRDUDE_CONF:-${ARDUINO_TOOLS_PATH}/avr/etc/avrdude.conf}" AVRDUDE_CONF="${AVRDUDE_CONF:-${ARDUINO_TOOLS_PATH}/avr/etc/avrdude.conf}"
###### ######
###### Source files and dependencies ###### Source files and dependencies
###### ######
BOARD_HARDWARE_PATH="${BOARD_HARDWARE_PATH:-${ARDUINO_LOCAL_LIB_PATH}/hardware}" BOARD_HARDWARE_PATH="${BOARD_HARDWARE_PATH:-${ARDUINO_LOCAL_LIB_PATH}/hardware}"
BOOTLOADER_PATH="${BOOTLOADER_PATH:-${BOARD_HARDWARE_PATH}/keyboardio/avr/bootloaders/caterina/Caterina.hex}" BOOTLOADER_PATH="${BOOTLOADER_PATH:-${BOARD_HARDWARE_PATH}/keyboardio/avr/bootloaders/caterina/Caterina.hex}"
if [ ! -z "${ARDUINO_TOOLS_PATH}" ]; then if [ ! -z "${ARDUINO_TOOLS_PATH}" ]; then
ARDUINO_TOOLS_PARAM="-tools ${ARDUINO_TOOLS_PATH}" ARDUINO_TOOLS_PARAM="-tools ${ARDUINO_TOOLS_PATH}"
fi fi
@ -137,4 +120,3 @@ fi
if [ ! -z "${AVR_GCC_PREFIX}" ]; then if [ ! -z "${AVR_GCC_PREFIX}" ]; then
ARDUINO_AVR_GCC_PREFIX_PARAM="-prefs \"runtime.tools.avr-gcc.path=${AVR_GCC_PREFIX}\"" ARDUINO_AVR_GCC_PREFIX_PARAM="-prefs \"runtime.tools.avr-gcc.path=${AVR_GCC_PREFIX}\""
fi fi

Write Preview
Loading…
Cancel
Save