Add NO_VTARGET_DETECT compile time option to the AVRISP-MKII clone project, to disabl...

diff --git a/Projects/AVRISP-MKII/AVRISP.txt b/Projects/AVRISP-MKII/AVRISP.txt
index cff8d7d..feccfca 100644 (file)
--- a/Projects/AVRISP-MKII/AVRISP.txt
+++ b/Projects/AVRISP-MKII/AVRISP.txt
@@ -247,7 +247,7 @@
  *   <tr>\r
  *    <td>VTARGET_ADC_CHANNEL</td>\r
  *    <td>Makefile CDEFS</td>\r
  *   <tr>\r
  *    <td>VTARGET_ADC_CHANNEL</td>\r
  *    <td>Makefile CDEFS</td>\r

- *    <td>ADC channel number (on supported AVRs) to use for VTARGET level detection.</td> \r
+ *    <td>ADC channel number (on supported AVRs) to use for VTARGET level detection, if NO_VTARGET_DETECT is not defined.</td> \r

  *   </tr>\r
  *   <tr>\r
  *    <td>ENABLE_ISP_PROTOCOL</td>\r
  *   </tr>\r
  *   <tr>\r
  *    <td>ENABLE_ISP_PROTOCOL</td>\r


@@ -267,5 +267,11 @@
  *        seperate ISP, PDI, and TPI programming headers) but increases programming speed dramatically.\r
  *        <i>Ignored when compiled for the XPLAIN board.</i></td>  \r
  *   </tr>\r
  *        seperate ISP, PDI, and TPI programming headers) but increases programming speed dramatically.\r
  *        <i>Ignored when compiled for the XPLAIN board.</i></td>  \r
  *   </tr>\r

+ *   <tr>\r
+ *    <td>NO_VTARGET_DETECT</td>\r
+ *    <td>Makefile CDEFS</td>\r
+ *    <td>Define to disable VTARGET sampling and reporting on AVR models with an ADC converter. This will cause the programmer\r
+ *        to report a fixed 5V target voltage to the host regardless of the real target voltage.</td>  \r
+ *   </tr>\r

  *  </table>\r
  */\r
  *  </table>\r
  */\r

diff --git a/Projects/AVRISP-MKII/Lib/V2ProtocolParams.c b/Projects/AVRISP-MKII/Lib/V2ProtocolParams.c
index 0078851..a4709f8 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/V2ProtocolParams.c
+++ b/Projects/AVRISP-MKII/Lib/V2ProtocolParams.c
@@ -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

diff --git a/Projects/AVRISP-MKII/makefile b/Projects/AVRISP-MKII/makefile
index 2698de8..b0b26c2 100644 (file)
--- a/Projects/AVRISP-MKII/makefile
+++ b/Projects/AVRISP-MKII/makefile
@@ -198,6 +198,7 @@ CDEFS += -DVTARGET_ADC_CHANNEL=2
 CDEFS += -DENABLE_ISP_PROTOCOL\r
 CDEFS += -DENABLE_XPROG_PROTOCOL\r
 #CDEFS += -DXPROG_VIA_HARDWARE_USART\r
 CDEFS += -DENABLE_ISP_PROTOCOL\r
 CDEFS += -DENABLE_XPROG_PROTOCOL\r
 #CDEFS += -DXPROG_VIA_HARDWARE_USART\r

+#CDEFS += -DNO_VTARGET_DETECT\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r