summaryrefslogtreecommitdiff
path: root/project/Core
diff options
context:
space:
mode:
Diffstat (limited to 'project/Core')
-rw-r--r--project/Core/Inc/Activities/activity5.h2
-rw-r--r--project/Core/Src/Activties/activity5.c3
-rw-r--r--project/Core/Src/Activties/activity7.c8
3 files changed, 6 insertions, 7 deletions
diff --git a/project/Core/Inc/Activities/activity5.h b/project/Core/Inc/Activities/activity5.h
index 90c81bb..235e241 100644
--- a/project/Core/Inc/Activities/activity5.h
+++ b/project/Core/Inc/Activities/activity5.h
@@ -10,4 +10,6 @@
void activity5_run();
+uint8_t read_and_print_char();
+
#endif /* INC_ACTIVITIES_ACTIVITY5_H_ */
diff --git a/project/Core/Src/Activties/activity5.c b/project/Core/Src/Activties/activity5.c
index f214ca2..6e7446a 100644
--- a/project/Core/Src/Activties/activity5.c
+++ b/project/Core/Src/Activties/activity5.c
@@ -9,12 +9,13 @@
#include <UART.h>
#include "printf.h"
-void read_and_print_char() {
+uint8_t read_and_print_char() {
uint8_t ch = USART_Read(USART2);
printf("%c", ch);
if (ch == '\r') {
printf("\n");
}
+ return ch;
}
void activity5_run() {
diff --git a/project/Core/Src/Activties/activity7.c b/project/Core/Src/Activties/activity7.c
index e3499ec..b6db116 100644
--- a/project/Core/Src/Activties/activity7.c
+++ b/project/Core/Src/Activties/activity7.c
@@ -6,16 +6,12 @@
*/
#include "LED.h"
-#include "UART.h"
+#include "activity5.h"
#include <stdio.h>
void activity7_run() {
for(;;) {
- uint8_t ch = USART_Read(USART2);
- printf("%c", ch);
- if (ch == '\r') {
- printf("\n");
- }
+ uint8_t ch = read_and_print_char();
if (ch == 'o') {
LED_On();
}