Diff: ui.h

Revision:

2:a5e8e6156172

Parent:

1:ed6249618fd3

Child:

3:1f322deb75d8

--- a/ui.h	Wed Mar 03 11:49:25 2021 +0000
+++ b/ui.h	Thu Mar 04 11:38:44 2021 +0000
@@ -21,7 +21,7 @@
     valname    ３文字までしか入れちゃだめだよ
     dispvaleu  ３桁までしか表示しないよ
     */
-    void change(char *valname1, char *valname2, double *dispvalue);
+    void change(char *valname1, char *valname2, int *dispvalue);
     
     /*
     ループ入るよ
@@ -35,20 +35,22 @@
     */
     void returnchar(char *buf);
     
+    void returnbt(uint8_t *mainbt);
+    
     /*
     mainに入れよう
     */
-    uint8_t team, algorithm, displayst, start;
+    uint8_t team, algorithm, displayst, start, mode;
+    uint8_t b[4], b_[4], st[4], b0;
     /*
     team      -> 0:yellow  1:blue
     algorithm -> 0:offence  1:deffence  2:kicktest  3:displayonly  4:display & omuni
      アルゴリズムは今はオフェンスディフェンスだけにする
-    displayst -> 0:gyro & ballangle  1:goalangle  2:motor0,1  3:motor2,3
+    displayst -> 0:gyro & ballangle  1:きいろの角度と距離  2:あおのゴールと距離  3:motor0,1  4:motor2,3  5:
     */
     
 private :
     Thread    UIthread;
-    Thread    buzzthread;
     aqm0802   lcd;
     AnalogIn  b0_;
     DigitalIn tgl1, tgl2, tgl3;
@@ -56,7 +58,6 @@
     
     char *name1, *name2;
     double dispvalue[2];
-    uint8_t b[4], b_[4], st[4], b0, mode;
     
 };
 #endif
\ No newline at end of file