Merge branch 'dcussans/change_permissions' into HEAD
Large number of conflicts reports - but almost all of these seem to have been white-space only README.md conflict probably not resolved correctly. Tidying up some files. This seems to have resulted in conflict with master, but I don't know how.
Showing
AIDA_tlu/.gitignore
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/Documentation/AIDA_TLU_note.pdf
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/Documentation/AddressMap.xlsx
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/Documentation/Connections.xlsx
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/Documentation/Enclosure.docx
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/Documentation/LUT6.xlsx
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/Documentation/Latex/AIDA_TLU_v1d.prj
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/Documentation/Latex/DUT_signals.tex
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/Documentation/Latex/Docs/PM3TopView.pdf
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/Documentation/Latex/Docs/schematics.pdf
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/Documentation/Latex/Images/Initial.png
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/Documentation/Latex/Images/PM3.jpg
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/Documentation/Latex/Images/Warning.png
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/Documentation/Latex/Main_TLU.pdf
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/Documentation/Latex/Main_TLU.tex
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/Documentation/Latex/ch_EventBuffer.tex
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/Documentation/Latex/ch_TLU_Appendix.tex
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/Documentation/Latex/ch_TLU_Hardware.tex
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/Documentation/Latex/ch_TLU_clock.tex
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/Documentation/TP.pptx
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/Documentation/triggerInputs.docx
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/README.md
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/.directory
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/TLU_CLK_Config.txt
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/TLU_CLK_Config_BKP.txt
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/TLU_CLK_Config_v1e.txt
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/TLU_CLK_Config_v1e_2.txt
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/debug_nets.ltx
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/debug_nets_abcd000a.ltx
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/debug_nets_abcd000b.ltx
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/debug_nets_abcd000d.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/debug_nets_abcd000d.ltx
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/debug_nets_abcd000e.ltx
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170201.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170202.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170203.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170206.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170206_2.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170207.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170208.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170209.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170209_2.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170209_3.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170209_4.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170209_5.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170215.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170216.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170216_2.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170216_3.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170216_messy.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170216_reclock.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170217.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170217_2.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170217_3.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170217_4.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170220_6trigIn.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170220_evBuffer.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170220_evFormat.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170220_shutter.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170221_DUTs.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170223_complete.bit
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170227.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_20170228.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_abcd0005.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_abcd0006.bit
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_abcd000a.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_abcd000b.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_abcd000d.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_abcd000e.bit
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/bitFiles/top_tlu_v1e_0xabcd0005.bit
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/EUDETdummy/hdl/Dummy_DUT.vhd
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/EUDETdummy/hdl/ZestSC1_Host.vhd
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/EUDETdummy/hdl/delay.vhd
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/EUDETdummy/hdl/delay_word.vhd
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/EUDETdummy/hdl/dtype.vhdl
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/EUDETdummy/hdl/eth_7s_rgmii.vhd
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/EUDETdummy/hdl/fmcTLU_pkg.vhd
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/EUDETdummy/hdl/ipbus_example.vhd
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/EUDETdummy/hdl/ipbus_slaves.vhd
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/EUDETdummy/hdl/ipbus_ver.vhd
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/EUDETdummy/hdl/led_stretcher.vhd
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/EUDETdummy/scripts/EUDETdummy.py
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/EUDETdummy/scripts/initTLU.py
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/EUDETdummy/scripts/startDUMMY.sh
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/TLU_v1c/common/DUTs_outputs.vhd
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/TLU_v1c/common/GPP_rtl.vhd
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/TLU_v1c/common/Reg_2clks.vhd
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/TLU_v1c/common/TPx3Logic_rtl.vhd
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/TLU_v1c/common/clock_sim.vhd
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/TLU_v1c/common/counterDown.vhd
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/TLU_v1c/common/eth_7s_gmii.vhd
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/TLU_v1c/common/eth_7s_rgmii.vhd
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/TLU_v1c/common/fmcTLU_pkg.vhd
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/TLU_v1c/common/ipbus_example.vhd
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/TLU_v1c/common/ipbus_slaves.vhd
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/TLU_v1c/common/ipbus_ver.vhd
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/TLU_v1c/common/led_stretcher.vhd
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/TLU_v1c/common/pulseClockDomainCrossing_rtl.vhd
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/TLU_v1c/common/sychronizedIPBusCtrlRegV_rtl.vhd
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/TLU_v1c/common/sync_reg.vhd
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/TLU_v1c/common/test_inToOut.vhd
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/TLU_v1c/common/triggerInputs_newTLU_rtl_BKP.vhd
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/TLU_v1c/scripts/500ns_23ns.txt
100644 → 100755
File mode changed from 100644 to 100755
AIDA_tlu/legacy/TLU_v1c/scripts/500ns_24ns.txt
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
This diff is collapsed.
This diff is collapsed.