Changeset 678d396 in libvcomm


Ignore:
Timestamp:
02/05/15 16:50:31 (4 years ago)
Author:
Tarmo Kople <tarmo@…>
Branches:
master
Parents:
a92d0c9 (diff), 430a9c8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Tarmo Kople <tarmo@…> (02/05/15 16:50:31)
git-committer:
Tarmo Kople <tarmo@…> (02/05/15 16:50:31)
Message:

Merge branch 'master' of arhiiv.lan:libvcomm

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • proto.h

    r99340c9 r2fba30a  
    7373//! Set IRframe info (num of pulses in IRframe) 
    7474#define REQ_SET_IRFRAME_INFO    30 
     75//! Blast IRframe info (freq , duty cycle) 
     76#define REQ_BLAST_IRFRAME       31 
    7577 
    7678// Response type ID's (100-255) 
  • vactions.c

    rdd0acb5 r2fba30a  
    291291} 
    292292 
     293VCOMMAPI int VCOMMCALL Vblast_irframe(hid_device **vhandle, uint8_t freq, uint8_t duty){ 
     294        int resp; 
     295        response_t response; 
     296        request_t request; 
     297 
     298        request.type = REQ_BLAST_IRFRAME; 
     299        request.data[0] = freq; 
     300        request.data[1] = duty; 
     301 
     302        if ((resp = Vcomm(vhandle, &request, &response))) 
     303                        return resp; 
     304 
     305        return response.data[0]; 
     306} 
    293307 
    294308VCOMMAPI int VCOMMCALL Vclear_event_ircode(hid_device **vhandle, ircode_t *ircode, cmdstat_t *cmdstat ){ 
  • vactions.h

    re7768a6 r2fba30a  
    248248VCOMMAPI int VCOMMCALL Vset_irframe(hid_device **vhandle, irframe_t *irframe); 
    249249/** 
     250 * \brief Blasts IRframe from IRvoodoo. 
     251 * 
     252 *      @ingroup vapi 
     253 *      @param[in] vhandle IRvoodoo connection handle 
     254 *      @param[in] freq Frequency of carrier signal in KHz 
     255 *      @param[in] duty Duty cycle of carrier signal in % (0 - 50) 
     256 * 
     257 *  @returns 
     258 *      This function returns 0 on success or error code on error. 
     259 * 
     260 */ 
     261VCOMMAPI int VCOMMCALL Vblast_irframe(hid_device **vhandle, uint8_t freq, uint8_t duty); 
     262/** 
    250263 * \brief Delete event from eventmap 
    251264 * 
  • vcomm.c

    r569336b ra92d0c9  
    4444        v_dev = NULL; 
    4545 
    46         devs = hid_enumerate(VENDOR_ID, PRODUCT_ID); // Get linked list of IRvoodoo info structs 
     46        devs = hid_enumerate(vid, pid); // Get linked list of IRvoodoo info structs 
    4747 
    4848        // Loop while last HID is found(4 EP found) 
Note: See TracChangeset for help on using the changeset viewer.