Diff: main.cpp

Revision:

9:3e9245dc54e4

Parent:

8:9304b2c411e4

Child:

10:709d8eef81fd

--- a/main.cpp	Fri Aug 17 18:07:59 2018 +0000
+++ b/main.cpp	Tue Aug 21 22:54:33 2018 +0000
@@ -65,12 +65,12 @@
     
 //-------------------- Variable speed settings------------------------   
 int nspeeds = 5;
-unsigned char v_low[5]= { 0x99, 0x99, 0x99, 0x99, 0x99 }; 
-unsigned char v_high[5]= { 0x93, 0x94, 0x93, 0x93, 0x93 }; 
-unsigned char srsettings_low[5] = {0x04, 0x05, 0x06, 0x07, 0x08};
-unsigned char srsettings_high[5] = {0x02, 0x0E, 0x03, 0x04, 0x05};
-float rates_low[5] = {3.4, 3.7, 4.0, 4.2, 4.5};
-float rates_high[5] = {185, 195, 203, 220, 237};
+const char v_low[]= { 0x99, 0x99, 0x99, 0x99, 0x99 }; 
+const char v_high[]= { 0x93, 0x94, 0x93, 0x93, 0x93 }; 
+const char srsettings_low[] = {0x04, 0x05, 0x06, 0x07, 0x08};
+const char srsettings_high[] = {0x02, 0x0E, 0x03, 0x04, 0x05};
+const float rates_low[] = {3.4, 3.7, 4.0, 4.2, 4.5};
+const float rates_high[] = {185, 195, 203, 220, 237};
 //--------------------------------------------------------------------
 
 char takeAsample_F;
@@ -116,7 +116,7 @@
     int nextdatahs = 0;
     float tprev = 0;
     float tnow = 0;
-    float n_ss = 0; // speed selector variable
+    int n_ss = 0; // speed selector variable
     
     mag.lock();
 //    magTimer.attach(&sampletimer,SAMPLE_INTERVAL);
@@ -376,8 +376,8 @@
                     fprintf(sd,"%s",disp_buffer);
                     printf("%s",disp_buffer);
                 }
-                printf("%s,%s,%s,%s\n",v_low[n_ss],v_high[n_ss],srsettings_low[n_ss],srsettings_high[n_ss]);
-                printf("%d,%d\n",rates_low[n_ss],rates_high[n_ss]);
+                //printf("%#x,%#x,%#x,%#x\r\n",v_low[n_ss],v_high[n_ss],srsettings_low[n_ss],srsettings_high[n_ss]);
+                //printf("%f,%f\r\n",rates_low[n_ss],rates_high[n_ss]);
             }
         }