Permalink
Browse files

Release 1.0.16

Feature - Full support for Raspberry Pi Foundation Sense HAT now built in
Feature - Added Scrot as an alternative to Raspi2PNG
Feature - Added support for Pimoroni Piano HAT, Explorer HAT (and Explorer HAT pro) and Microstack Accelerometer.
Improvement - User lists are now sorted alphabetically
Bugfix - Now catches when user hits escape on extra software menu
  • Loading branch information...
1 parent f50c9c7 commit 92e3be8499e8dc8fb9eda6a60ba1aaa85a4e823e @gbaman gbaman committed Aug 31, 2015
Showing with 18 additions and 7 deletions.
  1. +6 −1 Scripts/pinet-functions-python.py
  2. +12 −6 pinet
@@ -905,18 +905,23 @@ def installSoftwareList(holdOffInstall = False):
software.append(softwarePackage("BlueJ", "A Java IDE for developing programs quickly and easily", "script", ["rm -rf /tmp/bluej-314a.deb", "rm -rf /opt/ltsp/armhf/tmp/bluej-314a.deb", "wget http://bluej.org/download/files/bluej-314a.deb -O /tmp/bluej-314a.deb", "dpkg -i /tmp/bluej-314a.deb"]))
software.append(softwarePackage("Custom-package", "Allows you to enter the name of a package from Raspbian repository", "customApt", ["",]))
software.append(softwarePackage("Custom-python", "Allows you to enter the name of a Python library from pip.", "customPip", ["",]))
+ software.append(softwarePackage("Python-hardware", "Python libraries for a number of additional addon boards", "pip", ["pibrella skywriter unicornhat piglow pianohat explorerhat microstacknode"]))
softwareList = []
for i in software:
softwareList.append([i.name, i.description])
done = False
if (shutil.get_terminal_size()[0] < 105) or (shutil.get_terminal_size()[0] < 30):
print("\x1b[8;30;105t")
time.sleep(0.05)
- print("Resizing")
+ #print("Resizing")
while done == False:
whiptailBox("msgbox", "Additional Software", "In the next window you can select additional software you wish to install. Use space bar to select applications and hit enter when you are finished.", False)
result = (whiptailCheckList("Extra Software Submenu", "Select any software you want to install. Use space bar to select then enter to continue.", softwareList))
result = result.decode("utf-8")
+ try:
+ result = result.decode("utf-8")
+ except AttributeError:
+ return
result = result.replace('"', '')
if result != "Cancel":
if result == "":
View
@@ -3,7 +3,7 @@
#
# See LICENSE file for copyright and license details
-version=1.0.15
+version=1.0.16
#PiNet (Previously RaspberryPi-LTSP)
@@ -75,7 +75,6 @@ LegacyFixes() {
if [ "$exitcode" = "1" ]; then
UpdateConfig NBDBuildNeeded true
fi
- DisableI2C_SPI
if [ -f "/opt/ltsp/armhf/usr/bin/scratch.old" ]; then
echo "-------------------------------------------------------------------------------------------------"
@@ -666,7 +665,7 @@ ltsp-chroot --arch armhf apt-get install -y ssh locales less fbset sudo psmisc s
ltsp-chroot --arch armhf apt-get install -y python3-rpi.gpio python-rpi.gpio python-pip python3-pip python-picamera python3-picamera x2x wolfram-engine xserver-xorg-video-fbturbo netsurf-common netsurf-gtk rpi-update
ltsp-chroot --arch armhf apt-get install -y ftp libraspberrypi-bin python3-pifacecommon python3-pifacedigitalio python3-pifacedigital-scratch-handler python-pifacecommon python-pifacedigitalio i2c-tools man-db
ltsp-chroot --arch armhf apt-get install -y --no-install-recommends cifs-utils midori lxtask
-ltsp-chroot --arch armhf apt-get install -y minecraft-pi python-smbus dosfstools ruby iputils-ping
+ltsp-chroot --arch armhf apt-get install -y minecraft-pi python-smbus dosfstools ruby iputils-ping scrot
ltsp-chroot --arch armhf apt-get install -y gstreamer1.0-x gstreamer1.0-omx gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-libav
ltsp-chroot --arch armhf apt-get install --no-install-recommends -y epiphany-browser cgroup-bin
ltsp-chroot --arch armhf apt-get install -y -o Dpkg::Options::="--force-confnew" raspberrypi-net-mods
@@ -1113,6 +1112,7 @@ SelectUser(){
#Using some BASH/Whiptail magic, builds a list of users, formats it perfectly and hads it to whiptail
users=$(cut -d: -f1,3 /etc/passwd | egrep ':[0-9]{4}$' | cut -d: -f1 | awk -F':' '{ print $1"\na"}')
user=$(whiptail --title "Users" --menu "Select a user $1" 16 78 5 $users --noitem 3>&1 1>&2 2>&3)
+users=$(cut -d: -f1,3 /etc/passwd | egrep ':[0-9]{4}$' | cut -d: -f1 | sort | awk -F':' '{ print $1"\na"}')
if [ $? -eq 0 ]; then
echo $user
else
@@ -1937,14 +1937,20 @@ fi
}
DisableI2C_SPI(){
-#Disables I2C and SPI to allow pins to be used for other stuff
+#Disables both I2C and SPI to allow the pins to be used as general purpose IO
if [ ! -f /opt/ltsp/armhf/etc/modprobe.d/raspi-blacklist.conf ]; then
echo "blacklist spi-bcm2708
blacklist i2c-bcm2708 " > /opt/ltsp/armhf/etc/modprobe.d/raspi-blacklist.conf
UpdateConfig NBDBuildNeeded true
fi
}
+DisableSPI(){
+#Disables SPI (and enables I2C) to allow the SPI pins to be used as general purpose IO
+ echo "blacklist spi-bcm2708" > /opt/ltsp/armhf/etc/modprobe.d/raspi-blacklist.conf
+ UpdateConfig NBDBuildNeeded true
+}
+
InstallBlueJ(){
#Install BlueJ java IDE. Part of AddSoftware
rm -rf /tmp/bluej-314a.deb
@@ -2604,7 +2610,7 @@ FullInstall(){
#whiptail --title "Extra software" --msgbox "Select any additional software you want to use or use Install-Custom-software to install a specific package from the Raspbian apt repository if you know its name. To quit the menu, use the finished option. This menu can be later accessed from Install-Program from the main menu." 12 78
#ExtraSoftware #Runs ExtraSoftware menu to let the user select additional software they wish to install
$p installSoftwareFromFile
- DisableI2C_SPI
+ DisableSPI
SudoMenu #Asks the user if they wish to enable Sudo for the pupils
UpdateConfig NBD true
UpdateConfig NBDuse true
@@ -2686,7 +2692,7 @@ Rebuild-OS)
EnableNBDswap
whiptail --title "Extra software" --msgbox "Select any additional software you want to use or use Install-Custom-software to install a specific package from the Raspbian apt repository if you know its name. To quit the menu, use the cancel option. This menu can be later accessed from Install-Program from the main menu." 12 78
$p installSoftwareFromFile
- DisableI2C_SPI
+ DisableSPI
SudoMenu #Asks the user if they wish to enable Sudo for the pupils
UpdateSD
addSoundcardDefault

0 comments on commit 92e3be8

Please sign in to comment.