Skip to content

Commit

Permalink
Update license info, updates to work with latest CAN stack
Browse files Browse the repository at this point in the history
Clarify license in installer.
Fixed a bug where working set icon background would be incorrectly drawn as all red.
Fix call to internal control function factory which has since had its api updated.
  • Loading branch information
ad3154 committed Sep 26, 2024
1 parent f85fd0e commit 418d99b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 41 deletions.
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,7 @@ set (CPACK_COMPONENTS_ALL applications)
set (CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "AgISOVirtualTerminal")
set (CPACK_COMPONENT_APPLICATIONS_DESCRIPTION "A free and open source ISO11783-6 Server")
set (CPACK_PACKAGE_CONTACT "[email protected]")
# TODO? set (CPACK_DEBIAN_PACKAGE_DEPENDS "libasound2-dev, libjack-jackd2-dev, ladspa-sdk, libcurl4-openssl-dev, libfreetype6-dev, libx11-dev, libxcomposite-dev libxcursor-dev libxcursor-dev libxext-dev libxinerama-dev libxrandr-dev libxrender-dev libwebkit2gtk-4.0-dev libglu1-mesa-dev mesa-common-dev")
set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_LIST_DIR}/doc/NSISLicenseInfo.txt")
set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_LIST_DIR}/LICENSE")
set (CPACK_PACKAGE_EXECUTABLES "AgISOVirtualTerminal" "AgISOVirtualTerminal")
set(CPACK_ALL_INSTALL_TYPES Full)
set(CPACK_COMPONENT_LIBRARIES_INSTALL_TYPES Full)
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,16 @@ If you open an issue, we need the object pool of the working set you were using,

### Disclaimers

Because this software is licensed under the GPL v3.0, you may not include this software in any closed source software, nor link to it in any way from closed source software.

If you wish to sponsor development of this software, please contact us in the discord or telegram channels.

This project is not associated with the Agricultural Industry Electronics Foundation (AEF) in any way.

This project is not associated with the International Organization for Standardization (ISO) in any way.

Don't ask us to share the ISO standards with you. We can't. You have to buy them from ISO. We don't have the right to share them with you.

By acquiring or using this project you agree to the [JUCE License](https://github.com/juce-framework/JUCE/blob/master/LICENSE.md) as well as any applicable licenses provided by dependencies such as AgIsoStack.
By acquiring or using this project you agree to the [JUCE License](https://github.com/juce-framework/JUCE/blob/master/LICENSE.md), [this project's license](https://github.com/Open-Agriculture/AgIsoVirtualTerminal/blob/main/LICENSE), and any applicable licenses provided by dependencies such as AgIsoStack.

This software was not created to compete with any commercial or open-source software. It was created to help hobbyists and professionals alike learn about and experiment with ISOBUS.
36 changes: 0 additions & 36 deletions doc/NSISLicenseInfo.txt

This file was deleted.

3 changes: 2 additions & 1 deletion src/Main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "ServerMainComponent.hpp"
#include "isobus/hardware_integration/can_hardware_interface.hpp"
#include "isobus/isobus/can_internal_control_function.hpp"
#include "isobus/isobus/can_network_manager.hpp"

//==============================================================================
class AgISOVirtualTerminalApplication : public juce::JUCEApplication
Expand Down Expand Up @@ -97,7 +98,7 @@ class AgISOVirtualTerminalApplication : public juce::JUCEApplication
serverNAME.set_function_code(static_cast<std::uint8_t>(isobus::NAME::Function::VirtualTerminal));
serverNAME.set_industry_group(2);
serverNAME.set_manufacturer_code(1407);
serverInternalControlFunction = isobus::InternalControlFunction::create(serverNAME, 0x26, 0);
serverInternalControlFunction = isobus::CANNetworkManager::CANNetwork.create_internal_control_function(serverNAME, 0, 0x26);
setUsingNativeTitleBar(true);
setContentOwned(new ServerMainComponent(serverInternalControlFunction, canDrivers), true);

Expand Down
2 changes: 1 addition & 1 deletion src/WorkingSetComponent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ WorkingSetComponent::WorkingSetComponent(std::shared_ptr<isobus::VirtualTerminal
void WorkingSetComponent::paint(Graphics &g)
{
auto vtColour = parentWorkingSet->get_colour(get_background_color());
auto background = Colour(vtColour.r, vtColour.g, vtColour.b, 1.0f);
auto background = Colour::fromFloatRGBA(vtColour.r, vtColour.g, vtColour.b, 1.0f);
g.setColour(background);
g.fillAll();
}

0 comments on commit 418d99b

Please sign in to comment.