From 0062ce3d8c64ed7b0cf0c94e8dcc2cc316df4fb1 Mon Sep 17 00:00:00 2001 From: sowgro Date: Fri, 26 Sep 2025 10:25:07 -0400 Subject: submit activity6 --- project/Core/Inc/Activities/activity4.h | 13 +++++++++++ project/Core/Inc/Activities/activity5.h | 2 +- project/Core/Inc/Activities/activity6.h | 13 +++++++++++ project/Core/Inc/Activities/midi_header.h | 13 ----------- project/Core/Src/Activties/activity4.c | 37 +++++++++++++++++++++++++++++++ project/Core/Src/Activties/activity5.c | 2 +- project/Core/Src/Activties/activity6.c | 35 +++++++++++++++++++++++++++++ project/Core/Src/Activties/midi_header.c | 37 ------------------------------- project/Core/Src/main.c | 9 ++++---- 9 files changed, 105 insertions(+), 56 deletions(-) create mode 100644 project/Core/Inc/Activities/activity4.h create mode 100644 project/Core/Inc/Activities/activity6.h delete mode 100644 project/Core/Inc/Activities/midi_header.h create mode 100644 project/Core/Src/Activties/activity4.c create mode 100644 project/Core/Src/Activties/activity6.c delete mode 100644 project/Core/Src/Activties/midi_header.c (limited to 'project/Core') diff --git a/project/Core/Inc/Activities/activity4.h b/project/Core/Inc/Activities/activity4.h new file mode 100644 index 0000000..6a1a93f --- /dev/null +++ b/project/Core/Inc/Activities/activity4.h @@ -0,0 +1,13 @@ +/* + * activity4.h + * + * Created on: Sep 22, 2025 + * Author: sowgro + */ + +#ifndef INC_ACTIVITIES_ACTIVITY4_H_ +#define INC_ACTIVITIES_ACTIVITY4_H_ + +void activity4_run(); + +#endif /* INC_ACTIVITIES_ACTIVITY4_H_ */ diff --git a/project/Core/Inc/Activities/activity5.h b/project/Core/Inc/Activities/activity5.h index e74b3f0..90c81bb 100644 --- a/project/Core/Inc/Activities/activity5.h +++ b/project/Core/Inc/Activities/activity5.h @@ -8,6 +8,6 @@ #ifndef INC_ACTIVITIES_ACTIVITY5_H_ #define INC_ACTIVITIES_ACTIVITY5_H_ -void run2(); +void activity5_run(); #endif /* INC_ACTIVITIES_ACTIVITY5_H_ */ diff --git a/project/Core/Inc/Activities/activity6.h b/project/Core/Inc/Activities/activity6.h new file mode 100644 index 0000000..f170b22 --- /dev/null +++ b/project/Core/Inc/Activities/activity6.h @@ -0,0 +1,13 @@ +/* + * activity6.h + * + * Created on: Sep 26, 2025 + * Author: sowgro + */ + +#ifndef INC_ACTIVITIES_ACTIVITY6_H_ +#define INC_ACTIVITIES_ACTIVITY6_H_ + +void activity6_run(); + +#endif /* INC_ACTIVITIES_ACTIVITY6_H_ */ diff --git a/project/Core/Inc/Activities/midi_header.h b/project/Core/Inc/Activities/midi_header.h deleted file mode 100644 index 62904a3..0000000 --- a/project/Core/Inc/Activities/midi_header.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * midi_header.h - * - * Created on: Sep 22, 2025 - * Author: sowgro - */ - -#ifndef INC_ACTIVITIES_MIDI_HEADER_H_ -#define INC_ACTIVITIES_MIDI_HEADER_H_ - -void run(); - -#endif /* INC_ACTIVITIES_MIDI_HEADER_H_ */ diff --git a/project/Core/Src/Activties/activity4.c b/project/Core/Src/Activties/activity4.c new file mode 100644 index 0000000..44653e1 --- /dev/null +++ b/project/Core/Src/Activties/activity4.c @@ -0,0 +1,37 @@ +/* + * activity4.c + * + * Created on: Sep 16, 2025 + * Author: sowgro + */ + +#include "song.h" +#include +#include +#include + +typedef struct { + char chunk_type[4]; + uint32_t length; + uint16_t format; + uint16_t ntrcks; + uint16_t division; +} header; + +void activity4_run() { + header* p_header; + + p_header = (header *) (get_song(0).p_song); + + p_header->length = convert_to_uint32((uint8_t*) &p_header->length); + p_header->format = convert_to_uint16((uint8_t*) &p_header->format); + p_header->ntrcks = convert_to_uint16((uint8_t*) &p_header->ntrcks); + p_header->division = convert_to_uint16((uint8_t*) &p_header->division); + + printf ("Header: \r\n"); + printf ("\tLength: %lu\r\n", p_header->length); + printf ("\tFormat: %u\r\n", p_header->format); + printf ("\tNum Tracks: %u\r\n", p_header->ntrcks); + printf ("\tDivision: %u\r\n", p_header->division); +} + diff --git a/project/Core/Src/Activties/activity5.c b/project/Core/Src/Activties/activity5.c index 9201f70..f214ca2 100644 --- a/project/Core/Src/Activties/activity5.c +++ b/project/Core/Src/Activties/activity5.c @@ -17,7 +17,7 @@ void read_and_print_char() { } } -void run2() { +void activity5_run() { for(;;) { read_and_print_char(); } diff --git a/project/Core/Src/Activties/activity6.c b/project/Core/Src/Activties/activity6.c new file mode 100644 index 0000000..c32c03e --- /dev/null +++ b/project/Core/Src/Activties/activity6.c @@ -0,0 +1,35 @@ +/* + * activity6.c + * + * Created on: Sep 25, 2025 + * Author: sowgro + */ + +#include +#include + +typedef struct { + uint32_t CSR; + uint32_t RVR; + uint32_t CVR; + uint32_t CALIB; +} sys_tick; + + +void activity6_run() { + sys_tick *s = (sys_tick *) 0xE000E010; + printf("%lu\r\n", s->CVR); + + s->RVR = 8000000; + s->CSR = 1; + + int count = 0; + for(;;) { + if (!s->CVR) { + printf("%i\r\n", count); + count++; + } + } + + +} diff --git a/project/Core/Src/Activties/midi_header.c b/project/Core/Src/Activties/midi_header.c deleted file mode 100644 index de3dc68..0000000 --- a/project/Core/Src/Activties/midi_header.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * activity4.c - * - * Created on: Sep 16, 2025 - * Author: sowgro - */ - -#include "song.h" -#include -#include -#include - -typedef struct { - char chunk_type[4]; - uint32_t length; - uint16_t format; - uint16_t ntrcks; - uint16_t division; -} header; - -void run() { - header* p_header; - - p_header = (header *) (get_song(0).p_song); - - p_header->length = convert_to_uint32((uint8_t*) &p_header->length); - p_header->format = convert_to_uint16((uint8_t*) &p_header->format); - p_header->ntrcks = convert_to_uint16((uint8_t*) &p_header->ntrcks); - p_header->division = convert_to_uint16((uint8_t*) &p_header->division); - - printf ("Header: \r\n"); - printf ("\tLength: %lu\r\n", p_header->length); - printf ("\tFormat: %u\r\n", p_header->format); - printf ("\tNum Tracks: %u\r\n", p_header->ntrcks); - printf ("\tDivision: %u\r\n", p_header->division); -} - diff --git a/project/Core/Src/main.c b/project/Core/Src/main.c index ff819f2..0ea5a3f 100644 --- a/project/Core/Src/main.c +++ b/project/Core/Src/main.c @@ -8,9 +8,9 @@ #include "LED.h" #include "UART.h" #include "demo.h" +#include "activity4.h" #include "activity5.h" -#include "midi_header.h" - +#include "activity6.h" #include int main(void){ @@ -22,8 +22,9 @@ int main(void){ // printf("Hello world \r\n"); -// run(); - run2(); +// activity4_run(); +// activity5_run(); + activity6_run(); // application run function // run_demo() ; -- cgit v1.2.3