Now compiles! (moved declaration of data structure from .h to .c)

Author: ggasmithh

BUILD_DIR/main.c

@@ -1,5 +1,3 @@
-
-
 #include <esos.h>
 #include "esos_pic24.h"
 #include "esos_pic24_rs232.h"
@@ -63,25 +61,18 @@ ESOS_USER_TASK(demoLEDsAndSwitches) {
 		}
 	ESOS_TASK_END();
 }	
-		
-/*enum { u16_DOUBLE_PRESS_UPPER_MS_NDX, // the variables that will be displayed on uc/pc variable tab
-		u16_RPG_SLOW_MS_NDX,
-		u16_RPG_MEDIUM_MS_NDX, 
-		u16_RPG_FAST_MS_NDX,
-		u16_RPG_PERIOD_NDX,
-		U16_RPG_VALUE_NDX};*/
 
 
 ESOS_USER_TASK(drawDisplay) {
     ESOS_TASK_BEGIN();
-		/*initDataXfer(); 
+		//initDataXfer(); 
 		//format for below... var name from enum above, actual var name, T/F changeable, label
-		SPECIFY_VAR(u16_DOUBLE_PRESS_UPPER_MS_NDX, _st_esos_uiF14Data.u16_doublePressUpperMs, TRUE, "%u", "Upper double press time limit");
-		SPECIFY_VAR(u16_RPG_SLOW_MS_NDX, _st_esos_uiF14Data.u16_RPGNotMovingToSlowPeriodMs, TRUE, "%u", "Time in ms between RPG clicks -not moving to slow");
-		SPECIFY_VAR(u16_RPG_MEDIUM_MS_NDX, _st_esos_uiF14Data.u16_RPGSlowToMediumPeriodMs, TRUE, "%u", "Time in ms between RPG clicks -slow to medium");
-		SPECIFY_VAR(u16_RPG_FAST_MS_NDX, _st_esos_uiF14Data.u16_RPGMediumToFastPeriodMs, TRUE, "%u", "Time in ms between RPG clicks -medium to fast");
-		SPECIFY_VAR(u16_RPG_PERIOD_NDX, _st_esos_uiF14Data.u16_RPGPeriodMs, FALSE, "%u", "Time between clicks in ms");
-		SPECIFY_VAR(U16_RPG_VALUE_NDX, _st_esos_uiF14Data.i16_RPGCounter, FALSE, "%u", "Current RPG Counter");	*/
+		//SPECIFY_VAR(u16_DOUBLE_PRESS_UPPER_MS_NDX, _st_esos_uiF14Data.u16_doublePressUpperMs, TRUE, "%u", "Upper double press time limit");
+		//SPECIFY_VAR(u16_RPG_SLOW_MS_NDX, _st_esos_uiF14Data.u16_RPGNotMovingToSlowPeriodMs, TRUE, "%u", "Time in ms between RPG clicks -not moving to slow");
+		//SPECIFY_VAR(u16_RPG_MEDIUM_MS_NDX, _st_esos_uiF14Data.u16_RPGSlowToMediumPeriodMs, TRUE, "%u", "Time in ms between RPG clicks -slow to medium");
+		//SPECIFY_VAR(u16_RPG_FAST_MS_NDX, _st_esos_uiF14Data.u16_RPGMediumToFastPeriodMs, TRUE, "%u", "Time in ms between RPG clicks -medium to fast");
+		//SPECIFY_VAR(u16_RPG_PERIOD_NDX, _st_esos_uiF14Data.u16_RPGPeriodMs, FALSE, "%u", "Time between clicks in ms");
+		//SPECIFY_VAR(U16_RPG_VALUE_NDX, _st_esos_uiF14Data.i16_RPGCounter, FALSE, "%u", "Current RPG Counter");
 		while(1){
 			if (esos_uiF14_isSW1Pressed()){ESOS_TASK_WAIT_ON_SEND_STRING("\nSw1 is Pushed  ");}
 			if (esos_uiF14_isSW1Released()){ESOS_TASK_WAIT_ON_SEND_STRING("Sw1 is Released");}
@@ -121,10 +112,8 @@ ESOS_USER_TASK(drawDisplay) {
 		}
 	ESOS_TASK_END();
 }
-void user_init(){
-	
+
+void user_init(void){
 	esos_RegisterTask(demoLEDsAndSwitches);
 	esos_RegisterTask(drawDisplay);
-	
-		
 }

esos/include/esos_f14ui.h

@@ -59,10 +59,6 @@ typedef struct {
 #define __ESOS_UIF14_UI_PERIOD_MS       10
 #define __RPGCountsPerRev               12
 
-// PRIVATE DATA 
- 
-_st_esos_uiF14Data_t _st_esos_uiF14Data;
-
 // PRIVATE FUNCTION PROTOTYPES
 
 inline void _esos_uiF14_setRPGCounter (int16_t);

esos/src/esos_f14ui.c

@@ -12,6 +12,8 @@
 
 #define MINIMUM_LED_FLASH_PERIOD 100
 
+_st_esos_uiF14Data_t _st_esos_uiF14Data;
+
 // PRIVATE FUNCTIONS
 inline void _esos_uiF14_setRPGCounter (int16_t i16_newValue) {
     _st_esos_uiF14Data.i16_RPGCounter = i16_newValue;