From 5b8ce7fe071e8427eac6dd7283b509e46773e0e9 Mon Sep 17 00:00:00 2001 From: Sacha Weatherstone Date: Tue, 15 Mar 2022 17:30:55 +1100 Subject: [PATCH] Remove unused scripts --- bin/install-bootloader.sh | 37 ------------------- bin/install-eink.sh | 26 -------------- bin/lora32-openocd.cfg | 61 -------------------------------- bin/mqtt-listen.sh | 4 --- bin/mqtt-send-status.sh | 3 -- bin/nrf52-console.sh | 4 --- bin/nrf52832-gdbserver.sh | 3 -- bin/nrf52833-gdbserver.sh | 3 -- bin/nrf52840-gdbserver.sh | 3 -- bin/program-1.0-tbeam.sh | 5 --- bin/program-1.1-tbeam.sh | 3 -- bin/program-release-heltec.sh | 7 ---- bin/program-release-tbeam.sh | 9 ----- bin/program-release-universal.sh | 7 ---- bin/run-0-monitor.sh | 3 -- bin/run-1-monitor.sh | 3 -- bin/run-both-monitor.sh | 9 ----- bin/run-both.sh | 15 -------- bin/run-openocd.sh | 5 --- bin/start-terminal0.sh | 3 -- bin/start-terminal1.sh | 3 -- bin/upload-to-bootloader.sh | 10 ------ bin/upload-to-rak4631.sh | 7 ---- bin/upload-usb1.sh | 3 -- gdbinit | 19 ---------- 25 files changed, 255 deletions(-) delete mode 100755 bin/install-bootloader.sh delete mode 100755 bin/install-eink.sh delete mode 100644 bin/lora32-openocd.cfg delete mode 100755 bin/mqtt-listen.sh delete mode 100755 bin/mqtt-send-status.sh delete mode 100755 bin/nrf52-console.sh delete mode 100755 bin/nrf52832-gdbserver.sh delete mode 100755 bin/nrf52833-gdbserver.sh delete mode 100755 bin/nrf52840-gdbserver.sh delete mode 100755 bin/program-1.0-tbeam.sh delete mode 100755 bin/program-1.1-tbeam.sh delete mode 100755 bin/program-release-heltec.sh delete mode 100755 bin/program-release-tbeam.sh delete mode 100755 bin/program-release-universal.sh delete mode 100755 bin/run-0-monitor.sh delete mode 100755 bin/run-1-monitor.sh delete mode 100755 bin/run-both-monitor.sh delete mode 100755 bin/run-both.sh delete mode 100755 bin/run-openocd.sh delete mode 100755 bin/start-terminal0.sh delete mode 100755 bin/start-terminal1.sh delete mode 100755 bin/upload-to-bootloader.sh delete mode 100755 bin/upload-to-rak4631.sh delete mode 100755 bin/upload-usb1.sh delete mode 100644 gdbinit diff --git a/bin/install-bootloader.sh b/bin/install-bootloader.sh deleted file mode 100755 index 4d2568f2..00000000 --- a/bin/install-bootloader.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash - -# You probably don't want to use this script, it programs a custom bootloader build onto a nrf52 board - -set -e - -# dependencies -# apt install srecord - -BOOTDIR=/home/kevinh/development/meshtastic/Adafruit_nRF52_Bootloader -BOARD=othernet_ppr1 -BOOTVER=0.3.2 -BOOTNUM=128 -BOOTSHA=gc01b9ea -SDCODE=s113 -SDVER=7.2.0 -PROJ=ppr1 - -# FIXME for nRF52840 use 0xff000, for nRF52833 use 0x7f000 -BOOTSET=0x7f000 - -nrfjprog --eraseall -f nrf52 - -# this generates an intel hex file that can be programmed into a NRF52 to tell the adafruit bootloader that the current app image is valid -# Bootloader settings are at BOOTLOADER_SETTINGS (rw) : ORIGIN = 0xFF000, LENGTH = 0x1000 -# first 4 bytes should be 0x01 to indicate valid app image -# second 4 bytes should be 0x00 to indicate no CRC required for image -echo "01 00 00 00 00 00 00 00" | xxd -r -p - >/tmp/bootconf.bin -srec_cat /tmp/bootconf.bin -binary -offset $BOOTSET -output /tmp/bootconf.hex -intel - -echo Generating merged hex file from .pio/build/$PROJ/firmware.hex -mergehex -o ${BOARD}_full.hex -m $BOOTDIR/_build/build-$BOARD/${BOARD}_bootloader-$BOOTVER-$BOOTNUM-$BOOTSHA-dirty_${SDCODE}_$SDVER.hex .pio/build/$PROJ/firmware.hex /tmp/bootconf.hex - -echo Telling bootloader app region is valid and telling CPU to run -nrfjprog --program ${BOARD}_full.hex -f nrf52 --reset - -# nrfjprog --readuicr /tmp/uicr.hex; objdump -s /tmp/uicr.hex | less diff --git a/bin/install-eink.sh b/bin/install-eink.sh deleted file mode 100755 index a0b5bab7..00000000 --- a/bin/install-eink.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -# You probably don't want to use this script, it programs a custom bootloader build onto a nrf52 board - -set -e - -BOOTDIR=/home/kevinh/development/meshtastic/Adafruit_nRF52_Bootloader - -nrfjprog --eraseall -f nrf52 - -# to get tool run "sudo apt-get install srecord" - -# this generates an intel hex file that can be programmed into a NRF52 to tell the adafruit bootloader that the current app image is valid -# Bootloader settings are at BOOTLOADER_SETTINGS (rw) : ORIGIN = 0xFF000, LENGTH = 0x1000 -# first 4 bytes should be 0x01 to indicate valid app image -# second 4 bytes should be 0x00 to indicate no CRC required for image -echo "01 00 00 00 00 00 00 00" | xxd -r -p - >/tmp/bootconf.bin -srec_cat /tmp/bootconf.bin -binary -offset 0xff000 -output /tmp/bootconf.hex -intel - -echo Generating merged hex file -mergehex -m $BOOTDIR/_build/build-ttgo_eink/ttgo_eink_bootloader-0.3.2-213-gf67f592-dirty_s140_6.1.1.hex .pio/build/eink/firmware.hex /tmp/bootconf.hex -o ttgo_eink_full.hex - -echo Telling bootloader app region is valid and telling CPU to run -nrfjprog --program ttgo_eink_full.hex -f nrf52 --reset - -# nrfjprog --readuicr /tmp/uicr.hex; objdump -s /tmp/uicr.hex | less diff --git a/bin/lora32-openocd.cfg b/bin/lora32-openocd.cfg deleted file mode 100644 index 3d0297c4..00000000 --- a/bin/lora32-openocd.cfg +++ /dev/null @@ -1,61 +0,0 @@ -# Example OpenOCD configuration file for ESP-WROOM-32 module. -# By default, the following configuration is used: -# - dual core debugging -# - support for listing FreeRTOS tasks is enabled -# - OpenOCD is configured to set SPI flash voltage at 3.3V -# by keeping MTDI bootstrapping pin low -# -# Use variables listed below to customize this. -# Variables can be modified in this file or set on the command line. -# -# For example, OpenOCD can be started for single core ESP32 debugging on -# ESP-WROVER-KIT with ESP-WROOM-32 module as follows: -# -# openocd -f interface/ftdi/esp32_devkitj_v1.cfg -c 'set ESP32_ONLYCPU 1' -f board/esp-wroom-32.cfg -# -# If a different JTAG interface is used, change the first -f option. -# -# If OpenOCD is built from source, pass an additional -s option to specify -# the location of 'tcl' directory: -# -# src/openocd -s tcl -# -# Note: -# For ESP32-WROVER module use 'esp32-wrover.cfg' configuration file -# ESP-WROOM-32 and ESP32-WROVER have different flash voltage setting - - -# The ESP32 only supports JTAG. -transport select jtag - -# The speed of the JTAG interface, in KHz. If you get DSR/DIR errors (and they -# do not relate to OpenOCD trying to read from a memory range without physical -# memory being present there), you can try lowering this. -# -# On DevKit-J, this can go as high as 20MHz if CPU frequency is 80MHz, or 26MHz -# if CPU frequency is 160MHz or 240MHz. -adapter_khz 20000 - -# If single core debugging is required, uncomment the following line -# set ESP32_ONLYCPU 1 - -# To disable RTOS support, uncomment the following line -# set ESP32_RTOS none - -# Tell OpenOCD which SPI flash voltage is used by the board (3.3 or 1.8) -# The TDI pin of ESP32 is also a bootstrap pin that selects the voltage the SPI flash -# chip runs at. When a hard reset happens (e.g. because someone switches the board off -# and on) the ESP32 will use the current TDI value as the bootstrap value because the -# JTAG adapter overrides the pull-up or pull-down resistor that is supposed to do the -# bootstrapping. These lines basically set the idle value of the TDI line to a -# specified value, therefore reducing the chance of a bad bootup due to a bad flash -# voltage greatly. -# This option defaults to 3.3, if not set. To override the default, uncomment -# the following line: -# set ESP32_FLASH_VOLTAGE 1.8 - -# Set semihosting I/O base dir -# set ESP_SEMIHOST_BASEDIR "" - -# Source the ESP32 configuration file -source [find target/esp32.cfg] diff --git a/bin/mqtt-listen.sh b/bin/mqtt-listen.sh deleted file mode 100755 index 29c4e395..00000000 --- a/bin/mqtt-listen.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -mosquitto_sub -h mqtt.meshtastic.org -v -t \$SYS/\# -t msh/+/stat/\# -t msh/+/json/\# -# mosquitto_sub -h test.mosquitto.org -v -t mesh/\# -F "%j" diff --git a/bin/mqtt-send-status.sh b/bin/mqtt-send-status.sh deleted file mode 100755 index 04281975..00000000 --- a/bin/mqtt-send-status.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -mosquitto_pub -h mqtt.meshtastic.org -u meshdev -P large4cats -t msh/1/stat/FakeNode -m online -d diff --git a/bin/nrf52-console.sh b/bin/nrf52-console.sh deleted file mode 100755 index a25666e4..00000000 --- a/bin/nrf52-console.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# JLinkRTTViewer -JLinkRTTClient diff --git a/bin/nrf52832-gdbserver.sh b/bin/nrf52832-gdbserver.sh deleted file mode 100755 index 7ee12d8f..00000000 --- a/bin/nrf52832-gdbserver.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -JLinkGDBServerCLExe -if SWD -select USB -port 2331 -device NRF52832_XXAA diff --git a/bin/nrf52833-gdbserver.sh b/bin/nrf52833-gdbserver.sh deleted file mode 100755 index 117b7d85..00000000 --- a/bin/nrf52833-gdbserver.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -JLinkGDBServerCLExe -if SWD -select USB -port 2331 -device NRF52833_XXAA diff --git a/bin/nrf52840-gdbserver.sh b/bin/nrf52840-gdbserver.sh deleted file mode 100755 index 7aaea2df..00000000 --- a/bin/nrf52840-gdbserver.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -JLinkGDBServerCLExe -if SWD -select USB -port 2331 -device NRF52840_XXAA -SuppressInfoUpdateFW -DisableAutoUpdateFW -rtos GDBServer/RTOSPlugin_FreeRTOS diff --git a/bin/program-1.0-tbeam.sh b/bin/program-1.0-tbeam.sh deleted file mode 100755 index a5e25797..00000000 --- a/bin/program-1.0-tbeam.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -esptool.py --baud 921600 write_flash 0x10000 release/archive/old/firmware-tbeam-EU865-1.0.0.bin -echo "Erasing the otadata partition, which will turn off flash flippy-flop and force the first image to be used" -esptool.py --baud 921600 erase_region 0xe000 0x2000 diff --git a/bin/program-1.1-tbeam.sh b/bin/program-1.1-tbeam.sh deleted file mode 100755 index 31d7ce2e..00000000 --- a/bin/program-1.1-tbeam.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -esptool.py --baud 921600 write_flash 0x10000 release/archive/old/firmware-tbeam-1.1.50.bin diff --git a/bin/program-release-heltec.sh b/bin/program-release-heltec.sh deleted file mode 100755 index f88446b0..00000000 --- a/bin/program-release-heltec.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -set -e - -source bin/version.sh - -esptool.py --baud 921600 write_flash 0x10000 release/latest/bins/firmware-heltec-US-$VERSION.bin diff --git a/bin/program-release-tbeam.sh b/bin/program-release-tbeam.sh deleted file mode 100755 index 08e0a4e8..00000000 --- a/bin/program-release-tbeam.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -e - -VERSION=`bin/buildinfo.py` -FILENAME=release/latest/bins/universal/firmware-tbeam-$VERSION.bin - -echo Installing $FILENAME -esptool.py --baud 921600 write_flash 0x10000 $FILENAME diff --git a/bin/program-release-universal.sh b/bin/program-release-universal.sh deleted file mode 100755 index b2f3ae2c..00000000 --- a/bin/program-release-universal.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -set -e - -source bin/version.sh - -esptool.py --baud 921600 write_flash 0x10000 release/latest/bins/universal/firmware-tbeam-$VERSION.bin diff --git a/bin/run-0-monitor.sh b/bin/run-0-monitor.sh deleted file mode 100755 index 1ad23166..00000000 --- a/bin/run-0-monitor.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -pio run --upload-port /dev/ttyUSB0 -t upload -t monitor diff --git a/bin/run-1-monitor.sh b/bin/run-1-monitor.sh deleted file mode 100755 index 38d43c58..00000000 --- a/bin/run-1-monitor.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -pio run --upload-port /dev/ttyUSB1 -t upload -t monitor diff --git a/bin/run-both-monitor.sh b/bin/run-both-monitor.sh deleted file mode 100755 index 6703ce98..00000000 --- a/bin/run-both-monitor.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -e - -echo uploading to usb1 -pio run --upload-port /dev/ttyUSB1 -t upload - -echo uploading to usb0 -pio run --upload-port /dev/ttyUSB0 -t upload -t monitor diff --git a/bin/run-both.sh b/bin/run-both.sh deleted file mode 100755 index 2cb2e0bb..00000000 --- a/bin/run-both.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -set -e - -TARG=tbeam - -pio run -e $TARG - -echo uploading to usb1 -pio run --upload-port /dev/ttyUSB1 -t upload -e $TARG & - -echo uploading to usb0 -pio run --upload-port /dev/ttyUSB0 -t upload -e $TARG & - -wait diff --git a/bin/run-openocd.sh b/bin/run-openocd.sh deleted file mode 100755 index 3afed079..00000000 --- a/bin/run-openocd.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# /home/kevinh/.platformio/packages/tool-openocd-esp32/bin/openocd -s /home/kevinh/.platformio/packages/tool-openocd-esp32 -c gdb_port pipe; tcl_port disabled; telnet_port disabled -s /home/kevinh/.platformio/packages/tool-openocd-esp32/share/openocd/scripts -f interface/jlink.cfg -f board/esp-wroom-32.cfg -/home/kevinh/.platformio/packages/tool-openocd-esp32/bin/openocd -s /home/kevinh/.platformio/packages/tool-openocd-esp32 -s /home/kevinh/.platformio/packages/tool-openocd-esp32/share/openocd/scripts -f interface/jlink.cfg -f ./lora32-openocd.cfg - diff --git a/bin/start-terminal0.sh b/bin/start-terminal0.sh deleted file mode 100755 index 3cb40692..00000000 --- a/bin/start-terminal0.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -pio device monitor -b 921600 diff --git a/bin/start-terminal1.sh b/bin/start-terminal1.sh deleted file mode 100755 index ca59c809..00000000 --- a/bin/start-terminal1.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -pio device monitor -p /dev/ttyUSB1 -b 921600 diff --git a/bin/upload-to-bootloader.sh b/bin/upload-to-bootloader.sh deleted file mode 100755 index f48cc38b..00000000 --- a/bin/upload-to-bootloader.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -set -e - -echo "building for t-echo" -pio run --environment t-echo - -echo "Converting to uf2 for NRF52 Adafruit bootloader - double tap on the reset button to force bootloader entry" -bin/uf2conv.py .pio/build/t-echo/firmware.hex -f 0xADA52840 -cp flash.uf2 /media/kevinh/FTH*BOOT/ diff --git a/bin/upload-to-rak4631.sh b/bin/upload-to-rak4631.sh deleted file mode 100755 index 185fa559..00000000 --- a/bin/upload-to-rak4631.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -set -e - -echo "Converting to uf2 for NRF52 Adafruit bootloader" -bin/uf2conv.py .pio/build/rak4631/firmware.hex -f 0xADA52840 -cp flash.uf2 /media/kevinh/FTH*BOOT/ diff --git a/bin/upload-usb1.sh b/bin/upload-usb1.sh deleted file mode 100755 index 92cc051c..00000000 --- a/bin/upload-usb1.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -pio run --upload-port /dev/ttyUSB1 -t upload diff --git a/gdbinit b/gdbinit deleted file mode 100644 index 9950fac4..00000000 --- a/gdbinit +++ /dev/null @@ -1,19 +0,0 @@ - -# Setup Monitor Mode Debugging -# Per .platformio/packages/framework-arduinoadafruitnrf52-old/cores/nRF5/linker/nrf52840_s140_v6.ld -# our appload starts at 0x26000 -# Disable for now because our version on board doesn't support monitor mode debugging -# mon exec SetMonModeDebug=1 -# mon exec SetMonModeVTableAddr=0x26000 - -# echo setting RTTAddr -# eval "monitor exec SetRTTAddr %p", &_SEGGER_RTT - -# the jlink debugger seems to want a pause after reset before we tell it to start running -define restart - echo Restarting - monitor reset - shell sleep 1 - cont -end -