From a5ba6ff463671ca15837a47f39067b386e906a1b Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Mon, 29 Oct 2012 21:06:16 +0000
Subject: [PATCH] VARIANT is not available on VS++

---
 src/Makefile       | 16 ++++++++--------
 src/eeprom_arm.cpp |  2 +-
 src/eeprom_avr.cpp |  4 ++--
 src/open9x.cpp     |  2 +-
 src/stamp.cpp      |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 430ff6f91..dcba0bc8d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -311,7 +311,7 @@ CPPDEFS += -DTRANSLATIONS_$(TRANSLATIONS)
 # TTS language
 CPPDEFS += -DTTS_$(TTS)
 
-VARIANT = 0
+EEPROM_VARIANT = 0
 
 ifeq ($(UNITS), IMPERIAL)
   CPPDEFS += -DIMPERIAL_UNITS
@@ -373,7 +373,7 @@ endif
 
 ifeq ($(GVARS), YES)
   CPPDEFS += -DGVARS
-  VARIANT += +1
+  EEPROM_VARIANT += +1
 endif
 
 # If STD-Support is enabled
@@ -417,7 +417,7 @@ ifeq ($(EXT), FRSKY)
   ifeq ($(VARIO), YES)
     CPPDEFS += -DVARIO
   endif
-  VARIANT += +2
+  EEPROM_VARIANT += +2
 endif
 
 ifeq ($(DEBUG), YES)
@@ -438,7 +438,7 @@ RUN_FROM_FLASH = 1
 ifeq ($(PCB), X9D)
   # X9D, so ...
   OPT = 2
-  CPPDEFS += -DPCBX9D -DPCBSKY9X -DVARIANT=0 -DAUDIO -DHAPTIC -DPXX -DDSM2 -DDSM2_PPM -DROTARY_ENCODERS=1
+  CPPDEFS += -DPCBX9D -DPCBSKY9X -DEEPROM_VARIANT=0 -DAUDIO -DHAPTIC -DPXX -DDSM2 -DDSM2_PPM -DROTARY_ENCODERS=1
   EXTRAINCDIRS += sky9x CoOS/kernel CoOS/portable
   BOARDSRC = board_sky9x.cpp 
   SRC += sky9x/core_cm3.c sky9x/board_lowlevel.c sky9x/crt.c sky9x/vectors_sam3s.c
@@ -472,7 +472,7 @@ endif
 ifeq ($(PCB), SKY9X)
   # SKY9X, so ...
   OPT = 2
-  CPPDEFS += -DPCBSKY9X -DVARIANT=0 -DAUDIO -DHAPTIC -DRTCLOCK -DPXX -DDSM2 -DDSM2_PPM -DROTARY_ENCODERS=1
+  CPPDEFS += -DPCBSKY9X -DEEPROM_VARIANT=0 -DAUDIO -DHAPTIC -DRTCLOCK -DPXX -DDSM2 -DDSM2_PPM -DROTARY_ENCODERS=1
   EXTRAINCDIRS += sky9x CoOS/kernel CoOS/portable
   BOARDSRC = board_sky9x.cpp
   SRC += sky9x/core_cm3.c sky9x/board_lowlevel.c sky9x/crt.c sky9x/vectors_sam3s.c
@@ -507,7 +507,7 @@ endif
 ifeq ($(PCB), GRUVIN9X)
   # Gruvin9x PCB, so ...
   OPT = 2
-  CPPDEFS += -DPCBGRUVIN9X -DVARIANT=0 -DAUDIO -DHAPTIC -DROTARY_ENCODERS=2 
+  CPPDEFS += -DPCBGRUVIN9X -DEEPROM_VARIANT=0 -DAUDIO -DHAPTIC -DROTARY_ENCODERS=2 
   EXTRAINCDIRS += gruvin9x stock FatFs FatFs/option
   BOARDSRC += board_gruvin9x.cpp
   EEPROMSRC = eeprom_avr.cpp
@@ -533,7 +533,7 @@ endif
 ifeq ($(PCB), STD128)
   # STD PCB with Atmega 128, so ...
   OPT = 2
