Added incomplete MIDIToneGenerator project.

[pub/USBasp.git] / Projects / AVRISP-MKII / Lib / V2ProtocolParams.c

diff --git a/Projects/AVRISP-MKII/Lib/V2ProtocolParams.c b/Projects/AVRISP-MKII/Lib/V2ProtocolParams.c
index bb18c5b..a4709f8 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/V2ProtocolParams.c
+++ b/Projects/AVRISP-MKII/Lib/V2ProtocolParams.c
@@ -1,13 +1,13 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r

 \r
   Permission to use, copy, modify, distribute, and sell this \r
   software and its documentation for any purpose is hereby granted\r
 \r
   Permission to use, copy, modify, distribute, and sell this \r
   software and its documentation for any purpose is hereby granted\r


@@ -97,7 +97,7 @@ void V2Params_LoadNonVolatileParamValues(void)
  */\r
 void V2Params_UpdateParamValues(void)\r
 {\r
  */\r
 void V2Params_UpdateParamValues(void)\r
 {\r

-       #if defined(ADC)\r
+       #if (defined(ADC) && !defined(NO_VTARGET_DETECT))\r

        /* Update VTARGET parameter with the latest ADC conversion of VTARGET on supported AVR models */\r
        V2Params_GetParamFromTable(PARAM_VTARGET)->ParamValue = ((5 * 10 * ADC_GetResult()) / 1024);\r
        #endif\r
        /* Update VTARGET parameter with the latest ADC conversion of VTARGET on supported AVR models */\r
        V2Params_GetParamFromTable(PARAM_VTARGET)->ParamValue = ((5 * 10 * ADC_GetResult()) / 1024);\r
        #endif\r


@@ -170,7 +170,7 @@ static ParameterItem_t* V2Params_GetParamFromTable(const uint8_t ParamID)
        ParameterItem_t* CurrTableItem = ParameterTable;\r
 \r
        /* Find the parameter in the parameter table if present */\r
        ParameterItem_t* CurrTableItem = ParameterTable;\r
 \r
        /* Find the parameter in the parameter table if present */\r

-       for (uint8_t TableIndex = 0; TableIndex < (sizeof(ParameterTable) / sizeof(ParameterTable[0])); TableIndex++)\r
+       for (uint8_t TableIndex = 0; TableIndex < TABLE_PARAM_COUNT; TableIndex++)\r

        {\r
                if (ParamID == CurrTableItem->ParamID)\r
                  return CurrTableItem;\r
        {\r
                if (ParamID == CurrTableItem->ParamID)\r
                  return CurrTableItem;\r