Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Diff: main.cpp
- Revision:
- 12:8ca53ff41e0a
- Parent:
- 11:37fbb78f0770
--- a/main.cpp Mon Aug 15 13:21:39 2022 +0000
+++ b/main.cpp Mon Aug 15 13:43:26 2022 +0000
@@ -2,10 +2,10 @@
#include "IWCMD.h"
/* 設定 */
-#define kModuleID 1 // パワーモジュールのID( 1 or 2 )
+#define kModuleID 2 // パワーモジュールのID( 1 or 2 )
const double WDT_PERIOD = 4.0; // WatchDogTimerの周期[sec.] 最後の接続確認からWDT_PERIOD以上2*WDT_PERIOD未満の時間でWDT発動.
-#define USB_DEBUG // USBデバッグをオン(Xbeeはオフ)
-//#define SIMPLE_LOG // Xbeeで送信できる情報量に制限
+//#define USB_DEBUG // USBデバッグをオン(Xbeeはオフ)
+#define SIMPLE_LOG // Xbeeで送信できる情報量に制限
const float k_vbat_offset[] = { // 電圧読み取りオフセット
0.53f,
0.35f
@@ -25,7 +25,7 @@
/* ピン設定 */
#if kModuleID == 1
-DigitalOut sluster(PA_9); // default : PA_8
+DigitalOut sluster(PA_8); // default : PA_8
DigitalOut pump(PA_11); // default : PA_11
#elif kModuleID == 2
DigitalOut sluster(PA_8); // default : PA_8
@@ -34,7 +34,7 @@
DigitalOut xbee_nreset(PB_5);
DigitalOut led[] = {
- DigitalOut(PA_7),
+ DigitalOut(PA_4),
DigitalOut(PA_5),
DigitalOut(PA_6),
};
@@ -44,12 +44,14 @@
DigitalOut(PF_1),
};
-AnalogIn raw_battery_voltage(PA_0);
-AnalogIn raw_sluster_shunt_voltage(PA_1);
+AnalogIn raw_battery_voltage(PA_1);
+AnalogIn raw_sluster_shunt_voltage(PA_0);
-
+#ifndef USB_DEBUG
+Serial ser(PA_9, PA_10, 9600);
+#else
Serial ser(USBTX, USBRX, 9600);
-
+#endif
/* タイマ設定 */