diff --git a/docs/process_variables.md b/docs/process_variables.md index 697af9e..f782246 100644 --- a/docs/process_variables.md +++ b/docs/process_variables.md @@ -1339,7 +1339,7 @@ which has to be replaced with the output-specific prefix. Out:Map -Mapping used for the output. A value of 0 to 31 specifies that the corresponding pulse generator shall be used. A value of 32 to 39 specifies that one of the distributed bus bits (32 meaning distributed bus bit 0 and 39 meaning distributed bus bit 7) shall be used. A value of 40 to 42 specifies that one of the prescalers (40 meaning prescaler 0 and 42 meaning prescaler 2) shall be used. A value of 48 to 55 means that one of the flip-flops shall be used (48 meaning flip-flop 0 and 55 meaning flip-flop 7). A value of 61 means that the output shall be put in a tri-state (only for outputs that can also act as inputs and thus support a tri-state). A value of 62 specified that the output shall be set to constant hight. A value of 63 specifies that the output shall be set to constant low. +Mapping used for the output. A value of 0 to 31 specifies that the corresponding pulse generator shall be used. A value of 32 to 39 specifies that one of the distributed bus bits (32 meaning distributed bus bit 0 and 39 meaning distributed bus bit 7) shall be used. A value of 40 to 47 specifies that one of the prescalers (40 meaning prescaler 0 and 47 meaning prescaler 7) shall be used. A value of 48 to 55 means that one of the flip-flops shall be used (48 meaning flip-flop 0 and 55 meaning flip-flop 7). A value of 61 means that the output shall be put in a tri-state (only for outputs that can also act as inputs and thus support a tri-state). A value of 62 specified that the output shall be set to constant hight. A value of 63 specifies that the output shall be set to constant low. Out:Map2 diff --git a/opi/boy/EVR/Interrupts_MTCA-EVR-300.opi b/opi/boy/EVR/Interrupts_MTCA-EVR-300.opi index 1b5b23c..20d85ca 100644 --- a/opi/boy/EVR/Interrupts_MTCA-EVR-300.opi +++ b/opi/boy/EVR/Interrupts_MTCA-EVR-300.opi @@ -10,7 +10,7 @@ - 5.1.0.202009030828 + 5.1.0.202302222212 @@ -45,7 +45,7 @@ 1 true - Header 1 + Header 1 @@ -96,7 +96,7 @@ 1 true - Default + Default false @@ -142,7 +142,7 @@ $(pv_value) 1 true - Default + Default false @@ -186,7 +186,7 @@ $(pv_value) 1 true - Default + Default @@ -236,7 +236,7 @@ $(pv_value) 1 true - Default + Default false @@ -289,7 +289,7 @@ $(pv_value) true true - Default + Default false @@ -338,7 +338,7 @@ $(pv_value) 1 true - Default + Default @@ -378,7 +378,7 @@ $(pv_value) 1 true - Default + Default @@ -420,7 +420,7 @@ $(pv_value) 1 false - Default + Default false @@ -481,7 +481,7 @@ $(pv_value) 1 true - Default + Default false @@ -534,7 +534,7 @@ $(pv_value) true true - Default + Default false @@ -583,7 +583,7 @@ $(pv_value) 1 true - Default + Default @@ -623,7 +623,7 @@ $(pv_value) 1 true - Default + Default @@ -665,7 +665,7 @@ $(pv_value) 1 false - Default + Default false @@ -726,7 +726,7 @@ $(pv_value) 1 true - Default + Default false @@ -779,7 +779,7 @@ $(pv_value) true true - Default + Default false @@ -828,7 +828,7 @@ $(pv_value) 1 true - Default + Default @@ -868,7 +868,7 @@ $(pv_value) 1 true - Default + Default @@ -910,7 +910,7 @@ $(pv_value) 1 false - Default + Default false @@ -971,7 +971,7 @@ $(pv_value) 1 true - Default + Default false @@ -1024,7 +1024,7 @@ $(pv_value) true true - Default + Default false @@ -1073,7 +1073,7 @@ $(pv_value) 1 true - Default + Default @@ -1113,7 +1113,7 @@ $(pv_value) 1 true - Default + Default @@ -1155,7 +1155,7 @@ $(pv_value) 1 false - Default + Default false @@ -1216,7 +1216,7 @@ $(pv_value) 1 true - Default + Default false @@ -1269,7 +1269,7 @@ $(pv_value) true true - Default + Default false @@ -1318,7 +1318,7 @@ $(pv_value) 1 true - Default + Default @@ -1358,7 +1358,7 @@ $(pv_value) 1 true - Default + Default @@ -1400,7 +1400,7 @@ $(pv_value) 1 false - Default + Default false @@ -1461,7 +1461,7 @@ $(pv_value) 1 true - Default + Default false @@ -1514,7 +1514,7 @@ $(pv_value) true true - Default + Default false @@ -1563,7 +1563,7 @@ $(pv_value) 1 true - Default + Default @@ -1603,7 +1603,7 @@ $(pv_value) 1 true - Default + Default @@ -1645,7 +1645,7 @@ $(pv_value) 1 false - Default + Default false @@ -1706,7 +1706,7 @@ $(pv_value) 1 true - Default + Default false @@ -1759,7 +1759,7 @@ $(pv_value) true true - Default + Default false @@ -1808,7 +1808,7 @@ $(pv_value) 1 true - Default + Default @@ -1848,7 +1848,7 @@ $(pv_value) 1 true - Default + Default @@ -1890,7 +1890,7 @@ $(pv_value) 1 false - Default + Default false @@ -1941,7 +1941,7 @@ $(pv_value) 1 true - Default + Default @@ -1983,13 +1983,13 @@ $(pv_value) 1 true - Default + Default false - 32 + 26 Pulse Generator 0 Pulse Generator 1 @@ -2018,6 +2018,19 @@ $(pv_value) Prescaler 0 Prescaler 1 Prescaler 2 + Prescaler 3 + Prescaler 4 + Prescaler 5 + Prescaler 6 + Prescaler 7 + Flip-Flop 0 + Flip-Flop 1 + Flip-Flop 2 + Flip-Flop 3 + Flip-Flop 4 + Flip-Flop 5 + Flip-Flop 6 + Flip-Flop 7 Force High Force Low @@ -2092,54 +2105,6 @@ case 14: case 15: mappingString = "Pulse Generator 15"; break; -case 16: - mappingString = "Pulse Generator 16"; - break; -case 17: - mappingString = "Pulse Generator 17"; - break; -case 18: - mappingString = "Pulse Generator 18"; - break; -case 19: - mappingString = "Pulse Generator 19"; - break; -case 20: - mappingString = "Pulse Generator 20"; - break; -case 21: - mappingString = "Pulse Generator 21"; - break; -case 22: - mappingString = "Pulse Generator 22"; - break; -case 23: - mappingString = "Pulse Generator 23"; - break; -case 24: - mappingString = "Pulse Generator 24"; - break; -case 25: - mappingString = "Pulse Generator 25"; - break; -case 26: - mappingString = "Pulse Generator 26"; - break; -case 27: - mappingString = "Pulse Generator 27"; - break; -case 28: - mappingString = "Pulse Generator 28"; - break; -case 29: - mappingString = "Pulse Generator 29"; - break; -case 30: - mappingString = "Pulse Generator 30"; - break; -case 31: - mappingString = "Pulse Generator 31"; - break; case 32: mappingString = "Dist. Bus Bit 0"; break; @@ -2173,6 +2138,45 @@ case 41: case 42: mappingString = "Prescaler 2"; break; +case 43: + mappingString = "Prescaler 3"; + break; +case 44: + mappingString = "Prescaler 4"; + break; +case 45: + mappingString = "Prescaler 5"; + break; +case 46: + mappingString = "Prescaler 6"; + break; +case 47: + mappingString = "Prescaler 7"; + break; +case 48: + mappingString = "Flip-Flop 0"; + break; +case 49: + mappingString = "Flip-Flop 1"; + break; +case 50: + mappingString = "Flip-Flop 2"; + break; +case 51: + mappingString = "Flip-Flop 3"; + break; +case 52: + mappingString = "Flip-Flop 4"; + break; +case 53: + mappingString = "Flip-Flop 5"; + break; +case 54: + mappingString = "Flip-Flop 6"; + break; +case 55: + mappingString = "Flip-Flop 7"; + break; case 62: mappingString = "Force High"; break; @@ -2230,38 +2234,6 @@ if (mappingString == "Pulse Generator 0") { mappingCode = 14; } else if (mappingString == "Pulse Generator 15") { mappingCode = 15; -} else if (mappingString == "Pulse Generator 16") { - mappingCode = 16; -} else if (mappingString == "Pulse Generator 17") { - mappingCode = 17; -} else if (mappingString == "Pulse Generator 18") { - mappingCode = 18; -} else if (mappingString == "Pulse Generator 19") { - mappingCode = 19; -} else if (mappingString == "Pulse Generator 20") { - mappingCode = 20; -} else if (mappingString == "Pulse Generator 21") { - mappingCode = 21; -} else if (mappingString == "Pulse Generator 22") { - mappingCode = 22; -} else if (mappingString == "Pulse Generator 23") { - mappingCode = 23; -} else if (mappingString == "Pulse Generator 24") { - mappingCode = 24; -} else if (mappingString == "Pulse Generator 25") { - mappingCode = 25; -} else if (mappingString == "Pulse Generator 26") { - mappingCode = 26; -} else if (mappingString == "Pulse Generator 27") { - mappingCode = 27; -} else if (mappingString == "Pulse Generator 28") { - mappingCode = 28; -} else if (mappingString == "Pulse Generator 29") { - mappingCode = 29; -} else if (mappingString == "Pulse Generator 30") { - mappingCode = 30; -} else if (mappingString == "Pulse Generator 31") { - mappingCode = 31; } else if (mappingString == "Dist. Bus Bit 0") { mappingCode = 32; } else if (mappingString == "Dist. Bus Bit 1") { @@ -2284,6 +2256,32 @@ if (mappingString == "Pulse Generator 0") { mappingCode = 41; } else if (mappingString == "Prescaler 2") { mappingCode = 42; +} else if (mappingString == "Prescaler 3") { + mappingCode = 43; +} else if (mappingString == "Prescaler 4") { + mappingCode = 44; +} else if (mappingString == "Prescaler 5") { + mappingCode = 45; +} else if (mappingString == "Prescaler 6") { + mappingCode = 46; +} else if (mappingString == "Prescaler 7") { + mappingCode = 47; +} else if (mappingString == "Flip-Flop 0") { + mappingCode = 48; +} else if (mappingString == "Flip-Flop 1") { + mappingCode = 49; +} else if (mappingString == "Flip-Flop 2") { + mappingCode = 50; +} else if (mappingString == "Flip-Flop 3") { + mappingCode = 51; +} else if (mappingString == "Flip-Flop 4") { + mappingCode = 52; +} else if (mappingString == "Flip-Flop 5") { + mappingCode = 53; +} else if (mappingString == "Flip-Flop 6") { + mappingCode = 54; +} else if (mappingString == "Flip-Flop 7") { + mappingCode = 55; } else if (mappingString == "Force High") { mappingCode = 62; } else if (mappingString == "Force Low") { diff --git a/opi/boy/EVR/Output16PulseGenerators8FlipFlopsWithTriState.opi b/opi/boy/EVR/Output16PulseGenerators8FlipFlops8Prescalers.opi similarity index 93% rename from opi/boy/EVR/Output16PulseGenerators8FlipFlopsWithTriState.opi rename to opi/boy/EVR/Output16PulseGenerators8FlipFlops8Prescalers.opi index fc495df..c10eb18 100644 --- a/opi/boy/EVR/Output16PulseGenerators8FlipFlopsWithTriState.opi +++ b/opi/boy/EVR/Output16PulseGenerators8FlipFlops8Prescalers.opi @@ -10,7 +10,7 @@ - 5.1.0.202204071456 + 5.1.0.202302222212 @@ -82,6 +82,11 @@ Prescaler 0 Prescaler 1 Prescaler 2 + Prescaler 3 + Prescaler 4 + Prescaler 5 + Prescaler 6 + Prescaler 7 Flip-Flop 0 Flip-Flop 1 Flip-Flop 2 @@ -90,7 +95,6 @@ Flip-Flop 5 Flip-Flop 6 Flip-Flop 7 - Tri-State Force High Force Low @@ -206,6 +210,21 @@ case 41: case 42: mappingString = "Prescaler 2"; break; +case 43: + mappingString = "Prescaler 3"; + break; +case 44: + mappingString = "Prescaler 4"; + break; +case 45: + mappingString = "Prescaler 5"; + break; +case 46: + mappingString = "Prescaler 6"; + break; +case 47: + mappingString = "Prescaler 7"; + break; case 48: mappingString = "Flip-Flop 0"; break; @@ -230,9 +249,6 @@ case 54: case 55: mappingString = "Flip-Flop 7"; break; -case 61: - mappingString = "Tri-State"; - break; case 62: mappingString = "Force High"; break; @@ -312,6 +328,16 @@ if (mappingString == "Pulse Generator 0") { mappingCode = 41; } else if (mappingString == "Prescaler 2") { mappingCode = 42; +} else if (mappingString == "Prescaler 3") { + mappingCode = 43; +} else if (mappingString == "Prescaler 4") { + mappingCode = 44; +} else if (mappingString == "Prescaler 5") { + mappingCode = 45; +} else if (mappingString == "Prescaler 6") { + mappingCode = 46; +} else if (mappingString == "Prescaler 7") { + mappingCode = 47; } else if (mappingString == "Flip-Flop 0") { mappingCode = 48; } else if (mappingString == "Flip-Flop 1") { @@ -328,8 +354,6 @@ if (mappingString == "Pulse Generator 0") { mappingCode = 54; } else if (mappingString == "Flip-Flop 7") { mappingCode = 55; -} else if (mappingString == "Tri-State") { - mappingCode = 61; } else if (mappingString == "Force High") { mappingCode = 62; } else if (mappingString == "Force Low") { @@ -503,6 +527,11 @@ $(pv_value) Prescaler 0 Prescaler 1 Prescaler 2 + Prescaler 3 + Prescaler 4 + Prescaler 5 + Prescaler 6 + Prescaler 7 Flip-Flop 0 Flip-Flop 1 Flip-Flop 2 @@ -511,7 +540,6 @@ $(pv_value) Flip-Flop 5 Flip-Flop 6 Flip-Flop 7 - Tri-State Force High Force Low @@ -627,6 +655,21 @@ case 41: case 42: mappingString = "Prescaler 2"; break; +case 43: + mappingString = "Prescaler 3"; + break; +case 44: + mappingString = "Prescaler 4"; + break; +case 45: + mappingString = "Prescaler 5"; + break; +case 46: + mappingString = "Prescaler 6"; + break; +case 47: + mappingString = "Prescaler 7"; + break; case 48: mappingString = "Flip-Flop 0"; break; @@ -651,9 +694,6 @@ case 54: case 55: mappingString = "Flip-Flop 7"; break; -case 61: - mappingString = "Tri-State"; - break; case 62: mappingString = "Force High"; break; @@ -733,6 +773,16 @@ if (mappingString == "Pulse Generator 0") { mappingCode = 41; } else if (mappingString == "Prescaler 2") { mappingCode = 42; +} else if (mappingString == "Prescaler 3") { + mappingCode = 43; +} else if (mappingString == "Prescaler 4") { + mappingCode = 44; +} else if (mappingString == "Prescaler 5") { + mappingCode = 45; +} else if (mappingString == "Prescaler 6") { + mappingCode = 46; +} else if (mappingString == "Prescaler 7") { + mappingCode = 47; } else if (mappingString == "Flip-Flop 0") { mappingCode = 48; } else if (mappingString == "Flip-Flop 1") { @@ -749,8 +799,6 @@ if (mappingString == "Pulse Generator 0") { mappingCode = 54; } else if (mappingString == "Flip-Flop 7") { mappingCode = 55; -} else if (mappingString == "Tri-State") { - mappingCode = 61; } else if (mappingString == "Force High") { mappingCode = 62; } else if (mappingString == "Force Low") { @@ -764,7 +812,7 @@ if (mappingCode >= 0 && pvMappingCode.isWriteAllowed()) { PVUtil.writePV(pvMappingCode.getName(), mappingCode); } ]]> - $(mrf_evr_output_prefix)$(mrf_evr_output_num):Map + $(mrf_evr_output_prefix)$(mrf_evr_output_num):Map2 $(pv_name) diff --git a/opi/boy/EVR/Output16PulseGenerators8FlipFlops.opi b/opi/boy/EVR/Output16PulseGenerators8FlipFlops8PrescalersWithTriState.opi similarity index 92% rename from opi/boy/EVR/Output16PulseGenerators8FlipFlops.opi rename to opi/boy/EVR/Output16PulseGenerators8FlipFlops8PrescalersWithTriState.opi index d7fd19e..d654bf5 100644 --- a/opi/boy/EVR/Output16PulseGenerators8FlipFlops.opi +++ b/opi/boy/EVR/Output16PulseGenerators8FlipFlops8PrescalersWithTriState.opi @@ -10,7 +10,7 @@ - 5.1.0.202204071456 + 5.1.0.202302222212 @@ -82,6 +82,11 @@ Prescaler 0 Prescaler 1 Prescaler 2 + Prescaler 3 + Prescaler 4 + Prescaler 5 + Prescaler 6 + Prescaler 7 Flip-Flop 0 Flip-Flop 1 Flip-Flop 2 @@ -90,6 +95,7 @@ Flip-Flop 5 Flip-Flop 6 Flip-Flop 7 + Tri-State Force High Force Low @@ -205,6 +211,21 @@ case 41: case 42: mappingString = "Prescaler 2"; break; +case 43: + mappingString = "Prescaler 3"; + break; +case 44: + mappingString = "Prescaler 4"; + break; +case 45: + mappingString = "Prescaler 5"; + break; +case 46: + mappingString = "Prescaler 6"; + break; +case 47: + mappingString = "Prescaler 7"; + break; case 48: mappingString = "Flip-Flop 0"; break; @@ -229,6 +250,9 @@ case 54: case 55: mappingString = "Flip-Flop 7"; break; +case 61: + mappingString = "Tri-State"; + break; case 62: mappingString = "Force High"; break; @@ -308,6 +332,16 @@ if (mappingString == "Pulse Generator 0") { mappingCode = 41; } else if (mappingString == "Prescaler 2") { mappingCode = 42; +} else if (mappingString == "Prescaler 3") { + mappingCode = 43; +} else if (mappingString == "Prescaler 4") { + mappingCode = 44; +} else if (mappingString == "Prescaler 5") { + mappingCode = 45; +} else if (mappingString == "Prescaler 6") { + mappingCode = 46; +} else if (mappingString == "Prescaler 7") { + mappingCode = 47; } else if (mappingString == "Flip-Flop 0") { mappingCode = 48; } else if (mappingString == "Flip-Flop 1") { @@ -324,6 +358,8 @@ if (mappingString == "Pulse Generator 0") { mappingCode = 54; } else if (mappingString == "Flip-Flop 7") { mappingCode = 55; +} else if (mappingString == "Tri-State") { + mappingCode = 61; } else if (mappingString == "Force High") { mappingCode = 62; } else if (mappingString == "Force Low") { @@ -497,6 +533,11 @@ $(pv_value) Prescaler 0 Prescaler 1 Prescaler 2 + Prescaler 3 + Prescaler 4 + Prescaler 5 + Prescaler 6 + Prescaler 7 Flip-Flop 0 Flip-Flop 1 Flip-Flop 2 @@ -505,6 +546,7 @@ $(pv_value) Flip-Flop 5 Flip-Flop 6 Flip-Flop 7 + Tri-State Force High Force Low @@ -620,6 +662,21 @@ case 41: case 42: mappingString = "Prescaler 2"; break; +case 43: + mappingString = "Prescaler 3"; + break; +case 44: + mappingString = "Prescaler 4"; + break; +case 45: + mappingString = "Prescaler 5"; + break; +case 46: + mappingString = "Prescaler 6"; + break; +case 47: + mappingString = "Prescaler 7"; + break; case 48: mappingString = "Flip-Flop 0"; break; @@ -644,6 +701,9 @@ case 54: case 55: mappingString = "Flip-Flop 7"; break; +case 61: + mappingString = "Tri-State"; + break; case 62: mappingString = "Force High"; break; @@ -723,6 +783,16 @@ if (mappingString == "Pulse Generator 0") { mappingCode = 41; } else if (mappingString == "Prescaler 2") { mappingCode = 42; +} else if (mappingString == "Prescaler 3") { + mappingCode = 43; +} else if (mappingString == "Prescaler 4") { + mappingCode = 44; +} else if (mappingString == "Prescaler 5") { + mappingCode = 45; +} else if (mappingString == "Prescaler 6") { + mappingCode = 46; +} else if (mappingString == "Prescaler 7") { + mappingCode = 47; } else if (mappingString == "Flip-Flop 0") { mappingCode = 48; } else if (mappingString == "Flip-Flop 1") { @@ -739,6 +809,8 @@ if (mappingString == "Pulse Generator 0") { mappingCode = 54; } else if (mappingString == "Flip-Flop 7") { mappingCode = 55; +} else if (mappingString == "Tri-State") { + mappingCode = 61; } else if (mappingString == "Force High") { mappingCode = 62; } else if (mappingString == "Force Low") { diff --git a/opi/boy/EVR/Outputs_MTCA-EVR-300.opi b/opi/boy/EVR/Outputs_MTCA-EVR-300.opi index a986f66..26373b8 100644 --- a/opi/boy/EVR/Outputs_MTCA-EVR-300.opi +++ b/opi/boy/EVR/Outputs_MTCA-EVR-300.opi @@ -253,7 +253,7 @@ $(pv_value) 0 Linking Container - Output16PulseGenerators8FlipFlops.opi + Output16PulseGenerators8FlipFlops8Prescalers.opi 1 @@ -335,7 +335,7 @@ $(pv_value) 1 Linking Container - Output16PulseGenerators8FlipFlops.opi + Output16PulseGenerators8FlipFlops8Prescalers.opi 1 @@ -377,7 +377,7 @@ $(pv_value) 2 Linking Container - Output16PulseGenerators8FlipFlops.opi + Output16PulseGenerators8FlipFlops8Prescalers.opi 1 @@ -419,7 +419,7 @@ $(pv_value) 3 Linking Container - Output16PulseGenerators8FlipFlops.opi + Output16PulseGenerators8FlipFlops8Prescalers.opi 1 @@ -582,7 +582,7 @@ $(pv_value) 0 Linking Container - Output16PulseGenerators8FlipFlopsWithTriState.opi + Output16PulseGenerators8FlipFlops8PrescalersWithTriState.opi 1 @@ -824,7 +824,7 @@ $(pv_value) 1 Linking Container - Output16PulseGenerators8FlipFlopsWithTriState.opi + Output16PulseGenerators8FlipFlops8PrescalersWithTriState.opi 1 @@ -906,7 +906,7 @@ $(pv_value) 2 Linking Container - Output16PulseGenerators8FlipFlopsWithTriState.opi + Output16PulseGenerators8FlipFlops8PrescalersWithTriState.opi 1 @@ -988,7 +988,7 @@ $(pv_value) 3 Linking Container_1 - Output16PulseGenerators8FlipFlopsWithTriState.opi + Output16PulseGenerators8FlipFlops8PrescalersWithTriState.opi 1 @@ -1070,7 +1070,7 @@ $(pv_value) 4 Linking Container - Output16PulseGenerators8FlipFlopsWithTriState.opi + Output16PulseGenerators8FlipFlops8PrescalersWithTriState.opi 1 @@ -1152,7 +1152,7 @@ $(pv_value) 5 Linking Container_1 - Output16PulseGenerators8FlipFlopsWithTriState.opi + Output16PulseGenerators8FlipFlops8PrescalersWithTriState.opi 1 @@ -1234,7 +1234,7 @@ $(pv_value) 6 Linking Container - Output16PulseGenerators8FlipFlopsWithTriState.opi + Output16PulseGenerators8FlipFlops8PrescalersWithTriState.opi 1 @@ -1316,7 +1316,7 @@ $(pv_value) 7 Linking Container_1 - Output16PulseGenerators8FlipFlopsWithTriState.opi + Output16PulseGenerators8FlipFlops8PrescalersWithTriState.opi 1 @@ -1398,7 +1398,7 @@ $(pv_value) 8 Linking Container - Output16PulseGenerators8FlipFlopsWithTriState.opi + Output16PulseGenerators8FlipFlops8PrescalersWithTriState.opi 1 @@ -1480,7 +1480,7 @@ $(pv_value) 9 Linking Container_1 - Output16PulseGenerators8FlipFlopsWithTriState.opi + Output16PulseGenerators8FlipFlops8PrescalersWithTriState.opi 1 @@ -1655,4 +1655,4 @@ $(pv_value) - \ No newline at end of file +