Compare commits

..

2 Commits

Author SHA1 Message Date
jiwonRepair
977e31706f fix: PRO_S model number & read,write func 2025-08-13 09:44:09 +09:00
jiwonRepair
085a17e8e7 fix: DS_PRO_S 2025-08-13 09:13:12 +09:00
2 changed files with 10 additions and 0 deletions

View File

@ -82,6 +82,7 @@
DS_PRO = 1 DS_PRO = 1
DS_LUX DS_LUX
DS_ALPHA = 4 DS_ALPHA = 4
DS_PRO_S = 8
MAX_DS_MODEL_NUM MAX_DS_MODEL_NUM
End Enum End Enum
Public Enum DS_TYPE Public Enum DS_TYPE
@ -106,6 +107,10 @@
DS_ALPHA_FACE DS_ALPHA_FACE
DS_ALPHA_EYE DS_ALPHA_EYE
DS_ALPHA_BODY DS_ALPHA_BODY
DS_PRO_S_DEV = 80
DS_PRO_S_FACE
DS_PRO_S_EYE
DS_PRO_S_BODY
MAX_DS_PRODUCT_NUM MAX_DS_PRODUCT_NUM
End Enum End Enum
Public Enum DIFF_MATCH Public Enum DIFF_MATCH

View File

@ -3260,6 +3260,7 @@ Public Class MainForm
If tmpModelType = DS_PRODUCT.DS_PRO_DEV Or tmpModelType = DS_PRODUCT.DS_PRO_FACE Or tmpModelType = DS_PRODUCT.DS_PRO_EYE Or tmpModelType = DS_PRODUCT.DS_PRO_BODY Then If tmpModelType = DS_PRODUCT.DS_PRO_DEV Or tmpModelType = DS_PRODUCT.DS_PRO_FACE Or tmpModelType = DS_PRODUCT.DS_PRO_EYE Or tmpModelType = DS_PRODUCT.DS_PRO_BODY Then
ElseIf tmpModelType = DS_PRODUCT.DS_LUX_DEV Or tmpModelType = DS_PRODUCT.DS_LUX_FACE Or tmpModelType = DS_PRODUCT.DS_LUX_EYE Or tmpModelType = DS_PRODUCT.DS_LUX_BODY Then ElseIf tmpModelType = DS_PRODUCT.DS_LUX_DEV Or tmpModelType = DS_PRODUCT.DS_LUX_FACE Or tmpModelType = DS_PRODUCT.DS_LUX_EYE Or tmpModelType = DS_PRODUCT.DS_LUX_BODY Then
ElseIf tmpModelType = DS_PRODUCT.DS_ALPHA_DEV Or tmpModelType = DS_PRODUCT.DS_ALPHA_FACE Or tmpModelType = DS_PRODUCT.DS_ALPHA_EYE Or tmpModelType = DS_PRODUCT.DS_ALPHA_BODY Then ElseIf tmpModelType = DS_PRODUCT.DS_ALPHA_DEV Or tmpModelType = DS_PRODUCT.DS_ALPHA_FACE Or tmpModelType = DS_PRODUCT.DS_ALPHA_EYE Or tmpModelType = DS_PRODUCT.DS_ALPHA_BODY Then
ElseIf tmpModelType = DS_PRODUCT.DS_PRO_S_DEV Or tmpModelType = DS_PRODUCT.DS_PRO_S_FACE Or tmpModelType = DS_PRODUCT.DS_PRO_S_EYE Or tmpModelType = DS_PRODUCT.DS_PRO_S_BODY Then
Else Else
Return Return
End If End If
@ -3425,6 +3426,8 @@ DUPLICATION_NG:
txbInfo_Model(MODEL_TYPE).Text = "LUX" txbInfo_Model(MODEL_TYPE).Text = "LUX"
ElseIf DS_SN(MODEL_TYPE).MODEL = DS_MODEL.DS_ALPHA Then ElseIf DS_SN(MODEL_TYPE).MODEL = DS_MODEL.DS_ALPHA Then
txbInfo_Model(MODEL_TYPE).Text = "ALPHA" txbInfo_Model(MODEL_TYPE).Text = "ALPHA"
ElseIf DS_SN(MODEL_TYPE).MODEL = DS_MODEL.DS_PRO_S Then
txbInfo_Model(MODEL_TYPE).Text = "PRO_S"
End If End If
txbInfo_Manufacture(MODEL_TYPE).Text = "JOMT" txbInfo_Manufacture(MODEL_TYPE).Text = "JOMT"
txbInfo_Year(MODEL_TYPE).Text = DS_SN(MODEL_TYPE).YEAR txbInfo_Year(MODEL_TYPE).Text = DS_SN(MODEL_TYPE).YEAR
@ -3827,6 +3830,8 @@ DUPLICATION_NG:
Conf_DS_Set.CONF_MODEL = DS_MODEL.DS_LUX Conf_DS_Set.CONF_MODEL = DS_MODEL.DS_LUX
ElseIf txbConf_Model.Text = "ALPHA" Then ElseIf txbConf_Model.Text = "ALPHA" Then
Conf_DS_Set.CONF_MODEL = DS_MODEL.DS_ALPHA Conf_DS_Set.CONF_MODEL = DS_MODEL.DS_ALPHA
ElseIf txbConf_Model.Text = "PRO_S" Then
Conf_DS_Set.CONF_MODEL = DS_MODEL.DS_PRO_S
End If End If
txbConf_FaceShot.Text = ItemSelectFace(CboNum).Text txbConf_FaceShot.Text = ItemSelectFace(CboNum).Text