From: Stéphane F. <fi...@us...> - 2008-09-15 15:15:54
|
Update of /cvsroot/hamlib/hamlib/yaesu In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv12048/yaesu Modified Files: ft100.c Log Message: disable confusing width setting in ft100_set_mode for now Index: ft100.c =================================================================== RCS file: /cvsroot/hamlib/hamlib/yaesu/ft100.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** ft100.c 15 Sep 2008 18:32:10 -0000 1.21 --- ft100.c 15 Sep 2008 22:15:50 -0000 1.22 *************** *** 475,480 **** int ft100_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) { unsigned char cmd_index; /* index of sequence to send */ ! rig_debug(RIG_DEBUG_VERBOSE,"ft100: generic mode = %x \n", mode); switch(mode) { --- 475,481 ---- int ft100_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) { unsigned char cmd_index; /* index of sequence to send */ + int ret; ! rig_debug(RIG_DEBUG_VERBOSE,"ft100: generic mode = %x, width %d\n", mode, width); switch(mode) { *************** *** 485,488 **** --- 486,492 ---- cmd_index = FT100_NATIVE_CAT_SET_MODE_CW; break; + case RIG_MODE_CWR: + cmd_index = FT100_NATIVE_CAT_SET_MODE_CWR; + break; case RIG_MODE_USB: cmd_index = FT100_NATIVE_CAT_SET_MODE_USB; *************** *** 504,507 **** --- 508,517 ---- } + ret = ft100_send_priv_cmd(rig,cmd_index); + if (ret != RIG_OK) + return ret; + + #if 0 + /* ignore width for now. Should be Opcode 0x8C */ switch(width) { case RIG_PASSBAND_NORMAL: *************** *** 510,515 **** return -RIG_EINVAL; } ! return ft100_send_priv_cmd(rig,cmd_index); } --- 520,526 ---- return -RIG_EINVAL; } + #endif ! return RIG_OK; } |