Skip to content

Commit 67fe0d1

Browse files
committed
Conflicts: utilities.c utilities.h
2 parents d50b0ee + fd1a8a3 commit 67fe0d1

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

utilities.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
printf("%d", (var >> (n - i)) & 1);
3939
#endif
4040
}
41-
#endif
41+
42+
4243
void error(char* str)
4344
{
4445
#ifdef __AVR__
@@ -49,7 +50,7 @@
4950
fprintf(stderr, "\r\n"); // New line
5051
#endif // __AVR__
5152
}
52-
53+
#endif
5354

5455
uint16_t int_pow(uint16_t a, uint16_t b)
5556
{

utilities.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
#pragma once
44
#define DEBUG // If enable, debugging routines will be compiled
55

6+
#define DEBUG
7+
68
#ifdef __AVR__
79
#include "../lib_uart/uart.h"
810
#endif
@@ -21,8 +23,8 @@
2123

2224
#ifdef DEBUG
2325
void print_var_bits(uint16_t var, uint8_t n);
26+
void error(char* str); // Exit the program with the error code EXIT_FAILED
2427
#endif
2528

26-
void error(char* str); // Exit the program with the error code EXIT_FAILED
2729
uint16_t int_pow(uint16_t a, uint16_t b); // Computes a^b
2830
#endif // UTILITIES_H

0 commit comments

Comments
 (0)