Tera TermRevision: 9205
https://osdn.net/projects/ttssh2/scm/svn/commits/9205
Author: nmaya
Date: 2021-04-12 23:12:46 +0900 (Mon, 12 Apr 2021)
Log Message:
-----------
シリアルポート接続の1.5ストップビットのサポートを削除
ticket #40299
1.5ストップビットは常に不正な設定となるため
MF4-stable to: trunk
Ticket Links:
------------
https://osdn.net/projects/ttssh2/tracker/detail/40299
Modified Paths:
--------------
branches/4-stable/doc/en/html/about/history.html
branches/4-stable/doc/ja/html/about/history.html
branches/4-stable/installer/release/TERATERM.INI
branches/4-stable/teraterm/common/tttypes.h
branches/4-stable/teraterm/teraterm/commlib.c
branches/4-stable/teraterm/ttpdlg/ttdlg.c
branches/4-stable/teraterm/ttpset/ttset.c
-------------- next part --------------
Modified: branches/4-stable/doc/en/html/about/history.html
===================================================================
--- branches/4-stable/doc/en/html/about/history.html 2021-04-11 03:22:11 UTC (rev 9204)
+++ branches/4-stable/doc/en/html/about/history.html 2021-04-12 14:12:46 UTC (rev 9205)
@@ -33,11 +33,15 @@
<h3 id="teraterm_4.106">2021.xx.xx (Ver 4.106)</h3>
<ul class="history">
- <!-- li>Changes
+ <li>Changes
<ul>
- <li></li>
+ <li>Serial port connection
+ <ul>
+ <li>remove 1.5 stop bit from the serial port setup.</li>
+ <li>remote the "1.5" name from the StopBit entry.</li>
+ </ul></li>
</ul>
- </li -->
+ </li>
<li>Bug fixes
<ul>
Modified: branches/4-stable/doc/ja/html/about/history.html
===================================================================
--- branches/4-stable/doc/ja/html/about/history.html 2021-04-11 03:22:11 UTC (rev 9204)
+++ branches/4-stable/doc/ja/html/about/history.html 2021-04-12 14:12:46 UTC (rev 9205)
@@ -33,11 +33,15 @@
<h3 id="teraterm_4.106">2021.xx.xx (Ver 4.106)</h3>
<ul class="history">
- <!-- li>\x95ύX
+ <li>\x95ύX
<ul>
- <li></li>
+ <li>\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x90ڑ\xB1
+ <ul>
+ <li>\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x90ݒ\xE8\x82ŁA1.5\x83X\x83g\x83b\x83v\x83r\x83b\x83g\x82̃T\x83|\x81[\x83g\x82\xF0\x8D폜\x82\xB5\x82\xBD\x81B</li>
+ <li>teraterm.ini \x82\xCC StopBit \x83G\x83\x93\x83g\x83\x8A\x82\xA9\x82\xE7"1.5"\x82\xF0\x8D폜\x82\xB5\x82\xBD\x81B</li>
+ </ul></li>
</ul>
- </li -->
+ </li>
<li>\x83o\x83O\x8FC\x90\xB3
<ul>
Modified: branches/4-stable/installer/release/TERATERM.INI
===================================================================
--- branches/4-stable/installer/release/TERATERM.INI 2021-04-11 03:22:11 UTC (rev 9204)
+++ branches/4-stable/installer/release/TERATERM.INI 2021-04-12 14:12:46 UTC (rev 9205)
@@ -318,7 +318,7 @@
Parity=none
; Data (7/8)
DataBit=8
-; Stop (1/1.5/2)
+; Stop (1/2)
StopBit=1
; Flow control (x/hard/none/rtscts/dsrdtr)
; "hard" is same as "rtscts"
Modified: branches/4-stable/teraterm/common/tttypes.h
===================================================================
--- branches/4-stable/teraterm/common/tttypes.h 2021-04-11 03:22:11 UTC (rev 9204)
+++ branches/4-stable/teraterm/common/tttypes.h 2021-04-12 14:12:46 UTC (rev 9205)
@@ -820,9 +820,8 @@
#define IdDataBit7 1
#define IdDataBit8 2
/* Stop bit ID */
-#define IdStopBit1 1
-#define IdStopBit15 2
-#define IdStopBit2 3
+#define IdStopBit1 1
+#define IdStopBit2 2
/* Flow control ID */
#define IdFlowX 1
#define IdFlowHard 2 // RTS/CTS(hardware flow)
Modified: branches/4-stable/teraterm/teraterm/commlib.c
===================================================================
--- branches/4-stable/teraterm/teraterm/commlib.c 2021-04-11 03:22:11 UTC (rev 9204)
+++ branches/4-stable/teraterm/teraterm/commlib.c 2021-04-12 14:12:46 UTC (rev 9205)
@@ -246,9 +246,6 @@
case IdStopBit1:
dcb.StopBits = ONESTOPBIT;
break;
- case IdStopBit15:
- dcb.StopBits = ONE5STOPBITS;
- break;
case IdStopBit2:
dcb.StopBits = TWOSTOPBITS;
break;
Modified: branches/4-stable/teraterm/ttpdlg/ttdlg.c
===================================================================
--- branches/4-stable/teraterm/ttpdlg/ttdlg.c 2021-04-11 03:22:11 UTC (rev 9204)
+++ branches/4-stable/teraterm/ttpdlg/ttdlg.c 2021-04-12 14:12:46 UTC (rev 9205)
@@ -1146,7 +1146,7 @@
static PCHAR DataList[] = {"7 bit","8 bit",NULL};
static PCHAR ParityList[] = {"none", "odd", "even", "mark", "space", NULL};
-static PCHAR StopList[] = {"1 bit", "1.5 bit", "2 bit", NULL};
+static PCHAR StopList[] = {"1 bit", "2 bit", NULL};
static PCHAR FlowList[] = {"Xon/Xoff", "RTS/CTS", "DSR/DTR", "none", NULL};
static int g_deltaSumSerialDlg = 0; // \x83}\x83E\x83X\x83z\x83C\x81[\x83\x8B\x82\xCCDelta\x97ݐϗp
static WNDPROC g_defSerialDlgEditWndProc; // Edit Control\x82̃T\x83u\x83N\x83\x89\x83X\x89\xBB\x97p
Modified: branches/4-stable/teraterm/ttpset/ttset.c
===================================================================
--- branches/4-stable/teraterm/ttpset/ttset.c 2021-04-11 03:22:11 UTC (rev 9204)
+++ branches/4-stable/teraterm/ttpset/ttset.c 2021-04-12 14:12:46 UTC (rev 9205)
@@ -91,7 +91,6 @@
static id_str_pair_t serial_conf_stopbit[] = {
{IdStopBit1, "1"},
- {IdStopBit15, "1.5"},
{IdStopBit2, "2"},
{IDENDMARK, NULL},
};