From 61deef5cdf96cbfdd6ad45be49e80d597c00ca65 Mon Sep 17 00:00:00 2001 From: QuakeGod <QuakeGod@sina.com> Date: 星期二, 24 十二月 2024 08:37:21 +0800 Subject: [PATCH] 2024-12-24 --- MTerm1/Resource.h | 134 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 127 insertions(+), 7 deletions(-) diff --git a/MTerm1/Resource.h b/MTerm1/Resource.h index fb6ffd7..95c5f7d 100644 --- a/MTerm1/Resource.h +++ b/MTerm1/Resource.h @@ -77,7 +77,14 @@ #define IDD_DIALOGBAR 351 #define IDD_DIALOGBAR_INPUT_SHOW 351 #define IDD_PROP_OUTPUT_MAPPING 352 +#define IDR_NAV_TOOLBAR 352 #define IDD_FORM_INPUTSHOW 353 +#define IDB_NAV_TOOLBAR_24 353 +#define IDD_MTerm1BnlView 354 +#define IDD_CONFIGTOOL_FORM 355 +#define IDD_PROP_SYSREG2 356 +#define IDR_POPUP_NAV 359 +#define IDD_DIALOG2 360 #define IDC_EDIT1 1000 #define IDC_BUTTON1 1001 #define IDC_BUTTON_LOAD 1001 @@ -89,11 +96,14 @@ #define IDC_COMBOBOXEX1 1004 #define IDC_BUTTON_CONVERT 1004 #define IDC_EDIT_CAP_AIN_I 1004 +#define IDC_BUTTON_UPLOAD 1004 #define IDC_EDIT_DISPLAY 1005 #define IDC_BUTTON4 1005 +#define IDC_BUTTON_DOWNLOAD 1005 #define IDC_COMBO_INPUT 1006 #define IDC_BUTTON_TRNS_TOTXT 1006 #define IDC_EDIT_CAP_AOUT_I 1006 +#define IDC_BUTTON_COMM_SET 1006 #define IDC_BUTTON_SEND 1007 #define IDC_BUTTON_TRNS_PRG 1007 #define IDC_EDIT_CAP_AIN_E 1007 @@ -103,6 +113,7 @@ #define IDC_BUTTON_START 1009 #define IDC_RADIO_SET_OFF 1009 #define IDC_EDIT_CAP_HIN 1009 +#define IDC_BUTTON_EVENTLOG 1009 #define IDC_COMBO_COMPORT 1010 #define IDC_STATIC_INFO2 1010 #define IDC_EDIT_CAP_HOUT 1010 @@ -203,12 +214,14 @@ #define IDC_COMBO_OUTPUT_SET_5 1040 #define IDC_CHECK_AUTO_CONN 1040 #define IDC_COMBO_INPUT_FILTER_12 1040 +#define IDC_BUTTON_LOAD_SYSCFG_FILE 1040 #define IDC_COMBO_NETWORK_TYPE 1041 #define IDC_STATIC_OUTPUT_NAME_5 1041 #define IDC_BUTTON_CONN 1041 #define IDC_BUTTON_WRITE_TO_PLC 1041 #define IDC_STATIC_INPUT_NAME_13 1041 #define IDC_EDIT_MON4 1041 +#define IDC_BUTTON_SAVE_SYSCFG_FILE 1041 #define IDC_COMBO_PORT 1042 #define IDC_COMBO_OUTPUT_SET_6 1042 #define IDC_EDIT_DEVICE_TYPE 1042 @@ -226,6 +239,7 @@ #define IDC_STATIC_OUTPUT_NAME_7 1045 #define IDC_EDIT_LOT_NO 1045 #define IDC_STATIC_INPUT_NAME_15 1045 +#define IDC_BUTTON_TIME_NOW 1045 #define IDC_RADIO_DATA_LENGTH_8B 1046 #define IDC_COMBO_OUTPUT_SET_8 1046 #define IDC_EDIT_FACT_SN 1046 @@ -258,6 +272,7 @@ #define IDC_EDIT_ORG_FAC_DATE 1057 #define IDC_BUTTON31 1057 #define IDC_BUTTON3 1058 +#define IDC_EDIT_ORG_FAC_DATE2 1058 #define IDC_LIST_STATUS1 1059 #define IDC_EDIT31 1059 #define IDC_EDIT_CAP_COM 1059 @@ -282,9 +297,11 @@ #define IDC_STATIC_PROP 1066 #define IDC_BUTTON_BACKSPACE 1066 #define IDC_COMBO_EOF_CHAR 1066 +#define IDC_COMBO_BYTE_SIZE1 1066 #define IDC_SCROLLBAR1 1067 #define IDC_BUTTON_0 1067 #define IDC_COMBO_SOF_CHAR 1067 +#define IDC_COMBO_PARITY1 1067 #define IDC_BUTTON_EQ 1068 #define IDC_COMBO_END_TYPE 1068 #define IDC_BUTTON1_DOT 1069 @@ -314,69 +331,121 @@ #define IDC_COMBO_WORKMODE 1077 #define IDC_BUTTON_CLEAR_STAT 1078 #define IDC_COMBO_STATION 1078 +#define IDC_COMBO_STATION1 1078 #define IDC_PROGRESS1 1079 #define IDC_EDIT_END_TIME 1079 +#define IDC_EDIT_END_TIME1 1079 #define IDC_BUTTON_READ 1080 #define IDC_STATIC_PIN_NAME_1 1080 +#define IDC_EDIT_BUF_ADDR1 1080 #define IDC_STATIC_HINT 1081 #define IDC_COMBO_FROM_COIL_TYPE_1 1081 +#define IDC_EDIT_BUF_SIZE1 1081 #define IDC_BUTTON_CONNECT 1082 #define IDC_COMBO_FROM_COIL_ADDR_1 1082 +#define IDC_COMBO_STOP_BIT1 1082 #define IDC_LIST_EVENTLOG 1083 #define IDC_BUTTON_DISCONNECT 1083 #define IDC_COMBO_FROM_COIL_TYPE_2 1083 #define IDC_COMBO4 1083 +#define IDC_COMBO_EOF_CHAR1 1083 #define IDC_EDIT_EVENT_COUNT 1084 #define IDC_COMBO_FROM_COIL_ADDR_2 1084 #define IDC_COMBO5 1084 +#define IDC_COMBO_SOF_CHAR1 1084 #define IDC_BUTTON_CLEAR_EVENTLOG 1085 #define IDC_STATIC_PIN_NAME_2 1085 #define IDC_COMBO6 1085 +#define IDC_COMBO_END_TYPE1 1085 #define IDC_BUTTON_RELOAD 1086 #define IDC_COMBO_FROM_COIL_TYPE_3 1086 +#define IDC_COMBO_BAUDRATE1 1086 #define IDC_LIST_FORCE_IO 1087 #define IDC_COMBO_FROM_COIL_ADDR_3 1087 +#define IDC_COMBO_WORKMODE3 1087 +#define IDC_HOTKEY1 1087 #define IDC_BUTTON_FREE 1088 #define IDC_STATIC_PIN_NAME_3 1088 +#define IDC_EDIT_END_TIME2 1088 +#define IDC_EDIT9 1088 #define IDC_BUTTON_RELEASE 1089 #define IDC_COMBO_FROM_COIL_TYPE_4 1089 +#define IDC_COMBO_WORKMODE1 1089 +#define IDC_EDIT10 1089 #define IDC_BUTTON_EP_ADD 1090 #define IDC_COMBO_FROM_COIL_ADDR_4 1090 +#define IDC_COMBO_WORKMODE2 1090 +#define IDC_COMBO7 1090 #define IDC_BUTTON_DELETE 1091 #define IDC_STATIC_PIN_NAME_4 1091 +#define IDC_COMBO_STATION2 1091 +#define IDC_COMBO8 1091 #define IDC_BUTTON_HELP 1092 #define IDC_COMBO_FROM_COIL_TYPE_5 1092 +#define IDC_EDIT_BUF_ADDR2 1092 +#define IDC_COMBO9 1092 #define IDC_BUTTON_CLOSE 1093 #define IDC_COMBO_FROM_COIL_ADDR_5 1093 +#define IDC_EDIT_BUF_SIZE2 1093 +#define IDC_COMBO10 1093 #define IDC_BUTTON_ON 1094 #define IDC_STATIC_PIN_NAME_5 1094 +#define IDC_COMBO_BYTE_SIZE2 1094 +#define IDC_COMBO11 1094 #define IDC_BUTTON_OFF 1095 #define IDC_COMBO_FROM_COIL_TYPE_6 1095 +#define IDC_COMBO_PARITY2 1095 +#define IDC_COMBO12 1095 #define IDC_STATIC_INFO 1096 #define IDC_COMBO_FROM_COIL_ADDR_6 1096 +#define IDC_COMBO_STOP_BIT2 1096 +#define IDC_COMBO13 1096 #define IDC_CHECK_SYSTIME 1097 #define IDC_STATIC_PIN_NAME_6 1097 +#define IDC_COMBO_EOF_CHAR2 1097 +#define IDC_COMBO14 1097 #define IDC_BUTTON_SUBMIT 1098 #define IDC_COMBO_FROM_COIL_TYPE_7 1098 +#define IDC_COMBO_SOF_CHAR2 1098 #define IDC_EDIT_YEAR 1099 #define IDC_COMBO_FROM_COIL_ADDR_7 1099 +#define IDC_COMBO_END_TYPE2 1099 #define IDC_EDIT_MONTH 1100 #define IDC_STATIC_PIN_NAME_7 1100 +#define IDC_COMBO_BAUDRATE2 1100 #define IDC_STATIC_CONNECT 1101 #define IDC_COMBO_FROM_COIL_TYPE_8 1101 +#define IDC_COMBO_FROM_COIL_TYPE_00 1101 #define IDC_BUTTON11 1102 #define IDC_COMBO_FROM_COIL_ADDR_8 1102 +#define IDC_COMBO_FROM_COIL_ADDR_00 1102 #define IDC_BUTTON12 1103 #define IDC_STATIC_PIN_NAME_8 1103 #define IDC_BUTTON13 1104 #define IDC_COMBO_FROM_COIL_BIT_1 1104 +#define IDC_COMBO_FROM_COIL_TYPE_01 1104 #define IDC_COMBO_FROM_COIL_BIT_2 1105 +#define IDC_COMBO_FROM_COIL_ADDR_01 1105 #define IDC_COMBO_FROM_COIL_BIT_3 1106 #define IDC_COMBO_FROM_COIL_BIT_4 1107 +#define IDC_COMBO_FROM_COIL_TYPE_02 1107 #define IDC_COMBO_FROM_COIL_BIT_5 1108 +#define IDC_COMBO_FROM_COIL_ADDR_02 1108 #define IDC_COMBO_FROM_COIL_BIT_6 1109 #define IDC_COMBO_FROM_COIL_BIT_7 1110 +#define IDC_COMBO_FROM_COIL_TYPE_03 1110 #define IDC_COMBO_FROM_COIL_BIT_8 1111 +#define IDC_COMBO_FROM_COIL_ADDR_03 1111 +#define IDC_COMBO_FROM_COIL_TYPE_04 1113 +#define IDC_COMBO_FROM_COIL_ADDR_04 1114 +#define IDC_COMBO_FROM_COIL_TYPE_05 1116 +#define IDC_COMBO_FROM_COIL_ADDR_05 1117 +#define IDC_COMBO_FROM_COIL_BIT_00 1125 +#define IDC_COMBO_FROM_COIL_BIT_01 1126 +#define IDC_COMBO_FROM_COIL_BIT_02 1127 +#define IDC_COMBO_FROM_COIL_BIT_03 1128 +#define IDC_COMBO_FROM_COIL_BIT_04 1129 +#define IDC_COMBO_FROM_COIL_BIT_05 1130 #define IDC_CHECK_PAUSE 1157 #define IDC_CHECK_NOSCROLL 1158 #define IDC_CHECK_PAUSEUPDATE 1161 @@ -443,10 +512,6 @@ #define ID_32829 32829 #define ID_Menu32833 32833 #define ID_32834 32834 -#define ID_32835 32835 -#define ID_32836 32836 -#define ID_32837 32837 -#define ID_32839 32839 #define ID_32840 32840 #define ID_32844 32844 #define ID_32845 32845 @@ -645,6 +710,7 @@ #define ID_SHOW_LOG 33092 #define ID_33093 33093 #define ID_MENU_SHOWNAV 33094 +#define ID_KEY_X 33095 #define IDS_STRING101 33100 #define IDC_BUTTON_AND 33101 #define IDC_BUTTON_OR 33102 @@ -658,17 +724,71 @@ #define IDC_BUTTON_MC 33110 #define IDC_BUTTON_MCE 33111 #define IDC_BUTTON_E 33183 +#define ID_SORT 33185 +#define ID_SORT_33186 33186 +#define ID_SORT_33187 33187 +#define ID_SORT_33188 33188 +#define ID_SORT_33189 33189 +#define ID_33190 33190 +#define ID_33191 33191 +#define ID_33192 33192 +#define ID_33193 33193 +#define ID_33194 33194 +#define ID_33195 33195 +#define ID_MENU_CONNECT 33196 +#define ID_MENU_NAV_DISCONNECT 33197 +#define ID_MENU_NAV_CONNECT 33198 +#define ID_MENU_NAV_SET_CONN 33199 +#define ID_MENU_NAV_CONN_STAT 33200 #define IDC_BUTTON_SET 33201 +#define ID_33201 33201 #define IDC_BUTTON_RESET 33202 +#define ID_33202 33202 #define IDC_BUTTON_DF 33203 +#define ID_MENU_NV_UPDATE_FIRMWARE 33203 #define IDC_BUTTON_END 33204 +#define ID_MENU_NV_DEVICE_READ_INFO 33204 #define IDC_BUTTON_COMPARE 33205 +#define ID_33205 33205 #define IDC_BUTTON_PFUN 33206 +#define ID_33206 33206 #define IDC_BUTTON_UPDOWN 33207 +#define ID_33207 33207 #define IDC_BUTTON_BIT 33208 +#define ID_33208 33208 #define IDC_BUTTON_WORD 33209 +#define ID_33209 33209 #define IDC_BUTTON_INSTRUCTION1 33210 +#define ID_UPDATE_REMOTE_FIRMWARE 33210 #define IDC_BUTTON_INSTRUCTION2 33211 +#define ID_REMOTE_BLINK 33211 +#define ID_REMOTE_REFRESH_DATA 33212 +#define ID_33213 33213 +#define ID_33214 33214 +#define ID_NAV_CONNECT 33215 +#define ID_NAV_DISCONNECT 33216 +#define ID_33217 33217 +#define ID_33218 33218 +#define ID_LED_BLINK 33219 +#define ID_33220 33220 +#define ID_33221 33221 +#define ID_33222 33222 +#define ID_33223 33223 +#define ID_PORT_RESET 33224 +#define ID_PORT_RESET_ALL_CHILD 33225 +#define ID_PORT_ACTION 33226 +#define ID_33227 33227 +#define ID_REMOTE_DEVICE_RESET 33228 +#define ID_REMOTE_UPDATE_FIRMWARE 33229 +#define ID_RESET_DEVICE 33230 +#define ID_33231 33231 +#define ID_REMOTE_BLINK_LED_ALL 33232 +#define ID_NAV_SETCOMM 33233 +#define ID_33234 33234 +#define ID_COMMTEST 33235 +#define ID_33236 33236 +#define ID_33237 33237 +#define ID_DEVICE_CONFIG 33238 #define IDC_BUTTON_PGCONVERT 33301 #define IDC_BUTTON_ONLINE 33302 #define IDC_BUTTON_OFFLINE 33303 @@ -702,9 +822,9 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 359 -#define _APS_NEXT_COMMAND_VALUE 33185 -#define _APS_NEXT_CONTROL_VALUE 1087 +#define _APS_NEXT_RESOURCE_VALUE 363 +#define _APS_NEXT_COMMAND_VALUE 33239 +#define _APS_NEXT_CONTROL_VALUE 1098 #define _APS_NEXT_SYMED_VALUE 319 #endif #endif -- Gitblit v1.9.1