diff --git a/v1/js/settings.js b/v1/js/settings.js
index a78345f..4436c1b 100644
--- a/v1/js/settings.js
+++ b/v1/js/settings.js
@@ -292,12 +292,12 @@ document.addEventListener('alpine:init', () => {
             this.selectedStopBit = item;
         },
         openModalEdit(item) {
-            // tcp server
             this.selectedJenis = {
                 idJenis: item.idJenis,
                 namaJenis: item.namaJenis,
             },
-                this.port = item.port
+            this.port = item.port
+            this.server = item.server
             this.selectedInterface = {
                 idInterface: item.idInterface,
                 namaInterface: item.namaInterface
@@ -306,8 +306,20 @@ document.addEventListener('alpine:init', () => {
                 idInstrument: item.idInstrument,
                 namaInstrument: item.namaInstrument
             }
-            // tcp client
-            
+            this.speed = item.speed
+            this.selectedParity = {
+                idParity: item.idParity,
+                namaParity: item.namaParity
+            },
+            this.selectedDataBit = {
+                idDataBit: item.idDataBit,
+                namaDataBit: item.namaDataBit
+            },
+            this.selectedStopBit = {
+                idStopBit: item.idStopBit,
+                namaStopBit: item.namaStopBit
+            },
+
             this.showDialogEdit = !this.showDialogEdit;
         },
         closeDialogEdit() {
diff --git a/v1/settings.html b/v1/settings.html
index 6ae2f82..4eb9eb4 100644
--- a/v1/settings.html
+++ b/v1/settings.html
@@ -731,7 +731,7 @@
                                     <!-- server -->
                                     <label for="Server"
                                         class="relative block rounded-md border border-gray-400 focus-within:border-blue-600 focus-within:ring-1 focus-within:ring-blue-600">
-                                        <input type="text" id="Server"
+                                        <input type="text" id="Server" x-model="server"
                                             class="peer pl-2 border-none py-3 bg-transparent placeholder-transparent focus:border-transparent focus:ring-0 focus:outline-hidden"
                                             placeholder="Server" />
 
@@ -744,7 +744,7 @@
                                     <!-- port -->
                                     <label for="Port"
                                         class="relative block rounded-md border border-gray-400 focus-within:border-blue-600 focus-within:ring-1 focus-within:ring-blue-600">
-                                        <input type="text" id="Port"
+                                        <input type="text" id="Port" x-model="port"
                                             class="peer pl-2 border-none py-3 bg-transparent placeholder-transparent focus:border-transparent focus:ring-0 focus:outline-hidden"
                                             placeholder="Port" />
 
@@ -817,6 +817,206 @@
                                 </div>
                             </template>
                             <!-- namaJenis TCP Client -->
+
+                            <!-- namaJenis RS232 -->
+                            <template x-if="selectedJenis.idJenis === 3">
+                                <div>
+                                    <!-- serial -->
+                                    <fieldset @click.outside="openSerial = false"
+                                        class="relative border border-gray-400 rounded-md focus-within:border-blue-500 focus-within:ring-1 focus-within:ring-blue-500 px-3 pt-2 pb-2">
+                                        <span
+                                            x-text="selectedSerial.idSerial != -1 ? 'Serial' : selectedSerial.namaSerial"
+                                            class="pointer-events-none absolute start-2.5 top-0 -translate-y-1/2 bg-white p-0.5 text-xs text-gray-700 transition-all peer-placeholder-shown:top-1/2 peer-placeholder-shown:text-sm peer-focus:top-0 peer-focus:text-xs">
+                                        </span>
+                                        <button @click="openSerial = !openSerial" type="button"
+                                            class="w-full flex items-center justify-between bg-transparent text-gray-900 py-0.5 focus:outline-none">
+                                            <span x-text="selectedSerial.namaSerial" class="text-left"></span>
+                                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 transition-transform"
+                                                :class="{ 'rotate-180': openSerial }" fill="none" viewBox="0 0 24 24"
+                                                stroke="currentColor">
+                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                                    d="M19 9l-7 7-7-7" />
+                                            </svg>
+                                        </button>
+                                    </fieldset>
+                                    <div x-show="openSerial"
+                                        class="absolute bg-white w-full border border-gray-300 rounded-md shadow-lg z-10 max-h-[200px] overflow-y-auto">
+                                        <ul>
+                                            <template x-for="item in dataSerial" :key="item.idSerial">
+                                                <li :id="item.idSerial" @click="onChangeSerial(item)"
+                                                    class="py-2 px-3 hover:bg-blue-100 cursor-pointer text-gray-700">
+                                                    <button x-text="item.namaSerial"></button>
+                                                </li>
+                                            </template>
+                                        </ul>
+                                    </div>
+                                    <div class="mb-5"></div>
+                                    <!-- speed -->
+                                    <label for="Speed"
+                                        class="relative block rounded-md border border-gray-400 focus-within:border-blue-600 focus-within:ring-1 focus-within:ring-blue-600">
+                                        <input type="text" id="Speed" x-model="speed"
+                                            class="peer pl-2 border-none py-3 bg-transparent placeholder-transparent focus:border-transparent focus:ring-0 focus:outline-hidden"
+                                            placeholder="Speed" />
+
+                                        <span
+                                            class="pointer-events-none absolute start-2.5 top-0 -translate-y-1/2 bg-white p-0.5 text-xs text-gray-700 transition-all peer-placeholder-shown:top-1/2 peer-placeholder-shown:text-sm peer-focus:top-0 peer-focus:text-xs">
+                                            Speed
+                                        </span>
+                                    </label>
+                                    <div class="mb-5"></div>
+                                    <!-- parity -->
+                                    <fieldset @click.outside="openParity = false"
+                                        class="relative border border-gray-400 rounded-md focus-within:border-blue-500 focus-within:ring-1 focus-within:ring-blue-500 px-3 pt-2 pb-2">
+                                        <span
+                                            x-text="selectedParity.idParity != -1 ? 'DataBit' : selectedParity.namaParity"
+                                            class="pointer-events-none absolute start-2.5 top-0 -translate-y-1/2 bg-white p-0.5 text-xs text-gray-700 transition-all peer-placeholder-shown:top-1/2 peer-placeholder-shown:text-sm peer-focus:top-0 peer-focus:text-xs">
+                                        </span>
+                                        <button @click="openParity = !openParity" type="button"
+                                            class="w-full flex items-center justify-between bg-transparent text-gray-900 py-0.5 focus:outline-none">
+                                            <span x-text="selectedParity.namaParity" class="text-left"></span>
+                                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 transition-transform"
+                                                :class="{ 'rotate-180': openParity }" fill="none" viewBox="0 0 24 24"
+                                                stroke="currentColor">
+                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                                    d="M19 9l-7 7-7-7" />
+                                            </svg>
+                                        </button>
+                                    </fieldset>
+                                    <div x-show="openParity"
+                                        class="absolute bg-white w-full border border-gray-300 rounded-md shadow-lg z-10 max-h-[200px] overflow-y-auto">
+                                        <ul>
+                                            <template x-for="item in dataParity" :key="item.idParity">
+                                                <li :id="item.idParity" @click="onChangeParity(item)"
+                                                    class="py-2 px-3 hover:bg-blue-100 cursor-pointer text-gray-700">
+                                                    <button x-text="item.namaParity"></button>
+                                                </li>
+                                            </template>
+                                        </ul>
+                                    </div>
+                                    <div class="mb-5"></div>
+                                    <!-- data bits -->
+                                    <fieldset @click.outside="openDataBit = false"
+                                        class="relative border border-gray-400 rounded-md focus-within:border-blue-500 focus-within:ring-1 focus-within:ring-blue-500 px-3 pt-2 pb-2">
+                                        <span
+                                            x-text="selectedDataBit.idDataBit != -1 ? 'DataBit' : selectedDataBit.namaDataBit"
+                                            class="pointer-events-none absolute start-2.5 top-0 -translate-y-1/2 bg-white p-0.5 text-xs text-gray-700 transition-all peer-placeholder-shown:top-1/2 peer-placeholder-shown:text-sm peer-focus:top-0 peer-focus:text-xs">
+                                        </span>
+                                        <button @click="openDataBit = !openDataBit" type="button"
+                                            class="w-full flex items-center justify-between bg-transparent text-gray-900 py-0.5 focus:outline-none">
+                                            <span x-text="selectedDataBit.namaDataBit" class="text-left"></span>
+                                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 transition-transform"
+                                                :class="{ 'rotate-180': openDataBit }" fill="none" viewBox="0 0 24 24"
+                                                stroke="currentColor">
+                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                                    d="M19 9l-7 7-7-7" />
+                                            </svg>
+                                        </button>
+                                    </fieldset>
+                                    <div x-show="openDataBit"
+                                        class="absolute bg-white w-full border border-gray-300 rounded-md shadow-lg z-10 max-h-[200px] overflow-y-auto">
+                                        <ul>
+                                            <template x-for="item in dataDataBit" :key="item.idDataBit">
+                                                <li :id="item.idDataBit" @click="onChangeDataBit(item)"
+                                                    class="py-2 px-3 hover:bg-blue-100 cursor-pointer text-gray-700">
+                                                    <button x-text="item.namaDataBit"></button>
+                                                </li>
+                                            </template>
+                                        </ul>
+                                    </div>
+                                    <div class="mb-5"></div>
+                                    <!-- stop bit -->
+                                    <fieldset @click.outside="openStopBit = false"
+                                        class="relative border border-gray-400 rounded-md focus-within:border-blue-500 focus-within:ring-1 focus-within:ring-blue-500 px-3 pt-2 pb-2">
+                                        <span
+                                            x-text="selectedStopBit.idStopBit != -1 ? 'StopBit' : selectedStopBit.namaStopBit"
+                                            class="pointer-events-none absolute start-2.5 top-0 -translate-y-1/2 bg-white p-0.5 text-xs text-gray-700 transition-all peer-placeholder-shown:top-1/2 peer-placeholder-shown:text-sm peer-focus:top-0 peer-focus:text-xs">
+                                        </span>
+                                        <button @click="openStopBit = !openStopBit" type="button"
+                                            class="w-full flex items-center justify-between bg-transparent text-gray-900 py-0.5 focus:outline-none">
+                                            <span x-text="selectedStopBit.namaStopBit" class="text-left"></span>
+                                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 transition-transform"
+                                                :class="{ 'rotate-180': openStopBit }" fill="none" viewBox="0 0 24 24"
+                                                stroke="currentColor">
+                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                                    d="M19 9l-7 7-7-7" />
+                                            </svg>
+                                        </button>
+                                    </fieldset>
+                                    <div x-show="openStopBit"
+                                        class="absolute bg-white w-full border border-gray-300 rounded-md shadow-lg z-10 max-h-[200px] overflow-y-auto">
+                                        <ul>
+                                            <template x-for="item in dataStopBit" :key="item.idStopBit">
+                                                <li :id="item.idStopBit" @click="onChangeStopBit(item)"
+                                                    class="py-2 px-3 hover:bg-blue-100 cursor-pointer text-gray-700">
+                                                    <button x-text="item.namaStopBit"></button>
+                                                </li>
+                                            </template>
+                                        </ul>
+                                    </div>
+                                    <div class="mb-5"></div>
+                                    <!-- interface -->
+                                    <fieldset @click.outside="openInterface = false"
+                                        class="relative border border-gray-400 rounded-md focus-within:border-blue-500 focus-within:ring-1 focus-within:ring-blue-500 px-3 pt-2 pb-2">
+                                        <span
+                                            x-text="selectedInterface.idInterface != -1 ? 'Interface' : selectedInterface.namaInterface"
+                                            class="pointer-events-none absolute start-2.5 top-0 -translate-y-1/2 bg-white p-0.5 text-xs text-gray-700 transition-all peer-placeholder-shown:top-1/2 peer-placeholder-shown:text-sm peer-focus:top-0 peer-focus:text-xs">
+                                        </span>
+                                        <button @click="openInterface = !openInterface" type="button"
+                                            class="w-full flex items-center justify-between bg-transparent text-gray-900 py-0.5 focus:outline-none">
+                                            <span x-text="selectedInterface.namaInterface" class="text-left"></span>
+                                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 transition-transform"
+                                                :class="{ 'rotate-180': openInterface }" fill="none" viewBox="0 0 24 24"
+                                                stroke="currentColor">
+                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                                    d="M19 9l-7 7-7-7" />
+                                            </svg>
+                                        </button>
+                                    </fieldset>
+                                    <div x-show="openInterface"
+                                        class="absolute bg-white w-full border border-gray-300 rounded-md shadow-lg z-10 max-h-[200px] overflow-y-auto">
+                                        <ul>
+                                            <template x-for="item in dataInterface" :key="item.idInterface">
+                                                <li :id="item.idInterface" @click="onChangeInterface(item)"
+                                                    class="py-2 px-3 hover:bg-blue-100 cursor-pointer text-gray-700">
+                                                    <button x-text="item.namaInterface"></button>
+                                                </li>
+                                            </template>
+                                        </ul>
+                                    </div>
+                                    <div class="mb-5"></div>
+                                    <!-- instrument -->
+                                    <fieldset @click.outside="openInstrument = false"
+                                        class="relative border border-gray-400 rounded-md focus-within:border-blue-500 focus-within:ring-1 focus-within:ring-blue-500 px-3 pt-2 pb-2">
+                                        <span
+                                            x-text="selectedInstrument.idInstrument != -1 ? 'Instrument' : selectedInstrument.namaInstrument"
+                                            class="pointer-events-none absolute start-2.5 top-0 -translate-y-1/2 bg-white p-0.5 text-xs text-gray-700 transition-all peer-placeholder-shown:top-1/2 peer-placeholder-shown:text-sm peer-focus:top-0 peer-focus:text-xs">
+                                        </span>
+                                        <button @click="openInstrument = !openInstrument" type="button"
+                                            class="w-full flex items-center justify-between bg-transparent text-gray-900 py-0.5 focus:outline-none">
+                                            <span x-text="selectedInstrument.namaInstrument" class="text-left"></span>
+                                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 transition-transform"
+                                                :class="{ 'rotate-180': openInstrument }" fill="none"
+                                                viewBox="0 0 24 24" stroke="currentColor">
+                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                                    d="M19 9l-7 7-7-7" />
+                                            </svg>
+                                        </button>
+                                    </fieldset>
+                                    <div x-show="openInstrument"
+                                        class="absolute bg-white w-full border border-gray-300 rounded-md shadow-lg z-10 max-h-[200px] overflow-y-auto">
+                                        <ul>
+                                            <template x-for="item in dataInstrument" :key="item.idInstrument">
+                                                <li :id="item.idInstrument" @click="onChangeInstrument(item)"
+                                                    class="py-2 px-3 hover:bg-blue-100 cursor-pointer text-gray-700">
+                                                    <button x-text="item.namaInstrument"></button>
+                                                </li>
+                                            </template>
+                                        </ul>
+                                    </div>
+                                    <div class="mb-5"></div>
+                                </div>
+                            </template>
+                            <!-- namaJenis RS232 -->
                         </div>
                     </div>
                     <!-- footer -->