Freakin rabbit corrections

Rat-OS · Feb 13, 2025 · f6d3d2c · f6d3d2c
1 parent e090910
commit f6d3d2c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/configuration/boards/ldo-nitehawk-36/98-ldo-nitehawk-36.rules b/configuration/boards/ldo-nitehawk-36/98-ldo-nitehawk-36.rules
@@ -1,4 +1,4 @@
 # LDO Nitehawk 36
 SUBSYSTEMS=="usb", ATTRS{idProduct}=="614e",  ATTRS{idVendor}=="1d50", ATTRS{serial}=="ldo-nitehawk-36", ACTION=="add", SYMLINK+="ldo-nitehawk-36", RUN+="/home/pi/printer_data/config/RatOS/scripts/klipper-mcu-added.sh"
 
-ACTION=="remove", ENV{DEVLINKS}=="/dev/ldo-nitehawk-36"
+ACTION=="remove", ENV{DEVLINKS}=="/dev/ldo-nitehawk-36", RUN+="/home/pi/printer_data/config/RatOS/scripts/klipper-mcu-removed.sh"
diff --git a/configuration/boards/ldo-nitehawk-36/compile.sh b/configuration/boards/ldo-nitehawk-36/compile.sh
@@ -5,9 +5,9 @@ if [ "$EUID" -ne 0 ]
 fi
 cp -f /home/pi/printer_data/config/RatOS/boards/ldo-nitehawk-36/firmware.config /home/pi/klipper/.config
 pushd /home/pi/klipper || exit
-make olddefconfig
-make clean
-make
+make olddefconfig || exit 1
+make clean || exit 1
+make || exit 1
 
 if [ ! -d "/home/pi/printer_data/config/firmware_binaries" ]
 then

diff --git a/configuration/boards/ldo-nitehawk-36/firmware.config b/configuration/boards/ldo-nitehawk-36/firmware.config
@@ -39,8 +39,8 @@ CONFIG_RPXXXX_USB=y
 # CONFIG_RPXXXX_SERIAL_UART1_PINS_24_25 is not set
 # CONFIG_RPXXXX_CANBUS is not set
 # CONFIG_RPXXXX_USBCANBUS is not set
-CONFIG_RPXXXX_CANBUS_GPIO_RX=4
-CONFIG_RPXXXX_CANBUS_GPIO_TX=5
+# CONFIG_RPXXXX_CANBUS_GPIO_RX=4
+# CONFIG_RPXXXX_CANBUS_GPIO_TX=5
 CONFIG_USB=y
 CONFIG_USB_VENDOR_ID=0x1d50
 CONFIG_USB_DEVICE_ID=0x614e

diff --git a/configuration/boards/ldo-nitehawk-36/flash.sh b/configuration/boards/ldo-nitehawk-36/flash.sh
@@ -5,7 +5,6 @@ if [ "$EUID" -ne 0 ]
   exit
 fi
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
 FLASH_SCRIPT=$(realpath "$SCRIPT_DIR/../../scripts/flash-path.sh")
 if [ ! -f "$FLASH_SCRIPT" ]; then
   echo "ERROR: Flash script not found at $FLASH_SCRIPT"

diff --git a/configuration/boards/ldo-nitehawk-36/make-and-flash-mcu.sh b/configuration/boards/ldo-nitehawk-36/make-and-flash-mcu.sh
@@ -13,10 +13,16 @@ if [ $? -ne 0 ]; then
   exit 1
 fi
 
+"$SCRIPT_DIR"/compile.sh
+if [ $? -ne 0 ]; then
+  echo "ERROR: Compilation failed"
+  exit 1
+fi
+
 "$SCRIPT_DIR"/flash.sh
 if [ $? -ne 0 ]; then
   echo "ERROR: Flashing failed"
   exit 1
 fi
 
-echo "Successfully compiled and flashed firmware"
+echo "Successfully compiled and flashed firmware"
diff --git a/configuration/boards/ldo-nitehawk-36/toolboard-config.cfg b/configuration/boards/ldo-nitehawk-36/toolboard-config.cfg
@@ -13,6 +13,7 @@ aliases:
 	# accel
 	adxl345_cs_pin=gpio27, adxl345_miso=gpio19, adxl345_mosi=gpio20, adxl345_clk=gpio18,
 	# leveling
+	# BLTouch is not supported on this board
 	bltouch_sensor_pin=null, bltouch_control_pin=null,
 	probe_pin=gpio10,
 	# fans