Ben Gordon / Mbed 2 deprecated Muscle_Controlled_Servo

Dependencies:   mbed

Files at this revision

API Documentation at this revision

Comitter:
BenRJG
Date:
Fri Jun 01 13:39:12 2018 +0000
Parent:
9:a7085b7503d2
Commit message:
fixed adc

Changed in this revision

ADC.cpp Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/ADC.cpp	Fri Jun 01 12:57:31 2018 +0000
+++ b/ADC.cpp	Fri Jun 01 13:39:12 2018 +0000
@@ -1,4 +1,9 @@
 #include "ADC.h"
+#include "LCD.h"
+
+float adc_data_f = 0;
+unsigned short ADC_DATA = 0;
+char adc_str[5];
  
 void read_adc(void)
 { 
--- a/main.cpp	Fri Jun 01 12:57:31 2018 +0000
+++ b/main.cpp	Fri Jun 01 13:39:12 2018 +0000
@@ -5,17 +5,12 @@
 char adstr[32];
 int err;                    //error variable used for debugging, trapping etc
 
-float adc_data_f = 0;
-unsigned short ADC_DATA = 0;
-char adc_str[5];
-
 int main (void)
 {   
     reset_board();
 
     SPI_INIT();
     LCD_INIT();
-    init_ADC();
     /*err = 0;
     
     adval =0.0f;