소스 검색

Merge branch 'release' of https://tree.clementinecomputing.com/clementinecomputing/popufare into release

clementinecomputing 5 년 전
부모
커밋
c17ef418e8
2개의 변경된 파일41개의 추가작업 그리고 4개의 파일을 삭제
  1. 3 3
      Documentation/bill-of-materials/BillOfMaterials.md
  2. 38 1
      aux/deploy-busunit-interactive

+ 3 - 3
Documentation/bill-of-materials/BillOfMaterials.md

@@ -23,11 +23,11 @@ DIU Configuration 'Apple'
 | DC 12V 24V to DC 5V 10A 50W Converter Regulator | 1 | [Amazon](https://www.amazon.com/EPBOWPT-Converter-Regulator-Supply-Transformer/dp/B01M03288J) | $10.00 |
 | Buck Boost Converter DC 8V-40V to 12V 6A | 1 | [Amazon](https://www.amazon.com/Automatic-Converter-6A-Waterproof-Transformer/dp/B07WFMKMV9) | $23.00 |
 | TTL to RS232 Module | 1 | [Amazon](https://www.amazon.com/gp/product/B07BJJ3TZR/) | $8.00 |
-| RS232 to USB (FTDI) | 1 | [Amazon](https://www.amazon.com/DIYmall-Adapter-Chipset-Arduino-ESP8266) | $8.00 |
+| Arduino Nano | 1 | [Amazon](https://www.amazon.com/Arduino-Board-ATmega328P-Without-Compatible/dp/B07XVYBR9Y) | $1.50 |
 | Inline Fuse Holder | 1 | [Amazon](https://www.amazon.com/Nilight-NI-FH01-Automotive-Holder-10-Warranty/dp/B07426WCLM/) | $9.00 |
 | Fuse | 1 | [Amazon](https://www.amazon.com/EPAuto-AE-009-1-Pieces-Assorted-Standard/dp/B01DYQ5T3O/) | $10.00 |
-| FFC Micro B Male USB 90 Degree to USB A Male | 2 | [Amazon](https://www.amazon.com/gp/product/B077RKFXJT/) | $16.00 |
-| USB A Male to Micro B Male (Left Angle) | 1 | [Amazon](https://www.amazon.com/StarTech-com-Micro-USB-Cable-Angle/dp/B003YKX6W2) | $6.00 |
+| FFC Micro B Male USB 90 Degree to USB A Male (30cm to 40cm) | 2 | [Amazon](https://www.amazon.com/gp/product/B077RKFXJT/) | $16.00 |
+| USB A Male to Micro B Male (30cm) (Left Angle) | 1 | [Amazon](https://www.amazon.com/StarTech-com-Micro-USB-Cable-Angle/dp/B003YKX6W2) | $6.00 |
 | M3 Screw Set | 1 | [Amazon](https://www.amazon.com/XOOL-Assortment-Precise-Beautiful-Printed/dp/B072FKMYMF) | $11.00 |
 | M3 40mm + 6mm Brass Standoffs | 4 | [Amazon](https://www.amazon.com/gp/product/B01LOIKEWU) | $11.00 |
 | M3 Brass Standoff Set | 1 | [Amazon](https://www.amazon.com/HVAZI-210pcs-Standoff-Stainless-Assortment/dp/B01LW4A34E/) | $1 |

+ 38 - 1
aux/deploy-busunit-interactive

@@ -123,7 +123,7 @@ read adddeps
 
 if [[ "$adddeps" =~ ^[yY]?$ ]]; then
 
-  deps="espeak mplayer git ppp ppp-dev sox alsa-utils unclutter fbi xinput-calibrator ffmpeg jq matchbox-window-manager libi2c-dev socat "
+  deps="espeak mplayer git ppp ppp-dev sox alsa-utils unclutter fbi xinput-calibrator ffmpeg jq matchbox-window-manager libi2c-dev socat figlet vim "
 
   echo ""
   echo "  Installing: $deps"
@@ -261,6 +261,28 @@ sudo mkdir -p /home/bus/config/server
 
 echo ""
 
+##### i2c serial passthrough setup
+#####
+
+echo -n "Setup i2c-serial passthrough? [Y/n]: "
+read i2cpass
+
+if [[ "$i2cpass" =~ ^[yY]?$ ]] ; then
+
+  echo "  compiling and installing ichthyic-passthrough"
+  sudo bash -c " cd /home/bus/popufare/busunit/PIU/shim ; ./cmp.sh ; cp ./ichthyic-passthrough /home/bus/bin"
+
+  echo "  installing popufare_monitor script"
+  sudo bash -c " cp -f /home/bus/popufare/busunit/scripts/popufare_monitor /home/bus/bin/popufare_monitor"
+
+  echo "  enabling ichthyic (touch /home/bus/config/popufare.ichthyic)"
+  sudo bash -c " touch /home/bus/config/popufare.ichthyic ; chown bus:bus /home/bus/config/popufare.ichthyic"
+
+  echo "  setting root crontab to call popufare_monitor (using $repolocation/busunit/scripts/crontab.root)"
+  sudo bash -c " crontab $repolocation/busunit/scripts/crontab.root "
+
+fi
+
 ##### paddle setup
 #####
 
@@ -628,6 +650,21 @@ fi
 
 echo ""
 
+##### setup pi user welcome
+#####
+
+echo -n "Setup pi ser 'welcome' text splash screen? [Y/n]: "
+read textsplash 
+
+if [[ "$textsplash" =~ ^[yY]?$ ]] ; then
+
+  sudo mkdir -p /home/pi/bin
+  sudo cp /home/bus/popufare/busunit/scripts/welcome_to_popufare.sh /home/pi/bin/welcome_to_popufare.sh
+  sudo chown -R pi:pi /home/pi/bin
+  sudo echo "/home/pi/bin/welcome_to_popufare.sh" >> /home/pi/.bashrc
+
+fi
+
 
 ##### setup legacy data directories
 #####