bsncubed
5f27262b27
It behaved exactly like auto (clock class 248); the only difference was a priority1 suggestion in the page. Roles are now slave|auto; to prefer this device, use auto with a low priority1. A stored "master" is converted to auto at boot (new cfg_set_string, like cfg_set_number). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
89 lines
2.7 KiB
C
89 lines
2.7 KiB
C
#include "aes67_ptp.h"
|
|
|
|
#include <string.h>
|
|
|
|
#include "aes67_cfg.h"
|
|
#include "aes67_web.h"
|
|
#include "esp_log.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}"; // hardware timestamps always (status.ptp.hw_ts)
|
|
|
|
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", 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);
|
|
}
|
|
|
|
static void ptp_apply(const cJSON *g)
|
|
{
|
|
ptp_clock_reconfig();
|
|
}
|
|
|
|
esp_err_t aes67_ptp_init(void)
|
|
{
|
|
esp_err_t err = cfg_register("ptp", PTP_DEFAULTS, ptp_validate, ptp_apply);
|
|
if (err != ESP_OK) {
|
|
return err;
|
|
}
|
|
// Role "master" was dropped (it behaved like auto; a low priority1 does the same). Stored values
|
|
// aren't re-validated, so convert it here.
|
|
cJSON *c = cfg_get("ptp");
|
|
bool master = !strcmp(cJSON_GetObjectItemCaseSensitive(c, "role")->valuestring, "master");
|
|
cJSON_Delete(c);
|
|
if (master) {
|
|
ESP_LOGW("ptp", "stored role \"master\" is no longer offered: now \"auto\" (same behaviour)");
|
|
cfg_set_string("ptp", "role", "auto", false);
|
|
}
|
|
return ESP_OK;
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
bool aes67_ptp_gm_id(char out[24])
|
|
{
|
|
return ptp_clock_gm_id(out);
|
|
}
|
|
|
|
bool aes67_ptp_locked(void)
|
|
{
|
|
return ptp_clock_locked();
|
|
}
|
|
|
|
esp_err_t aes67_ptp_now_ns(int64_t *ns)
|
|
{
|
|
eth_mac_time_t t;
|
|
esp_err_t err = ptp_hw_get_time(&t);
|
|
if (err == ESP_OK) {
|
|
*ns = (int64_t)t.seconds * 1000000000LL + t.nanoseconds;
|
|
}
|
|
return err;
|
|
}
|