Change in osmo-ccid-firmware[master]: switch to using 'usbrelay' and more generic, inexpensive relay board

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Tue Mar 17 12:49:07 UTC 2020


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17492 )

Change subject: switch to using 'usbrelay' and  more generic,inexpensive relay board
......................................................................

switch to using 'usbrelay' and  more generic,inexpensive relay board

Change-Id: I292e3fd8127d393838b11db7fb058eb638524abc
---
M tests/README
M tests/sysmo-octsim/01_check_rig.out
M tests/sysmo-octsim/README
M tests/sysmo-octsim/ctl_reset_target.sh
M tests/sysmo-octsim/ctl_reset_to_dfu.sh
M tests/sysmo-octsim/prepare
M tests/sysmo-octsim/test-data
7 files changed, 40 insertions(+), 75 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/tests/README b/tests/README
index 552ac71..0508a4a 100644
--- a/tests/README
+++ b/tests/README
@@ -3,5 +3,5 @@
 
 this testbed is the hardware-CI interface to make sure the firmware built is also working when flashed onto hardware.
 
-to run it you will need a usb controlled relay board like the devantech_Ltd._USB-RLY08 and a sysmo-octsim board.
+to run it you will need a usb controlled relay board and a sysmo-octsim board.
 
diff --git a/tests/sysmo-octsim/01_check_rig.out b/tests/sysmo-octsim/01_check_rig.out
index 1bd7d66..2a0d463 100644
--- a/tests/sysmo-octsim/01_check_rig.out
+++ b/tests/sysmo-octsim/01_check_rig.out
@@ -1,51 +1,50 @@
 
-ID 04d8:ffee Microchip Technology, Inc. Devantech USB-ISS
+ID 16c0:05df Van Ooijen Technische Informatica HID device except mice, keyboards, and joysticks
 Device Descriptor:
   bLength                18
   bDescriptorType         1
-  bcdUSB               2.00
-  bDeviceClass            2 Communications
+  bcdUSB               1.10
+  bDeviceClass            0 
   bDeviceSubClass         0 
   bDeviceProtocol         0 
   bMaxPacketSize0         8
-  idVendor           0x04d8 Microchip Technology, Inc.
-  idProduct          0xffee Devantech USB-ISS
+  idVendor           0x16c0 Van Ooijen Technische Informatica
+  idProduct          0x05df HID device except mice, keyboards, and joysticks
   bcdDevice            1.00
-  iManufacturer           1 Devantech Ltd.
-  iProduct                2 USB-RLY08
-  iSerial                 3 00021197
+  iManufacturer           1 www.dcttech.com
+  iProduct                2 USBRelay2
+  iSerial                 0 
   bNumConfigurations      1
   Configuration Descriptor:
     bLength                 9
     bDescriptorType         2
-    wTotalLength       0x0043
-    bNumInterfaces          2
+    wTotalLength       0x0022
+    bNumInterfaces          1
     bConfigurationValue     1
     iConfiguration          0 
-    bmAttributes         0xc0
-      Self Powered
-    MaxPower              100mA
+    bmAttributes         0x80
+      (Bus Powered)
+    MaxPower               20mA
     Interface Descriptor:
       bLength                 9
       bDescriptorType         4
       bInterfaceNumber        0
       bAlternateSetting       0
       bNumEndpoints           1
-      bInterfaceClass         2 Communications
-      bInterfaceSubClass      2 Abstract (modem)
-      bInterfaceProtocol      1 AT-commands (v.25ter)
+      bInterfaceClass         3 Human Interface Device
+      bInterfaceSubClass      0 
+      bInterfaceProtocol      0 
       iInterface              0 
-      CDC Header:
-        bcdCDC               1.10
-      CDC ACM:
-        bmCapabilities       0x02
-          line coding and serial state
-      CDC Union:
-        bMasterInterface        0
-        bSlaveInterface         1 
-      CDC Call Management:
-        bmCapabilities       0x00
-        bDataInterface          1
+        HID Device Descriptor:
+          bLength                 9
+          bDescriptorType        33
+          bcdHID               1.01
+          bCountryCode            0 Not supported
+          bNumDescriptors         1
+          bDescriptorType        34 Report
+          wDescriptorLength      22
+         Report Descriptors: 
+           ** UNAVAILABLE **
       Endpoint Descriptor:
         bLength                 7
         bDescriptorType         5
@@ -55,36 +54,6 @@
           Synch Type               None
           Usage Type               Data
         wMaxPacketSize     0x0008  1x 8 bytes
