Moved calls to V2Params_UpdateParamValues() out of the main AVRISP-MKII and XPLAINBri...

diff --git a/Projects/AVRISP-MKII/AVRISP.c b/Projects/AVRISP-MKII/AVRISP.c
index 0766025..7b2429c 100644 (file)
--- a/Projects/AVRISP-MKII/AVRISP.c
+++ b/Projects/AVRISP-MKII/AVRISP.c
@@ -48,9 +48,7 @@ int main(void)
 
        for (;;)
        {
 
        for (;;)
        {

-               Process_AVRISP_Commands();
-               V2Params_UpdateParamValues();
-               
+               AVRISP_Task();

                USB_USBTask();
        }
 }
                USB_USBTask();
        }
 }


@@ -108,12 +106,14 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 }
 
 /** Processes incoming V2 Protocol commands from the host, returning a response when required. */
 }
 
 /** Processes incoming V2 Protocol commands from the host, returning a response when required. */

-void Process_AVRISP_Commands(void)
+void AVRISP_Task(void)

 {
        /* Device must be connected and configured for the task to run */
        if (USB_DeviceState != DEVICE_STATE_Configured)
          return;
 
 {
        /* Device must be connected and configured for the task to run */
        if (USB_DeviceState != DEVICE_STATE_Configured)
          return;
 

+       V2Params_UpdateParamValues();
+

        Endpoint_SelectEndpoint(AVRISP_DATA_OUT_EPNUM);
        
        /* Check to see if a V2 Protocol command has been received */
        Endpoint_SelectEndpoint(AVRISP_DATA_OUT_EPNUM);
        
        /* Check to see if a V2 Protocol command has been received */

diff --git a/Projects/AVRISP-MKII/AVRISP.h b/Projects/AVRISP-MKII/AVRISP.h
index 409b147..1018ebc 100644 (file)
--- a/Projects/AVRISP-MKII/AVRISP.h
+++ b/Projects/AVRISP-MKII/AVRISP.h
@@ -72,7 +72,7 @@
 
        /* Function Prototypes: */
                void SetupHardware(void);
 
        /* Function Prototypes: */
                void SetupHardware(void);

-               void Process_AVRISP_Commands(void);
+               void AVRISP_Task(void);

                
                void EVENT_USB_Device_Connect(void);
                void EVENT_USB_Device_Disconnect(void);
                
                void EVENT_USB_Device_Connect(void);
                void EVENT_USB_Device_Disconnect(void);

diff --git a/Projects/AVRISP-MKII/AVRISP.txt b/Projects/AVRISP-MKII/AVRISP.txt
index de08d5f..c4ba43c 100644 (file)
--- a/Projects/AVRISP-MKII/AVRISP.txt
+++ b/Projects/AVRISP-MKII/AVRISP.txt
@@ -57,7 +57,6 @@
  *    - Minimum ISP target clock speed of 500KHz due to hardware SPI module prescaler limitations
  *    - No reversed/shorted target connector detection and notification
  *    - A seperate header is required for each of the ISP, PDI and TPI programming protocols that the user wishes to use
  *    - Minimum ISP target clock speed of 500KHz due to hardware SPI module prescaler limitations
  *    - No reversed/shorted target connector detection and notification
  *    - A seperate header is required for each of the ISP, PDI and TPI programming protocols that the user wishes to use

- *    - XMEGA EEPROM erase section command does not work (but EEPROM read/write and chip erase does)

  *
  *  On AVR models with an ADC converter, AVCC should be tied to 5V (e.g. VBUS) and the VTARGET_ADC_CHANNEL token should be
  *  set to an appropriate ADC channel number in the project makefile for VTARGET detection to operate correctly. On models
  *
  *  On AVR models with an ADC converter, AVCC should be tied to 5V (e.g. VBUS) and the VTARGET_ADC_CHANNEL token should be
  *  set to an appropriate ADC channel number in the project makefile for VTARGET detection to operate correctly. On models

diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c
index ad3fc6c..2a71c56 100644 (file)
--- a/Projects/XPLAINBridge/XPLAINBridge.c
+++ b/Projects/XPLAINBridge/XPLAINBridge.c
@@ -86,14 +86,9 @@ int main(void)
        for (;;)
        {
                if (CurrentFirmwareMode == MODE_USART_BRIDGE)
        for (;;)
        {
                if (CurrentFirmwareMode == MODE_USART_BRIDGE)

-               {
-                       USARTBridge_Task();
-               }
+                 UARTBridge_Task();

                else
                else

-               {
-                       AVRISP_Task();
-                       V2Params_UpdateParamValues();
-               }
+                 AVRISP_Task();

 
                USB_USBTask();
        }
 
                USB_USBTask();
        }


@@ -105,6 +100,8 @@ void AVRISP_Task(void)
        if (USB_DeviceState != DEVICE_STATE_Configured)
          return;
 
        if (USB_DeviceState != DEVICE_STATE_Configured)
          return;
 

+       V2Params_UpdateParamValues();
+

        Endpoint_SelectEndpoint(AVRISP_DATA_OUT_EPNUM);
        
        /* Check to see if a V2 Protocol command has been received */
        Endpoint_SelectEndpoint(AVRISP_DATA_OUT_EPNUM);
        
        /* Check to see if a V2 Protocol command has been received */


@@ -119,7 +116,7 @@ void AVRISP_Task(void)
        }
 }
 
        }
 }
 

-void USARTBridge_Task(void)
+void UARTBridge_Task(void)

 {
        /* Must be in the configured state for the USART Bridge code to process data */
        if (USB_DeviceState != DEVICE_STATE_Configured)
 {
        /* Must be in the configured state for the USART Bridge code to process data */
        if (USB_DeviceState != DEVICE_STATE_Configured)

diff --git a/Projects/XPLAINBridge/XPLAINBridge.h b/Projects/XPLAINBridge/XPLAINBridge.h
index 72e9046..3d257e5 100644 (file)
--- a/Projects/XPLAINBridge/XPLAINBridge.h
+++ b/Projects/XPLAINBridge/XPLAINBridge.h
@@ -84,7 +84,7 @@
        /* Function Prototypes: */
                void SetupHardware(void);
                void AVRISP_Task(void);
        /* Function Prototypes: */
                void SetupHardware(void);
                void AVRISP_Task(void);

-               void USARTBridge_Task(void);
+               void UARTBridge_Task(void);

 
                void EVENT_USB_Device_ConfigurationChanged(void);
                void EVENT_USB_Device_UnhandledControlRequest(void);
 
                void EVENT_USB_Device_ConfigurationChanged(void);
                void EVENT_USB_Device_UnhandledControlRequest(void);