diff --git a/ChangeLog b/ChangeLog index 543107c9..10aa0bb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16231,3 +16231,5 @@ * Added a screenshot for RMLSend to the Operations Guide. 2017-11-02 Fred Gleason * Moved the contents of 'docs/SWITCHERS.txt' to the Operations Guide. +2017-11-03 Fred Gleason + * Moved the contents of 'docs/GPIO.txt' to the Operations Guide. diff --git a/docs/GPIO.txt b/docs/GPIO.txt deleted file mode 100644 index e6af2134..00000000 --- a/docs/GPIO.txt +++ /dev/null @@ -1,185 +0,0 @@ - GPIO Notes for Rivendell - -Rivendell supports the following General Purpose Input/Output (GPIO) -devices: - -Gameport Joystick Buttons -USB Joystick Buttons -Measurement Computing PCI-PDIS08 Board -Measurement Computing PCI-PDIS16 Board -Measurement Computing PCI-DIO24 Board - -Several supported switcher devices feature GPIO capabiities as well, -see the file 'SWITCHERS.txt' for more info. - -JOYSTICK DEVICES -Joystick support utilizes the Linux Input Device subsystem. Inputs -are active-low, and should be wired as follows: - -02: Input 1 -04: Ground - -07: Input 2 -05: Ground - -10: Input 3 -12: Ground - -14: Input 4 -12: Ground - -In addition, you will need to connect 47 kohm resistors between the -following pins: 1-3, 6-8, 9-11 and 13-15. While not strictly needed -for the GPI portion of the interface to work, the kernel's analog -joystick driver will refuse to initialize the port if these resistors -(or a real joystick) are not present. - -The device name of the joystick will be one of the /dev/input/event -devices. - -NOTE: There have been reports that some port models do not internally -connect pin 12 to ground. The symptom of this situation will be that -Inputs 1 and 2 work, but not Inputs 3 and 4. If this is the case, -connecting the ground for Inputs 3 and 4 to pins 04 or 05 should remedy -the problem. - - -MEASUREMENT COMPUTER GPIO BOARDS -To configure one of the supported MeasurementComputing GPIO boards, -proceed as follows: - -1) Install the card(s) in the computer. In the case of the PCI-DIO24, - two cards may be necessary, as each seperate card is entirely - utilized as either inputs or outputs. - - -2) Test it out. Two programs exist for this purpose: 'gpitest' tests - GPI inputs, and 'gpotest' tests GPO outputs. These programs come - with the 'libradio' package. - -3) Define a GPIO device in RDAdmin->Stations->Switcher/GPIO. Use - a device type of 'Local GPIO'. - ------------------------------------------------------------------------------ -GPIO BOARD-SPECIFIC NOTES - -The Measurement Computing PCI-PDIS08 and PCI-PDIS16 boards feature -floating, opto-isolated inputs. The inputs are not polarity sensitive -and may be driven by either AC or DC. The outputs are electro-mechanical -relays with dry contacts. Connector pinouts are as follows: - -PCI-PDIS08 -- DB37 Male Connector -PCI-PDIS16 -- DB37 Male Connector (using C50F-37F Cable) -Pin Signal ----------------- - 1 Input 8/16 - 20 Input 8/16 - - 2 Input 7/15 - 21 Input 7/15 - - 3 Input 6/14 - 22 Input 6/14 - - 4 Input 5/13 - 23 Input 5/13 - - 5 Input 4/12 - 24 Input 4/12 - - 6 Input 3/11 - 25 Input 3/11 - - 7 Input 2/10 - 26 Input 2/10 - - 8 Input 1/9 - 27 Input 1/9 - - 9 Output 8/16 C - 28 Output 8/16 N/O - - 10 Output 7/15 C - 29 Output 7/15 N/O - - 11 Output 6/14 C - 30 Output 6/14 N/O - - 12 Output 5/13 N/C - 13 Output 5/13 N/O - 31 Output 5/13 C - - 14 Output 4/12 C - 32 Output 4/12 N/C - 33 Output 4/12 N/O - - 15 Output 3/11 N/C - 16 Output 3/11 N/O - 34 Output 3/11 C - - 17 Output 2/10 C - 35 Output 2/10 N/C - 36 Output 2/10 N/O - - 18 Output 1/9 N/C - 19 Output 1/9 N/O - - 37 Output 1/9 C ----------------------- -C = Common -N/O = Normally Open -N/C = Normally Closed - ------------------------------------------------------------------------------ - -The Measurement Computing PCI-DIO24 board features TTL logic-level -connections, which can be configured to operate either as inputs or -outputs. Connector pinouts are as follows: - -PCI-DIO24 -- DB37 Male Connector -Pin Signal ---------------------- - 37 Input/Output 1 - 36 Input/Output 2 - 35 Input/Output 3 - 34 Input/Output 4 - 33 Input/Output 5 - 32 Input/Output 6 - 31 Input/Output 7 - 30 Input/Output 8 - 10 Input/Output 9 - 9 Input/Output 10 - 8 Input/Output 11 - 7 Input/Output 12 - 6 Input/Output 13 - 5 Input/Output 14 - 4 Input/Output 15 - 3 Input/Output 16 - 29 Input/Output 17 - 28 Input/Output 18 - 27 Input/Output 19 - 26 Input/Output 20 - 25 Input/Output 21 - 24 Input/Output 22 - 23 Input/Output 23 - 22 Input/Output 24 - - 11 Ground - 13 Ground - 15 Ground - 17 Ground - 19 Ground - 21 Ground - - 18 +5 VDC - 20 +5 VDC - - 16 +12 VDC - - 14 -12 VDC - -WARNING: The +5 VDC, +12 VDC and -12 VDC pins are connected directly to -the power supply buss of the host PC. Improper use of these pins can -cause serious damage to your computer! - ------------------------------------------------------------------------------ diff --git a/docs/Makefile.am b/docs/Makefile.am index a2ad6bd1..f54053d5 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -35,7 +35,6 @@ EXTRA_DIST = ALSA.txt\ datetime_wildcards.txt\ implemented_macros.txt\ ENCODERS.txt\ - GPIO.txt\ JACK.txt\ MESSAGE_BOX.txt\ metadata_wildcards.txt\ @@ -49,7 +48,6 @@ EXTRA_DIST = ALSA.txt\ RIVENDELL_FILTER.txt\ SAGE_ENDEC.txt\ scheduler_formats.ods\ - SWITCHERS.txt\ WIN32.txt\ WINGS_FILTER.txt diff --git a/docs/SWITCHERS.txt b/docs/SWITCHERS.txt deleted file mode 100644 index 5828e431..00000000 --- a/docs/SWITCHERS.txt +++ /dev/null @@ -1 +0,0 @@ -The contents of this file have been moved to the Rivendell Operations Guide. diff --git a/docs/opsguide/opsguide.xml b/docs/opsguide/opsguide.xml index e231a12e..b68cb683 100644 --- a/docs/opsguide/opsguide.xml +++ b/docs/opsguide/opsguide.xml @@ -8126,6 +8126,239 @@ under certain conditions; type `show c' for details. + + Local GPIO + + + Driver Name: + + + Local GPIO + + + + + Supported RML Commands: + + + + GPI Enable ['GE'] + GPI Set ['GI'] + GPO Set ['GO'] + + + + + + + General Notes + + This driver supports a variety of GPIO devices, including: + + 15 Pin Joystick Port + USB HID Devices + MeasurementComputing GPIO Cards + + + + 15 Pin Joystick Port + + Joystick support utilizes the Linux Input Device subsystem. Inputs + are active-low, and should be wired as follows: + + + 15 Pin Joystick Port Wiring + + + + + PinSignal + + + 2Input 1 + 4Ground + + 7Input 2 + 5Ground + + 10Input 3 + 12Ground + + 14Input 4 + 12Ground + + +
+ + In addition, you will need to connect 47 kohm resistors between the + following pins: 1-3, 6-8, 9-11 and 13-15. While not strictly needed + for the GPI portion of the interface to work, the kernel's analog + joystick driver will refuse to initialize the port if these resistors + (or a real joystick) are not present. + + + The device name of the joystick will be one of the + /dev/input/eventn + devices. + + + NOTE: There have been reports that some port models do not internally + connect pin 12 to ground. The symptom of this situation will be that + Inputs 1 and 2 work, but not Inputs 3 and 4. If this is the case, + connecting the ground for Inputs 3 and 4 to pins 04 or 05 should remedy + the problem. + +
+ + MeasurementComputing GPIO Cards + + The following MeasurementComputing cards are supported: + + + PCI-PDIS08 + PCI-PDIS16 + PCI-DIO24 + + + The device name for the card should be + /dev/gpion. + + + PCI-PDIS08 and PCI-PDIS16 + + The Measurement Computing PCI-PDIS08 and PCI-PDIS16 boards + feature floating, opto-isolated inputs. The inputs are + not polarity sensitive and may be driven by either AC or + DC. The outputs are electro-mechanical relays with dry + contacts. + + + PCI-PDIS08 and PCI-PDIS16 Connector Pinout (DB37F) + + + + + PinSignal + + + 1Input 8/16 + 20Input 8/16 + + 2Input 7/15 + 21Input 7/15 + + 3Input 6/14 + 22Input 6/14 + + 4Input 5/13 + 23Input 5/13 + + 5Input 4/12 + 24Input 4/12 + + 6Input 3/11 + 25Input 3/11 + + 7Input 2/10 + 26Input 2/10 + + 8Input 1/9 + 27Input 1/9 + + 9Output 8/16 C + 28Output 8/16 N/O + + 10Output 7/15 C + 29Output 7/15 N/O + + 11Output 6/14 C + 30Output 6/14 N/O + + 12Output 5/13 N/C + 13Output 5/13 N/O + 31Output 5/13 C + + 14Output 4/12 N/C + 32Output 4/12 N/O + 33Output 4/12 C + + 15Output 3/11 N/C + 16Output 3/11 N/O + 34Output 3/11 C + + 17Output 2/10 N/C + 35Output 2/10 N/O + 36Output 2/10 C + + 18Output 1/9 N/C + 19Output 1/9 N/O + 37Output 1/9 C + + +
+
+ + PCI-DIO24 + + The Measurement Computing PCI-DIO24 board features 24 + bi-directional, TTL level signal lines, referenced to a + common ground. The driver can be + configured to use all of the lines as inputs or outputs + (mixing inputs and outputs on the same board is not supported). + When used as inputs, termination resistor packs should be + installed. + + + PCI-DIO24 Connector Pinout (DB37F) + + + + + PinSignal + + + 37Input 1 + 36Input 2 + 35Input 3 + 34Input 4 + 33Input 5 + 32Input 6 + 31Input 7 + 30Input 8 + 10Input 9 + 9Input 10 + 8Input 11 + 7Input 12 + 6Input 13 + 5Input 14 + 4Input 15 + 3Input 16 + 29Input 17 + 28Input 18 + 27Input 19 + 26Input 20 + 25Input 21 + 24Input 22 + 23Input 23 + 22Input 24 + 11Ground + 13Ground + 15Ground + 17Ground + 19Ground + 21Ground + 18+5 vdc + 20+5 vdc + 16+12 vdc + 14+-12 vdc + + +
+
+
+
+
+ Logitek vGuest diff --git a/rivendell.spec.in b/rivendell.spec.in index 5badc01e..2825f46b 100644 --- a/rivendell.spec.in +++ b/rivendell.spec.in @@ -376,9 +376,7 @@ rm -rf $RPM_BUILD_ROOT %doc conf/my.cnf-standby %doc docs/catchd.txt %doc docs/colors -%doc docs/GPIO.txt %doc docs/ripc.txt -%doc docs/SWITCHERS.txt %doc docs/JACK.txt %doc docs/ENCODERS.txt %doc docs/pam_rd.txt