Fx0 hackathon team4
Dependencies: NySNICInterface mbed-rtos mbed
Fork of RESTServerSample by
Revision 9:01aa69185ed8, committed 2015-02-15
- Comitter:
- yi
- Date:
- Sun Feb 15 13:18:24 2015 +0000
- Parent:
- 8:babc71c8c498
- Commit message:
- fixed
Changed in this revision
control_motors.cpp | Show annotated file Show diff for this revision Revisions of this file |
main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/control_motors.cpp Sun Feb 15 06:12:58 2015 +0000 +++ b/control_motors.cpp Sun Feb 15 13:18:24 2015 +0000 @@ -75,7 +75,6 @@ if(motor_id == MOTOR_RIGHT){ printf("motor right speed = %d\n", speed); - // TODO // モーター制御の処理 if(speed > 0){ mPwmMotorR = (float)speed/255; @@ -94,7 +93,6 @@ }else if(motor_id == MOTOR_LEFT){ printf("motor left speed = %d\n", speed); - // TODO // モーター制御の処理 if(speed > 0){ mPwmMotorL = (float)speed/255; @@ -117,7 +115,6 @@ void start_shaking_tail(){ printf("start_shaking_tail\n"); - // TODO // モーター制御の処理 mPwmMotorTail = 0.8; mDoutMotorTail1 = 1; @@ -129,7 +126,6 @@ void stop_shaking_tail(){ printf("stop_shaking_tail\n"); - // TODO // モーター制御の処理 mPwmMotorTail = 0.0; mDoutMotorTail1 = 0;
--- a/main.cpp Sun Feb 15 06:12:58 2015 +0000 +++ b/main.cpp Sun Feb 15 13:18:24 2015 +0000 @@ -2,25 +2,16 @@ #include "SNIC_WifiInterface.h" #include "HTTPServer.h" +#include "control_motors.h" + /** * Wifi AP parameter */ /* Set this */ -//#define WIFI_SSID "" -//#define WIFI_SECUTIRY_KEY "" - -/* -#define WIFI_SSID "2ndguests" -#define WIFI_SECUTIRY_KEY "Sepkddi0077" +#define WIFI_SSID "" +#define WIFI_SECUTIRY_KEY "" #define WIFI_SECURITY_TYPE e_SEC_WPA2_AES -*/ - -//#define WIFI_SSID "Team3_4" -#define WIFI_SSID "Team11_12" -#define WIFI_SECUTIRY_KEY "123456789" -#define WIFI_SECURITY_TYPE e_SEC_WPA2_AES - //#define WIFI_SECURITY_TYPE e_SEC_OPEN //#define WIFI_SECURITY_TYPE e_SEC_WEP //#define WIFI_SECURITY_TYPE e_SEC_WPA_TKIP @@ -37,7 +28,6 @@ Serial pc(USBTX, USBRX); // This is required when defined "_DEBUG" /** Wi-Fi SNIC UART Interface*/ -//C_SNIC_WifiInterface mSNICwifi( p13, p14, p12, p11, p20 ); C_SNIC_WifiInterface mSNICwifi( p9, p10, NC, NC, p30 ); // Left motor