-  CPPDEFS += -DPCBSTD -DM128 -DVARIANT=0
+  CPPDEFS += -DPCBSTD -DM128 -DEEPROM_VARIANT=0
   EXTRAINCDIRS += stock
   BOARDSRC = board_stock.cpp
   EEPROMSRC = eeprom_avr.cpp
@@ -565,7 +565,7 @@ ifeq ($(PCB), STD)
   # STD PCB, so ...
   OPT = s
   EXTRAINCDIRS += stock
-  CPPDEFS += -DPCBSTD -DM64 -DVARIANT=$(shell echo ${VARIANT} | bc)
+  CPPDEFS += -DPCBSTD -DM64 -DEEPROM_VARIANT=$(shell echo ${EEPROM_VARIANT} | bc)
   BOARDSRC = board_stock.cpp
   EEPROMSRC = eeprom_avr.cpp
   PULSESSRC = pulses_avr.cpp
diff --git a/src/eeprom_arm.cpp b/src/eeprom_arm.cpp
index db613bae1..e932abec8 100644
--- a/src/eeprom_arm.cpp
+++ b/src/eeprom_arm.cpp
@@ -444,7 +444,7 @@ bool eeLoadGeneral()
   }
 
 #ifdef SIMU
-  printf("EEPROM version %d (%d) instead of %d (%d)\n", g_eeGeneral.version, g_eeGeneral.variant, EEPROM_VER, VARIANT);
+  printf("EEPROM version %d (%d) instead of %d (%d)\n", g_eeGeneral.version, g_eeGeneral.variant, EEPROM_VER, EEPROM_VARIANT);
   fflush(stdout);
 #endif
 
diff --git a/src/eeprom_avr.cpp b/src/eeprom_avr.cpp
index a48026704..093cea99b 100644
--- a/src/eeprom_avr.cpp
+++ b/src/eeprom_avr.cpp
@@ -817,7 +817,7 @@ bool eeLoadGeneral()
     theFile.openRlc(FILE_GENERAL);
     if (theFile.readRlc((uint8_t*)&g_eeGeneral, sizeof(g_eeGeneral)) <= sizeof(EEGeneral)) {
 #if defined(PCBSTD)
-      if (g_eeGeneral.variant == VARIANT && g_eeGeneral.chkSum == evalChkSum()) {
+      if (g_eeGeneral.variant == EEPROM_VARIANT && g_eeGeneral.chkSum == evalChkSum()) {
         return true;
       }
 #else
@@ -829,7 +829,7 @@ bool eeLoadGeneral()
   }
 
 #ifdef SIMU
-  printf("EEPROM version %d (%d) instead of %d (%d)\n", g_eeGeneral.version, g_eeGeneral.variant, EEPROM_VER, VARIANT);
+  printf("EEPROM version %d (%d) instead of %d (%d)\n", g_eeGeneral.version, g_eeGeneral.variant, EEPROM_VER, EEPROM_VARIANT);
   fflush(stdout);
 #endif
 
diff --git a/src/open9x.cpp b/src/open9x.cpp
index 15d6d4573..306ad0edd 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -216,7 +216,7 @@ void generalDefault()
 {
   memclear(&g_eeGeneral, sizeof(g_eeGeneral));
   g_eeGeneral.version  = EEPROM_VER;
-  g_eeGeneral.variant = VARIANT;
+  g_eeGeneral.variant = EEPROM_VARIANT;
   g_eeGeneral.contrast = 25;
   g_eeGeneral.vBatWarn = 90;
   for (int i = 0; i < 7; ++i) {
diff --git a/src/stamp.cpp b/src/stamp.cpp
index e4ffd5a89..c158967e5 100644
--- a/src/stamp.cpp
+++ b/src/stamp.cpp
@@ -40,4 +40,4 @@
 const pm_char stamp1[] PROGMEM = " SVN: " SVN_STR;
 const pm_char stamp2[] PROGMEM = "DATE: " DATE_STR;
 const pm_char stamp3[] PROGMEM = "TIME: " TIME_STR;
-const pm_char eeprom_stamp[] PROGMEM = "EEPR: " DEFNUMSTR(EEPROM_VER) "-" DEFNUMSTR(VARIANT);
+const pm_char eeprom_stamp[] PROGMEM = "EEPR: " DEFNUMSTR(EEPROM_VER) "-" DEFNUMSTR(EEPROM_VARIANT);