Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added license to OpenFlexure project #487

Merged
merged 7 commits into from
Sep 27, 2024
Merged

Added license to OpenFlexure project #487

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
df24d1e
Added license to OpenFlexure.h
samdrea Aug 31, 2024
42000b5
Added license to OpenFlexure.cpp
samdrea Aug 31, 2024
50be5ca
added board test during initialization
samdrea Sep 23, 2024
9485c87
Merge branch 'pr' of https://github.com/samdrea/mmCoreAndDevices into pr
samdrea Sep 23, 2024
6aeac35
Merge branch 'micro-manager:main' into pr
samdrea Sep 23, 2024
86716b5
fixed license and added board test during initialization
samdrea Sep 23, 2024
295bb10
Merge branch 'pr' of https://github.com/samdrea/mmCoreAndDevices into pr
samdrea Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions DeviceAdapters/OpenFlexure/OpenFlexure.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,27 @@
//////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
// FILE: OpenFlexure.cpp
// PROJECT: Micro-Manager
// SUBSYSTEM: DeviceAdapters
//-----------------------------------------------------------------------------
// DESCRIPTION: Adapter for the OpenFlexure Microscope. This adapter is used on the v5 Sangaboard.
// DESCRIPTION: Adapter for the OpenFlexure Microscope. This adapter is used on the v5 Sangaboard.
//
// AUTHOR: Samdrea Hsu, [email protected], 06/22/2024
//
// Karl Hoover (stuff such as programmable CCD size & the various image processors)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@samdrea did you mean to include these other authors?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@henrypinkard No, I'm not sure how that got in there... Could you edit them off or should I open a new pr?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you make new commits and push again they should be added to the PR

// Arther Edelstein ( equipment error simulation)
//
// COPYRIGHT: Samdrea Hsu
//
// AUTHOR: Samdrea Hsu, [email protected], 06/22/2024
// LICENSE: This file is distributed under the BSD license.
// License text is included with the source distribution.
//
// This file is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
//
// IN NO EVENT SHALL THE COPYRIGHT OWNER OR
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES.
//
//////////////////////////////////////////////////////////////////////////////

Expand Down Expand Up @@ -940,4 +954,4 @@ int LEDIllumination::SetBrightness()
pHub->SendCommand(cmd, _serial_answer);

return DEVICE_OK;
}
}
20 changes: 17 additions & 3 deletions DeviceAdapters/OpenFlexure/OpenFlexure.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,27 @@
//////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
// FILE: OpenFlexure.h
// PROJECT: Micro-Manager
// SUBSYSTEM: DeviceAdapters
//-----------------------------------------------------------------------------
// DESCRIPTION: Adapter for the OpenFlexure Microscope. This adapter is used on the v5 Sangaboard.
// DESCRIPTION: Adapter for the OpenFlexure Microscope. This adapter is used on the v5 Sangaboard.
//
// AUTHOR: Samdrea Hsu, [email protected], 06/22/2024
//
// Karl Hoover (stuff such as programmable CCD size & the various image processors)
// Arther Edelstein ( equipment error simulation)
//
// COPYRIGHT: Samdrea Hsu
//
// AUTHOR: Samdrea Hsu, [email protected], 06/22/2024
// LICENSE: This file is distributed under the BSD license.
// License text is included with the source distribution.
//
// This file is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
//
// IN NO EVENT SHALL THE COPYRIGHT OWNER OR
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES.
//
//////////////////////////////////////////////////////////////////////////////

Expand Down