Merge pull request #39 from xmos/feature/support_xvf3600

Add support for xvf3600 and remove references to xvf3610 in README

CHANGELOG.md

@@ -1,5 +1,9 @@
 # VocalFusion AVS Setup Change Log
 
+## 2.2.0
+
+ * Support for all xvf3600 master and slave products
+
 ## 2.1.1
 
  * Changes to README.md to emphasize the necessity of not updating the kernel.

README.md

@@ -2,7 +2,7 @@
 
 This repository provides a simple-to-use automated script to install the Amazon AVS SDK on a Raspberry Pi and configure the Raspberry Pi to use the appropriate **xCORE VocalFusion Kit for Amazon AVS**.
 
-The XMOS **xCORE VocalFusion Kit for Amazon AVS** provides far-field voice capture using one of the XMOS XVF3000, XVF3100, XVF3500, XVF3510 or XVF3610 voice processors.
+The XMOS **xCORE VocalFusion Kit for Amazon AVS** provides far-field voice capture using one of the XMOS XVF3000, XVF3100, XVF3500 or XVF3510 voice processors.
 
 Combined with a Raspberry Pi running the Amazon Alexa Voice Service (AVS) Software Development Kit (SDK), these kits allow you to quickly prototype and evaluate talking with Alexa.
 
@@ -27,7 +27,7 @@ You will need:
 - MicroSD card (min. 16GB)
 - Powered speakers with audio 3.5mm analogue plug
 
- Stereo for the XVF3610, XVF3510 and XVF3500, or 
+ Stereo for the XVF3510 and XVF3500, or 
  Mono for the XVF3100 and XVF3000
 
 - Monitor with HDMI input
@@ -106,7 +106,6 @@ When the Raspberry Pi boots up, give these answers to the following questions:
 
  And then either
 
- XVF3610: ```./auto_install.sh xvf3610``` 
  XVF3510: ```./auto_install.sh xvf3510``` 
  XVF3500: ```./auto_install.sh xvf3500``` 
  XVF3100: ```./auto_install.sh xvf3100``` 

auto_install.sh

@@ -7,12 +7,12 @@ RPI_SETUP_REPO=vocalfusion-rpi-setup
 RPI_SETUP_DIR=$SETUP_DIR/$RPI_SETUP_REPO
 RPI_SETUP_SCRIPT=$RPI_SETUP_DIR/setup.sh
 
-RPI_SETUP_TAG="v4.1.0"
+RPI_SETUP_TAG="v4.2.0"
 AVS_DEVICE_SDK_TAG="v1.21.0"
 AVS_SCRIPT="setup.sh"
 
 # Valid values for XMOS device
-VALID_XMOS_DEVICES="xvf3100 xvf3500 xvf3510 xvf3610"
+VALID_XMOS_DEVICES="xvf3100 xvf3500 xvf3510 xvf3600-slave xvf3600-master xvf3610"
 XMOS_DEVICE=
 
 # Default device serial number if nothing is specified
@@ -128,6 +128,11 @@ git clone -b $RPI_SETUP_TAG https://github.com/xmos/$RPI_SETUP_REPO.git
 echo "Installing VocalFusion ${XMOS_DEVICE:3} Raspberry Pi Setup..."
 if $RPI_SETUP_SCRIPT $XMOS_DEVICE; then
 
+ # The line below is needed to avoid the error:
+ # E: Repository 'http://raspbian.raspberrypi.org/raspbian buster InRelease' changed its 'Suite' value from 'testing' to 'stable'
+ # N: This must be accepted explicitly before updates for this repository can be applied. See apt-secure(8) manpage for details.
+ sudo apt update --allow-releaseinfo-change
+
  echo "Installing Amazon AVS SDK..."
  wget -O $AVS_SCRIPT https://raw.githubusercontent.com/xmos/avs-device-sdk/$AVS_DEVICE_SDK_TAG/tools/Install/$AVS_SCRIPT
  wget -O pi.sh https://raw.githubusercontent.com/xmos/avs-device-sdk/$AVS_DEVICE_SDK_TAG/tools/Install/pi.sh