"Add_AdSense_and_Settings_Delay"
This commit is contained in:
@@ -20,8 +20,20 @@ const Settings: React.FC = () => {
|
||||
try {
|
||||
await serialService.enterFactoryModeRead();
|
||||
|
||||
const p = serialService.readRegister.bind(serialService);
|
||||
const pBytes = serialService.readRegisterBytes.bind(serialService);
|
||||
// Helper with delay
|
||||
const delay = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
|
||||
|
||||
const p = async (reg: number) => {
|
||||
const val = await serialService.readRegister(reg);
|
||||
await delay(250);
|
||||
return val;
|
||||
};
|
||||
|
||||
const pBytes = async (reg: number) => {
|
||||
const val = await serialService.readRegisterBytes(reg);
|
||||
await delay(250);
|
||||
return val;
|
||||
};
|
||||
|
||||
// 병렬 처리는 시리얼 통신에서 꼬일 수 있으므로 순차 처리 권장 (await 사용)
|
||||
// 주요 레지스터 읽기
|
||||
@@ -105,9 +117,9 @@ const Settings: React.FC = () => {
|
||||
} else if (type === 'string' || type === 'bytes') {
|
||||
const bytes = await serialService.readRegisterBytes(reg);
|
||||
if (type === 'string') {
|
||||
val = JBD.JBDProtocol.parseString(bytes);
|
||||
val = JBD.JBDProtocol.parseString(bytes);
|
||||
} else {
|
||||
val = bytes; // bytes not fully supported in single row yet unless custom
|
||||
val = bytes; // bytes not fully supported in single row yet unless custom
|
||||
}
|
||||
}
|
||||
|
||||
@@ -150,11 +162,11 @@ const Settings: React.FC = () => {
|
||||
};
|
||||
|
||||
// 그룹 컴포넌트
|
||||
const Group: React.FC<{title: string, children: React.ReactNode}> = ({title, children}) => (
|
||||
const Group: React.FC<{ title: string, children: React.ReactNode }> = ({ title, children }) => (
|
||||
<div className="bg-gray-900 rounded-xl border border-gray-800 shadow-xl overflow-hidden mb-6">
|
||||
<div className="bg-gray-800/50 px-5 py-3 border-b border-gray-700">
|
||||
<h3 className="text-lg font-bold text-gray-200 flex items-center gap-2">
|
||||
{title}
|
||||
{title}
|
||||
</h3>
|
||||
</div>
|
||||
<div className="p-1 space-y-1">{children}</div>
|
||||
@@ -177,40 +189,40 @@ const Settings: React.FC = () => {
|
||||
|
||||
// config 값이 업데이트되면 로컬 상태 동기화
|
||||
useEffect(() => {
|
||||
if (val === undefined || val === null) {
|
||||
setLocalVal('');
|
||||
setIsDirty(false);
|
||||
if (val === undefined || val === null) {
|
||||
setLocalVal('');
|
||||
setIsDirty(false);
|
||||
} else {
|
||||
if (type === 'date') {
|
||||
setLocalVal(JBD.JBDProtocol.parseDate(val as number));
|
||||
} else if (type === 'int') {
|
||||
setLocalVal(Number(val) * scale);
|
||||
} else {
|
||||
if (type === 'date') {
|
||||
setLocalVal(JBD.JBDProtocol.parseDate(val as number));
|
||||
} else if (type === 'int') {
|
||||
setLocalVal(Number(val) * scale);
|
||||
} else {
|
||||
setLocalVal(val as string);
|
||||
}
|
||||
setIsDirty(false);
|
||||
setLocalVal(val as string);
|
||||
}
|
||||
setIsDirty(false);
|
||||
}
|
||||
}, [val, scale, type]);
|
||||
|
||||
const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
setLocalVal(e.target.value);
|
||||
setIsDirty(true);
|
||||
setLocalVal(e.target.value);
|
||||
setIsDirty(true);
|
||||
};
|
||||
|
||||
const onRead = () => {
|
||||
handleReadSingle(reg, field, type as 'int' | 'string' | 'bytes' | 'date');
|
||||
handleReadSingle(reg, field, type as 'int' | 'string' | 'bytes' | 'date');
|
||||
};
|
||||
|
||||
const onSave = () => {
|
||||
let payload: any = localVal;
|
||||
if (type === 'int') {
|
||||
payload = Number(localVal) / scale;
|
||||
} else if (type === 'date') {
|
||||
payload = JBD.JBDProtocol.encodeDate(localVal as string);
|
||||
}
|
||||
let payload: any = localVal;
|
||||
if (type === 'int') {
|
||||
payload = Number(localVal) / scale;
|
||||
} else if (type === 'date') {
|
||||
payload = JBD.JBDProtocol.encodeDate(localVal as string);
|
||||
}
|
||||
|
||||
handleSaveSingle(reg, payload, type as 'int' | 'string' | 'bytes' | 'date');
|
||||
setIsDirty(false);
|
||||
handleSaveSingle(reg, payload, type as 'int' | 'string' | 'bytes' | 'date');
|
||||
setIsDirty(false);
|
||||
};
|
||||
|
||||
return (
|
||||
@@ -293,62 +305,62 @@ const Settings: React.FC = () => {
|
||||
|
||||
{/* 설정 그리드 */}
|
||||
<div className="grid grid-cols-1 xl:grid-cols-2 gap-6">
|
||||
<div className="space-y-6">
|
||||
<Group title="전압 보호 (Voltage Protection)">
|
||||
<SettingRow label="셀 과전압 (Cell OVP)" unit="mV" val={config.cellOvp} reg={JBD.REG_COVP} field="cellOvp" />
|
||||
<SettingRow label="셀 과전압 해제 (Release)" unit="mV" val={config.cellOvpRel} reg={JBD.REG_COVP_REL} field="cellOvpRel" />
|
||||
<SettingRow label="셀 저전압 (Cell UVP)" unit="mV" val={config.cellUvp} reg={JBD.REG_CUVP} field="cellUvp" />
|
||||
<SettingRow label="셀 저전압 해제 (Release)" unit="mV" val={config.cellUvpRel} reg={JBD.REG_CUVP_REL} field="cellUvpRel" />
|
||||
<SettingRow label="팩 과전압 (Pack OVP)" unit="V" val={config.packOvp} reg={JBD.REG_POVP} field="packOvp" scale={0.01} />
|
||||
<SettingRow label="팩 과전압 해제 (Release)" unit="V" val={config.packOvpRel} reg={JBD.REG_POVP_REL} field="packOvpRel" scale={0.01} />
|
||||
<SettingRow label="팩 저전압 (Pack UVP)" unit="V" val={config.packUvp} reg={JBD.REG_PUVP} field="packUvp" scale={0.01} />
|
||||
<SettingRow label="팩 저전압 해제 (Release)" unit="V" val={config.packUvpRel} reg={JBD.REG_PUVP_REL} field="packUvpRel" scale={0.01} />
|
||||
</Group>
|
||||
<div className="space-y-6">
|
||||
<Group title="전압 보호 (Voltage Protection)">
|
||||
<SettingRow label="셀 과전압 (Cell OVP)" unit="mV" val={config.cellOvp} reg={JBD.REG_COVP} field="cellOvp" />
|
||||
<SettingRow label="셀 과전압 해제 (Release)" unit="mV" val={config.cellOvpRel} reg={JBD.REG_COVP_REL} field="cellOvpRel" />
|
||||
<SettingRow label="셀 저전압 (Cell UVP)" unit="mV" val={config.cellUvp} reg={JBD.REG_CUVP} field="cellUvp" />
|
||||
<SettingRow label="셀 저전압 해제 (Release)" unit="mV" val={config.cellUvpRel} reg={JBD.REG_CUVP_REL} field="cellUvpRel" />
|
||||
<SettingRow label="팩 과전압 (Pack OVP)" unit="V" val={config.packOvp} reg={JBD.REG_POVP} field="packOvp" scale={0.01} />
|
||||
<SettingRow label="팩 과전압 해제 (Release)" unit="V" val={config.packOvpRel} reg={JBD.REG_POVP_REL} field="packOvpRel" scale={0.01} />
|
||||
<SettingRow label="팩 저전압 (Pack UVP)" unit="V" val={config.packUvp} reg={JBD.REG_PUVP} field="packUvp" scale={0.01} />
|
||||
<SettingRow label="팩 저전압 해제 (Release)" unit="V" val={config.packUvpRel} reg={JBD.REG_PUVP_REL} field="packUvpRel" scale={0.01} />
|
||||
</Group>
|
||||
|
||||
<Group title="온도 보호 (Temperature)">
|
||||
<SettingRow label="충전 과온 (Chg OT)" unit="°C" val={config.chgOt} reg={JBD.REG_CHG_OT} field="chgOt" type="int" />
|
||||
<SettingRow label="충전 과온 해제 (Release)" unit="°C" val={config.chgOtRel} reg={JBD.REG_CHG_OT_REL} field="chgOtRel" />
|
||||
<SettingRow label="충전 저온 (Chg UT)" unit="°C" val={config.chgUt} reg={JBD.REG_CHG_UT} field="chgUt" />
|
||||
<SettingRow label="충전 저온 해제 (Release)" unit="°C" val={config.chgUtRel} reg={JBD.REG_CHG_UT_REL} field="chgUtRel" />
|
||||
<SettingRow label="방전 과온 (Dsg OT)" unit="°C" val={config.dsgOt} reg={JBD.REG_DSG_OT} field="dsgOt" />
|
||||
<SettingRow label="방전 과온 해제 (Release)" unit="°C" val={config.dsgOtRel} reg={JBD.REG_DSG_OT_REL} field="dsgOtRel" />
|
||||
</Group>
|
||||
<Group title="온도 보호 (Temperature)">
|
||||
<SettingRow label="충전 과온 (Chg OT)" unit="°C" val={config.chgOt} reg={JBD.REG_CHG_OT} field="chgOt" type="int" />
|
||||
<SettingRow label="충전 과온 해제 (Release)" unit="°C" val={config.chgOtRel} reg={JBD.REG_CHG_OT_REL} field="chgOtRel" />
|
||||
<SettingRow label="충전 저온 (Chg UT)" unit="°C" val={config.chgUt} reg={JBD.REG_CHG_UT} field="chgUt" />
|
||||
<SettingRow label="충전 저온 해제 (Release)" unit="°C" val={config.chgUtRel} reg={JBD.REG_CHG_UT_REL} field="chgUtRel" />
|
||||
<SettingRow label="방전 과온 (Dsg OT)" unit="°C" val={config.dsgOt} reg={JBD.REG_DSG_OT} field="dsgOt" />
|
||||
<SettingRow label="방전 과온 해제 (Release)" unit="°C" val={config.dsgOtRel} reg={JBD.REG_DSG_OT_REL} field="dsgOtRel" />
|
||||
</Group>
|
||||
|
||||
<Group title="하드웨어 정보 (Hardware Info)">
|
||||
<SettingRow label="제조일자 (Mfg Date)" unit="" val={config.mfgDate} reg={JBD.REG_MFG_DATE} field="mfgDate" type="date" />
|
||||
<SettingRow label="제조사명 (Mfg Name)" unit="" val={config.mfgName} reg={JBD.REG_MFG_NAME} field="mfgName" type="string" />
|
||||
<SettingRow label="장치명 (Device Name)" unit="" val={config.deviceName} reg={JBD.REG_DEVICE_NAME} field="deviceName" type="string" />
|
||||
<SettingRow label="바코드 (Barcode)" unit="" val={config.barcode} reg={JBD.REG_BARCODE} field="barcode" type="string" />
|
||||
<SettingRow label="션트 저항 (Shunt)" unit="mΩ" val={config.shuntRes} reg={JBD.REG_SHUNT_RES} field="shuntRes" scale={0.1} />
|
||||
<SettingRow label="셀 개수 (Cell Count)" unit="S" val={config.cellCnt} reg={JBD.REG_CELL_CNT} field="cellCnt" />
|
||||
</Group>
|
||||
</div>
|
||||
<Group title="하드웨어 정보 (Hardware Info)">
|
||||
<SettingRow label="제조일자 (Mfg Date)" unit="" val={config.mfgDate} reg={JBD.REG_MFG_DATE} field="mfgDate" type="date" />
|
||||
<SettingRow label="제조사명 (Mfg Name)" unit="" val={config.mfgName} reg={JBD.REG_MFG_NAME} field="mfgName" type="string" />
|
||||
<SettingRow label="장치명 (Device Name)" unit="" val={config.deviceName} reg={JBD.REG_DEVICE_NAME} field="deviceName" type="string" />
|
||||
<SettingRow label="바코드 (Barcode)" unit="" val={config.barcode} reg={JBD.REG_BARCODE} field="barcode" type="string" />
|
||||
<SettingRow label="션트 저항 (Shunt)" unit="mΩ" val={config.shuntRes} reg={JBD.REG_SHUNT_RES} field="shuntRes" scale={0.1} />
|
||||
<SettingRow label="셀 개수 (Cell Count)" unit="S" val={config.cellCnt} reg={JBD.REG_CELL_CNT} field="cellCnt" />
|
||||
</Group>
|
||||
</div>
|
||||
|
||||
<div className="space-y-6">
|
||||
<Group title="용량 설정 (Capacity Settings)">
|
||||
<SettingRow label="설계 용량 (Design Cap)" unit="Ah" val={config.designCapacity} reg={JBD.REG_DESIGN_CAP} field="designCapacity" scale={0.01} />
|
||||
<SettingRow label="사이클 용량 (Cycle Cap)" unit="Ah" val={config.cycleCapacity} reg={JBD.REG_CYCLE_CAP} field="cycleCapacity" scale={0.01} />
|
||||
<SettingRow label="방전율 (Dsg Rate)" unit="%" val={config.dsgRate} reg={JBD.REG_DSG_RATE} field="dsgRate" scale={0.1} />
|
||||
<SettingRow label="100% 전압 (Vol at 100%)" unit="mV" val={config.cap100} reg={JBD.REG_CAP_100} field="cap100" />
|
||||
<SettingRow label="80% 전압 (Vol at 80%)" unit="mV" val={config.cap80} reg={JBD.REG_CAP_80} field="cap80" />
|
||||
<SettingRow label="60% 전압 (Vol at 60%)" unit="mV" val={config.cap60} reg={JBD.REG_CAP_60} field="cap60" />
|
||||
<SettingRow label="40% 전압 (Vol at 40%)" unit="mV" val={config.cap40} reg={JBD.REG_CAP_40} field="cap40" />
|
||||
<SettingRow label="20% 전압 (Vol at 20%)" unit="mV" val={config.cap20} reg={JBD.REG_CAP_20} field="cap20" />
|
||||
<SettingRow label="0% 전압 (Vol at 0%)" unit="mV" val={config.cap0} reg={JBD.REG_CAP_0} field="cap0" />
|
||||
</Group>
|
||||
<div className="space-y-6">
|
||||
<Group title="용량 설정 (Capacity Settings)">
|
||||
<SettingRow label="설계 용량 (Design Cap)" unit="Ah" val={config.designCapacity} reg={JBD.REG_DESIGN_CAP} field="designCapacity" scale={0.01} />
|
||||
<SettingRow label="사이클 용량 (Cycle Cap)" unit="Ah" val={config.cycleCapacity} reg={JBD.REG_CYCLE_CAP} field="cycleCapacity" scale={0.01} />
|
||||
<SettingRow label="방전율 (Dsg Rate)" unit="%" val={config.dsgRate} reg={JBD.REG_DSG_RATE} field="dsgRate" scale={0.1} />
|
||||
<SettingRow label="100% 전압 (Vol at 100%)" unit="mV" val={config.cap100} reg={JBD.REG_CAP_100} field="cap100" />
|
||||
<SettingRow label="80% 전압 (Vol at 80%)" unit="mV" val={config.cap80} reg={JBD.REG_CAP_80} field="cap80" />
|
||||
<SettingRow label="60% 전압 (Vol at 60%)" unit="mV" val={config.cap60} reg={JBD.REG_CAP_60} field="cap60" />
|
||||
<SettingRow label="40% 전압 (Vol at 40%)" unit="mV" val={config.cap40} reg={JBD.REG_CAP_40} field="cap40" />
|
||||
<SettingRow label="20% 전압 (Vol at 20%)" unit="mV" val={config.cap20} reg={JBD.REG_CAP_20} field="cap20" />
|
||||
<SettingRow label="0% 전압 (Vol at 0%)" unit="mV" val={config.cap0} reg={JBD.REG_CAP_0} field="cap0" />
|
||||
</Group>
|
||||
|
||||
<Group title="밸런스 설정 (Balancer)">
|
||||
<SettingRow label="시작 전압 (Start Volt)" unit="mV" val={config.balStart} reg={JBD.REG_BAL_START} field="balStart" />
|
||||
<SettingRow label="정밀도 (Precision)" unit="mV" val={config.balWindow} reg={JBD.REG_BAL_WINDOW} field="balWindow" />
|
||||
</Group>
|
||||
<Group title="밸런스 설정 (Balancer)">
|
||||
<SettingRow label="시작 전압 (Start Volt)" unit="mV" val={config.balStart} reg={JBD.REG_BAL_START} field="balStart" />
|
||||
<SettingRow label="정밀도 (Precision)" unit="mV" val={config.balWindow} reg={JBD.REG_BAL_WINDOW} field="balWindow" />
|
||||
</Group>
|
||||
|
||||
<Group title="기타 설정 (Misc)">
|
||||
<SettingRow label="기능 설정 (Func Config)" unit="HEX" val={config.funcConfig} reg={JBD.REG_FUNC_CONFIG} field="funcConfig" />
|
||||
<SettingRow label="NTC 설정 (NTC Config)" unit="HEX" val={config.ntcConfig} reg={JBD.REG_NTC_CONFIG} field="ntcConfig" />
|
||||
<SettingRow label="FET 제어 시간" unit="s" val={config.fetCtrl} reg={JBD.REG_FET_CTRL} field="fetCtrl" />
|
||||
<SettingRow label="LED 타이머" unit="s" val={config.ledTimer} reg={JBD.REG_LED_TIMER} field="ledTimer" />
|
||||
</Group>
|
||||
</div>
|
||||
<Group title="기타 설정 (Misc)">
|
||||
<SettingRow label="기능 설정 (Func Config)" unit="HEX" val={config.funcConfig} reg={JBD.REG_FUNC_CONFIG} field="funcConfig" />
|
||||
<SettingRow label="NTC 설정 (NTC Config)" unit="HEX" val={config.ntcConfig} reg={JBD.REG_NTC_CONFIG} field="ntcConfig" />
|
||||
<SettingRow label="FET 제어 시간" unit="s" val={config.fetCtrl} reg={JBD.REG_FET_CTRL} field="fetCtrl" />
|
||||
<SettingRow label="LED 타이머" unit="s" val={config.ledTimer} reg={JBD.REG_LED_TIMER} field="ledTimer" />
|
||||
</Group>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user