Merge branch 'master' into devel

.github/workflows/build.yml

@@ -20,4 +20,4 @@ jobs:
         - name: Install dependencies
           run: cd board && sh install.sh 
         - name: Build PanFLUte firmware
-          run: cd board && make
+          run: cd board && make

board/adc/adc.c

@@ -1,5 +1,6 @@
 #include "../driver/adc.h"
 
+
 void adcInit(void) { 
   /* Enable ADC */
   ADCSRA = (1 << ADEN) | (1 << ADSC);
@@ -8,11 +9,20 @@ void adcInit(void) {
  //printf("ADC has started\n");
 }
 
+
 /*
 void getPSI(void) {
   ADCSRA |= (1 << ADSC); // Start ADC conversion 
   float rawPresureData = ADCH; // Max is 8bit value	
   printf("PSI: %.2f", (rawPresureData / 255.0) * 14.5);
   _delay_ms(100);
+
+
+uint8_t adcStart(void) {
+  ADCSRA |= (1 << ADSC); // Start ADC conversion 
+  loop_until_bit_is_clear(ADCSRA, ADSC); 
+  uint8_t rawPresureData = ADCH; // Max is 8bit value
+
+  return rawPresureData;
+
 }
-*/

board/driver/adc.h

@@ -2,4 +2,7 @@
 #include <stdint.h>
 
 void adcInit(void);
+
 //void getPSI(void);
+
+uint8_t adcStart(void);

board/main.c

@@ -1,19 +1,29 @@
 #include <util/delay.h>
 #include "driver/usart.h"
+#include "driver/led.h"
 #include "driver/adc.h"
 
 static FILE mystdout = FDEV_SETUP_STREAM(print, NULL, _FDEV_SETUP_RW);
 
+
 int main(void) {  
     adcInit();
     usartInit(MYUBRR);
     stdout = &mystdout;
     while(1) {	
 	while(ADCSRA & (1 << ADSC));
   	ADCSRA |= (1 << ADSC); // Start ADC conversion 
-	// TODO: Must subtract ADCH from offset.
-	printf("PSI: %.2f\n", (ADCH / 255.0) * 14.5);
-        _delay_ms(150);
+	  // TODO: Must subtract ADCH from offset.
+	  printf("PSI: %.2f\n", (ADCH / 255.0) * 14.5);
+    delay_ms(150);
+
+int main(void) { 
+    adcInit();
+    usartInit(MYUBRR);
+    stdout = &mystdout;
+    while(1) {		
+	    printf("Should be sensor data: %d\n", adcStart());
+    	delay_ms(1000);
     }
     return 0;
-}
+}