Diff: recieveController.cpp

Revision:

2:ead1b55ec5f0

Parent:

0:57fc300625c4

Child:

3:6287618256b5

--- a/recieveController.cpp	Fri Sep 01 11:18:24 2017 +0900
+++ b/recieveController.cpp	Thu Dec 07 00:57:04 2017 +0900
@@ -4,9 +4,10 @@
 {
   id_ = id;
   serial.baud(115200);
-  for(int i = 0;i<5;i++)
+  buttons = 0;
+  for(int i = 0;i<sizeof(analogs);i++)
   {
-    buttons[i] = 0;
+   analogs[i] = 0;
   }
 
 }
@@ -15,23 +16,38 @@
 void recieveController::update()
 {
   // printf("updating");
-  char data[50],*data2,*data3,*button_,*analog[4],*intensity,*bt,*tmpdata;
+  char data[50],*data2,*data3,*button_,*analog[4],*intensity,*bt,*tmpdata,*address;
+  string head;
 
   serial.gets(data,50);
-  // printf("%s",data);
-  strtok(data,"-");
+  //printf("%s",data);
+  head = strtok(data,"-");
   button_ = strtok(NULL,"-");
   analog[0] = strtok(NULL,"-");
   analog[1] = strtok(NULL,"-");
   analog[2] = strtok(NULL,"-");
   analog[3] = strtok(NULL,"-");
   intensity = strtok(NULL,"-");
+  if(*intensity < 10)return;
+  if(head != "RXT015")return;
 
-  //printf("%d\n",strtoul(button_,0,16) );
-  buttons[0] = strtoul(button_,0,16);
-  buttons[1] = strtoul(analog[0],0,16);
-  buttons[2] = strtoul(analog[1],0,16);
-  buttons[3] = strtoul(analog[2],0,16);
-  buttons[4] = strtoul(analog[3],0,16);
+  printf("%s\n",*analog[1]);
+  buttons = strtoul(button_,0,16);
+  analogs[0] = strtoul(analog[0],0,16);
+  analogs[1] = strtoul(analog[1],0,16);
+  analogs[2] = strtoul(analog[2],0,16);
+  analogs[3] = strtoul(analog[3],0,16);
   return;
 }
+int  recieveController::getButtons()
+{
+  return buttons;
+}
+
+uint8_t recieveController::getAnalog(const uint8_t& index)
+{
+
+ // printf("analogs%d",analogs[index]);
+  return analogs[index];
+}
+