* Time synchronization is performed in both directions.
*/
+/****************
+ * Testing vars *
+ ****************/
+
+uint32_t test_xmt_enab = 0;
+uint64_t test_xmt_time0 = 0;
+uint64_t test_xmt_time1 = 0;
+
+uint32_t test_rcv_enab = 0;
+uint64_t test_rcv_time = 0;
+
/*******************
* Timer functions *
*******************/
*/
void time_ext_sync(uint64_t local, uint64_t world)
{
- sirq_printf("syncing clocks: %d -> %d\r\n",
- (int)(local/NSEC_PER_SEC),
- (int)(world/NSEC_PER_SEC));
+ uint64_t guess = time_to_world(local);
time_last_local = local;
- time_last_world = world;
+ time_last_world = (guess/2) + (world/2);
+ //time_last_world = (guess * 3 / 4) + (world * 1 / 4);
+ //time_last_world =
+ // (guess - ( guess / 2)) +
+ // (world - (world - world / 2));
+ //time_last_world =
+ // (guess - (guess - guess / 4)) +
+ // (world - ( world / 4));
+
+ world = time_last_world;
+
+//#ifdef VERBOSE
+#if 0
+ uint64_t error = world > guess ? world - guess :
+ guess > world ? guess - world : 0;
+ int ahead = guess > world;
+ sirq_printf("syncing clocks: %6d=%d.%04u -> %d.%04u (err: %s%ld.%09lu)\r\n",
+ (int)((local / NSEC_PER_SEC)),
+ (int)((guess / NSEC_PER_SEC)),
+ (int)((guess % NSEC_PER_SEC)/(NSEC_PER_SEC/10000)),
+ (int)((world / NSEC_PER_SEC)),
+ (int)((world % NSEC_PER_SEC)/(NSEC_PER_SEC/10000)),
+ ahead ? "-" : " ",
+ (int32_t )(error / (int64_t)NSEC_PER_SEC),
+ (uint32_t)(error % (int64_t)NSEC_PER_SEC));
+#endif
+//#endif
+
+ // .000000284
+ // .000000253
+ // .000000264
+ // .000000451
+ // .000000284
+ // .000000267
+ // .000000223
+ // .000000326
+
+}
+
+void time_printf(const char *label, uint64_t local)
+{
+ uint64_t world = time_to_world(local);
+ sirq_printf("%s -- %d.%09u -> %d.%09u\r\n",
+ label,
+ (int)(local / NSEC_PER_SEC),
+ (int)(local % NSEC_PER_SEC),
+ (int)(world / NSEC_PER_SEC),
+ (int)(world % NSEC_PER_SEC));
+}
+
+/*********************
+ * Signal generation *
+ *********************/
+
+static uint32_t *emit_pcr = 0; // transmit pin name
+
+static uint64_t emit_start = 0; // transmit start time
+static uint64_t emit_period = 0; // transmit period
+static uint64_t emit_due = 0; // next transmit time
+
+static uint32_t emit_slack = 0; // how far ahead we need to schedule
+static uint32_t emit_worst = 0; // worst-case latency in task table
+
+void emit_init(int alt, PinName pin, PinMode mode)
+{
+ // Find pin
+ emit_pcr = (uint32_t*)(PORTA_BASE + pin);
+
+ // Enable clocks
+ SIM->SCGC6 |= SIM_SCGC6_TPM0_MASK;
+
+ SIM->SOPT2 |= SIM_SOPT2_TPMSRC(1);
+ SIM->SOPT4 |= SIM_SOPT4_TPM1CLKSEL_MASK;
+
+ // Set pin mode
+ emit_pcr[0] = PORT_PCR_ISF_MASK
+ | PORT_PCR_MUX(alt)
+ | mode;
+
+ // Setup Timer/PWM Module
+ TPM0->SC = TPM_SC_TOF_MASK
+ | TPM_SC_PS(1); // 24 MHz clock ?
+ TPM0->CNT = TPM_CNT_COUNT(0);
+ TPM0->MOD = TPM_MOD_MOD(0xFFFF);
+
+ TPM0->CONTROLS[0].CnSC = TPM_CnSC_CHF_MASK // clear flag
+ | TPM_CnSC_MSB_MASK // pulse output on match
+ | TPM_CnSC_MSA_MASK // ..
+ | TPM_CnSC_ELSA_MASK; // pulse high
+
+ TPM0->CONTROLS[0].CnV = 0xFFFF; // time delay
+
+ TPM0->STATUS = TPM_STATUS_CH0F_MASK
+ | TPM_STATUS_TOF_MASK;
+
+ TPM0->CONF = TPM_CONF_CSOO_MASK;
+}
+
+void emit_enable(uint64_t start, uint64_t period)
+{
+ emit_start = start;
+ emit_period = period;
+ emit_due = start + period;
+
+ emit_slack = 10000; // tune based on emit_worst
+
+ time_printf("scheuled emit - ", emit_due);
+}
+
+void emit_schedule(uint64_t when)
+{
+ uint64_t now = tdma_time();
+ uint16_t delay = (uint16_t)(when-now);
+
+ // Clear pending flags
+ //emit_pcr[0] |= PORT_PCR_ISF_MASK
+
+ // Disable timer
+ TPM0->SC = TPM_SC_TOF_MASK;
+
+ // Set transmit time
+ TPM0->CNT = TPM_CNT_COUNT(0);
+ TPM0->CONTROLS[0].CnV = delay;
+
+ // Start the timer
+ TPM0->SC = TPM_SC_TOF_MASK
+ | TPM_SC_CMOD(1);
+}
+
+void emit_transmit(void)
+{
+ static uint64_t prev;
+
+ // Get a fresh timestamp
+ uint64_t world = tdma_time();
+
+ // Record how how much time we have to reschedule
+ if (prev && world - prev > emit_worst)
+ emit_worst = prev;
+
+ // Schedule task if needed
+ if (world+emit_slack > emit_due)
+ emit_schedule(emit_due);
}
/************************
uint8_t buffer[256];
} parser_t;
-const uint64_t serial_sync_delay = NSEC_PER_SEC * 2; // 1hz
-static uint64_t serial_sync_due = 0;
+static uint32_t serial_device_id = 0;
+
+const uint64_t serial_sync_delay = NSEC_PER_SEC / 100; // 1hz
+static uint64_t serial_sync_due = 0;
+
+static tdma_t *serial_tdma_rcv = NULL;
+static tdma_t *serial_tdma_xmt = NULL;
-static tdma_t *serial_tdma_rcv = NULL;
-static tdma_t *serial_tdma_xmt = NULL;
+static uint64_t serial_prev_local = 0;
+static uint64_t serial_prev_seq = 0;
+
+static uint64_t serial_xmt_local = 0;
+static uint64_t serial_xmt_seq = 0;
+
+/**
+ * Convert world to local time
+ */
+uint64_t serial_read_time(ntime_t time)
+{
+ return ((uint64_t)time.seconds) * NSEC_PER_SEC
+ + ((uint64_t)time.nanosec);
+}
-static uint64_t serial_prev_local = 0;
-static uint64_t serial_prev_seq = 0;
+ntime_t serial_write_time(uint64_t time)
+{
+ ntime_t buf = {};
+ buf.seconds = time / NSEC_PER_SEC;
+ buf.nanosec = time % NSEC_PER_SEC;
+ return buf;
+}
-static uint64_t serial_xmt_local = 0;
-static uint64_t serial_xmt_seq = 0;
+/**
+ * Output initialization message init message
+ */
+void serial_send_init(uint16_t device, uint64_t local)
+{
+}
/**
* Output time sync message
if (serial_sync_due == 0 || now < serial_sync_due)
return; // not ready
+ //sirq_printf("sending sync\r\n");
+
// Calculate world time
+ uint64_t local = 0;
uint64_t world = time_to_world(serial_xmt_local);
// Message data
body.time.seconds = world / NSEC_PER_SEC;
body.time.nanosec = world % NSEC_PER_SEC;
+ tdma_stop(serial_tdma_rcv);
+
+ test_xmt_enab = 1;
+ test_xmt_time0 = 0;
+ test_xmt_time1 = 0;
+
+ tdma_start(serial_tdma_xmt);
sirq_write(port, &head, sizeof(head));
sirq_write(port, &body, sizeof(body));
+ tdma_stop(serial_tdma_xmt);
- serial_xmt_seq += 1;
- serial_sync_due = 0;
+ // save transmit time
+ //local = test_xmt_time1;
+ int valid = tdma_stamp(serial_tdma_xmt, &local);
+ if (!valid) {
+ sirq_printf("sync transmit time -- missed\r\n");
+ } else {
+ //time_printf("sync transmit time ", local);
+ //time_printf("sync transmit test0", test_xmt_time0);
+ //time_printf("sync transmit test1", test_xmt_time1);
+ }
- // Debug
- sirq_printf("sync msg transmit\r\n");
+ tdma_start(serial_tdma_rcv);
- // save transmit time
- for (int i = 0; i < 1000; i++)
- asm("nop");
- int valid = tdma_stamp(serial_tdma_xmt, &serial_xmt_local);
- if (!valid)
- sirq_printf("missing sync transmit time\r\n");
- tdma_reset(serial_tdma_xmt);
+ serial_xmt_seq += 1;
+ serial_sync_due = 0;
+ serial_xmt_local = local;
}
/**
*/
void serial_send_event(uint16_t event, uint64_t local)
{
- uint64_t world = time_to_world(local);
+// uint64_t world = time_to_world(local);
+
+ // Message data
+#if 0
+ header_t head;
+ event_msg_t body;
ntime_t time = {};
time.seconds = (uint32_t)(world / NSEC_PER_SEC);
time.nanosec = (uint32_t)(world % NSEC_PER_SEC);
- sirq_printf("event received - %08x:%08x - %u.%u\r\n",
+ sirq_printf("event received - %08x:%08x - %u.%09u\r\n",
(uint32_t)(local >> 32), (uint32_t)local,
time.seconds, time.nanosec);
- // todo
+
+ // Transmit sync message
+ head.header = MSG_HEADER;
+ head.msgid = MSG_ID_SYNC;
+ head.length = sizeof(body);
+ head.cksum = 0; // todo
+
+ body.seq = serial_xmt_seq;
+ body.time.seconds = world / NSEC_PER_SEC;
+ body.time.nanosec = world % NSEC_PER_SEC;
+
+ tdma_stop(serial_tdma_rcv);
+
+ test_xmt_enab = 1;
+ test_xmt_time0 = 0;
+ test_xmt_time1 = 0;
+
+ tdma_start(serial_tdma_xmt);
+ sirq_write(port, &head, sizeof(head));
+ sirq_write(port, &body, sizeof(body));
+ tdma_stop(serial_tdma_xmt);
+#endif
+}
+
+/**
+ * Handle init message
+ */
+void serial_handle_init(init_msg_t *msg)
+{
+ if (msg->valid & MSG_VALID_DEVICE)
+ serial_device_id = msg->device;
+
+ if ((msg->valid & MSG_VALID_START) ||
+ (msg->valid & MSG_VALID_PERIOD)) {
+ uint64_t start = serial_read_time(msg->start);
+ uint64_t period = serial_read_time(msg->period);
+ emit_enable(start, period);
+ }
+
+ if (msg->valid & MSG_VALID_WORLD) {
+ uint64_t world = serial_read_time(msg->world);
+ uint64_t local = tdma_time();
+ time_ext_init(local, world);
+ }
}
/**
uint64_t current = 0;
int valid = tdma_stamp(serial_tdma_rcv, ¤t);
if (!valid)
- sirq_printf("missing sync receive time\r\n");
- tdma_reset(serial_tdma_rcv);
+ sirq_printf("sync receive time -- missing\r\n");
+ //else
+ // time_printf("sync receive time ", current);
+ tdma_stop(serial_tdma_rcv);
// Lookup times
uint64_t world = ((uint64_t)msg->time.seconds) * NSEC_PER_SEC
+ ((uint64_t)msg->time.nanosec);
- // Initialize
- if (msg->seq == 0) {
- uint64_t local = tdma_time();
- time_ext_init(local, world);
- }
-
// Valid times timestamp
if (serial_prev_seq == (msg->seq-1)) {
uint64_t local = serial_prev_local;
void serial_deliver(int msgid, void *body)
{
switch (msgid) {
+ case MSG_ID_INIT:
+ //sirq_printf("received init msg\r\n");
+ serial_handle_init((init_msg_t*)body);
+ break;
case MSG_ID_SYNC:
- sirq_printf("received sync msg\r\n");
+ //sirq_printf("received sync msg\r\n");
serial_handle_sync((sync_msg_t*)body);
break;
case MSG_ID_EVENT:
- sirq_printf("received event msg\r\n");
+ //sirq_printf("received event msg\r\n");
serial_handle_event((event_msg_t*)body);
break;
}
case 1: // Header
if (parser->index == sizeof(header_t)) {
if (head->length <= max_length &&
- head->msgid <= MSG_MAXID) {
+ head->msgid <= MSG_MAX_ID) {
parser->state = 2;
} else {
parser->index = 0;
if (tdma_stamp(tdma_evt, &event))
serial_send_event(0, event);
- tdma_reset(tdma_evt);
+ tdma_stop(tdma_evt);
+ tdma_start(tdma_evt);
}
void task_sync(uint64_t local, uint64_t world)
{
- serial_send_sync(sirq_bbb, local);
+ serial_send_sync(sirq_mbed, local);
}
void task_leds(uint64_t local, uint64_t world)
which ^= 1;
}
+void task_emit(uint64_t local, uint64_t world)
+{
+ emit_transmit();
+}
+
void task_debug(uint64_t local, uint64_t world)
{
//tdma_debug(tdma_rcv);
- sirq_printf("background - %6d.%02d -> %d.%02d\r\n",
+ //tdma_debug(tdma_xmt);
+
+ //sirq_debug(sirq_mbed);
+
+#ifdef VERBOSE
+ sirq_printf("background - %6u.%02u -> %u.%02u\r\n",
(uint32_t)(local / NSEC_PER_SEC),
(uint32_t)(local % NSEC_PER_SEC / 10000000),
(uint32_t)(world / NSEC_PER_SEC),
(uint32_t)(world % NSEC_PER_SEC / 10000000));
+#endif
}
/********
uint64_t due;
} tasks[] = {
{ task_serial, 0 }, // always
- { task_events, 1000000000 }, // always
+ { task_events, 1000000000 }, // always -- testing
{ task_sync, 0 }, // always
+ { task_emit, 0 }, // always
{ task_leds, 100000000 }, // 10hz
{ task_debug, 1000000000 }, // 1hz
};
// Open serial ports
sirq_dbg = sirq_open(SIRQ_UART0, USBTX, USBRX, 115200); // to pc
- sirq_bbb = sirq_open(SIRQ_UART1, PTD3, PTD2, 115200); // to bbb
- sirq_mbed = sirq_open(SIRQ_UART2, PTE0, PTE1, 115200); // to mbed
-
+ sirq_bbb = sirq_open(SIRQ_UART1, PTE0, PTE1, 115200); // to bbb
+ sirq_mbed = sirq_open(SIRQ_UART2, PTD3, PTD2, 115200); // to mbed
// Setup timers
- tdma_evt = tdma_open(TDMA_CHAN0, 3, PTC9, PullDown); // async event
+ tdma_evt = tdma_open(TDMA_CHAN0, 3, PTC9, PullUp); // async event
// mbed time sync
tdma_rcv = tdma_open(TDMA_CHAN2, 3, PTD2, PullUp); // time sync rcv
//tdma_rcv = tdma_open(TDMA_CHAN2, 2, USBRX, PullUp); // time sync rcv
//tdma_xmt = tdma_open(TDMA_CHAN3, 2, USBTX, PullUp); // time sync xmt
+ // start timers
+ tdma_start(tdma_evt);
+ tdma_start(tdma_rcv);
+ tdma_start(tdma_xmt);
+
// Serial timestamping
serial_tdma_rcv = tdma_rcv;
serial_tdma_xmt = tdma_xmt;
+ // Test clocks
+ //MCG->C1 = 0x05; // was 0x1A
+ //MCG->C2 = 0x2C; // was 0x24
+ //MCG->C3 = 0x91; // was 0x91
+ //MCG->C4 = 0x10; // was 0x10
+ //MCG->C5 = 0x01; // was 0x01
+ //MCG->C6 = 0x40; // was 0x40
+ //MCG->S = 0x6E; // was 0x6E
+ //MCG->SC = 0x02; // was 0x02
+ //MCG->ATCVH = 0x00; // was 0x00
+ //MCG->ATCVL = 0x00; // was 0x00
+ //MCG->C7 = 0x00; // was 0x00
+ //MCG->C8 = 0x80; // was 0x80
+ //MCG->C9 = 0x00; // was 0x00
+ //MCG->C10 = 0x00; // was 0x00
+
+ //sirq_printf("MGC - C1 %02hx\r\n", MCG->C1); // 1A
+ //sirq_printf("MGC - C2 %02hx\r\n", MCG->C2); // 24
+ //sirq_printf("MGC - C3 %02hx\r\n", MCG->C3); // 91
+ //sirq_printf("MGC - C4 %02hx\r\n", MCG->C4); // 10
+ //sirq_printf("MGC - C5 %02hx\r\n", MCG->C5); // 01
+ //sirq_printf("MGC - C6 %02hx\r\n", MCG->C6); // 40
+ //sirq_printf("MGC - S %02hx\r\n", MCG->S); // 6E
+ //sirq_printf("MGC - SC %02hx\r\n", MCG->SC); // 02
+ //sirq_printf("MGC - ATCVH %02hx\r\n", MCG->ATCVH); // 00
+ //sirq_printf("MGC - ATCVL %02hx\r\n", MCG->ATCVL); // 00
+ //sirq_printf("MGC - C7 %02hx\r\n", MCG->C7); // 00
+ //sirq_printf("MGC - C8 %02hx\r\n", MCG->C8); // 80
+ //sirq_printf("MGC - C9 %02hx\r\n", MCG->C9); // 00
+ //sirq_printf("MGC - C10 %02hx\r\n", MCG->C10); // 00
+
// Run background loop
printf("hello");
while (true)
projects / ~andy / csm213a-hw / blobdiff