diff --git a/.vscode/arduino.json b/.vscode/arduino.json new file mode 100644 index 0000000..1595543 --- /dev/null +++ b/.vscode/arduino.json @@ -0,0 +1,7 @@ +{ + "configuration": "PartitionScheme=default,UploadSpeed=1500000,DebugLevel=none", + "board": "esp32:esp32:m5stick-c", + "sketch": "M5StickCPlus_FactoryTest2022.ino", + "output": "../ArduinoOutput", + "port": "/dev/tty.usbserial-6552E78DF6" +} \ No newline at end of file diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json new file mode 100644 index 0000000..4a08aaf --- /dev/null +++ b/.vscode/c_cpp_properties.json @@ -0,0 +1,357 @@ +{ + "version": 4, + "configurations": [ + { + "name": "Arduino", + "compilerPath": "/Users/miura/Library/Arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-97-gc752ad5-5.2.0/bin/xtensa-esp32-elf-g++", + "compilerArgs": [ + "-std=gnu++11", + "-Wpointer-arith", + "-fexceptions", + "-fstack-protector", + "-ffunction-sections", + "-fdata-sections", + "-fstrict-volatile-bitfields", + "-mlongcalls", + "-nostdlib", + "-w", + "-Wno-error=maybe-uninitialized", + "-Wno-error=unused-function", + "-Wno-error=unused-but-set-variable", + "-Wno-error=unused-variable", + "-Wno-error=deprecated-declarations", + "-Wno-unused-parameter", + "-Wno-unused-but-set-parameter", + "-Wno-missing-field-initializers", + "-Wno-sign-compare", + "-fno-rtti" + ], + "intelliSenseMode": "gcc-x64", + "includePath": [ + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/config", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/app_trace", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/app_update", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/asio", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/bootloader_support", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/bt", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/coap", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/console", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/driver", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/efuse", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/esp-tls", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/esp32", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/esp_adc_cal", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/esp_event", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/esp_http_client", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/esp_http_server", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/esp_https_ota", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/esp_https_server", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/esp_ringbuf", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/esp_websocket_client", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/espcoredump", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/ethernet", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/expat", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/fatfs", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/freemodbus", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/freertos", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/heap", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/idf_test", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/jsmn", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/json", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/libsodium", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/log", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/lwip", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/mbedtls", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/mdns", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/micro-ecc", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/mqtt", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/newlib", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/nghttp", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/nvs_flash", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/openssl", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/protobuf-c", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/protocomm", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/pthread", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/sdmmc", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/smartconfig_ack", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/soc", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/spi_flash", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/spiffs", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/tcp_transport", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/tcpip_adapter", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/ulp", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/unity", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/vfs", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/wear_levelling", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/wifi_provisioning", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/wpa_supplicant", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/xtensa-debug-module", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/esp-face", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/esp32-camera", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/esp-face", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/tools/sdk/include/fb_gfx", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/cores/esp32", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/variants/m5stick_c", + "/Users/miura/Documents/Arduino/libraries/M5StickCPlus/src", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/libraries/Wire/src", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/libraries/SPI/src", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/libraries/FS/src", + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/libraries/BLE/src", + "/Users/miura/Library/Arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-97-gc752ad5-5.2.0/xtensa-esp32-elf/include/c++/5.2.0", + "/Users/miura/Library/Arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-97-gc752ad5-5.2.0/xtensa-esp32-elf/include/c++/5.2.0/xtensa-esp32-elf", + "/Users/miura/Library/Arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-97-gc752ad5-5.2.0/xtensa-esp32-elf/include/c++/5.2.0/backward", + "/Users/miura/Library/Arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-97-gc752ad5-5.2.0/lib/gcc/xtensa-esp32-elf/5.2.0/include", + "/Users/miura/Library/Arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-97-gc752ad5-5.2.0/lib/gcc/xtensa-esp32-elf/5.2.0/include-fixed", + "/Users/miura/Library/Arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-97-gc752ad5-5.2.0/xtensa-esp32-elf/include", + "/Users/miura/Library/Arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-97-gc752ad5-5.2.0/xtensa-esp32-elf/sysroot/usr/include" + ], + "forcedInclude": [ + "/Users/miura/Library/Arduino15/packages/esp32/hardware/esp32/1.0.6/cores/esp32/Arduino.h" + ], + "cStandard": "c11", + "cppStandard": "c++11", + "defines": [ + "ESP_PLATFORM", + "MBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\"", + "HAVE_CONFIG_H", + "GCC_NOT_5_2_0=0", + "WITH_POSIX", + "F_CPU=240000000L", + "ARDUINO=10607", + "ARDUINO_M5Stick_C", + "ARDUINO_ARCH_ESP32", + "ARDUINO_BOARD=\"M5Stick_C\"", + "ARDUINO_VARIANT=\"m5stick_c\"", + "ESP32", + "CORE_DEBUG_LEVEL=0", + "__DBL_MIN_EXP__=(-1021)", + "__UINT_LEAST16_MAX__=0xffff", + "__ATOMIC_ACQUIRE=2", + "__FLT_MIN__=1.1754943508222875e-38F", + "__GCC_IEC_559_COMPLEX=0", + "__UINT_LEAST8_TYPE__=unsigned char", + "__INTMAX_C(c)=c ## LL", + "__CHAR_BIT__=8", + "__UINT8_MAX__=0xff", + "__WINT_MAX__=0xffffffffU", + "__ORDER_LITTLE_ENDIAN__=1234", + "__SIZE_MAX__=0xffffffffU", + "__WCHAR_MAX__=0xffff", + "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1=1", + "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2=1", + "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4=1", + "__DBL_DENORM_MIN__=double(4.9406564584124654e-324L)", + "__GCC_ATOMIC_CHAR_LOCK_FREE=2", + "__GCC_IEC_559=0", + "__FLT_EVAL_METHOD__=0", + "__cpp_binary_literals=201304", + "__GCC_ATOMIC_CHAR32_T_LOCK_FREE=2", + "__UINT_FAST64_MAX__=0xffffffffffffffffULL", + "__SIG_ATOMIC_TYPE__=int", + "__DBL_MIN_10_EXP__=(-307)", + "__FINITE_MATH_ONLY__=0", + "__GNUC_PATCHLEVEL__=0", + "__UINT_FAST8_MAX__=0xffffffffU", + "__has_include(STR)=__has_include__(STR)", + "__DEC64_MAX_EXP__=385", + "__INT8_C(c)=c", + "__UINT_LEAST64_MAX__=0xffffffffffffffffULL", + "__SHRT_MAX__=0x7fff", + "__LDBL_MAX__=1.7976931348623157e+308L", + "__UINT_LEAST8_MAX__=0xff", + "__GCC_ATOMIC_BOOL_LOCK_FREE=2", + "__UINTMAX_TYPE__=long long unsigned int", + "__DEC32_EPSILON__=1E-6DF", + "__CHAR_UNSIGNED__=1", + "__UINT32_MAX__=0xffffffffUL", + "__LDBL_MAX_EXP__=1024", + "__WINT_MIN__=0U", + "__SCHAR_MAX__=0x7f", + "__WCHAR_MIN__=0", + "__INT64_C(c)=c ## LL", + "__DBL_DIG__=15", + "__GCC_ATOMIC_POINTER_LOCK_FREE=2", + "__SIZEOF_INT__=4", + "__SIZEOF_POINTER__=4", + "__GCC_ATOMIC_CHAR16_T_LOCK_FREE=2", + "__USER_LABEL_PREFIX__", + "__STDC_HOSTED__=1", + "__LDBL_HAS_INFINITY__=1", + "__XTENSA_EL__=1", + "__FLT_EPSILON__=1.1920928955078125e-7F", + "__GXX_WEAK__=1", + "__LDBL_MIN__=2.2250738585072014e-308L", + "__DEC32_MAX__=9.999999E96DF", + "__INT32_MAX__=0x7fffffffL", + "__SIZEOF_LONG__=4", + "__UINT16_C(c)=c", + "__DECIMAL_DIG__=17", + "__has_include_next(STR)=__has_include_next__(STR)", + "__LDBL_HAS_QUIET_NAN__=1", + "__GNUC__=5", + "__GXX_RTTI=1", + "__FLT_HAS_DENORM__=1", + "__SIZEOF_LONG_DOUBLE__=8", + "__BIGGEST_ALIGNMENT__=16", + "__DBL_MAX__=double(1.7976931348623157e+308L)", + "__INT_FAST32_MAX__=0x7fffffff", + "__DBL_HAS_INFINITY__=1", + "__INT64_MAX__=0x7fffffffffffffffLL", + "__DEC32_MIN_EXP__=(-94)", + "__INT_FAST16_TYPE__=int", + "__LDBL_HAS_DENORM__=1", + "__cplusplus=199711L", + "__DEC128_MAX__=9.999999999999999999999999999999999E6144DL", + "__INT_LEAST32_MAX__=0x7fffffffL", + "__DEC32_MIN__=1E-95DF", + "__DEPRECATED=1", + "__DBL_MAX_EXP__=1024", + "__DEC128_EPSILON__=1E-33DL", + "__PTRDIFF_MAX__=0x7fffffff", + "__GNUG__=5", + "__LONG_LONG_MAX__=0x7fffffffffffffffLL", + "__SIZEOF_SIZE_T__=4", + "__SIZEOF_WINT_T__=4", + "__GXX_ABI_VERSION=1009", + "__FLT_MIN_EXP__=(-125)", + "__INT_FAST64_TYPE__=long long int", + "__FP_FAST_FMAF=1", + "__DBL_MIN__=double(2.2250738585072014e-308L)", + "__FLT_MIN_10_EXP__=(-37)", + "__DEC128_MIN__=1E-6143DL", + "__REGISTER_PREFIX__", + "__UINT16_MAX__=0xffff", + "__DBL_HAS_DENORM__=1", + "__UINT8_TYPE__=unsigned char", + "__NO_INLINE__=1", + "__FLT_MANT_DIG__=24", + "__VERSION__=\"5.2.0\"", + "__UINT64_C(c)=c ## ULL", + "__GCC_ATOMIC_INT_LOCK_FREE=2", + "__FLOAT_WORD_ORDER__=__ORDER_LITTLE_ENDIAN__", + "__INT32_C(c)=c ## L", + "__DEC64_EPSILON__=1E-15DD", + "__ORDER_PDP_ENDIAN__=3412", + "__DEC128_MIN_EXP__=(-6142)", + "__INT_FAST32_TYPE__=int", + "__UINT_LEAST16_TYPE__=short unsigned int", + "__INT16_MAX__=0x7fff", + "__cpp_rtti=199711", + "__SIZE_TYPE__=unsigned int", + "__UINT64_MAX__=0xffffffffffffffffULL", + "__INT8_TYPE__=signed char", + "__ELF__=1", + "__xtensa__=1", + "__FLT_RADIX__=2", + "__INT_LEAST16_TYPE__=short int", + "__LDBL_EPSILON__=2.2204460492503131e-16L", + "__UINTMAX_C(c)=c ## ULL", + "__SIG_ATOMIC_MAX__=0x7fffffff", + "__GCC_ATOMIC_WCHAR_T_LOCK_FREE=2", + "__SIZEOF_PTRDIFF_T__=4", + "__DEC32_SUBNORMAL_MIN__=0.000001E-95DF", + "__INT_FAST16_MAX__=0x7fffffff", + "__UINT_FAST32_MAX__=0xffffffffU", + "__UINT_LEAST64_TYPE__=long long unsigned int", + "__FLT_HAS_QUIET_NAN__=1", + "__FLT_MAX_10_EXP__=38", + "__LONG_MAX__=0x7fffffffL", + "__DEC128_SUBNORMAL_MIN__=0.000000000000000000000000000000001E-6143DL", + "__FLT_HAS_INFINITY__=1", + "__UINT_FAST16_TYPE__=unsigned int", + "__DEC64_MAX__=9.999999999999999E384DD", + "__CHAR16_TYPE__=short unsigned int", + "__PRAGMA_REDEFINE_EXTNAME=1", + "__INT_LEAST16_MAX__=0x7fff", + "__DEC64_MANT_DIG__=16", + "__UINT_LEAST32_MAX__=0xffffffffUL", + "__GCC_ATOMIC_LONG_LOCK_FREE=2", + "__INT_LEAST64_TYPE__=long long int", + "__INT16_TYPE__=short int", + "__INT_LEAST8_TYPE__=signed char", + "__DEC32_MAX_EXP__=97", + "__INT_FAST8_MAX__=0x7fffffff", + "__INTPTR_MAX__=0x7fffffff", + "__EXCEPTIONS=1", + "__LDBL_MANT_DIG__=53", + "__DBL_HAS_QUIET_NAN__=1", + "__SIG_ATOMIC_MIN__=(-__SIG_ATOMIC_MAX__ - 1)", + "__INTPTR_TYPE__=int", + "__UINT16_TYPE__=short unsigned int", + "__WCHAR_TYPE__=short unsigned int", + "__SIZEOF_FLOAT__=4", + "__UINTPTR_MAX__=0xffffffffU", + "__DEC64_MIN_EXP__=(-382)", + "__INT_FAST64_MAX__=0x7fffffffffffffffLL", + "__GCC_ATOMIC_TEST_AND_SET_TRUEVAL=1", + "__FLT_DIG__=6", + "__UINT_FAST64_TYPE__=long long unsigned int", + "__INT_MAX__=0x7fffffff", + "__INT64_TYPE__=long long int", + "__FLT_MAX_EXP__=128", + "__DBL_MANT_DIG__=53", + "__INT_LEAST64_MAX__=0x7fffffffffffffffLL", + "__DEC64_MIN__=1E-383DD", + "__WINT_TYPE__=unsigned int", + "__UINT_LEAST32_TYPE__=long unsigned int", + "__SIZEOF_SHORT__=2", + "__LDBL_MIN_EXP__=(-1021)", + "__INT_LEAST8_MAX__=0x7f", + "__WCHAR_UNSIGNED__=1", + "__LDBL_MAX_10_EXP__=308", + "__ATOMIC_RELAXED=0", + "__DBL_EPSILON__=double(2.2204460492503131e-16L)", + "__XTENSA_WINDOWED_ABI__=1", + "__UINT8_C(c)=c", + "__INT_LEAST32_TYPE__=long int", + "__SIZEOF_WCHAR_T__=2", + "__UINT64_TYPE__=long long unsigned int", + "__INT_FAST8_TYPE__=int", + "__DBL_DECIMAL_DIG__=17", + "__DEC_EVAL_METHOD__=2", + "__XTENSA__=1", + "__ORDER_BIG_ENDIAN__=4321", + "__cpp_runtime_arrays=198712", + "__UINT32_C(c)=c ## UL", + "__INTMAX_MAX__=0x7fffffffffffffffLL", + "__BYTE_ORDER__=__ORDER_LITTLE_ENDIAN__", + "__FLT_DENORM_MIN__=1.4012984643248171e-45F", + "__INT8_MAX__=0x7f", + "__UINT_FAST32_TYPE__=unsigned int", + "__CHAR32_TYPE__=long unsigned int", + "__FLT_MAX__=3.4028234663852886e+38F", + "__INT32_TYPE__=long int", + "__SIZEOF_DOUBLE__=8", + "__cpp_exceptions=199711", + "__INTMAX_TYPE__=long long int", + "__DEC128_MAX_EXP__=6145", + "__ATOMIC_CONSUME=1", + "__GNUC_MINOR__=2", + "__UINTMAX_MAX__=0xffffffffffffffffULL", + "__DEC32_MANT_DIG__=7", + "__DBL_MAX_10_EXP__=308", + "__LDBL_DENORM_MIN__=4.9406564584124654e-324L", + "__INT16_C(c)=c", + "__STDC__=1", + "__PTRDIFF_TYPE__=int", + "__ATOMIC_SEQ_CST=5", + "__UINT32_TYPE__=long unsigned int", + "__UINTPTR_TYPE__=unsigned int", + "__DEC64_SUBNORMAL_MIN__=0.000000000000001E-383DD", + "__DEC128_MANT_DIG__=34", + "__LDBL_MIN_10_EXP__=(-307)", + "__SIZEOF_LONG_LONG__=8", + "__GCC_ATOMIC_LLONG_LOCK_FREE=1", + "__LDBL_DIG__=15", + "__FLT_DECIMAL_DIG__=9", + "__UINT_FAST16_MAX__=0xffffffffU", + "__GNUC_GNU_INLINE__=1", + "__GCC_ATOMIC_SHORT_LOCK_FREE=2", + "__UINT_FAST8_TYPE__=unsigned int", + "__ATOMIC_ACQ_REL=4", + "__ATOMIC_RELEASE=3", + "USBCON" + ] + } + ] +} \ No newline at end of file diff --git a/M5StickCPlus_FactoryTest2022.ino b/M5StickCPlus_FactoryTest2022.ino index 272523b..3872649 100644 --- a/M5StickCPlus_FactoryTest2022.ino +++ b/M5StickCPlus_FactoryTest2022.ino @@ -47,7 +47,7 @@ extern const unsigned char icon_wifi[4608]; extern const unsigned char icon_ble_disconnect[4608]; -bool TestMode = false; +bool TestMode = true; TFT_eSprite Disbuff = TFT_eSprite(&M5.Lcd); @@ -67,14 +67,15 @@ void checkAXPPress() { - if( M5.Axp.GetBtnPress()) + if( M5.Axp.GetBtnPress()) // 電源ボタン押下したら { do{ delay(20); } while( M5.Axp.GetBtnPress()); M5.Beep.mute(); - ESP.restart(); + // ESP.restart(); + M5.Axp.Write1Byte(0x32, M5.Axp.Read8bit(0x32) | 0x80); } } @@ -423,7 +424,7 @@ void DisplayMicro() { - Disbuff.fillRect(0, 0, 160, 80, Disbuff.color565(0, 0, 0)); + Disbuff.fillRect(0, 0, 160, 80, Disbuff.color565(0, 0, 0)); //黒(R=0,G=0,B=0)で塗りつぶす Disbuff.pushSprite(0, 0); xSemaphoreGive(start_dis); @@ -723,6 +724,7 @@ return crc; } +// ENV. II SENSORをつないだときに、温度と湿度がとれる int getTempAndHum(float *temp,float *hum ) { static float _tempSave,_HUmSave; @@ -928,7 +930,7 @@ if( count >= 10 ) { count = 0; - getTempAndHum(&tempdata, &humdata); + getTempAndHum(&tempdata, &humdata);// ENV. II SENSORをつないだときに、温度と湿度がとれる Disbuff.setCursor(12, 50); Disbuff.printf("%.2f",tempdata); @@ -987,7 +989,7 @@ Disbuff.setTextSize(3); Disbuff.setCursor(12, 7); - if( M5.Axp.GetBatVoltage() > 3.2 ) + if( M5.Axp.GetBatVoltage() > 3.2 ) //バッテリーの電圧（残量によって変化する） { Disbuff.setTextColor(TFT_GREEN); } @@ -995,7 +997,7 @@ { Disbuff.setTextColor(TFT_RED); } - Disbuff.printf("%.2f",M5.Axp.GetBatVoltage()); + Disbuff.printf("b%.2f",M5.Axp.GetBatVoltage());// バッテリー電圧を表示する Disbuff.setCursor(12, 37); if( M5.Axp.GetVinVoltage() > 4.6 ) { @@ -1005,7 +1007,7 @@ { Disbuff.setTextColor(TFT_RED); } - Disbuff.printf("%.2f",M5.Axp.GetVinVoltage()); + Disbuff.printf("v%.2f",M5.Axp.GetVinVoltage());//外部電源電圧（5V←の電圧） digitalWrite(0,0); digitalWrite(26,0); @@ -1031,12 +1033,12 @@ if( count_u >= 5 ) { Disbuff.setTextColor(TFT_GREEN); - Disbuff.printf("%d G0", count_u); + Disbuff.printf(" %d G0", count_u); } else { Disbuff.setTextColor(TFT_RED); - Disbuff.printf("%d G0", count_u); + Disbuff.printf(" %d G0", count_u); } Disbuff.setTextColor(TFT_WHITE); @@ -1044,12 +1046,12 @@ if( count_t >= 5 ) { Disbuff.setTextColor(TFT_GREEN); - Disbuff.printf("%d G25", count_t); + Disbuff.printf(" %d G25", count_t); } else { Disbuff.setTextColor(TFT_RED); - Disbuff.printf("%d G25", count_t); + Disbuff.printf(" %d G25", count_t); } Disbuff.setTextColor(TFT_WHITE); @@ -1072,12 +1074,12 @@ if( count_u >= 5 ) { Disbuff.setTextColor(TFT_GREEN); - Disbuff.printf("%d G26", count_u); + Disbuff.printf(" %d G26", count_u); } else { Disbuff.setTextColor(TFT_RED); - Disbuff.printf("%d G26", count_u); + Disbuff.printf(" %d G26", count_u); } Disbuff.setTextColor(TFT_WHITE); @@ -1088,14 +1090,14 @@ if( count >= 10 ) { count = 0; - getTempAndHum(&tempdata, &humdata); + getTempAndHum(&tempdata, &humdata);// ENV. II SENSORをつないだときに、温度と湿度がとれる } - Disbuff.setTextColor(TFT_WHITE); + Disbuff.setTextColor(TFT_WHITE);//白色で Disbuff.setCursor(12, 67); - Disbuff.printf("%.1f",tempdata); + Disbuff.printf(" %.1f",tempdata);//温度？ Disbuff.setCursor(12, 97); - Disbuff.printf("%.1f",humdata); + Disbuff.printf(" %.1f",humdata);//湿度？ Disbuff.pushSprite(0,0); @@ -1322,7 +1324,8 @@ void loop() { - + // それぞれのテスト中は、関数のなかのループがまわる + // AorBボタンを押したら、現在実行中の関数のループを抜け、次の関数を実行する MPU6886Test(); DisplayRTC(); DisplayMicro(); @@ -1336,4 +1339,5 @@ DisPlayBLESend(); M5.update(); delay(50); + Serial.println("end of loop"); }