<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17492">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">switch to using 'usbrelay' and more generic,inexpensive relay board<br><br>Change-Id: I292e3fd8127d393838b11db7fb058eb638524abc<br>---<br>M tests/README<br>M tests/sysmo-octsim/01_check_rig.out<br>M tests/sysmo-octsim/README<br>M tests/sysmo-octsim/ctl_reset_target.sh<br>M tests/sysmo-octsim/ctl_reset_to_dfu.sh<br>M tests/sysmo-octsim/prepare<br>M tests/sysmo-octsim/test-data<br>7 files changed, 40 insertions(+), 75 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/README b/tests/README</span><br><span>index 552ac71..0508a4a 100644</span><br><span>--- a/tests/README</span><br><span>+++ b/tests/README</span><br><span>@@ -3,5 +3,5 @@</span><br><span> </span><br><span> this testbed is the hardware-CI interface to make sure the firmware built is also working when flashed onto hardware.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-to run it you will need a usb controlled relay board like the devantech_Ltd._USB-RLY08 and a sysmo-octsim board.</span><br><span style="color: hsl(120, 100%, 40%);">+to run it you will need a usb controlled relay board and a sysmo-octsim board.</span><br><span> </span><br><span>diff --git a/tests/sysmo-octsim/01_check_rig.out b/tests/sysmo-octsim/01_check_rig.out</span><br><span>index 1bd7d66..2a0d463 100644</span><br><span>--- a/tests/sysmo-octsim/01_check_rig.out</span><br><span>+++ b/tests/sysmo-octsim/01_check_rig.out</span><br><span>@@ -1,51 +1,50 @@</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ID 04d8:ffee Microchip Technology, Inc. Devantech USB-ISS</span><br><span style="color: hsl(120, 100%, 40%);">+ID 16c0:05df Van Ooijen Technische Informatica HID device except mice, keyboards, and joysticks</span><br><span> Device Descriptor:</span><br><span> bLength 18</span><br><span> bDescriptorType 1</span><br><span style="color: hsl(0, 100%, 40%);">- bcdUSB 2.00</span><br><span style="color: hsl(0, 100%, 40%);">- bDeviceClass 2 Communications</span><br><span style="color: hsl(120, 100%, 40%);">+ bcdUSB 1.10</span><br><span style="color: hsl(120, 100%, 40%);">+ bDeviceClass 0 </span><br><span> bDeviceSubClass 0 </span><br><span> bDeviceProtocol 0 </span><br><span> bMaxPacketSize0 8</span><br><span style="color: hsl(0, 100%, 40%);">- idVendor 0x04d8 Microchip Technology, Inc.</span><br><span style="color: hsl(0, 100%, 40%);">- idProduct 0xffee Devantech USB-ISS</span><br><span style="color: hsl(120, 100%, 40%);">+ idVendor 0x16c0 Van Ooijen Technische Informatica</span><br><span style="color: hsl(120, 100%, 40%);">+ idProduct 0x05df HID device except mice, keyboards, and joysticks</span><br><span> bcdDevice 1.00</span><br><span style="color: hsl(0, 100%, 40%);">- iManufacturer 1 Devantech Ltd.</span><br><span style="color: hsl(0, 100%, 40%);">- iProduct 2 USB-RLY08</span><br><span style="color: hsl(0, 100%, 40%);">- iSerial 3 00021197</span><br><span style="color: hsl(120, 100%, 40%);">+ iManufacturer 1 www.dcttech.com</span><br><span style="color: hsl(120, 100%, 40%);">+ iProduct 2 USBRelay2</span><br><span style="color: hsl(120, 100%, 40%);">+ iSerial 0 </span><br><span> bNumConfigurations 1</span><br><span> Configuration Descriptor:</span><br><span> bLength 9</span><br><span> bDescriptorType 2</span><br><span style="color: hsl(0, 100%, 40%);">- wTotalLength 0x0043</span><br><span style="color: hsl(0, 100%, 40%);">- bNumInterfaces 2</span><br><span style="color: hsl(120, 100%, 40%);">+ wTotalLength 0x0022</span><br><span style="color: hsl(120, 100%, 40%);">+ bNumInterfaces 1</span><br><span> bConfigurationValue 1</span><br><span> iConfiguration 0 </span><br><span style="color: hsl(0, 100%, 40%);">- bmAttributes 0xc0</span><br><span style="color: hsl(0, 100%, 40%);">- Self Powered</span><br><span style="color: hsl(0, 100%, 40%);">- MaxPower 100mA</span><br><span style="color: hsl(120, 100%, 40%);">+ bmAttributes 0x80</span><br><span style="color: hsl(120, 100%, 40%);">+ (Bus Powered)</span><br><span style="color: hsl(120, 100%, 40%);">+ MaxPower 20mA</span><br><span> Interface Descriptor:</span><br><span> bLength 9</span><br><span> bDescriptorType 4</span><br><span> bInterfaceNumber 0</span><br><span> bAlternateSetting 0</span><br><span> bNumEndpoints 1</span><br><span style="color: hsl(0, 100%, 40%);">- bInterfaceClass 2 Communications</span><br><span style="color: hsl(0, 100%, 40%);">- bInterfaceSubClass 2 Abstract (modem)</span><br><span style="color: hsl(0, 100%, 40%);">- bInterfaceProtocol 1 AT-commands (v.25ter)</span><br><span style="color: hsl(120, 100%, 40%);">+ bInterfaceClass 3 Human Interface Device</span><br><span style="color: hsl(120, 100%, 40%);">+ bInterfaceSubClass 0 </span><br><span style="color: hsl(120, 100%, 40%);">+ bInterfaceProtocol 0 </span><br><span> iInterface 0 </span><br><span style="color: hsl(0, 100%, 40%);">- CDC Header:</span><br><span style="color: hsl(0, 100%, 40%);">- bcdCDC 1.10</span><br><span style="color: hsl(0, 100%, 40%);">- CDC ACM:</span><br><span style="color: hsl(0, 100%, 40%);">- bmCapabilities 0x02</span><br><span style="color: hsl(0, 100%, 40%);">- line coding and serial state</span><br><span style="color: hsl(0, 100%, 40%);">- CDC Union:</span><br><span style="color: hsl(0, 100%, 40%);">- bMasterInterface 0</span><br><span style="color: hsl(0, 100%, 40%);">- bSlaveInterface 1 </span><br><span style="color: hsl(0, 100%, 40%);">- CDC Call Management:</span><br><span style="color: hsl(0, 100%, 40%);">- bmCapabilities 0x00</span><br><span style="color: hsl(0, 100%, 40%);">- bDataInterface 1</span><br><span style="color: hsl(120, 100%, 40%);">+ HID Device Descriptor:</span><br><span style="color: hsl(120, 100%, 40%);">+ bLength 9</span><br><span style="color: hsl(120, 100%, 40%);">+ bDescriptorType 33</span><br><span style="color: hsl(120, 100%, 40%);">+ bcdHID 1.01</span><br><span style="color: hsl(120, 100%, 40%);">+ bCountryCode 0 Not supported</span><br><span style="color: hsl(120, 100%, 40%);">+ bNumDescriptors 1</span><br><span style="color: hsl(120, 100%, 40%);">+ bDescriptorType 34 Report</span><br><span style="color: hsl(120, 100%, 40%);">+ wDescriptorLength 22</span><br><span style="color: hsl(120, 100%, 40%);">+ Report Descriptors: </span><br><span style="color: hsl(120, 100%, 40%);">+ ** UNAVAILABLE **</span><br><span> Endpoint Descriptor:</span><br><span> bLength 7</span><br><span> bDescriptorType 5</span><br><span>@@ -55,36 +54,6 @@</span><br><span> Synch Type None</span><br><span> Usage Type Data</span><br><span> wMaxPacketSize 0x0008 1x 8 bytes</span><br><span style="color: hsl(0, 100%, 40%);">- bInterval 2</span><br><span style="color: hsl(0, 100%, 40%);">- Interface Descriptor:</span><br><span style="color: hsl(0, 100%, 40%);">- bLength 9</span><br><span style="color: hsl(0, 100%, 40%);">- bDescriptorType 4</span><br><span style="color: hsl(0, 100%, 40%);">- bInterfaceNumber 1</span><br><span style="color: hsl(0, 100%, 40%);">- bAlternateSetting 0</span><br><span style="color: hsl(0, 100%, 40%);">- bNumEndpoints 2</span><br><span style="color: hsl(0, 100%, 40%);">- bInterfaceClass 10 CDC Data</span><br><span style="color: hsl(0, 100%, 40%);">- bInterfaceSubClass 0 </span><br><span style="color: hsl(0, 100%, 40%);">- bInterfaceProtocol 0 </span><br><span style="color: hsl(0, 100%, 40%);">- iInterface 0 </span><br><span style="color: hsl(0, 100%, 40%);">- Endpoint Descriptor:</span><br><span style="color: hsl(0, 100%, 40%);">- bLength 7</span><br><span style="color: hsl(0, 100%, 40%);">- bDescriptorType 5</span><br><span style="color: hsl(0, 100%, 40%);">- bEndpointAddress 0x02 EP 2 OUT</span><br><span style="color: hsl(0, 100%, 40%);">- bmAttributes 2</span><br><span style="color: hsl(0, 100%, 40%);">- Transfer Type Bulk</span><br><span style="color: hsl(0, 100%, 40%);">- Synch Type None</span><br><span style="color: hsl(0, 100%, 40%);">- Usage Type Data</span><br><span style="color: hsl(0, 100%, 40%);">- wMaxPacketSize 0x0040 1x 64 bytes</span><br><span style="color: hsl(0, 100%, 40%);">- bInterval 0</span><br><span style="color: hsl(0, 100%, 40%);">- Endpoint Descriptor:</span><br><span style="color: hsl(0, 100%, 40%);">- bLength 7</span><br><span style="color: hsl(0, 100%, 40%);">- bDescriptorType 5</span><br><span style="color: hsl(0, 100%, 40%);">- bEndpointAddress 0x82 EP 2 IN</span><br><span style="color: hsl(0, 100%, 40%);">- bmAttributes 2</span><br><span style="color: hsl(0, 100%, 40%);">- Transfer Type Bulk</span><br><span style="color: hsl(0, 100%, 40%);">- Synch Type None</span><br><span style="color: hsl(0, 100%, 40%);">- Usage Type Data</span><br><span style="color: hsl(0, 100%, 40%);">- wMaxPacketSize 0x0040 1x 64 bytes</span><br><span style="color: hsl(0, 100%, 40%);">- bInterval 0</span><br><span style="color: hsl(0, 100%, 40%);">-Device Status: 0x0001</span><br><span style="color: hsl(0, 100%, 40%);">- Self Powered</span><br><span style="color: hsl(120, 100%, 40%);">+ bInterval 20</span><br><span style="color: hsl(120, 100%, 40%);">+Device Status: 0x0000</span><br><span style="color: hsl(120, 100%, 40%);">+ (Bus Powered)</span><br><span>diff --git a/tests/sysmo-octsim/README b/tests/sysmo-octsim/README</span><br><span>index 162b876..1bdaa4b 100644</span><br><span>--- a/tests/sysmo-octsim/README</span><br><span>+++ b/tests/sysmo-octsim/README</span><br><span>@@ -3,3 +3,4 @@</span><br><span> - dfu-util</span><br><span> - wget</span><br><span> - pysim</span><br><span style="color: hsl(120, 100%, 40%);">+- usbrelay</span><br><span>diff --git a/tests/sysmo-octsim/ctl_reset_target.sh b/tests/sysmo-octsim/ctl_reset_target.sh</span><br><span>index 6aafaa2..8a45833 100755</span><br><span>--- a/tests/sysmo-octsim/ctl_reset_target.sh</span><br><span>+++ b/tests/sysmo-octsim/ctl_reset_target.sh</span><br><span>@@ -1,15 +1,15 @@</span><br><span> #!/bin/sh -e</span><br><span> . ./test-data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#usb_rly08</span><br><span style="color: hsl(120, 100%, 40%);">+#usb_relay</span><br><span> # relay1 = usbpower</span><br><span> # relay2 = dfu-btn</span><br><span> </span><br><span> #12 off</span><br><span> echo "resetting target"</span><br><span style="color: hsl(0, 100%, 40%);">-echo -n "op" > $USB_RELAY</span><br><span style="color: hsl(120, 100%, 40%);">+usbrelay BITFT_1=0 BITFT_2=0 2>/dev/null</span><br><span> sleep 1</span><br><span> # 1 on</span><br><span style="color: hsl(0, 100%, 40%);">-echo -n "e" > $USB_RELAY</span><br><span style="color: hsl(120, 100%, 40%);">+usbrelay BITFT_1=1 BITFT_2=0 2>/dev/null</span><br><span> sleep 1</span><br><span> echo "done"</span><br><span>diff --git a/tests/sysmo-octsim/ctl_reset_to_dfu.sh b/tests/sysmo-octsim/ctl_reset_to_dfu.sh</span><br><span>index 4807241..d9a668e 100755</span><br><span>--- a/tests/sysmo-octsim/ctl_reset_to_dfu.sh</span><br><span>+++ b/tests/sysmo-octsim/ctl_reset_to_dfu.sh</span><br><span>@@ -1,21 +1,21 @@</span><br><span> #!/bin/sh -e</span><br><span> . ./test-data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#usb_rly08</span><br><span style="color: hsl(120, 100%, 40%);">+#usb_relay</span><br><span> # relay1 = usbpower</span><br><span> # relay2 = dfu-btn</span><br><span> </span><br><span> echo "resetting target to dfu"</span><br><span> #12 off</span><br><span style="color: hsl(0, 100%, 40%);">-echo -n "op" > $USB_RELAY</span><br><span style="color: hsl(120, 100%, 40%);">+usbrelay BITFT_1=0 BITFT_2=0 2>/dev/null</span><br><span> sleep 1</span><br><span> # 2 on</span><br><span style="color: hsl(0, 100%, 40%);">-echo -n "f" > $USB_RELAY</span><br><span style="color: hsl(120, 100%, 40%);">+usbrelay BITFT_1=0 BITFT_2=1 2>/dev/null</span><br><span> sleep 1</span><br><span> # 1 on</span><br><span style="color: hsl(0, 100%, 40%);">-echo -n "e" > $USB_RELAY</span><br><span style="color: hsl(120, 100%, 40%);">+usbrelay BITFT_1=1 BITFT_2=1 2>/dev/null</span><br><span> sleep 1</span><br><span> # 2 off</span><br><span style="color: hsl(0, 100%, 40%);">-echo -n "p" > $USB_RELAY</span><br><span style="color: hsl(120, 100%, 40%);">+usbrelay BITFT_1=1 BITFT_2=0 2>/dev/null</span><br><span> sleep 1</span><br><span> echo "done"</span><br><span>diff --git a/tests/sysmo-octsim/prepare b/tests/sysmo-octsim/prepare</span><br><span>index b19fbed..48da199 100755</span><br><span>--- a/tests/sysmo-octsim/prepare</span><br><span>+++ b/tests/sysmo-octsim/prepare</span><br><span>@@ -3,9 +3,6 @@</span><br><span> . ./test-data</span><br><span> </span><br><span> echo "================ PREPARING TEST RIG ================"</span><br><span style="color: hsl(0, 100%, 40%);">-if [ ! -h "$USB_RELAY" ]; then echo "ERROR: usb relay device - symlink missing" ; exit 1; fi</span><br><span style="color: hsl(0, 100%, 40%);">-if [ ! -c "$USB_RELAY" ]; then echo "ERROR: usb relay device - not a char device" ; exit 1; fi</span><br><span style="color: hsl(0, 100%, 40%);">-if [ ! -h "$USB_RELAY" ]; then echo "ERROR: usb relay device - not writable" ; exit 1; fi</span><br><span> ./ctl_reset_target.sh</span><br><span> echo "================ TEST RIG PREPARED ================="</span><br><span> echo ""</span><br><span>diff --git a/tests/sysmo-octsim/test-data b/tests/sysmo-octsim/test-data</span><br><span>index 9220aad..e98f1db 100644</span><br><span>--- a/tests/sysmo-octsim/test-data</span><br><span>+++ b/tests/sysmo-octsim/test-data</span><br><span>@@ -1,6 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#usb_rly08 serial</span><br><span style="color: hsl(0, 100%, 40%);">-USB_RELAY="/dev/serial/by-id/usb-Devantech_Ltd._USB-RLY08_00021197-if00"</span><br><span style="color: hsl(0, 100%, 40%);">-USBD_RELAY="04d8:ffee"</span><br><span style="color: hsl(120, 100%, 40%);">+USBD_RELAY="16c0:05df"</span><br><span> USBD_TARGET="1d50:6141"</span><br><span> DFU_IMAGE="dl/sysmoOCTSIM-latest.bin"</span><br><span> PYSIMREAD="/home/jenkins/dep/pysim/pySim-read.py"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17492">change 17492</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17492"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ccid-firmware </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I292e3fd8127d393838b11db7fb058eb638524abc </div>
<div style="display:none"> Gerrit-Change-Number: 17492 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: roh <jsteiger@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>