shawn/op-pedal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #500 from rerdavies/dev

Browse Source 
v2.0.105 Dev pull.
This commit is contained in:
Robin Davies
2026-06-04 14:43:49 -04:00
committed by GitHub
parent 1261e670c0 1d0c1a56ad
commit 0dd9d4d863
14 changed files with 133 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+2 -2
View File
@@ -1,13 +1,13 @@
cmake_minimum_required(VERSION 3.16.0)
project(pipedal
VERSION 2.0.104
VERSION 2.0.105
DESCRIPTION "PiPedal Guitar Effect Pedal For Raspberry Pi"
HOMEPAGE_URL "https://rerdavies.github.io/pipedal"
)
execute_process( COMMAND dpkg --print-architecture COMMAND tr -d '\n' OUTPUT_VARIABLE DEBIAN_ARCHITECTURE )
set (DISPLAY_VERSION "PiPedal v2.0.104-Release")
set (DISPLAY_VERSION "PiPedal v2.0.105-Release")
set (PACKAGE_ARCHITECTURE ${DEBIAN_ARCHITECTURE})
set (CMAKE_INSTALL_PREFIX "/usr/")
README.md
+2 -2
View File
@@ -9,11 +9,11 @@
<img src="https://img.shields.io/github/downloads/rerdavies/pipedal/total?color=%23808080&link=https%3A%2F%2Frerdavies.github.io%2Fpipedal%2Fdownload.html"/>
Download:&nbsp;<a href='https://rerdavies.github.io/pipedal/download.html'>v2.0.104</a>
Download:&nbsp;<a href='https://rerdavies.github.io/pipedal/download.html'>v2.0.105</a>
Website:&nbsp;[https://rerdavies.github.io/pipedal](https://rerdavies.github.io/pipedal).
Documentation:&nbsp;[https://rerdavies.github.io/pipedal/Documentation.html](https://rerdavies.github.io/pipedal/Documentation.html).
#### Announcing PiPedal 2.0 (2.0.104)&mdash;a major update to PiPedal, including exciting new features, ioncluding support for NAM A2. See the Pipedal website [documentation](https://rerdavies.github.io/pipedal/PiPedal.html) for more information.
#### Announcing PiPedal 2.0 (2.0.105)&mdash;a major update to PiPedal, including exciting new features, ioncluding support for NAM A2. See the Pipedal website [documentation](https://rerdavies.github.io/pipedal/PiPedal.html) for more information.
&nbsp;
default_presets/V4 Factory Presets.piBank
BIN
View File
Binary file not shown.
default_presets/build_factory_presets.sh
+1 -1
View File
@@ -1,5 +1,5 @@
#!/usr/bin/bash
export SRC_ZIP="V3 Factory Presets.piBank"
export SRC_ZIP="V4 Factory Presets.piBank"
export DST_ZIP="Factory Presets.piBank"
rm "presets/$DST_ZIP"
default_presets/presets/Factory Presets.piBank
BIN
View File
Binary file not shown.
default_presets/presets/banks.versionInfo
+1 -1
View File
@@ -1 +1 @@
3
4
docs/Installing.md
+7 -7
View File
@@ -13,18 +13,18 @@ page_icon: img/Install4.jpg
Download the most recent Debian (.deb) package for your platform:
- [Raspberry Pi OS bookworm (aarch64) v2.0.104](https://github.com/rerdavies/pipedal/releases/download/v2.0.104/pipedal_2.0.104_arm64.deb)
- [Ubuntu 24.04 through 25.04 (aarch64) v2.0.104](https://github.com/rerdavies/pipedal/releases/download/v2.0.104/pipedal_2.0.104_arm64.deb)
- [Ubuntu 24.04 through 25.04 (amd64) v2.0.104](https://github.com/rerdavies/pipedal/releases/download/v2.0.104/pipedal_2.0.104_amd64.deb)
- [Raspberry Pi OS bookworm (aarch64) v2.0.105](https://github.com/rerdavies/pipedal/releases/download/v2.0.105/pipedal_2.0.105_arm64.deb)
- [Ubuntu 24.04 through 25.04 (aarch64) v2.0.105](https://github.com/rerdavies/pipedal/releases/download/v2.0.105/pipedal_2.0.105_arm64.deb)
- [Ubuntu 24.04 through 25.04 (amd64) v2.0.105](https://github.com/rerdavies/pipedal/releases/download/v2.0.105/pipedal_2.0.105_amd64.deb)
Version 2.0.104 has been tested on Raspberry Pi OS bookworm, Ubuntu 24.04 (amd64), Ubuntu 24.10 (aarch64), and Ubuntu 25.04 (aarch64). Download the appropriate package for your platform, and install using the following procedure:
Version 2.0.105 has been tested on Raspberry Pi OS bookworm, Ubuntu 24.04 (amd64), Ubuntu 24.10 (aarch64), and Ubuntu 25.04 (aarch64). Download the appropriate package for your platform, and install using the following procedure:
```
sudo apt update
sudo apt upgrade
cd ~/Downloads
sudo apt-get install ./pipedal_2.0.104_arm64.deb
sudo apt-get install ./pipedal_2.0.105_arm64.deb
```
You MUST use `apt-get`. `apt` will not install downloaded packages; and `dpkg -i` will not install dependencies.
@@ -62,7 +62,7 @@ Use the following command to copy the downloaded package to the server from Linu
Adjust `username`, `server_address` and the actual name of the Debian package you downloaded as needed:
```
scp Downloads/pipedal_2.0.104_arm64.deb username@server_address:/home/username/
scp Downloads/pipedal_2.0.105_arm64.deb username@server_address:/home/username/
```
This will copy the downloaded package on your desktop computer to your home directory on the PiPedal server computer.
@@ -70,7 +70,7 @@ Once you have copied the package to the server, you can SSH into the server and
```
ssh username@server_address
sudo apt-get install ./pipedal_2.0.104_arm64.deb
sudo apt-get install ./pipedal_2.0.105_arm64.deb
```
The PiPedal package installer will print out the port number that the PiPedal web server is listening on. It defaults to port 80, but if you have another web server already running on port 80, it will select the next available port. Ubuntu default installs have Apache Server running on port 80, so the PiPedal web server will default to port 81 on Ubuntu.
docs/PiPedal2.md
+1 -1
View File
@@ -11,7 +11,7 @@
<a href="https://rerdavies.github.io/pipedal/download2"><img src="https://img.shields.io/badge/Download-008060" /></a>
<a href="https://rerdavies.github.io/pipedal/Documentation"><img src="https://img.shields.io/badge/Documentation-0060d0"/></a>
_To download PiPedal v2.0.104-alpha, click [*here*](download.md).
_To download PiPedal v2.0.105-alpha, click [*here*](download.md).
To view PiPedal documentation, click [*here*](Documentation.md)._
Use your Raspberry Pi as a guitar effects pedal. Configure and control PiPedal with your phone or tablet.
docs/ReleaseNotes.md
+1 -1
View File
@@ -1,6 +1,6 @@
# Release Notes
## PiPedal 2.0.104-Release
## PiPedal 2.0.105-Release
Bug fix:
docs/download.md
+5 -5
View File
@@ -1,13 +1,13 @@
## Download
# Download PiPedal 2.0.104-alpha
# Download PiPedal 2.0.105-alpha
Download the most recent Debian (.deb) package for your platform:
- [Raspberry Pi OS bookworm (aarch64) v2.0.104 Alpha](https://github.com/rerdavies/pipedal/releases/download/v2.0.104/pipedal_2.0.104_arm64.deb)
- [Ubuntu 24.x, 25.04 (aarch64) v2.0.104 Alpha](https://github.com/rerdavies/pipedal/releases/download/v2.0.104/pipedal_2.0.104_arm64.deb)
- [Ubuntu 24.x, 25.04 (amd64/x86_64) v2.0.104 Alpha](https://github.com/rerdavies/pipedal/releases/download/v2.0.104/pipedal_2.0.104_amd64.deb)
- [Raspberry Pi OS bookworm (aarch64) v2.0.105 Alpha](https://github.com/rerdavies/pipedal/releases/download/v2.0.105/pipedal_2.0.105_arm64.deb)
- [Ubuntu 24.x, 25.04 (aarch64) v2.0.105 Alpha](https://github.com/rerdavies/pipedal/releases/download/v2.0.105/pipedal_2.0.105_arm64.deb)
- [Ubuntu 24.x, 25.04 (amd64/x86_64) v2.0.105 Alpha](https://github.com/rerdavies/pipedal/releases/download/v2.0.105/pipedal_2.0.105_amd64.deb)
Install the package by running
@@ -15,7 +15,7 @@ Install the package by running
```
sudo apt update
cd ~/Downloads
sudo apt install ./pipedal_2.0.104_arm64.deb
sudo apt install ./pipedal_2.0.105_arm64.deb
# or ... _amd64.deb as appropriate for your platform
```
The message about missing permissions given by `apt` is
src/Banks.hpp
+12
View File
@@ -188,6 +188,18 @@ namespace pipedal
}
return false;
}
BankFileEntry* getPresetByName(const std::string&presetName) {
for (std::unique_ptr<BankFileEntry> &preset: presets_)
{
if (preset->preset().name() == presetName)
{
return &(*preset);
}
}
return nullptr;
}
bool renamePreset(int64_t instanceId, const std::string &name)
{
if (hasName(name))
src/Storage.cpp
+37 -4
View File
@@ -294,8 +294,33 @@ void Storage::MoveExistingFactoryPresetsBank()
namespace pipedal::implementation {
extern int64_t ImportBankFile(PiPedalModel &model, const std::filesystem::path& filePath,uint64_t uploadAfter = -1);
extern void UpgradeBank(
PiPedalModel&model,
const std::filesystem::path &existingBankFile,
const std::filesystem::path &piBank,
const std::vector<std::string>&presetsToUpgrade
);
}
void Storage::UpgradeV3FactoryPresets()
{
std::vector<std::string> presetsToUpgrade = {
"Marshall JCM800 + TS9",
"Huge Lead 2"
};
fs::path factoryPresetPath = GetBankFileName("Factory Presets");
UpgradeBank(
*this->model,
factoryPresetPath,
this->configRoot / "default_presets" / "presets" / "Factory Presets.piBank",
presetsToUpgrade
);
}
void Storage::InstallFactoryPresets()
{
fs::path defaultBankFilePath = this->configRoot / "default_presets" / "presets" / "Factory Presets.piBank";
@@ -367,14 +392,22 @@ void Storage::ProvisionDefaultBanks()
constexpr uint32_t V2_VERSION_NUMBER = 2; // first to have a Factory Presets
constexpr uint32_t V3_VERSION_NUMBER = 3; // New A2 Presets, completely replacing the previons version.
constexpr uint32_t V4_VERSION_NUMBER = 4; // Fix incorrect Cab IR settings.
if (varPresetVersion < V3_VERSION_NUMBER) {
if (varPresetVersion < V4_VERSION_NUMBER) {
Lv2Log::info("Installing Factory Presets");
// Move the old factory presets bank out of the way.
MoveExistingFactoryPresetsBank();
InstallFactoryPresets();
SetVarPresetVersion(V3_VERSION_NUMBER);
if (varPresetVersion < V3_VERSION_NUMBER) {
MoveExistingFactoryPresetsBank();
}
if (varPresetVersion == V3_VERSION_NUMBER)
{
UpgradeV3FactoryPresets();
} else {
InstallFactoryPresets();
}
SetVarPresetVersion(V4_VERSION_NUMBER);
SaveBankIndex(); // checkpoint.
}
// Next time we will have to MERGE factor presets.
src/Storage.hpp
+1
View File
@@ -86,6 +86,7 @@ private:
void SetVarPresetVersion(int32_t version);
void UpgradeV1FactoryPresets();
void MoveExistingFactoryPresetsBank();
void UpgradeV3FactoryPresets();
void InstallFactoryPresets();
void CopyFactoryPresetsToDefaultBank();
void ProvisionDefaultBanks();
src/WebServerConfig.cpp
+63 -1
View File
@@ -183,6 +183,67 @@ static fs::path GetTone3000ThumbnailFile(const fs::path& thumbnailDirectory, con
namespace pipedal::implementation {
void UpgradeBank(PiPedalModel& model,
const std::filesystem::path& existingBankFilePath,
const std::filesystem::path& piBankFilePath,
const std::vector<std::string>& presetsToUpgrade
) {
BankFile sourceBankFile;
if (piBankFilePath.empty())
{
throw std::runtime_error("Unexpected.");
}
if (IsZipFile(piBankFilePath))
{
auto presetReader = PresetBundleReader::LoadPresetsFile(model, piBankFilePath);
presetReader->ExtractMediaFiles();
std::stringstream ss(presetReader->GetPresetJson());
json_reader reader(ss);
reader.read(&sourceBankFile);
}
else
{
std::ifstream f{ piBankFilePath };
if (!f.is_open()) {
throw std::runtime_error(SS("Unable to open file " << piBankFilePath));
}
// legacy json format, no zip, no media files.
json_reader reader(f);
reader.read(&sourceBankFile);
}
BankFile existingBankFile;
{
std::ifstream ifs{ existingBankFilePath };
if (!ifs.is_open()) {
return;
}
json_reader reader{ ifs };
reader.read(&existingBankFile);
}
for (const std::string& presetToUpgrade : presetsToUpgrade)
{
BankFileEntry* existingEntry = existingBankFile.getPresetByName(presetToUpgrade);
if (existingEntry) {
BankFileEntry* newEntry = sourceBankFile.getPresetByName(presetToUpgrade);
if (newEntry)
{
existingEntry->preset(newEntry->preset());
}
}
}
{
std::ofstream ofs{ existingBankFilePath };
json_writer writer{ ofs };
writer.write(existingBankFile);
}
}
int64_t ImportBankFile(PiPedalModel& model, const std::filesystem::path& filePath, uint64_t uploadAfter = -1)
{
BankFile bankFile;
@@ -211,6 +272,7 @@ namespace pipedal::implementation {
json_reader reader(f);
reader.read(&bankFile);
}
uint64_t instanceId = model.UploadBank(bankFile, uploadAfter);
return instanceId;
@@ -623,7 +685,7 @@ public:
fs::path path = GetTone3000ThumbnailFile(this->model->Tone3000ThumbnailDirectory(), id);
if (!fs::exists(path))
{
path = GetTone3000ThumbnailFile(this->model->OldTone3000ThumbnailDirectory(),id);
path = GetTone3000ThumbnailFile(this->model->OldTone3000ThumbnailDirectory(), id);
if (!fs::exists(path))
{
throw PiPedalException("File not found.");