Remove type definitions of the keyboard and mouse boot protocol report layouts from...

[pub/USBasp.git] / Projects / AVRISP / AVRISP.c

diff --git a/Projects/AVRISP/AVRISP.c b/Projects/AVRISP/AVRISP.c
index d4ae910..016d74c 100644 (file)
--- a/Projects/AVRISP/AVRISP.c
+++ b/Projects/AVRISP/AVRISP.c
@@ -35,7 +35,7 @@
  */\r
 \r
 // TODO: Add in software SPI for lower programming speeds below 125KHz\r
  */\r
 \r
 // TODO: Add in software SPI for lower programming speeds below 125KHz\r

-// TODO: Add reversed target connector checks\r
+// TODO: Add reversed/shorted target connector checks\r

 \r
 #include "AVRISP.h"\r
 \r
 \r
 #include "AVRISP.h"\r
 \r


@@ -46,7 +46,7 @@ int main(void)
 {\r
        SetupHardware();\r
 \r
 {\r
        SetupHardware();\r
 \r

-       V2Params_LoadEEPROMParamValues();\r
+       V2Params_LoadNonVolatileParamValues();\r

        \r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 \r
        \r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 \r


@@ -54,11 +54,8 @@ int main(void)
        {
                Process_AVRISP_Commands();\r
                \r
        {
                Process_AVRISP_Commands();\r
                \r

-               #if defined(ADC)\r
-               /* Update VTARGET parameter with the latest ADC conversion of VTARGET on supported AVR models */\r
-               V2Params_SetParameterValue(PARAM_VTARGET, ((5 * 10 * ADC_GetResult()) / 1024));\r
-               #endif
-\r
+               V2Params_UpdateParamValues();\r
+               \r

                USB_USBTask();\r
        }\r
 }\r
                USB_USBTask();\r
        }\r
 }\r


@@ -84,7 +81,7 @@ void SetupHardware(void)
        ADC_StartReading(VTARGET_ADC_CHANNEL | ADC_RIGHT_ADJUSTED | ADC_REFERENCE_AVCC);\r
        #endif\r
        \r
        ADC_StartReading(VTARGET_ADC_CHANNEL | ADC_RIGHT_ADJUSTED | ADC_REFERENCE_AVCC);\r
        #endif\r
        \r

-       /* Millisecond timer initialization for timeout checking */\r
+       /* Millisecond timer initialization for timeouts and delays */\r

        OCR0A  = ((F_CPU / 64) / 1000);\r
        TCCR0A = (1 << WGM01);\r
        TCCR0B = ((1 << CS01) | (1 << CS00));\r
        OCR0A  = ((F_CPU / 64) / 1000);\r
        TCCR0A = (1 << WGM01);\r
        TCCR0B = ((1 << CS01) | (1 << CS00));\r