Remove HW_VER option from build and FW source

Because `master` branch will only support one hardware - the one in
development. Each released version will be in separate branch thus is
not affected by changes in the master branch.

Author: coderarjob

Makefile

@@ -16,7 +16,7 @@ all:
 include build/gcc_rules.mk
 include build/fw/config.mk
 
-ifeq ($(and $(clock), $(machine), $(COMPILER), $(ARCH), $(HW_VER)),)
+ifeq ($(and $(clock), $(machine), $(COMPILER), $(ARCH)),)
 $(error Invalid build setup. Required variables are not set)
 endif
 

build/fw/config.mk

@@ -3,4 +3,3 @@ ARCH := avr
 machine ?= atmega8a
 clock ?= 16000000
 DEBUG := 1
-HW_VER := 1

build/fw/toolchain_avr_gcc.mk

@@ -8,8 +8,7 @@ PROGRAMMER := avrdude
 MPU_ARCH   := AVR
 
 cc_definitions := -DF_CPU=$(clock)    \
-				  -DARCH=$(MPU_ARCH)  \
-				  -DHW_VER=$(HW_VER)
+				  -DARCH=$(MPU_ARCH)
 
 ifeq ($(DEBUG), 1)
 	cc_definitions += -DDEBUG

build/ut/toolchain_gcc.mk

@@ -9,7 +9,6 @@ MPU_ARCH := $(shell echo $(ARCH)|tr 'a-z' 'A-Z')
 
 cc_definitions := -DF_CPU=$(clock)    \
 				  -DARCH=$(MPU_ARCH)  \
-				  -DHW_VER=$(HW_VER)  \
 				  -DUNITTESTS
 
 ld_flags :=

include/hw/v1/hwspec.h include/hw/hwspec.hinclude/hw/v1/hwspec.h renamed to include/hw/hwspec.h

@@ -1,10 +1,7 @@
 #pragma once
 
 #include <stdbool.h>
-#include <stdint.h>
-#if HW_VER == 1
-    #include <hw/v1/hwspec.h>
-#endif
+#include <hw/hwspec.h>
 
 #if !defined(UNITTESTS)
     #define NORETURN __attribute__ ((noreturn))

include/main.h

@@ -1,8 +1,6 @@
 #include <main.h>
 #include <hal.h>
-#if HW_VER == 1
-    #include <hw/v1/hwspec.h>
-#endif
+#include <hw/hwspec.h>
 #include <hw/hwdetect.h>
 
 void irq_switch_pressed()

src/fw/irq.c

@@ -1,7 +1,5 @@
 #include <hal.h>
-#if HW_VER == 1
-    #include <hw/v1/hwspec.h>
-#endif
+#include <hw/hwspec.h>
 #include <hw/hwdetect.h>
 #include <main.h>
 

src/fw/main.c

@@ -1,7 +1,5 @@
 #include <hal.h>
-#if HW_VER == 1
-    #include <hw/v1/hwspec.h>
-#endif
+#include <hw/hwspec.h>
 #include <stdint.h>
 #include <main.h>
 #include <utils.h>

src/fw/tests.c

@@ -5,9 +5,7 @@
 #include <mode_mock.h>
 #include <hal_mock.h>
 #include <assert.h>
-#if HW_VER == 1
-    #include <hw/v1/hwspec.h>
-#endif
+#include <hw/hwspec.h>
 
 bool mode_is_dirty_after_some_iterations_handler()
 {