Skip to content

Commit a96b5c8

Browse files
committed
forget
1 parent 04a8dcb commit a96b5c8

5 files changed

Lines changed: 27 additions & 20 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.16)
77

88

99
# add_definitions(-DMC_USE_CUSTOM_CONF)
10-
add_definitions(-DNO_BOOT_PLAY_SHIT)
10+
# add_definitions(-DNO_BOOT_PLAY_SHIT)
1111

1212

1313
include($ENV{IDF_PATH}/tools/cmake/project.cmake)

main/apps/app_ir/app_ir.cpp

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ void AppIR::_update_state()
158158

159159
if (_data.parse_result.size() >= 2)
160160
{
161+
// https://docs.espressif.com/projects/esp-idf/zh_CN/v4.4.6/esp32/api-guides/error-handling.html
161162
try
162163
{
163164
ir_addr = std::stoi(_data.parse_result[0]);
@@ -195,12 +196,16 @@ void AppIR::_update_state()
195196

196197

197198

198-
// New line
199-
_canvas->print(">>> ");
200-
_canvas_update();
199+
// // New line
200+
// _canvas->print(">>> ");
201+
// _canvas_update();
202+
// // Reset buffer
203+
// _data.repl_input_buffer = "";
204+
201205

202-
// Reset buffer
203-
_data.repl_input_buffer = "";
206+
// Keep that shit still
207+
_canvas->printf(">>> %s", _data.repl_input_buffer.c_str());
208+
_canvas_update();
204209

205210
_data.current_state = state_wait_input;
206211
}

main/apps/app_set_wifi/app_set_wifi.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void AppSetWiFi::_update_input()
4040
if (_keyboard->keysState().enter)
4141
{
4242
// New line
43-
_canvas->print(" \n>>> ");
43+
_canvas->print(" \n");
4444

4545
_update_state();
4646

@@ -139,6 +139,7 @@ void AppSetWiFi::_update_state()
139139
_canvas->setTextColor(TFT_ORANGE, THEME_COLOR_BG);
140140
_canvas->printf("WiFi SSID:\n");
141141
_canvas->setTextColor(THEME_COLOR_REPL_TEXT, THEME_COLOR_BG);
142+
_canvas->printf(">>> ");
142143
_canvas_update();
143144

144145
_data.current_state = state_wait_ssid;
@@ -151,6 +152,7 @@ void AppSetWiFi::_update_state()
151152
_canvas->setTextColor(TFT_ORANGE, THEME_COLOR_BG);
152153
_canvas->printf("WiFi Password:\n");
153154
_canvas->setTextColor(THEME_COLOR_REPL_TEXT, THEME_COLOR_BG);
155+
_canvas->printf(">>> ");
154156
_canvas_update();
155157

156158
_data.wifi_ssid = _data.repl_input_buffer;

main/cardputer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ void _data_base_setup_callback(SIMPLEKV::SimpleKV& db)
3232

3333
// #define ON_HAL_TEST
3434
// #define ON_APP_TEST 1
35-
#define ON_APP_TEST_WITH_LAUNCHER 1
35+
// #define ON_APP_TEST_WITH_LAUNCHER 1
3636
extern "C" void app_main(void)
3737
{
3838
// Init hal
@@ -83,7 +83,7 @@ extern "C" void app_main(void)
8383
// mooncake.installApp(new APPS::AppChat_Packer);
8484
// mooncake.installApp(new APPS::AppRecord_Packer);
8585
// mooncake.installApp(new APPS::AppWifiScan_Packer);
86-
// mooncake.installApp(new APPS::AppSetWiFi_Packer);
86+
mooncake.installApp(new APPS::AppSetWiFi_Packer);
8787
mooncake.installApp(new APPS::AppIR_Packer);
8888

8989
// Create launcher

sdkconfig

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1279,6 +1279,17 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
12791279
# CONFIG_WPA_DPP_SUPPORT is not set
12801280
# end of Supplicant
12811281

1282+
#
1283+
# CMake Utilities
1284+
#
1285+
# CONFIG_CU_RELINKER_ENABLE is not set
1286+
# CONFIG_CU_DIAGNOSTICS_COLOR_NEVER is not set
1287+
CONFIG_CU_DIAGNOSTICS_COLOR_ALWAYS=y
1288+
# CONFIG_CU_DIAGNOSTICS_COLOR_AUTO is not set
1289+
# CONFIG_CU_GCC_LTO_ENABLE is not set
1290+
# CONFIG_CU_GCC_STRING_1BYTE_ALIGN is not set
1291+
# end of CMake Utilities
1292+
12821293
#
12831294
# ESP-NOW Configuration
12841295
#
@@ -1345,17 +1356,6 @@ CONFIG_ESPNOW_DEBUG_CONSOLE_UART_NUM_0=y
13451356
CONFIG_ESPNOW_DEBUG_CONSOLE_UART_NUM=0
13461357
# end of ESP-NOW Debug Configuration
13471358
# end of ESP-NOW Configuration
1348-
1349-
#
1350-
# CMake Utilities
1351-
#
1352-
# CONFIG_CU_RELINKER_ENABLE is not set
1353-
# CONFIG_CU_DIAGNOSTICS_COLOR_NEVER is not set
1354-
CONFIG_CU_DIAGNOSTICS_COLOR_ALWAYS=y
1355-
# CONFIG_CU_DIAGNOSTICS_COLOR_AUTO is not set
1356-
# CONFIG_CU_GCC_LTO_ENABLE is not set
1357-
# CONFIG_CU_GCC_STRING_1BYTE_ALIGN is not set
1358-
# end of CMake Utilities
13591359
# end of Component config
13601360

13611361
#

0 commit comments

Comments
 (0)