Skip to content

Commit

Permalink
Merge branch 'release/2.0.0-bis'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.readthedocs.yml
#	Examples/correl_advanced.py
#	Examples/correl_fake_test.py
#	Examples/correl_strain_controlled_fake_test.py
#	Examples/dio_daqmx.py
#	Examples/discorrel_basic.py
#	Examples/gpucorrel_fake_test.py
#	Examples/read_write.py
#	Examples/stream_t7.py
#	Examples/tensile_1.py
#	Examples/thermocouple_daqmx.py
#	crappy/__version__.py
#	crappy/_global.py
#	crappy/actuator/actuator.py
#	crappy/actuator/biotens.py
#	crappy/actuator/cmDrive.py
#	crappy/actuator/fakemotor.py
#	crappy/actuator/motorkit_pump.py
#	crappy/actuator/oriental.py
#	crappy/actuator/servostar.py
#	crappy/actuator/tra6ppd.py
#	crappy/blocks/autoDrive.py
#	crappy/blocks/block.py
#	crappy/blocks/camera.py
#	crappy/blocks/dashboard.py
#	crappy/blocks/discorrel.py
#	crappy/blocks/displayer.py
#	crappy/blocks/disve.py
#	crappy/blocks/generator.py
#	crappy/blocks/generator_path/constant.py
#	crappy/blocks/generator_path/custom.py
#	crappy/blocks/generator_path/path.py
#	crappy/blocks/gpucorrel.py
#	crappy/blocks/gpuve.py
#	crappy/blocks/grapher.py
#	crappy/blocks/gui.py
#	crappy/blocks/ioblock.py
#	crappy/blocks/machine.py
#	crappy/blocks/mean.py
#	crappy/blocks/multiplex.py
#	crappy/blocks/pid.py
#	crappy/blocks/reader.py
#	crappy/blocks/recorder.py
#	crappy/blocks/sink.py
#	crappy/blocks/ucontroller.py
#	crappy/blocks/videoExtenso.py
#	crappy/camera/camera.py
#	crappy/camera/cameralink.py
#	crappy/camera/jai.py
#	crappy/camera/xiapi.py
#	crappy/inout/comedi.py
#	crappy/inout/fake_inout.py
#	crappy/inout/gpio_pwm.py
#	crappy/inout/gpio_switch.py
#	crappy/inout/gsm.py
#	crappy/inout/labjackUE9.py
#	crappy/inout/opsens.py
#	crappy/links/link.py
#	crappy/modifier/trig_on_value.py
#	crappy/tool/cameraConfigBoxes.py
#	crappy/tool/cameraConfigTools.py
#	crappy/tool/discorrelConfig.py
#	crappy/tool/disveConfig.py
#	crappy/tool/ft232h/usb_server.py
#	crappy/tool/videoextenso.py
#	crappy/tool/videoextensoConfig.py
#	docs/source/requirements.txt
#	docs/source/tutorials/gettingstarted.rst
#	src/crappy/__init__.py
#	src/crappy/actuator/pololu_tic.py
#	src/crappy/blocks/canvas.py
#	src/crappy/blocks/client_server.py
#	src/crappy/blocks/fake_machine.py
#	src/crappy/blocks/generator_path/conditional.py
#	src/crappy/blocks/generator_path/cyclic.py
#	src/crappy/blocks/generator_path/cyclic_ramp.py
#	src/crappy/blocks/generator_path/integrator.py
#	src/crappy/blocks/generator_path/ramp.py
#	src/crappy/blocks/generator_path/sine.py
#	src/crappy/blocks/hdf_recorder.py
#	src/crappy/camera/fake_camera.py
#	src/crappy/camera/file_reader.py
#	src/crappy/camera/gstreamer_camera_basic.py
#	src/crappy/camera/opencv_camera.py
#	src/crappy/camera/raspberry_pi_camera.py
#	src/crappy/camera/seek_thermal_pro.py
#	src/crappy/inout/ads1115.py
#	src/crappy/inout/daqmx.py
#	src/crappy/inout/ft232h/waveshare_ad_da.py
#	src/crappy/inout/kollmorgen_akd_pdmm.py
#	src/crappy/inout/labjack_t7.py
#	src/crappy/inout/labjack_t7_streamer.py
#	src/crappy/inout/mcp9600.py
#	src/crappy/inout/mprls.py
#	src/crappy/inout/nau7802.py
#	src/crappy/inout/ni_daqmx.py
#	src/crappy/inout/pijuice_hat.py
#	src/crappy/inout/spectrum_m2i4711.py
#	src/crappy/inout/waveshare_ad_da.py
#	src/crappy/inout/waveshare_high_precision.py
#	src/crappy/lamcube/bispectral.py
#	src/crappy/modifier/demux.py
#	src/crappy/modifier/differentiate.py
#	src/crappy/modifier/integrate.py
#	src/crappy/modifier/mean.py
#	src/crappy/modifier/median.py
#	src/crappy/modifier/moving_avg.py
#	src/crappy/modifier/moving_med.py
#	src/crappy/modifier/offset.py
#	src/crappy/modifier/trig_on_change.py
#	src/crappy/tool/camera_config/camera_config.py
#	src/crappy/tool/ft232h/ft232h.py
#	src/crappy/tool/ft232h/ft232h_server.py
#	src/crappy/tool/ft232h/i2c_message.py
#	src/crappy/tool/image_processing/dic_ve.py
#	src/crappy/tool/image_processing/dis_correl.py
#	src/crappy/tool/image_processing/gpu_correl.py
  • Loading branch information
WeisLeDocto committed Nov 28, 2023
2 parents 95ca19e + e2591cc commit d1d7f5e
Show file tree
Hide file tree
Showing 483 changed files with 37,953 additions and 21,987 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,5 @@ crappy.egg-info/
.idea/
*.swp
docs/build/
tests/
.directory
venv/
23 changes: 20 additions & 3 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,38 @@
# .readthedocs.yml
# Read the Docs configuration file
# Read the Docs configuration file for Sphinx projects
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2
# Default
formats: []

# Optionally set the version of Python and requirements required to build your docs
# Set the OS, Python version and other tools you might need
build:
os: ubuntu-22.04
tools:
python: "3.9"
# You can also specify other tool versions:
# nodejs: "20"
# rust: "1.70"
# golang: "1.20"

# Build documentation in the "docs/" directory with Sphinx
sphinx:
builder: html
configuration: docs/source/conf.py
# Fail on all warnings to avoid broken references
fail_on_warning: true
# You can configure Sphinx to use a different builder, for instance use the dirhtml builder for simpler URLs
# builder: "dirhtml"

# Optionally build your docs in additional formats such as PDF and ePub
# formats:
# - pdf
# - epub

# Optional but recommended, declare the Python requirements required
# to build your documentation
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
python:
install:
- requirements: docs/source/requirements.txt
Expand Down
5 changes: 5 additions & 0 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Global owner for the entire repo
* @WeisLeDocto

# PIERROOOTT owns the Gstreamer cameras
/src/crappy/camera/gstreamer_* @WeisLeDocto @PIERROOOTT
74 changes: 0 additions & 74 deletions Examples/correl_advanced.py

This file was deleted.

22 changes: 0 additions & 22 deletions Examples/correl_basic.py

This file was deleted.

85 changes: 0 additions & 85 deletions Examples/correl_fake_test.py

This file was deleted.

117 changes: 0 additions & 117 deletions Examples/correl_strain_controlled_fake_test.py

This file was deleted.

Loading

0 comments on commit d1d7f5e

Please sign in to comment.