CAN-FD 라이브러리 변경
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -250,6 +250,7 @@ const char canfd_index_html[] PROGMEM = R"rawliteral(
|
|||||||
<div class="nav">
|
<div class="nav">
|
||||||
<a href="/" class="active">📊 Dashboard</a>
|
<a href="/" class="active">📊 Dashboard</a>
|
||||||
<a href="/settings">⚙️ Settings</a>
|
<a href="/settings">⚙️ Settings</a>
|
||||||
|
<a href="/graph">📈 Graph</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="content">
|
<div class="content">
|
||||||
|
|||||||
@@ -291,13 +291,13 @@ const char canfd_settings_html[] PROGMEM = R"rawliteral(
|
|||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="wifi-ssid">AP SSID (네트워크 이름)</label>
|
<label for="wifi-ssid">AP SSID (네트워크 이름)</label>
|
||||||
<input type="text" id="wifi-ssid" placeholder="Byun_CANFD_Logger" maxlength="31">
|
<input type="text" id="wifi-ssid" value="Byun_CANFD_Logger" maxlength="31">
|
||||||
<div class="help-text">ESP32가 생성할 WiFi 네트워크 이름 (최대 31자)</div>
|
<div class="help-text">ESP32가 생성할 WiFi 네트워크 이름 (최대 31자)</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="wifi-password">AP Password (비밀번호)</label>
|
<label for="wifi-password">AP Password (비밀번호)</label>
|
||||||
<input type="password" id="wifi-password" placeholder="최소 8자 이상" minlength="8" maxlength="63">
|
<input type="password" id="wifi-password" value="12345678" minlength="8" maxlength="63">
|
||||||
<div class="help-text">WiFi 접속 시 필요한 비밀번호 (8-63자)</div>
|
<div class="help-text">WiFi 접속 시 필요한 비밀번호 (8-63자)</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -379,6 +379,15 @@ const char canfd_settings_html[] PROGMEM = R"rawliteral(
|
|||||||
</select>
|
</select>
|
||||||
<div class="help-text">Normal: 일반 통신, Listen Only: 수신 전용</div>
|
<div class="help-text">Normal: 일반 통신, Listen Only: 수신 전용</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="log-format">Log File Format</label>
|
||||||
|
<select id="log-format">
|
||||||
|
<option value="0" selected>CSV (Excel/Python)</option>
|
||||||
|
<option value="1">PCAP (Wireshark)</option>
|
||||||
|
</select>
|
||||||
|
<div class="help-text">CSV: 텍스트 형식 (분석 용이), PCAP: Wireshark로 분석 가능</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="button-group">
|
<div class="button-group">
|
||||||
@@ -409,7 +418,7 @@ const char canfd_settings_html[] PROGMEM = R"rawliteral(
|
|||||||
.then(data => {
|
.then(data => {
|
||||||
// WiFi settings
|
// WiFi settings
|
||||||
document.getElementById('wifi-ssid').value = data.wifiSSID || 'Byun_CANFD_Logger';
|
document.getElementById('wifi-ssid').value = data.wifiSSID || 'Byun_CANFD_Logger';
|
||||||
document.getElementById('wifi-password').value = data.wifiPassword || '';
|
document.getElementById('wifi-password').value = data.wifiPassword || '12345678';
|
||||||
|
|
||||||
// STA settings
|
// STA settings
|
||||||
document.getElementById('sta-enable').checked = data.staEnable || false;
|
document.getElementById('sta-enable').checked = data.staEnable || false;
|
||||||
@@ -421,6 +430,7 @@ const char canfd_settings_html[] PROGMEM = R"rawliteral(
|
|||||||
document.getElementById('bit-rate').value = data.bitRate || 500000;
|
document.getElementById('bit-rate').value = data.bitRate || 500000;
|
||||||
document.getElementById('data-rate').value = data.dataRate || 4;
|
document.getElementById('data-rate').value = data.dataRate || 4;
|
||||||
document.getElementById('controller-mode').value = data.controllerMode || 0;
|
document.getElementById('controller-mode').value = data.controllerMode || 0;
|
||||||
|
document.getElementById('log-format').value = data.logFormat || 0;
|
||||||
|
|
||||||
// Update UI
|
// Update UI
|
||||||
toggleSTASettings();
|
toggleSTASettings();
|
||||||
@@ -452,13 +462,16 @@ const char canfd_settings_html[] PROGMEM = R"rawliteral(
|
|||||||
canMode: document.getElementById('can-mode').value,
|
canMode: document.getElementById('can-mode').value,
|
||||||
bitRate: parseInt(document.getElementById('bit-rate').value),
|
bitRate: parseInt(document.getElementById('bit-rate').value),
|
||||||
dataRate: parseInt(document.getElementById('data-rate').value),
|
dataRate: parseInt(document.getElementById('data-rate').value),
|
||||||
controllerMode: parseInt(document.getElementById('controller-mode').value)
|
controllerMode: parseInt(document.getElementById('controller-mode').value),
|
||||||
|
logFormat: parseInt(document.getElementById('log-format').value)
|
||||||
};
|
};
|
||||||
|
|
||||||
// Validation
|
console.log('Saving settings:', settings);
|
||||||
|
|
||||||
|
// Validation - AP SSID가 비어있으면 기본값 사용
|
||||||
if (settings.wifiSSID.length === 0) {
|
if (settings.wifiSSID.length === 0) {
|
||||||
alert('WiFi SSID를 입력하세요.');
|
settings.wifiSSID = 'Byun_CANFD_Logger';
|
||||||
return;
|
console.log('Using default SSID:', settings.wifiSSID);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settings.wifiPassword.length > 0 && settings.wifiPassword.length < 8) {
|
if (settings.wifiPassword.length > 0 && settings.wifiPassword.length < 8) {
|
||||||
@@ -485,6 +498,7 @@ const char canfd_settings_html[] PROGMEM = R"rawliteral(
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(err => {
|
.catch(err => {
|
||||||
|
console.error('Save error:', err);
|
||||||
alert('설정 저장 실패: ' + err);
|
alert('설정 저장 실패: ' + err);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user