Merge pull request #16 from Embedded-Systems-Spring-2020/yingst

Task 1 stuff

Author: ggasmithh

BUILD_DIR/t4_sensor1.c

@@ -3,13 +3,54 @@
 #include "esos_pic24_rs232.h"
 #include <p33EP512GP806.h>
 #include <pic24_all.h>
+#include <esos_f14ui.h>
+
+#include <esos_sensor.h>
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "revF14.h"
 
-ESOS_USER_TASK()
+#define LOOP_DELAY 1000
+
+char buffer[30];
+BOOL SW1_latch = FALSE;
+BOOL SW2_latch = FALSE;
+
+ESOS_USER_TASK(loop) {
+    static uint16_t u16_data;
+
+    ESOS_TASK_BEGIN();
+
+    for (;;) {
+
+        ESOS_TASK_WAIT_UNTIL(esos_uiF14_isSW1Pressed());
+        
+        //Grab the potentiometer
+        ESOS_TASK_WAIT_ON_AVAILABLE_SENSOR(ESOS_SENSOR_CH02, ESOS_SENSOR_VREF_3V3);
+
+        //Now we have exclusive use of the pot, grab data
+        ESOS_TASK_WAIT_SENSOR_QUICK_READ(u16_data);
+
+        //Grab the output
+        ESOS_TASK_WAIT_ON_AVAILABLE_OUT_COMM();
+        sprintf(buffer, "%d\n", u16_data);
+        ESOS_TASK_WAIT_ON_SEND_STRING(buffer);
+        ESOS_TASK_SIGNAL_AVAILABLE_OUT_COMM();
+
+        //Release the potentiometer
+        ESOS_SENSOR_CLOSE();        
+
+        ESOS_TASK_WAIT_TICKS(LOOP_DELAY);
+    }
+
+    ESOS_TASK_END();
+}
 
 void user_init(void){
-    
+    config_esos_uiF14();
+
+    // Config heartbeat
+    esos_uiF14_flashLED3(500);
+
+    esos_RegisterTask(loop);
 }

esos/src/pic24/esos_pic24_sensor.c

@@ -56,7 +56,7 @@ Configure and enable the sensor module for pic24 hardware.
 void esos_sensor_config_hw (esos_sensor_ch_t e_senCh, esos_sensor_vref_t e_senVRef){
 	if (esos_IsUserFlagClear(__ESOS_SYS_ADC_IS_BUSY)){
 		esos_SetUserFlag(__ESOS_SYS_ADC_IS_BUSY);
-		AD1CON1 = ADC_MODULE_OFF;  //disables ADC while progranning
+		AD1CON1bits.ADON = 0; //disables ADC while progranning
 		AD1CON1 = ADC_CLK_AUTO | ADC_AUTO_SAMPLING_OFF;
 		AD1CON1bits.AD12B = 0;  // sets ADC for 10 bit sampling
 		if (e_senCh == ESOS_SENSOR_CH02){
@@ -75,7 +75,7 @@ void esos_sensor_config_hw (esos_sensor_ch_t e_senCh, esos_sensor_vref_t e_senVR
 		AD1CHS0 = ADC_CH0_NEG_SAMPLEA_VREFN | e_senCh;
 		// Use internal clock, set sample time to 31 (bitmask logic)
 		AD1CON3 = ADC_CONV_CLK_INTERNAL_RC | ADC_SAMPLE_TIME_31;
-		AD1CON1 = ADC_MODULE_ON;
+		AD1CON1bits.ADON = 1;
 	}
 }
 
@@ -112,6 +112,6 @@ Release any pending conversions for the sensor
  */
 void esos_sensor_release_hw (void){
 	esos_ClearUserFlag(__ESOS_SYS_ADC_IS_BUSY);
-	// Mask to set ACD1COn1bits.ADON to 0 (turns off)
-	AD1CON1 = ADC_MODULE_OFF;		
+
+	AD1CON1bits.ADON = 0; // turn off sensor
 }