Added Bronco 40 amps, cabinets and effects #21
Conversation
include/com/IdLookup.h
Outdated
| @@ -167,6 +178,7 @@ namespace plug | |||
|
|
|||
| constexpr cabinets lookupCabinetById(std::uint8_t id) | |||
| { | |||
| /* | |||
There was a problem hiding this comment.
Please do not comment out code, but add those values below (as with the amps).
include/effects_enum.h
Outdated
| @@ -29,8 +29,19 @@ namespace plug | |||
| // list of all amplifiers | |||
| enum class amps | |||
| { | |||
| FENDER_57_DELUXE, | |||
| // Bronco 40 amps | |||
There was a problem hiding this comment.
Please do not change the existing listing, but append to it's end.
include/effects_enum.h
Outdated
| }; | ||
|
|
||
|
|
||
| // list of all effects | ||
| enum class effects | ||
| { | ||
| // Bronco 40 effects |
There was a problem hiding this comment.
Same as above, please append and do not disable.
include/effects_enum.h
Outdated
| @@ -102,6 +113,7 @@ namespace plug | |||
| // list of all cabinets | |||
| enum class cabinets | |||
| { | |||
| /* | |||
src/ui/amplifier.cpp
Outdated
| @@ -183,6 +183,8 @@ namespace plug | |||
| // set properties | |||
| switch (static_cast<amps>(ampValue)) | |||
| { | |||
|
|
|||
| /* | |||
| @@ -53,6 +53,8 @@ | |||
| <property name="accessibleDescription"> | |||
| <string>Allows you to choose amplifier to emulate</string> | |||
| </property> | |||
| @@ -275,6 +275,10 @@ namespace plug | |||
| tr("When you choose an effect you can set precise value of a parameter here")}); | |||
| break; | |||
| case effects::OVERDRIVE: | |||
| case effects::MODERN_BASS_OVERDRIVE: | |||
There was a problem hiding this comment.
Please add a Bronce comment to those so we can determine later.
| @@ -51,11 +51,40 @@ | |||
| <string>None</string> | |||
| </property> | |||
| </item> | |||
|
|
|||
| <!-- Bronco 40 effects --> | |||
There was a problem hiding this comment.
Remark: The .ui files are created by Qt Designer (usually) , so comments wont last long here. Having the comments in the source files is enough.
src/ui/effect.cpp
Outdated
| @@ -555,6 +572,10 @@ namespace plug | |||
| tr("When you choose an effect you can set precise value of a parameter here")}); | |||
| break; | |||
| case effects::OVERDRIVE: | |||
| case effects::MODERN_BASS_OVERDRIVE: | |||
test/CMakeLists.txt
Outdated
| @@ -10,7 +10,7 @@ target_link_libraries(TestLibs INTERFACE | |||
| add_subdirectory(mocks) | |||
|
|
|||
|
|
|||
|
|
|||
| #[[ | |||
There was a problem hiding this comment.
Please do not disable tests. It's fine for the prototype to have failing tests regarding this feature.
Failing tests are ok at the moment. The first step is to figure out whether the device uses a compatible protocol (it seems so 🎉), figure out the ids and getting some working prototype that can do some communication with your device. Once these are done we can work on the actual implementation, which requires some more work. The bronco dev branch wont get merged directly, but should diff easily to master, so we can follow the changes. |
|
Oh and thanks for your PR btw.! 👍 |
|
I first tried to just append the Bronco amps/cabs/effects but at some places the order seems to matter. Sorry, I'm not very familiar with C++ but I will clean up the code, test it manually and make another PR. |
That should happen, but if it does you have found a bug 🐛. Let me know if you need some help here.
Really no problem, I can help where needed. Also it might help to do the changes step by step, eg. add amps, test, add cabinets etc.
You can update this PR, just push commits to your branch. |
|
Ok, will do. |
I added data for Bronco 40 amps, cabinets and effects as good as I could and it kinda works. However it is quite messy and I broke the tests that require Mustang cabinets.