-        bInterval               2
-    Interface Descriptor:
-      bLength                 9
-      bDescriptorType         4
-      bInterfaceNumber        1
-      bAlternateSetting       0
-      bNumEndpoints           2
-      bInterfaceClass        10 CDC Data
-      bInterfaceSubClass      0 
-      bInterfaceProtocol      0 
-      iInterface              0 
-      Endpoint Descriptor:
-        bLength                 7
-        bDescriptorType         5
-        bEndpointAddress     0x02  EP 2 OUT
-        bmAttributes            2
-          Transfer Type            Bulk
-          Synch Type               None
-          Usage Type               Data
-        wMaxPacketSize     0x0040  1x 64 bytes
-        bInterval               0
-      Endpoint Descriptor:
-        bLength                 7
-        bDescriptorType         5
-        bEndpointAddress     0x82  EP 2 IN
-        bmAttributes            2
-          Transfer Type            Bulk
-          Synch Type               None
-          Usage Type               Data
-        wMaxPacketSize     0x0040  1x 64 bytes
-        bInterval               0
-Device Status:     0x0001
-  Self Powered
+        bInterval              20
+Device Status:     0x0000
+  (Bus Powered)
diff --git a/tests/sysmo-octsim/README b/tests/sysmo-octsim/README
index 162b876..1bdaa4b 100644
--- a/tests/sysmo-octsim/README
+++ b/tests/sysmo-octsim/README
@@ -3,3 +3,4 @@
 - dfu-util
 - wget
 - pysim
+- usbrelay
diff --git a/tests/sysmo-octsim/ctl_reset_target.sh b/tests/sysmo-octsim/ctl_reset_target.sh
index 6aafaa2..8a45833 100755
--- a/tests/sysmo-octsim/ctl_reset_target.sh
+++ b/tests/sysmo-octsim/ctl_reset_target.sh
@@ -1,15 +1,15 @@
 #!/bin/sh -e
 . ./test-data
 
-#usb_rly08
+#usb_relay
 # relay1 = usbpower
 # relay2 = dfu-btn
 
 #12 off
 echo "resetting target"
-echo -n "op" > $USB_RELAY
+usbrelay BITFT_1=0 BITFT_2=0 2>/dev/null
 sleep 1
 # 1 on
-echo -n "e" > $USB_RELAY
+usbrelay BITFT_1=1 BITFT_2=0 2>/dev/null
 sleep 1
 echo "done"
diff --git a/tests/sysmo-octsim/ctl_reset_to_dfu.sh b/tests/sysmo-octsim/ctl_reset_to_dfu.sh
index 4807241..d9a668e 100755
--- a/tests/sysmo-octsim/ctl_reset_to_dfu.sh
+++ b/tests/sysmo-octsim/ctl_reset_to_dfu.sh
@@ -1,21 +1,21 @@
 #!/bin/sh -e
 . ./test-data
 
-#usb_rly08
+#usb_relay
 # relay1 = usbpower
 # relay2 = dfu-btn
 
 echo "resetting target to dfu"
 #12 off
-echo -n "op" > $USB_RELAY
+usbrelay BITFT_1=0 BITFT_2=0 2>/dev/null
 sleep 1
 # 2 on
-echo -n "f" > $USB_RELAY
+usbrelay BITFT_1=0 BITFT_2=1 2>/dev/null
 sleep 1
 # 1 on
-echo -n "e" > $USB_RELAY
+usbrelay BITFT_1=1 BITFT_2=1 2>/dev/null
 sleep 1
 # 2 off
-echo -n "p" > $USB_RELAY
+usbrelay BITFT_1=1 BITFT_2=0 2>/dev/null
 sleep 1
 echo "done"
diff --git a/tests/sysmo-octsim/prepare b/tests/sysmo-octsim/prepare
index b19fbed..48da199 100755
--- a/tests/sysmo-octsim/prepare
+++ b/tests/sysmo-octsim/prepare
@@ -3,9 +3,6 @@
 . ./test-data
 
 echo "================ PREPARING TEST RIG ================"
-if [ ! -h "$USB_RELAY" ]; then echo "ERROR: usb relay device - symlink missing" ; exit 1; fi
-if [ ! -c "$USB_RELAY" ]; then echo "ERROR: usb relay device - not a char device" ; exit 1; fi
-if [ ! -h "$USB_RELAY" ]; then echo "ERROR: usb relay device - not writable" ; exit 1; fi
 ./ctl_reset_target.sh
 echo "================ TEST RIG PREPARED ================="
 echo ""
diff --git a/tests/sysmo-octsim/test-data b/tests/sysmo-octsim/test-data
index 9220aad..e98f1db 100644
--- a/tests/sysmo-octsim/test-data
+++ b/tests/sysmo-octsim/test-data
@@ -1,6 +1,4 @@
-#usb_rly08 serial
-USB_RELAY="/dev/serial/by-id/usb-Devantech_Ltd._USB-RLY08_00021197-if00"
-USBD_RELAY="04d8:ffee"
+USBD_RELAY="16c0:05df"
 USBD_TARGET="1d50:6141"
 DFU_IMAGE="dl/sysmoOCTSIM-latest.bin"
 PYSIMREAD="/home/jenkins/dep/pysim/pySim-read.py"

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17492
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-Change-Id: I292e3fd8127d393838b11db7fb058eb638524abc
Gerrit-Change-Number: 17492
Gerrit-PatchSet: 1
Gerrit-Owner: roh <jsteiger at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200317/1c6265eb/attachment.htm>


More information about the gerrit-log mailing list