Bチーム手動機

Dependencies:   PID R1370 mechanism ikarashiMDC_2byte_ver states omni_wheel PS3

Files at this revision

API Documentation at this revision

Comitter:
THtakahiro702286
Date:
Fri Sep 13 03:06:08 2019 +0000
Parent:
0:b8dc3751805c
Commit message:
syudo;

Changed in this revision

libs/Controller.lib Show diff for this revision Revisions of this file
libs/QEI.lib Show diff for this revision Revisions of this file
libs/mechanism.lib Show annotated file Show diff for this revision Revisions of this file
libs/pin_config.h Show annotated file Show diff for this revision Revisions of this file
libs/serialArduino.lib Show diff for this revision Revisions of this file
libs/states.lib Show annotated file Show diff for this revision Revisions of this file
libs/wheelUnit.lib Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
diff -r b8dc3751805c -r e1aa7354dc9d libs/Controller.lib
--- a/libs/Controller.lib	Mon Sep 09 04:51:23 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-https://os.mbed.com/teams/NHK-Robocon2016_Nagaoka_B_Team/code/Controller/#875532e626ee
diff -r b8dc3751805c -r e1aa7354dc9d libs/QEI.lib
--- a/libs/QEI.lib	Mon Sep 09 04:51:23 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-https://os.mbed.com/users/tanabe2000/code/QEI-led/#7eb92981c3fd
diff -r b8dc3751805c -r e1aa7354dc9d libs/mechanism.lib
--- a/libs/mechanism.lib	Mon Sep 09 04:51:23 2019 +0000
+++ b/libs/mechanism.lib	Fri Sep 13 03:06:08 2019 +0000
@@ -1,1 +1,1 @@
-https://os.mbed.com/users/THtakahiro702286/code/mechanism/#0b7a52a20594
+https://os.mbed.com/users/THtakahiro702286/code/mechanism/#58b20a731e15
diff -r b8dc3751805c -r e1aa7354dc9d libs/pin_config.h
--- a/libs/pin_config.h	Mon Sep 09 04:51:23 2019 +0000
+++ b/libs/pin_config.h	Fri Sep 13 03:06:08 2019 +0000
@@ -37,13 +37,13 @@
 const int spinLimit = 500;
 
 /*昇降*/
-const float riseSpeed = 0.2;
-const float follSpeed = -0.2;
+const float riseSpeed = 0.5;
+const float follSpeed = -0.5;
 
 /*機構回転速度*/
-const float collectSpeed = 0.5;
+const float collectSpeed = 0.3;
 const float hookSpeed = 0.2;
-const float loadSpeed = 0.2;
+const float loadSpeed = -0.2;
 const float liftSpeed = 0.5;
 
 /*PC出力*/
@@ -58,6 +58,6 @@
 #define LEDTX PA_0
 #define LEDRX PA_1
 const int LEDBAUD = 9600;
-const int HEADER = 0xff;
+const int HEADER = 0xee;
 
 #endif
diff -r b8dc3751805c -r e1aa7354dc9d libs/serialArduino.lib
--- a/libs/serialArduino.lib	Mon Sep 09 04:51:23 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-https://os.mbed.com/users/THtakahiro702286/code/serialArduino/#d0a142b28455
diff -r b8dc3751805c -r e1aa7354dc9d libs/states.lib
--- a/libs/states.lib	Mon Sep 09 04:51:23 2019 +0000
+++ b/libs/states.lib	Fri Sep 13 03:06:08 2019 +0000
@@ -1,1 +1,1 @@
-https://os.mbed.com/users/THtakahiro702286/code/states/#eafd5a0c3351
+https://os.mbed.com/users/THtakahiro702286/code/states/#3cb78320d4db
diff -r b8dc3751805c -r e1aa7354dc9d libs/wheelUnit.lib
--- a/libs/wheelUnit.lib	Mon Sep 09 04:51:23 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-https://os.mbed.com/users/THtakahiro702286/code/wheelUnit/#01a6eca21b23
diff -r b8dc3751805c -r e1aa7354dc9d main.cpp
--- a/main.cpp	Mon Sep 09 04:51:23 2019 +0000
+++ b/main.cpp	Fri Sep 13 03:06:08 2019 +0000
@@ -1,3 +1,5 @@
+#include "mbed.h"
 #include "states.h"
 States state;
-int main(){while(1){state.move();}}
\ No newline at end of file
+int main()//{while(1){state.move();}}
+{state.move();}
\ No newline at end of file