summaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
Diffstat (limited to 'project')
-rw-r--r--project/Core/Inc/Activities/activity4.h13
-rw-r--r--project/Core/Inc/Activities/activity5.h2
-rw-r--r--project/Core/Inc/Activities/activity6.h13
-rw-r--r--project/Core/Inc/Activities/midi_header.h13
-rw-r--r--project/Core/Src/Activties/activity4.c (renamed from project/Core/Src/Activties/midi_header.c)2
-rw-r--r--project/Core/Src/Activties/activity5.c2
-rw-r--r--project/Core/Src/Activties/activity6.c35
-rw-r--r--project/Core/Src/main.c9
8 files changed, 69 insertions, 20 deletions
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/midi_header.c b/project/Core/Src/Activties/activity4.c
index de3dc68..44653e1 100644
--- a/project/Core/Src/Activties/midi_header.c
+++ b/project/Core/Src/Activties/activity4.c
@@ -18,7 +18,7 @@ typedef struct {
uint16_t division;
} header;
-void run() {
+void activity4_run() {
header* p_header;
p_header = (header *) (get_song(0).p_song);
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 <stdint.h>
+#include <stdio.h>
+
+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/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 <stdio.h>
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() ;