Revision: 8172 https://osdn.net/projects/ttssh2/scm/svn/commits/8172 Author: yutakapon Date: 2019-09-16 15:49:00 +0900 (Mon, 16 Sep 2019) Log Message: ----------- ・シリアルポート設定ダイアログからNew connectionする際、全設定をコマンドラインに渡すようにした。 ・コマンドラインオプション /CDATABIT=, /CPARITY=, /CSTOPBIT=, /CFLOWCTRL=, /CDELAYPERCHAR=, /CDELAYPERLINE=を追加した。 Modified Paths: -------------- branches/serial_port_improved/doc/en/html/about/history.html branches/serial_port_improved/doc/en/html/commandline/teraterm.html branches/serial_port_improved/doc/ja/html/about/history.html branches/serial_port_improved/doc/ja/html/commandline/teraterm.html branches/serial_port_improved/teraterm/teraterm/vtwin.cpp branches/serial_port_improved/teraterm/ttpset/ttset.c -------------- next part -------------- Modified: branches/serial_port_improved/doc/en/html/about/history.html =================================================================== --- branches/serial_port_improved/doc/en/html/about/history.html 2019-09-16 02:33:41 UTC (rev 8171) +++ branches/serial_port_improved/doc/en/html/about/history.html 2019-09-16 06:49:00 UTC (rev 8172) @@ -53,6 +53,7 @@ <li>The tooltip of the speed setting is added on the <a href="../menu/setup-serialport.html#Information">[Setup]-[Serial port]</a> dialog.</li> <li>The OK button notation in the <a href="../menu/setup-serialport.html#OK">[Setup]-[Serial port]</a> dialog is changed refering to the connection state. </li> <li>The OK button can not be pressed in the <a href="../menu/setup-serialport.html#OK">[Setup]-[Serial port]</a> dialog when no COM ports are available.</li> + <li>Added <a href="../commandline/teraterm.html#cdatabit">/CDATABIT=</a>, <a href="../commandline/teraterm.html#cparity">/CPARITY=</a>, <a href="../commandline/teraterm.html#cstopbit">/CSTOPBIT=</a>, <a href="../commandline/teraterm.html#cflowctrl">/CFLOWCTRL=</a>, <a href="../commandline/teraterm.html#cdelayperchar">/CDELAYPERCHAR=</a>, <a href="../commandline/teraterm.html#cdelayperline">/CDELAYPERLINE=</a> command line options.</li> </ul> </li> <li>Bug fixes Modified: branches/serial_port_improved/doc/en/html/commandline/teraterm.html =================================================================== --- branches/serial_port_improved/doc/en/html/commandline/teraterm.html 2019-09-16 02:33:41 UTC (rev 8171) +++ branches/serial_port_improved/doc/en/html/commandline/teraterm.html 2019-09-16 06:49:00 UTC (rev 8172) @@ -76,6 +76,58 @@ By default, maximum serial port number is 256. It is configurable in <a href="../setup/teraterm-com.html#maxport">MaxComPort</a> setting. </dd> + <dt id="cdatabit">/CDATABIT=<value></dt> + <dd>Data bit of serial port + <ul> + <li><span class="syntax">/CDATABIT=1</span> 7bit</li> + <li><span class="syntax">/CDATABIT=2</span> 8bit</li> + </ul> + </dd> + + <dt id="cparity">/CPARITY=<value></dt> + <dd>Parity of serial port + <ul> + <li><span class="syntax">/CPARITY=1</span> none</li> + <li><span class="syntax">/CPARITY=2</span> odd</li> + <li><span class="syntax">/CPARITY=3</span> even</li> + <li><span class="syntax">/CPARITY=4</span> mark</li> + <li><span class="syntax">/CPARITY=5</span> space</li> + </ul> + </dd> + + <dt id="cstopbit">/CSTOPBIT=<value></dt> + <dd>Stop bit of serial port + <ul> + <li><span class="syntax">/CSTOPBIT=1</span> 1bit</li> + <li><span class="syntax">/CSTOPBIT=2</span> 1.5bit</li> + <li><span class="syntax">/CSTOPBIT=3</span> 2bit</li> + </ul> + </dd> + + <dt id="cflowctrl">/CFLOWCTRL=<value></dt> + <dd>Flow control of serial port + <ul> + <li><span class="syntax">/CFLOWCTRL=1</span> Xon/Xoff</li> + <li><span class="syntax">/CFLOWCTRL=2</span> RTS/CTS</li> + <li><span class="syntax">/CFLOWCTRL=3</span> none</li> + <li><span class="syntax">/CFLOWCTRL=4</span> DSR/DTR</li> + </ul> + </dd> + + <dt id="cdelayperchar">/CDELAYPERCHAR=<value></dt> + <dd>Transmission delay time per character of serial port(msec) + <ul> + <li><span class="syntax">/CDELAYPERCHAR=n</span> n millisecond</li> + </ul> + </dd> + + <dt id="cdelayperline">/CDELAYPERLINE=<value></dt> + <dd>Transmission delay time per line of serial port(msec) + <ul> + <li><span class="syntax">/CDELAYPERLINE=n</span> nmillisecond</li> + </ul> + </dd> + <!-- <dt id="duplicate">/DUPLICATE</dt> <dd>Internal use(must not specify this option)</dd> Modified: branches/serial_port_improved/doc/ja/html/about/history.html =================================================================== --- branches/serial_port_improved/doc/ja/html/about/history.html 2019-09-16 02:33:41 UTC (rev 8171) +++ branches/serial_port_improved/doc/ja/html/about/history.html 2019-09-16 06:49:00 UTC (rev 8172) @@ -53,6 +53,7 @@ <li><a href="../menu/setup-serialport.html">[Setup]-[Serial port]</a> \x83_\x83C\x83A\x83\x8D\x83O\x82̃X\x83s\x81[\x83h\x90ݒ\xE8\x82Ńc\x81[\x83\x8B\x83`\x83b\x83v\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li> <li><a href="../menu/setup-serialport.html#OK">[Setup]-[Serial port]</a> \x83_\x83C\x83A\x83\x8D\x83O\x82\xCCOK\x83{\x83^\x83\x93\x82̕\\x8BL\x82\xF0\x90ڑ\xB1\x8F\xF3\x91ԂŐ\xE8\x91ւ\xA6\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li> <li>\x8Eg\x97p\x89\\x82\xC8COM\x83|\x81[\x83g\x82\xAA\x91\xB6\x8D݂\xB5\x82Ȃ\xA2\x8Fꍇ\x81A<a href="../menu/setup-serialport.html#OK">[Setup]-[Serial port]</a> \x83_\x83C\x83A\x83\x8D\x83O\x82\xCCOK\x83{\x83^\x83\x93\x82\xF0\x89\x9F\x82\xB9\x82Ȃ\xA2\x82悤\x82ɂ\xB5\x82\xBD\x81B</li> + <li><a href="../commandline/teraterm.html#cdatabit">/CDATABIT=</a>, <a href="../commandline/teraterm.html#cparity">/CPARITY=</a>, <a href="../commandline/teraterm.html#cstopbit">/CSTOPBIT=</a>, <a href="../commandline/teraterm.html#cflowctrl">/CFLOWCTRL=</a>, <a href="../commandline/teraterm.html#cdelayperchar">/CDELAYPERCHAR=</a>, <a href="../commandline/teraterm.html#cdelayperline">/CDELAYPERLINE=</a> \x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x83I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B</li> </ul> </li> <li>\x83o\x83O\x8FC\x90\xB3 Modified: branches/serial_port_improved/doc/ja/html/commandline/teraterm.html =================================================================== --- branches/serial_port_improved/doc/ja/html/commandline/teraterm.html 2019-09-16 02:33:41 UTC (rev 8171) +++ branches/serial_port_improved/doc/ja/html/commandline/teraterm.html 2019-09-16 06:49:00 UTC (rev 8172) @@ -80,6 +80,58 @@ \x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x94ԍ\x86\x82̍ő\xE5\x92l\x82̓f\x83t\x83H\x83\x8B\x83g\x82\xC5256\x82ƂȂ\xC1\x82Ă\xA2\x82܂\xB7\x81B<a href="../setup/teraterm-com.html#maxport">MaxComPort</a>\x82ōő\xE5\x92l\x82\xF0\x95ύX\x82ł\xAB\x82܂\xB7\x81B </dd> + <dt id="cdatabit">/CDATABIT=<value></dt> + <dd>\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x82̃f\x81[\x83^\x83r\x83b\x83g + <ul> + <li><span class="syntax">/CDATABIT=1</span> 7bit</li> + <li><span class="syntax">/CDATABIT=2</span> 8bit</li> + </ul> + </dd> + + <dt id="cparity">/CPARITY=<value></dt> + <dd>\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x82̃p\x83\x8A\x83e\x83B + <ul> + <li><span class="syntax">/CPARITY=1</span> none</li> + <li><span class="syntax">/CPARITY=2</span> odd</li> + <li><span class="syntax">/CPARITY=3</span> even</li> + <li><span class="syntax">/CPARITY=4</span> mark</li> + <li><span class="syntax">/CPARITY=5</span> space</li> + </ul> + </dd> + + <dt id="cstopbit">/CSTOPBIT=<value></dt> + <dd>\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x82̃X\x83g\x83b\x83v\x83r\x83b\x83g + <ul> + <li><span class="syntax">/CSTOPBIT=1</span> 1bit</li> + <li><span class="syntax">/CSTOPBIT=2</span> 1.5bit</li> + <li><span class="syntax">/CSTOPBIT=3</span> 2bit</li> + </ul> + </dd> + + <dt id="cflowctrl">/CFLOWCTRL=<value></dt> + <dd>\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x82̃t\x83\x8D\x81[\x90\xA7\x8C\xE4 + <ul> + <li><span class="syntax">/CFLOWCTRL=1</span> Xon/Xoff</li> + <li><span class="syntax">/CFLOWCTRL=2</span> RTS/CTS</li> + <li><span class="syntax">/CFLOWCTRL=3</span> none</li> + <li><span class="syntax">/CFLOWCTRL=4</span> DSR/DTR</li> + </ul> + </dd> + + <dt id="cdelayperchar">/CDELAYPERCHAR=<value></dt> + <dd>\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x82̈ꕶ\x8E\x9A\x82\xA0\x82\xBD\x82\xE8\x82̑\x97\x90M\x92x\x89\x84\x8E\x9E\x8A\xD4(\x83~\x83\x8A\x95b) + <ul> + <li><span class="syntax">/CDELAYPERCHAR=n</span> n\x83~\x83\x8A\x95b</li> + </ul> + </dd> + + <dt id="cdelayperline">/CDELAYPERLINE=<value></dt> + <dd>\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x82̈\xEA\x8Ds\x82\xA0\x82\xBD\x82\xE8\x82̑\x97\x90M\x92x\x89\x84\x8E\x9E\x8A\xD4(\x83~\x83\x8A\x95b) + <ul> + <li><span class="syntax">/CDELAYPERLINE=n</span> n\x83~\x83\x8A\x95b</li> + </ul> + </dd> + <!-- <dt id="duplicate">/DUPLICATE</dt> <dd>\x8Eg\x97p\x8B֎~\x81i\x83Z\x83b\x83V\x83\x87\x83\x93\x82̕\xA1\x90\xBB\x82œ\xE0\x95\x94\x82Ŏg\x82\xED\x82\xEA\x82\xE9\x81j</dd> Modified: branches/serial_port_improved/teraterm/teraterm/vtwin.cpp =================================================================== --- branches/serial_port_improved/teraterm/teraterm/vtwin.cpp 2019-09-16 02:33:41 UTC (rev 8171) +++ branches/serial_port_improved/teraterm/teraterm/vtwin.cpp 2019-09-16 06:49:00 UTC (rev 8172) @@ -4689,8 +4689,11 @@ */ if ( cv.Ready && (cv.PortType != IdSerial) ) { - _snprintf_s(Command, sizeof(Command), "ttermpro /C=%u /SPEED=%lu", - ts.ComPort, ts.Baud); + _snprintf_s(Command, sizeof(Command), + "ttermpro /C=%u /SPEED=%lu /CDATABIT=%u /CPARITY=%u " + "/CSTOPBIT=%u /CFLOWCTRL=%u /CDELAYPERCHAR=%u /CDELAYPERLINE=%u", + ts.ComPort, ts.Baud, ts.DataBit, ts.Parity, + ts.StopBit, ts.Flow, ts.DelayPerChar, ts.DelayPerLine); WinExec(Command,SW_SHOW); return; Modified: branches/serial_port_improved/teraterm/ttpset/ttset.c =================================================================== --- branches/serial_port_improved/teraterm/ttpset/ttset.c 2019-09-16 02:33:41 UTC (rev 8171) +++ branches/serial_port_improved/teraterm/ttpset/ttset.c 2019-09-16 06:49:00 UTC (rev 8172) @@ -4047,6 +4047,64 @@ if ((ParamCom < 1) || (ParamCom > ts->MaxComPort)) ParamCom = 0; } + else if (_strnicmp(Temp, "/CDATABIT=", 10) == 0) { /* COM data bit */ + WORD val = 0; + + ParamPort = IdSerial; + val = atoi(&Temp[10]); + if (val == IdDataBit7 || + val == IdDataBit8 + ) { + ts->DataBit = val; + } + } + else if (_strnicmp(Temp, "/CPARITY=", 9) == 0) { /* COM Parity */ + WORD val = 0; + + ParamPort = IdSerial; + val = atoi(&Temp[9]); + if (val >= IdParityNone && + val <= IdParitySpace + ) { + ts->Parity = val; + } + } + else if (_strnicmp(Temp, "/CSTOPBIT=", 10) == 0) { /* COM Stop bit */ + WORD val = 0; + + ParamPort = IdSerial; + val = atoi(&Temp[10]); + if (val >= IdStopBit1 && + val <= IdStopBit2 + ) { + ts->StopBit = val; + } + } + else if (_strnicmp(Temp, "/CFLOWCTRL=", 11) == 0) { /* COM Flow control */ + WORD val = 0; + + ParamPort = IdSerial; + val = atoi(&Temp[11]); + if (val >= IdFlowX && + val <= IdFlowHardDsrDtr + ) { + ts->Flow = val; + } + } + else if (_strnicmp(Temp, "/CDELAYPERCHAR=", 15) == 0) { /* COM Transmit delay per character (in msec) */ + WORD val = 0; + + ParamPort = IdSerial; + val = atoi(&Temp[15]); + ts->DelayPerChar = val; + } + else if (_strnicmp(Temp, "/CDELAYPERLINE=", 15) == 0) { /* COM Transmit delay per line (in msec) */ + WORD val = 0; + + ParamPort = IdSerial; + val = atoi(&Temp[15]); + ts->DelayPerLine = val; + } else if (_stricmp(Temp, "/WAITCOM") == 0) { /* wait COM arrival */ ts->WaitCom = 1; }