diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e58e6c..d053763 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,7 +76,7 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "IoT guitar effect for Raspberry Pi") set(CPACK_DEBIAN_PACKAGE_SECTION sound) set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) set(CPACK_DEBIAN_PACKAGE_CONTROL_STRICT_PERMISSION TRUE) -set(CPACK_DEBIAN_PACKAGE_DEPENDS "jackd2") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "jackd2, hostapd, dnsmasq" ) #set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "arm64") set(CPACK_PACKAGING_INSTALL_PREFIX /usr) set(CPACK_PROJECT_NAME ${PROJECT_NAME}) diff --git a/README.md b/README.md index a5c2cec..cbe8428 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ PiPedal provides a pre-installed selection of LV2 plugins from the ToobAmp colle If your USB audio adapter has midi connectors, you can use midi devices (keyboards or midi floor boards) to control PiPedal while performing. A simple interface allows you to select how you would like to bind PiPedal controls to midi messages. + diff --git a/docs/_includes/gallery.html b/docs/_includes/gallery.html index ab2028e..9eea5b7 100644 --- a/docs/_includes/gallery.html +++ b/docs/_includes/gallery.html @@ -2,12 +2,14 @@ { let images = [ + "rig.jpg", "jazz.png", "thunder.png", "midi-bindings.png", "hotspot.png" ]; let captions = [ + "\u00A0", "PiPedal web interface.", "Flexible effect routing.", "Bind controls to midi messages.", diff --git a/docs/_includes/header.html b/docs/_includes/header.html index 328b05f..897e16e 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -23,7 +23,7 @@ height: 54px; } -
+
{%- assign default_paths = site.pages | map: "path" -%} diff --git a/docs/banner-bg.jpg b/docs/banner-bg.jpg new file mode 100644 index 0000000..97e99d6 Binary files /dev/null and b/docs/banner-bg.jpg differ diff --git a/docs/gallery/rig.jpg b/docs/gallery/rig.jpg new file mode 100644 index 0000000..5149dcd Binary files /dev/null and b/docs/gallery/rig.jpg differ diff --git a/docs/index.md b/docs/index.md index 3d384d1..ba17420 100644 --- a/docs/index.md +++ b/docs/index.md @@ -5,15 +5,16 @@ Use your Raspberry Pi as a guitar effects pedal. Configure and control PiPedal with your phone or tablet. -PiPedal running on a Raspberry Pi 4 provides stable super-low-latency audio via external USB audio devices, or internal Raspberry Pi audio hats. +PiPedal running on a Raspberry Pi 4 provides stable low-latency audio via external USB audio devices, or internal Raspberry Pi audio hats; and the Raspberry Pi 4's +processor provides enough power to run even the most demanding pedal plugins. PiPedal's user interface has been specifically designed to work well on small form-factor touch devices like phones or tablets. Clip a phone or tablet on your microphone stand on stage, and you're ready to play! Or connect via a desktop browser, for a slightly more luxurious experience. The PiPedal user-interface adapts to the screen size and orientation of your device, providing easy control of your guitar effects across a broad variety devices and screen sizes. -PiPedal provides a simple configuration tool that allows you to easily set up a WiFi hotspot on your Raspberry Pi which can then be used to connect wirelessly. +Set up a Wi-Fi hotspot for your phone or table to connect to using a simple setup dialog. -PiPedal provides a pre-installed selection of LV2 plugins from the ToobAmp collection of plugins. But it works with most LV2 Audio plugins. There are literally hundreds of free high-quality LV2 audio plugins that will work with PiPedal. +PiPedal includes a small selection of LV2 plugins from the ToobAmp collection of plugins. But it works with most LV2 Audio plugins. There are literally hundreds of [free high-quality LV2 audio plugins](UsingLv2Plugins.md) that will work with PiPedal. -If your USB audio adapter has midi connectors, you can use midi devices (keyboards or midi floor boards) to control PiPedal while performing. A simple interface allows you to select how you would like to bind PiPedal controls to midi messages. +If your USB audio adapter has MIDI connectors, you can use MIDI controllers or keyboards to control PiPedal while performing. A simple interface allows you to select how you would like to bind MIDI messages to effect controls. {% include gallery.html %} diff --git a/docs/press/Gallery_Rig.psd b/docs/press/Gallery_Rig.psd new file mode 100644 index 0000000..58cb8a5 Binary files /dev/null and b/docs/press/Gallery_Rig.psd differ diff --git a/docs/press/PortableRig.jpg b/docs/press/PortableRig.jpg new file mode 100644 index 0000000..b255c02 Binary files /dev/null and b/docs/press/PortableRig.jpg differ diff --git a/docs/press/PortableRig.psd b/docs/press/PortableRig.psd new file mode 100644 index 0000000..50ef431 Binary files /dev/null and b/docs/press/PortableRig.psd differ diff --git a/docs/press/hotspot.png b/docs/press/hotspot.png new file mode 100644 index 0000000..588a8b2 Binary files /dev/null and b/docs/press/hotspot.png differ diff --git a/docs/press/jazz.png b/docs/press/jazz.png new file mode 100644 index 0000000..1720e4e Binary files /dev/null and b/docs/press/jazz.png differ diff --git a/docs/press/midi-bindings.png b/docs/press/midi-bindings.png new file mode 100644 index 0000000..4a51356 Binary files /dev/null and b/docs/press/midi-bindings.png differ diff --git a/docs/press/rig.jpg b/docs/press/rig.jpg new file mode 100644 index 0000000..1e5992c Binary files /dev/null and b/docs/press/rig.jpg differ diff --git a/docs/press/rig_small.jpg b/docs/press/rig_small.jpg new file mode 100644 index 0000000..5149dcd Binary files /dev/null and b/docs/press/rig_small.jpg differ diff --git a/docs/press/thunder.png b/docs/press/thunder.png new file mode 100644 index 0000000..eabeae1 Binary files /dev/null and b/docs/press/thunder.png differ diff --git a/react/src/SettingsDialog.tsx b/react/src/SettingsDialog.tsx index 7da42b7..65040d3 100644 --- a/react/src/SettingsDialog.tsx +++ b/react/src/SettingsDialog.tsx @@ -563,7 +563,7 @@ const SettingsDialog = withStyles(styles, { withTheme: true })( - this.handleRestart()} >
@@ -577,7 +577,7 @@ const SettingsDialog = withStyles(styles, { withTheme: true })(
- this.handleShutdown()} >
diff --git a/src/Ipv6Helpers.cpp b/src/Ipv6Helpers.cpp index 6bb2f04..f1709b4 100644 --- a/src/Ipv6Helpers.cpp +++ b/src/Ipv6Helpers.cpp @@ -314,7 +314,7 @@ static std::string GetLinkLocalAddressForInterface(const std::string &name) struct ifaddrs *ifap = nullptr; if (getifaddrs(&ifap) != 0) return ""; - std::string result; + std::string result = "notlinklocal.error"; for (ifaddrs *p = ifap; p != nullptr; p = p->ifa_next) { if (p->ifa_addr->sa_family == AF_INET6 && p->ifa_addr != nullptr && p->ifa_netmask != nullptr) @@ -322,7 +322,7 @@ static std::string GetLinkLocalAddressForInterface(const std::string &name) struct sockaddr_in6 *pAddr = (struct sockaddr_in6 *)(p->ifa_addr); if (IN6_IS_ADDR_LINKLOCAL(&(pAddr->sin6_addr))) { - if (name.length() == 0 || name == p->ifa_name) + if (name == p->ifa_name) { const int BUFSIZE = 128; char host[BUFSIZE]; @@ -349,6 +349,36 @@ static std::string GetLinkLocalAddressForInterface(const std::string &name) freeifaddrs(ifap); return result; } +static std::string GetLinkLocalAddressForIp4Interface(const std::string&name) +{ + struct ifaddrs *ifap = nullptr; + if (getifaddrs(&ifap) != 0) + return ""; + std::string result = "notlocalsubnet.error"; + for (ifaddrs *p = ifap; p != nullptr; p = p->ifa_next) + { + if (p->ifa_addr->sa_family == AF_INET && p->ifa_addr != nullptr && p->ifa_netmask != nullptr) + { // TODO: Add support for AF_INET6 + struct sockaddr_in *pAddr = (struct sockaddr_in *)(p->ifa_addr); + { + if (name == p->ifa_name) + { + const int BUFSIZE = 128; + char host[BUFSIZE]; + if (getnameinfo(p->ifa_addr, sizeof(struct sockaddr_in), host, BUFSIZE, NULL, 0, NI_NUMERICHOST) == 0) + { + host[BUFSIZE - 1] = '\0'; + + result = host; + break; + } + } + } + } + } + freeifaddrs(ifap); + return result; +} std::string pipedal::GetLinkLocalAddress(const std::string fromAddress) { @@ -365,7 +395,7 @@ std::string pipedal::GetLinkLocalAddress(const std::string fromAddress) { uint32_t remoteAddress = htonl(inetAddr.s_addr); std::string interfaceName = GetInterfaceForIp4Address(remoteAddress); - result = GetLinkLocalAddressForInterface(interfaceName); + result = GetLinkLocalAddressForIp4Interface(interfaceName); } } else @@ -391,26 +421,26 @@ std::string pipedal::GetLinkLocalAddress(const std::string fromAddress) // [FE80:: ] link local. // [FEC0:: ] site local. // others? - if (IN6_IS_ADDR_LINKLOCAL(&inetAddr6)) + if (IN6_IS_ADDR_V4MAPPED(&inetAddr6)) { - return address; - } - if (IN6_IS_ADDR_SITELOCAL(&inetAddr6)) - { - return address; - } + int8_t*pAddr = (int8_t*)&inetAddr6; + uint32_t remoteAddress = htonl(*(int32_t*)(pAddr+12)); + std::string interfaceName = GetInterfaceForIp4Address(remoteAddress); + result = GetLinkLocalAddressForIp4Interface(interfaceName); + } else { - std::string interfaceName; - if (IsIpv4MappedAddress(inetAddr6)) - { - uint32_t remoteAddress = GetIpv4MappedAddress(inetAddr6); - interfaceName = GetInterfaceForIp4Address(remoteAddress); + std::string interfaceName; + if (IsIpv4MappedAddress(inetAddr6)) + { + uint32_t remoteAddress = GetIpv4MappedAddress(inetAddr6); + interfaceName = GetInterfaceForIp4Address(remoteAddress); + } + else + { + interfaceName = GetInterfaceForIp6Address(inetAddr6); + } + result = GetLinkLocalAddressForInterface(interfaceName); } - else - { - interfaceName = GetInterfaceForIp6Address(inetAddr6); - } - result = GetLinkLocalAddressForInterface(interfaceName); } } if (result == "")