Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
# 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