Skip to content
Snippets Groups Projects
Commit 85535ce6 authored by dawehr's avatar dawehr
Browse files

Added timing functionality to timer.c

parent 78a838ac
No related branches found
No related tags found
No related merge requests found
#!/usr/bin/python #!/usr/bin/python
import sys import sys
import time
print(sys.version_info) print(sys.version_info)
import serial import serial
...@@ -44,7 +45,13 @@ def query_received(ser): ...@@ -44,7 +45,13 @@ def query_received(ser):
if __name__ == '__main__': if __name__ == '__main__':
with serial.Serial('/dev/ttyUSB0', 921600, timeout=5) as ser: with serial.Serial('/dev/ttyUSB0', 921600, timeout=5) as ser:
ser.write(create_test_packet(8)) ser.reset_input_buffer()
ser.write(create_test_packet(40))
time.sleep(0.05)
#while ser.in_waiting != 0:
# resp = read_packet(ser)
# elapsed = int.from_bytes(resp, byteorder='little')
# print(f"Took {elapsed} cycles, {elapsed / 100} us")
ser.flush() ser.flush()
print(query_received(ser)) #print(query_received(ser))
...@@ -56,6 +56,12 @@ int initializeAllComponents(user_input_t * user_input_struct, log_t * log_struct ...@@ -56,6 +56,12 @@ int initializeAllComponents(user_input_t * user_input_struct, log_t * log_struct
// Xilinx given initialization // Xilinx given initialization
init_platform(); init_platform();
// Initialize loop timers
if (timer_init()) {
return -1;
}
// Initialize UART0 (Bluetooth) // Initialize UART0 (Bluetooth)
if (initUartComms()) { if (initUartComms()) {
return -1; return -1;
...@@ -69,11 +75,6 @@ int initializeAllComponents(user_input_t * user_input_struct, log_t * log_struct ...@@ -69,11 +75,6 @@ int initializeAllComponents(user_input_t * user_input_struct, log_t * log_struct
// Initialize PWM Recorders and Motor outputs // Initialize PWM Recorders and Motor outputs
pwm_init(); pwm_init();
// Initialize loop timers
if (timer_init()) {
return -1;
}
//manual flight mode //manual flight mode
user_defined_struct->flight_mode = MANUAL_FLIGHT_MODE; user_defined_struct->flight_mode = MANUAL_FLIGHT_MODE;
......
...@@ -64,3 +64,7 @@ int timer_end_loop(log_t *log_struct) ...@@ -64,3 +64,7 @@ int timer_end_loop(log_t *log_struct)
return 0; return 0;
} }
u32 timer_get_count() {
return XTmrCtr_GetValue(&axi_timer, 0);
}
...@@ -53,4 +53,6 @@ int timer_start_loop(); ...@@ -53,4 +53,6 @@ int timer_start_loop();
*/ */
int timer_end_loop(log_t *log_struct); int timer_end_loop(log_t *log_struct);
u32 timer_get_count();
#endif /* TIMER_H_ */ #endif /* TIMER_H_ */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment