Changeset 374 for asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter
- Timestamp:
- Apr 5, 2019, 9:26:53 PM (5 years ago)
- Location:
- asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter/Debug/Makefile
r373 r374 172 172 # 共通コンパイルオプションの定義 173 173 # 174 COPTS := -g -std=gnu99 $(COPTS)174 COPTS := -g -std=gnu99 -ffunction-sections -fdata-sections $(COPTS) 175 175 ifndef OMIT_WARNING_ALL 176 176 COPTS := -Wall $(COPTS) … … 226 226 APPL_COBJS := $(APPL_COBJS) main.o ntshell_main.o echonet_main.o client.o jsonsl.o 227 227 endif 228 APPL_COBJS := $(APPL_COBJS) log_output.o vasyslog.o t_perror.o strerror.o 228 APPL_COBJS := $(APPL_COBJS) log_output.o vasyslog.o t_perror.o strerror.o mbed_stub.o 229 229 APPL_BINOBJS := rom_fs.o 230 230 APPL_CFLAGS := $(APPL_CFLAGS) -nostdinc -
asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter/DebugEnbt/Makefile
r373 r374 172 172 # 共通コンパイルオプションの定義 173 173 # 174 COPTS := -g -std=gnu99 $(COPTS)174 COPTS := -g -std=gnu99 -ffunction-sections -fdata-sections $(COPTS) 175 175 ifndef OMIT_WARNING_ALL 176 176 COPTS := -Wall $(COPTS) … … 226 226 APPL_COBJS := $(APPL_COBJS) main.o ntshell_main.o echonet_main.o client.o jsonsl.o 227 227 endif 228 APPL_COBJS := $(APPL_COBJS) log_output.o vasyslog.o t_perror.o strerror.o 228 APPL_COBJS := $(APPL_COBJS) log_output.o vasyslog.o t_perror.o strerror.o mbed_stub.o 229 229 APPL_BINOBJS := rom_fs.o 230 230 APPL_CFLAGS := $(APPL_CFLAGS) -nostdinc -
asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter/DebugEther/Makefile
r373 r374 172 172 # 共通コンパイルオプションの定義 173 173 # 174 COPTS := -g -std=gnu99 $(COPTS)174 COPTS := -g -std=gnu99 -ffunction-sections -fdata-sections $(COPTS) 175 175 ifndef OMIT_WARNING_ALL 176 176 COPTS := -Wall $(COPTS) … … 226 226 APPL_COBJS := $(APPL_COBJS) main.o ntshell_main.o echonet_main.o client.o jsonsl.o 227 227 endif 228 APPL_COBJS := $(APPL_COBJS) log_output.o vasyslog.o t_perror.o strerror.o 228 APPL_COBJS := $(APPL_COBJS) log_output.o vasyslog.o t_perror.o strerror.o mbed_stub.o 229 229 APPL_BINOBJS := rom_fs.o 230 230 APPL_CFLAGS := $(APPL_CFLAGS) -nostdinc -
asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter/src/client.c
r371 r374 33 33 * の責任を負わない. 34 34 * 35 * @(#) $Id : client.c 1729 2019-01-09 14:44:36Z coas-nagasima$35 * @(#) $Id$ 36 36 */ 37 37 #include <lib/curl_config.h> … … 47 47 #include "kernel_cfg.h" 48 48 #include "ff.h" 49 #include "util/ntstdio.h"49 #include <stdio.h> 50 50 #include "client.h" 51 51 #include "jsonsl.h" -
asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter/src/client.h
r371 r374 33 33 * の責任を負わない. 34 34 * 35 * @(#) $Id : client.h 1784 2019-02-06 01:11:25Z coas-nagasima$35 * @(#) $Id$ 36 36 */ 37 37 -
asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter/src/echonet_main.c
r364 r374 905 905 static uint8_t main_read_button(analogin_t *obj) 906 906 { 907 float a = analogin_read(obj);908 909 a *= 5 .0;907 int a = analogin_read_u16(obj); 908 909 a *= 5; 910 910 911 911 //printf("Button read analog = %f\r\n",a); 912 if (a < 0.2)912 if (a < (int)(0.2 * 65536)) 913 913 return BUTTON_DOWN; 914 if (a < 1.0)914 if (a < (int)(1.0 * 65536)) 915 915 return BUTTON_RIGHT; 916 if (a < 1.7)916 if (a < (int)(1.7 * 65536)) 917 917 return BUTTON_SELECT; 918 if (a < 2.6)918 if (a < (int)(2.6 * 65536)) 919 919 return BUTTON_UP; 920 if (a < 4.6)920 if (a < (int)(4.6 * 65536)) 921 921 return BUTTON_LEFT; 922 922 else -
asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter/src/main.c
r371 r374 68 68 #include "core/ntshell.h" 69 69 #include "core/ntlibc.h" 70 #include "util/ntstdio.h"70 #include <stdio.h> 71 71 #include "usrcmd.h" 72 72 #include "util/ntopt.h" … … 192 192 { 193 193 FILINFO fno; 194 #if _USE_LFN195 char lfn[ _MAX_LFN + 1];194 #if FF_USE_LFN 195 char lfn[FF_MAX_LFN + 1]; 196 196 fno.lfname = lfn; 197 fno.lfsize = _MAX_LFN + 1;197 fno.lfsize = FF_MAX_LFN + 1; 198 198 #endif 199 199 ER ret; 200 200 201 #ifdef TOPPERS_OMIT_TECS202 serial_opn_por(SIO_PORTID);203 #endif204 serial_ctl_por(SIO_PORTID, IOCTL_FCSND | IOCTL_FCRCV);205 206 201 //wolfSSL_Debugging_ON(); 207 202 208 ntshell_task_init( uart_read, uart_write, &main_obj);203 ntshell_task_init(SIO_PORTID); 209 204 210 205 main_obj.timer = TMO_FEVR; -
asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter/src/main.cfg
r364 r374 51 51 52 52 INCLUDE("tecsgen.cfg"); 53 INCLUDE("mbed_stub.cfg"); 53 54 54 55 INCLUDE("tinet/tinet_asp.cfg");
Note:
See TracChangeset
for help on using the changeset viewer.