Changeset 374 for asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter/src/echonet_main.c

Timestamp:

Apr 5, 2019, 9:26:53 PM (5 years ago)

Author:

coas-nagasima

Message:

mbed関連を更新
シリアルドライバをmbedのHALを使うよう変更
ファイルディスクリプタの処理を更新

File:

• asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter/src/echonet_main.c (modified) (1 diff)

asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter/src/echonet_main.c

@@ -905 +905 @@
 static uint8_t main_read_button(analogin_t *obj)
 {
-        float a = analogin_read(obj);
-
-        a *= 5.0;
+        int a = analogin_read_u16(obj);
+
+        a *= 5;
 
         //printf("Button read analog = %f\r\n",a);
-        if (a < 0.2)
+        if (a < (int)(0.2 * 65536))
                 return BUTTON_DOWN;
-        if (a < 1.0)
+        if (a < (int)(1.0 * 65536))
                 return BUTTON_RIGHT;
-        if (a < 1.7)
+        if (a < (int)(1.7 * 65536))
                 return BUTTON_SELECT;
-        if (a < 2.6)
+        if (a < (int)(2.6 * 65536))
                 return BUTTON_UP;
-        if (a < 4.6)
+        if (a < (int)(4.6 * 65536))
                 return BUTTON_LEFT;
         else