Diff: main.cpp

Revision:

3:59a57634f1fa

Parent:

2:b489f23d9d2c

Child:

4:2a0242bfbe0c

--- a/main.cpp	Wed Feb 03 21:44:06 2016 +0000
+++ b/main.cpp	Tue Feb 09 07:54:15 2016 +0000
@@ -53,6 +53,8 @@
 //DigitalOut mux_out[10] = {(PB_5), (PB_4), (PB_10), (PA_8), (PA_9),(PC_7), (PB_6),(PA_7),(PA_6),(PA_5)};
 //DigitalOut mux_in[10] = {(PC_6), (PC_5), (PA_12), (PA_11), (PB_12),(PB_2), (PB_1),(PB_15), (PB_14),(PB_13)};
 
+char stopbit[1]; //для начала работы, мб не пригодится
+char proof[] = "s";
 int freqdata;
 float amp;
 int form;
@@ -67,7 +69,11 @@
 
 
     int main() {
-        serial.printf("start \r\n");
+      while(1)
+      {
+           
+        
+      //  serial.printf("start \r\n");
         /*outE1=0;
         inE1=0;
         outE2=outE3=outE4=outE5=outE6=outE7=outE8=outE9=outE10=0;
@@ -83,33 +89,36 @@
     /*    ddsstart;
         ddsreset;
         ddsstop;*/
+        serial.scanf("%c",&stopbit);
+        while (strcmp(stopbit,proof) != 0)  {printf("%c",stopbit); serial.scanf("%c",&stopbit);}
         mclk.period_us(0.1);
         mclk.pulsewidth_us(0.05);
        request();
-       serial.printf("finish");
-       serial.printf("\r\n");
+     //  serial.printf("finish");
+      // serial.printf("\r\n");
         rasputte();
         adc_read();
-    serial.printf("begin");
-    serial.printf("\r\n");    
-    serial.printf("%f\r\n", mdata);
-    serial.printf("end");
-    serial.printf("\r\n");
-    //ddsstart;
-    //ddsoff;
-    //ddsstop;
+   // serial.printf("begin");
+   // serial.printf("\r\n");    
+   // serial.printf("%f\r\n", mdata);
+    //serial.printf("end");
+    //serial.printf("\r\n");
+    ddsstart;
+    ddsoff;
+    ddsstop;
+    }
     }
 
     int amplitude () {
-        uint16_t ampt;
-        uint16_t ampReg;
+                uint16_t ampt;
+                uint16_t ampReg;
         ampt = uint16_t(819.2*(5-amp));
         ampReg = uint16_t(ampt & 0xFFF);
         DAC.format(16,1);
         dacstart;
         DAC.write(ampReg*4);
         dacstop;
-        serial.printf("amp %X \r\n", ampReg*4);
+       // serial.printf("amp %X \r\n", ampReg*4);
         return 0;
     }
 
@@ -124,8 +133,8 @@
         Uptemp = (uint16_t)((ftemp/16384) & 0x3FFF);
         DDS.write(Lowtemp + 0x4000);ddsstart;
         DDS.write(Uptemp + 0x4000);
-        serial.printf("uptemp %X \r\n", Uptemp + 0x4000);
-        serial.printf("lowtemp %X \r\n", Lowtemp + 0x4000);
+        //serial.printf("uptemp %X \r\n", Uptemp + 0x4000);
+        //serial.printf("lowtemp %X \r\n", Lowtemp + 0x4000);
         ddsstop;
         return 0;
     }
@@ -189,10 +198,10 @@
 
 int request()
 {
-       while(1) {
+/*       while(1) {
         serial.printf("Vyberite formu signala :1 - sinus, 2 - pryamougolniy, 3 - treugol'nyi \r\n");
         serial.scanf("%i", &form);
-        serial.printf(" %i\n",form);
+        serial.printf("%i\n",form);
                if (form >= 1 && form<= 3)  break;
              else   form = 1; serial.printf("Nepravil'nyi vvod, vvedite ewe raz \r\n");
         
@@ -212,8 +221,25 @@
         serial.printf(" %f\n",amp);
         if (amp >= 0 && amp<= 5.0)  break;
          else amp=1.0;serial.printf("Nepravil'nyi vvod, vvedite ewe raz \r\n");
+         }*/
+//         for (int i =0; i < 1000; i++){
+ //           serial.putc(i);
+ //           printf("%i    NO: "+i);    
+ //           printf("\r\n");
+ //       }
+         
+        // printf("%i",11111);
+        printf("%i",7);
+         serial.scanf("%i,%i,%f",&form,&freqdata,&amp);
+         printf("%i",8);
+                
+     // serial.printf(" %i\r\n",form);
+    // serial.printf(" %i\r\n",freqdata);
+    //  serial.printf(" %f\r\n",amp);
+
+         
         
-}
+
 return 0;
 }
     int rasputte()