From 55b08b7630444debf238894c4e7bccb0ae82e630 Mon Sep 17 00:00:00 2001
From: binaryDiv <binarydiv@gmail.com>
Date: Sun, 4 Apr 2021 17:18:45 +0200
Subject: [PATCH] Refactoring: common.h with common typedefs etc.

---
 firmware/src/commands.c |  2 +-
 firmware/src/commands.h |  2 +-
 firmware/src/common.h   | 21 +++++++++++++++++++++
 firmware/src/eeprom.c   |  1 -
 firmware/src/eeprom.h   |  7 +------
 firmware/src/main.c     |  1 +
 firmware/src/parsing.h  | 10 +---------
 7 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 firmware/src/common.h

diff --git a/firmware/src/commands.c b/firmware/src/commands.c
index 6f8b27d..18035fb 100644
--- a/firmware/src/commands.c
+++ b/firmware/src/commands.c
@@ -1,5 +1,5 @@
-#include "config.h"
 #include "commands.h"
+#include "common.h"
 #include "parsing.h"
 #include "uart.h"
 #include "eeprom.h"
diff --git a/firmware/src/commands.h b/firmware/src/commands.h
index 159a8f3..b1bf0ac 100644
--- a/firmware/src/commands.h
+++ b/firmware/src/commands.h
@@ -1,7 +1,7 @@
 #ifndef COMMANDS_H_
 #define COMMANDS_H_
 
-#include "config.h"
+#include "common.h"
 #include "parsing.h"
 
 void executeCommand(CommandLine cmdLine);
diff --git a/firmware/src/common.h b/firmware/src/common.h
new file mode 100644
index 0000000..2e5c13a
--- /dev/null
+++ b/firmware/src/common.h
@@ -0,0 +1,21 @@
+#ifndef COMMON_H_
+#define COMMON_H_
+
+#include "config.h"
+#include <avr/io.h>
+#include <stdbool.h>
+
+// Define macro for NOP instruction
+#define _NOP() __asm__ __volatile__ ("nop");
+
+// Define type for EEPROM addresses
+typedef uint16_t address_t;
+
+// Type definition for address ranges (from-to)
+typedef struct {
+    bool isValid;
+    address_t from;
+    address_t to;
+} AddressRange;
+
+#endif /* COMMON_H_ */
diff --git a/firmware/src/eeprom.c b/firmware/src/eeprom.c
index 619e9fe..50d5d30 100644
--- a/firmware/src/eeprom.c
+++ b/firmware/src/eeprom.c
@@ -1,4 +1,3 @@
-#include "config.h"
 #include "eeprom.h"
 
 #include <avr/io.h>
diff --git a/firmware/src/eeprom.h b/firmware/src/eeprom.h
index 442fbf2..c0cfdf6 100644
--- a/firmware/src/eeprom.h
+++ b/firmware/src/eeprom.h
@@ -2,14 +2,9 @@
 #define EEPROM_H_
 
 #include "config.h"
+#include "common.h"
 #include <avr/io.h>
 
-// Define macro for NOP instruction
-#define _NOP() __asm__ __volatile__ ("nop");
-
-// Define type for (to be shifted) addresses
-typedef uint16_t address_t;
-
 // Define address length
 // TODO 15 or 16?
 #define ADDRESS_LENGTH 15
diff --git a/firmware/src/main.c b/firmware/src/main.c
index cc580f7..70d302d 100644
--- a/firmware/src/main.c
+++ b/firmware/src/main.c
@@ -1,4 +1,5 @@
 #include "config.h"
+#include "common.h"
 #include "uart.h"
 #include "eeprom.h"
 #include "parsing.h"
diff --git a/firmware/src/parsing.h b/firmware/src/parsing.h
index 9885dee..fe15c27 100644
--- a/firmware/src/parsing.h
+++ b/firmware/src/parsing.h
@@ -1,8 +1,7 @@
 #ifndef PARSING_H_
 #define PARSING_H_
 
-#include "config.h"
-#include "eeprom.h"
+#include "common.h"
 #include <stdbool.h>
 
 // Type definition for a command line with optional argument (actually just two pointers to strings)
@@ -11,13 +10,6 @@ typedef struct {
     char* arg;
 } CommandLine;
 
-// Type definition for address ranges (from-to)
-typedef struct {
-    bool isValid;
-    address_t from;
-    address_t to;
-} AddressRange;
-
 void parseNextCommand();
 CommandLine readNextCommand(char* buffer, uint8_t bufferLength);
 CommandLine tokenizeCommand(char* cmd);