Skip to content

Commit 418d99b

Browse files
committed
Update license info, updates to work with latest CAN stack
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.
1 parent f85fd0e commit 418d99b

File tree

5 files changed

+9
-41
lines changed

5 files changed

+9
-41
lines changed

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,7 @@ set (CPACK_COMPONENTS_ALL applications)
153153
set (CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "AgISOVirtualTerminal")
154154
set (CPACK_COMPONENT_APPLICATIONS_DESCRIPTION "A free and open source ISO11783-6 Server")
155155
set (CPACK_PACKAGE_CONTACT "delgrossoengineering@protonmail.com")
156-
# 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")
157-
set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_LIST_DIR}/doc/NSISLicenseInfo.txt")
156+
set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_LIST_DIR}/LICENSE")
158157
set (CPACK_PACKAGE_EXECUTABLES "AgISOVirtualTerminal" "AgISOVirtualTerminal")
159158
set(CPACK_ALL_INSTALL_TYPES Full)
160159
set(CPACK_COMPONENT_LIBRARIES_INSTALL_TYPES Full)

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,16 @@ If you open an issue, we need the object pool of the working set you were using,
179179

180180
### Disclaimers
181181

182+
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.
183+
184+
If you wish to sponsor development of this software, please contact us in the discord or telegram channels.
185+
182186
This project is not associated with the Agricultural Industry Electronics Foundation (AEF) in any way.
183187

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

186190
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.
187191

188-
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.
192+
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.
189193

190194
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.

doc/NSISLicenseInfo.txt

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/Main.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "ServerMainComponent.hpp"
1111
#include "isobus/hardware_integration/can_hardware_interface.hpp"
1212
#include "isobus/isobus/can_internal_control_function.hpp"
13+
#include "isobus/isobus/can_network_manager.hpp"
1314

1415
//==============================================================================
1516
class AgISOVirtualTerminalApplication : public juce::JUCEApplication
@@ -97,7 +98,7 @@ class AgISOVirtualTerminalApplication : public juce::JUCEApplication
9798
serverNAME.set_function_code(static_cast<std::uint8_t>(isobus::NAME::Function::VirtualTerminal));
9899
serverNAME.set_industry_group(2);
99100
serverNAME.set_manufacturer_code(1407);
100-
serverInternalControlFunction = isobus::InternalControlFunction::create(serverNAME, 0x26, 0);
101+
serverInternalControlFunction = isobus::CANNetworkManager::CANNetwork.create_internal_control_function(serverNAME, 0, 0x26);
101102
setUsingNativeTitleBar(true);
102103
setContentOwned(new ServerMainComponent(serverInternalControlFunction, canDrivers), true);
103104

src/WorkingSetComponent.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ WorkingSetComponent::WorkingSetComponent(std::shared_ptr<isobus::VirtualTerminal
3333
void WorkingSetComponent::paint(Graphics &g)
3434
{
3535
auto vtColour = parentWorkingSet->get_colour(get_background_color());
36-
auto background = Colour(vtColour.r, vtColour.g, vtColour.b, 1.0f);
36+
auto background = Colour::fromFloatRGBA(vtColour.r, vtColour.g, vtColour.b, 1.0f);
3737
g.setColour(background);
3838
g.fillAll();
3939
}

0 commit comments

Comments
 (0)