9af6c53294
- ptp_clock_status() adds status.ptp: state (LISTENING / UNCALIBRATED / SLAVE), locked, gm_id, offset_ns, freq_ppb, path_delay_ns + path_delay_sd_ns (window of 64, from lock on), steps_removed, gm_time/freq_traceable, version, own_class (255 slave / 248 auto, master), clock_id, gm_class/accuracy/p1/p2, sync_avg/min/max_ms and sync_jitter_us (HW Sync intervals), announce_avg_ms, delay_req/resp counters, hw_ts, window. Snapshot under a mutex shared with the PTP task. - Per-Sync log moved to debug; info level logs state changes plus a 60 s summary (max |offset|, freq, delay). - Verified vs ptp4l: LISTENING -> UNCALIBRATED -> SLAVE in ~35 s; locked offset within a few hundred ns, delay 10.27 us +-0.20 us, Delay_Req/Resp 69/69, Sync avg 1000.097 ms, Announce avg 2000 ms. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
48 lines
1.7 KiB
C
48 lines
1.7 KiB
C
#include "aes67_ptp.h"
|
|
|
|
#include "aes67_cfg.h"
|
|
#include "aes67_web.h"
|
|
#include "ptp_clock.h"
|
|
#include "ptp_hw.h"
|
|
|
|
// Core defaults: Riedel SIC intervals, role auto with fallback priorities (docs/aes67-core-base.md).
|
|
static const char PTP_DEFAULTS[] =
|
|
"{\"mode\":\"multicast\",\"role\":\"auto\",\"domain\":0,\"priority1\":250,\"priority2\":250,"
|
|
"\"log_sync\":0,\"log_announce\":1,\"announce_timeout\":3,\"log_delay_req\":0,"
|
|
"\"dscp\":46,\"hw_ts\":true}";
|
|
|
|
static bool ptp_validate(const cJSON *g, char *err, size_t n)
|
|
{
|
|
static const char *const modes[] = { "multicast", "hybrid", NULL };
|
|
static const char *const roles[] = { "slave", "auto", "master", NULL };
|
|
return cfg_check_enum(g, "mode", modes, err, n) &&
|
|
cfg_check_enum(g, "role", roles, err, n) &&
|
|
cfg_check_int(g, "domain", 0, 127, err, n) &&
|
|
cfg_check_int(g, "priority1", 0, 255, err, n) &&
|
|
cfg_check_int(g, "priority2", 0, 255, err, n) &&
|
|
cfg_check_int(g, "log_sync", -4, 1, err, n) &&
|
|
cfg_check_int(g, "log_announce", 0, 4, err, n) &&
|
|
cfg_check_int(g, "announce_timeout", 2, 10, err, n) &&
|
|
cfg_check_int(g, "log_delay_req", -4, 1, err, n) &&
|
|
cfg_check_int(g, "dscp", 0, 63, err, n);
|
|
}
|
|
|
|
esp_err_t aes67_ptp_init(void)
|
|
{
|
|
return cfg_register("ptp", PTP_DEFAULTS, ptp_validate, NULL);
|
|
}
|
|
|
|
esp_err_t aes67_ptp_start(esp_eth_handle_t eth)
|
|
{
|
|
esp_netif_t *netif = esp_netif_get_handle_from_ifkey("ETH_DEF");
|
|
esp_err_t err = ptp_hw_init(eth, netif);
|
|
if (err != ESP_OK) {
|
|
return err;
|
|
}
|
|
err = ptp_clock_start(netif);
|
|
if (err == ESP_OK) {
|
|
err = status_register(ptp_clock_status);
|
|
}
|
|
return err;
|
|
}
|