Changeset 78dc3a3 in subsurface


Ignore:
Timestamp:
Sep 22, 2016, 2:56:31 PM (7 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
131c5a2
Parents:
f35f767
Message:

Revert "Add a simple cp2130 libusb driver"

This reverts commit 93ef223a3131db838abc7c390ddce3fae8be5f7c.

Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r93ef223 r78dc3a3  
    3434option(BTSUPPORT "enable support for QtBluetooth (requires Qt5.4 or newer)" ON)
    3535option(FTDISUPPORT "enable support for libftdi based serial" OFF)
    36 option(CP2130SUPPORT "enable support for cp2130 based serial" OFF)
    3736
    3837# Options regarding What should we build on subsurface
  • android/res/xml/device_filter.xml

    r93ef223 r78dc3a3  
    1212    <!-- Cressi (Leonardo) Custom PID -->
    1313    <usb-device vendor-id="1027" product-id="63104"/>
    14 
    15         <!-- CP2130 Chip -->
    16         <usb-device vendor-id="4292" product-id="34720"/>
    1714</resources>
  • core/CMakeLists.txt

    r93ef223 r78dc3a3  
    1717if(FTDISUPPORT)
    1818        set(SERIAL_FTDI serial_ftdi.c)
    19 endif()
    20 
    21 if(CP2130SUPPORT)
    22         message(STATUS "building with cp2130 support")
    23         add_definitions(-DSERIAL_CP2130)
    24         set(SERIAL_CP2130 serial_cp2130.c)
    2519endif()
    2620
     
    9690        subsurface-qt/SettingsObjectWrapper.cpp
    9791        ${SERIAL_FTDI}
    98         ${SERIAL_CP2130}
    9992        ${PLATFORM_SRC}
    10093        ${BT_CORE_SRC_FILES}
  • core/libdivecomputer.c

    rc809a887 r78dc3a3  
    10351035                rc = dc_context_set_custom_serial(data->context, &serial_ftdi_ops);
    10361036#endif
    1037 #ifdef SERIAL_CP2130
    1038         } else if (!strcmp(data->devname, "cp2130")) {
    1039                 rc = dc_context_set_custom_serial(data->context, &cp2130_serial_ops);
    1040 #endif
    10411037        }
    10421038
  • core/libdivecomputer.h

    r93ef223 r78dc3a3  
    6666dc_custom_serial_t* get_qt_serial_ops();
    6767extern dc_custom_serial_t serial_ftdi_ops;
    68 extern dc_custom_serial_t cp2130_serial_ops;
    6968#endif
    7069
Note: See TracChangeset for help on using the changeset viewer.