Skip to content

Commit 5cea2c2

Browse files
committed
Merge branch 'master' into feature-dev
2 parents c3c56fc + 572979b commit 5cea2c2

File tree

2 files changed

+22
-16
lines changed

2 files changed

+22
-16
lines changed

README.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,22 @@ The following plug-ins are currently available:
6262
__Acquisition Systems:__
6363
|Name | Description |
6464
|-----|-----|
65+
|[PhytoOCT](https://github.com/spectralcode/PhytoOCT)| A portable and low-cost OCT system.|
6566
|[Virtual OCT System](octproz_project/octproz_plugins/octproz_virtual_oct_system)| Can be used to load already acquired OCT raw data from the disk|
6667

6768

6869
__Extensions:__
69-
|Name | Description |
70-
|-----|-----|
70+
| Name | Description |
71+
|------|-------------|
72+
|[Axial PSF Analyzer](https://github.com/spectralcode/AxialPsfAnalyzerExtension)| Measuring the FWHM of the axial point spread function.|
73+
|[Camera](https://github.com/spectralcode/CameraExtension)| Displays live view from a webcam.|
7174
|[Demo Extension](octproz_project/octproz_plugins/octproz_demo_extension)| This demo extension is for developers. It has no useful functionality, but the code can be used as a template for developing custom extensions.|
72-
|[Image Statistics](https://github.com/spectralcode/ImageStatisticsExtension)| Displays useful image statistics, such as a histogram, in real time of currently acquired B-scans |
73-
|[Socket Stream](https://github.com/spectralcode/SocketStreamExtension)| Streaming of OCT data via TCP/IP. Just for slow OCT acquisitions.|
75+
|[Image Statistics](https://github.com/spectralcode/ImageStatisticsExtension)| Displays useful image statistics, such as a histogram, in real time of currently acquired B-scans. |
76+
|[Peak Detector](https://github.com/spectralcode/PeakDetectorExtension)| Detects and displays the position of the highest peak in an A-scan.|
7477
|[Phase Extraction](https://github.com/spectralcode/PhaseExtractionExtension)| Can be used to determine a suitable resampling curve for k-linearization.|
78+
|[Signal Monitor](https://github.com/spectralcode/SignalMonitorExtension)| Displays signal intensity. Useful during optical alignment for maximizing intensity on detector.|
79+
|[Socket Stream](https://github.com/spectralcode/SocketStreamExtension)| Controlling OCTproZ remotely and streaming OCT data via TCP/IP, Websocket, IPC.|
80+
7581

7682
The easiest way to develop custom plug-ins is to clone/download the entire OCTproZ project, compile the DevKit and OCTproZ and use the existing examples as templates. Have a look at the [plugin developer guide](https://spectralcode.github.io/OCTproZ/developer.html).
7783

octproz_project/octproz/pri/cuda.pri

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ CUDA_SOURCES += $$SOURCEDIR/cuda_code.cu \
1717
#-gencode=arch=compute_70,code=sm_70
1818

1919
#use this for maximum compatibility with CUDA 11.0
20-
#CUDA_ARCH += sm_52 \
21-
#-gencode=arch=compute_52,code=sm_52 \
22-
#-gencode=arch=compute_60,code=sm_60 \
23-
#-gencode=arch=compute_61,code=sm_61 \
24-
#-gencode=arch=compute_70,code=sm_70 \
25-
#-gencode=arch=compute_75,code=sm_75 \
26-
#-gencode=arch=compute_80,code=sm_80 \
27-
#-gencode=arch=compute_86,code=sm_86 \
28-
#-gencode=arch=compute_86,code=compute_86
20+
CUDA_ARCH += sm_52 \
21+
-gencode=arch=compute_52,code=sm_52 \
22+
-gencode=arch=compute_60,code=sm_60 \
23+
-gencode=arch=compute_61,code=sm_61 \
24+
-gencode=arch=compute_70,code=sm_70 \
25+
-gencode=arch=compute_75,code=sm_75 \
26+
-gencode=arch=compute_80,code=sm_80 \
27+
-gencode=arch=compute_86,code=sm_86 \
28+
-gencode=arch=compute_86,code=compute_86
2929

3030
#use this for Jetson Nano with JetPack 4.6.1 (Cuda 10.2, Ubuntu 18.04)
31-
CUDA_ARCH += sm_53 \
32-
-gencode=arch=compute_53,code=sm_53 \
33-
-gencode=arch=compute_53,code=compute_53
31+
#CUDA_ARCH += sm_53 \
32+
#-gencode=arch=compute_53,code=sm_53 \
33+
#-gencode=arch=compute_53,code=compute_53
3434

3535

3636
#include addtional macro definitions

0 commit comments

Comments
 (0)