Skip to content

Commit 7cb16af

Browse files
mongonta0716mongonta0716
committed
fix Example and parameter
1 parent 6e1cae5 commit 7cb16af

File tree

4 files changed

+24
-28
lines changed

4 files changed

+24
-28
lines changed

‎examples/Basic/src/Stackchan_ex_config.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
StackchanExConfig::StackchanExConfig() {};
55
StackchanExConfig::~StackchanExConfig() {};
66

7-
void StackchanConfig::loadExtendConfig(fs::FS& fs, const char *yaml_filename, uint32_t yaml_size) {
7+
void StackchanExConfig::loadExtendConfig(fs::FS& fs, const char *yaml_filename, uint32_t yaml_size) {
88
M5_LOGI("----- StackchanExConfig::loadConfig:%s\n", yaml_filename);
99
File file = fs.open(yaml_filename);
1010
if (file) {
@@ -21,11 +21,11 @@ void StackchanConfig::loadExtendConfig(fs::FS& fs, const char *yaml_filename, ui
2121

2222
void StackchanExConfig::setExtendSettings(DynamicJsonDocument doc) {
2323
JsonObject app_param1 = doc["app_parameters1"];
24-
_ex_parameters.item1 = app_param1["item1"].as<String>(); // 文字列はこのように記述
25-
_ex_parameters.item2 = app_param1["item2"] // 数値
24+
_ex_parameters.item1 = doc["app_parameters1"]["item1"].as<String>(); // 文字列はこのように記述
25+
_ex_parameters.item2 = app_param1["item2"]; // 数値
2626
_ex_parameters.item3 = app_param1["item3"].as<bool>(); // True/False/0/1
2727
JsonObject app_param2 = doc["app_parameters2"];
28-
28+
_item4 = app_param2["item4"].as<String>();
2929
JsonArray list_str = app_param2["list_str"];
3030
_list_str_count = list_str.size();
3131
for (int i=0; i<_list_str_count; i++) {
@@ -40,14 +40,14 @@ void StackchanExConfig::setExtendSettings(DynamicJsonDocument doc) {
4040

4141

4242
void StackchanExConfig::printExtParameters(void) {
43-
M5_LOGI("item1:%s\n", _ex_parameters.item1.c_str());
44-
M5_LOGI("item2:%d\n", _ex_parameters.item2);
45-
M5_LOGI("item3:%s\n", _ex_parameters.item3 ? "true":"false");
46-
M5_LOGI("item4:%s\n", _item4);
43+
M5_LOGI("item1:%s", _ex_parameters.item1.c_str());
44+
M5_LOGI("item2:%d", _ex_parameters.item2);
45+
M5_LOGI("item3:%s", _ex_parameters.item3 ? "true":"false");
46+
M5_LOGI("item4:%s", _item4.c_str());
4747
for (int i=0; i<_list_str_count; i++) {
48-
M5_LOGI("list_str[%d]: %s\n", i, _list_str[i]);
48+
M5_LOGI("list_str[%d]: %s", i, _list_str[i].c_str());
4949
}
5050
for (int i=0; i<_list_num_count; i++) {
51-
M5_LOGI("list_num[%d]: %d\n", i, _list_num[i]);
51+
M5_LOGI("list_num[%d]: %d", i, _list_num[i]);
5252
}
5353
}

‎examples/Basic/src/main.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,8 @@ void setup() {
1414
delay(2000);
1515
config.loadConfig(SD, "/yaml/SC_BasicConfig.yaml");
1616

17-
config.getWiFiSetting();
18-
1917
}
2018

2119
void loop() {
2220
// put your main code here, to run repeatedly:
2321
}
24-

‎src/Stackchan_system_config.cpp‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void StackchanSystemConfig::loadConfig(fs::FS& fs, const char *yaml_filename) {
8989
// JSONファイルが見つからない場合はデフォルト値を利用します。
9090
setDefaultParameters();
9191
}
92-
if (_secret_config_filename > 0) {
92+
if (_secret_config_filesize > 0) {
9393
loadSecretConfig(fs, _secret_config_filename.c_str(), _secret_config_filesize);
9494
}
9595
if (_extend_config_filesize > 0) {
@@ -108,13 +108,13 @@ void StackchanSystemConfig::loadSecretConfig(fs::FS& fs, const char* yaml_filena
108108
M5_LOGE("yaml file read error: %s\n", yaml_filename);
109109
M5_LOGE("error%s\n", err.c_str());
110110
}
111-
if (_secret_info_show) {
111+
if (_secret_config_show) {
112112
// 個人的な情報をログに表示する。
113113
M5_LOGI("=======================================================================================");
114114
M5_LOGI("下記の情報は公開してはいけません。(The following information must not be disclosed.)");
115115
M5_LOGI("");
116116
serializeJsonPretty(doc, Serial);
117-
setSecretSettings(doc);
117+
setSecretConfig(doc);
118118
M5_LOGI("");
119119
printSecretParameters();
120120
M5_LOGI("ここまでの情報は公開してはいけません。(No information should be disclosed so far.)");
@@ -174,7 +174,7 @@ void StackchanSystemConfig::setSystemConfig(DynamicJsonDocument doc) {
174174
_servo[AXIS_X].start_degree = 90;
175175
_servo[AXIS_Y].start_degree = 90;
176176
}
177-
_secret_info_show = doc["sercret_info_show"].as<bool>();
177+
_secret_config_show = doc["secret_config_show"].as<bool>();
178178
_secret_config_filename = doc["secret_config_filename"].as<String>();
179179
_secret_config_filesize = doc["secret_config_filesize"];
180180
_extend_config_filename = doc["extend_config_filename"].as<String>();
@@ -186,9 +186,9 @@ void StackchanSystemConfig::setSecretConfig(DynamicJsonDocument doc) {
186186
_secret_config.wifi_info.ssid = doc["wifi"]["ssid"].as<String>();
187187
_secret_config.wifi_info.password = doc["wifi"]["password"].as<String>();
188188

189-
_secret_config.apikey.stt = doc["apikey"]["stt"].as<String>();
190-
_secret_config.apikey.aiservice = doc["apikey"]["aiservice"].as<String>();
191-
_secret_config.apikey.tts = doc["apikey"]["tts"].as<String>();
189+
_secret_config.api_key.stt = doc["apikey"]["stt"].as<String>();
190+
_secret_config.api_key.ai_service = doc["apikey"]["aiservice"].as<String>();
191+
_secret_config.api_key.tts = doc["apikey"]["tts"].as<String>();
192192

193193
}
194194

@@ -216,8 +216,6 @@ void StackchanSystemConfig::printAllParameters() {
216216
M5_LOGI("move_max:%d", _servo_interval[i].move_max);
217217
}
218218
M5_LOGI("mode_num:%d", _mode_num);
219-
M5_LOGI("WiFi SSID: %s", _wifi.ssid.c_str());
220-
M5_LOGI("WiFi PASS: %s", _wifi.password.c_str());
221219
M5_LOGI("Bluetooth_device_name:%s", _bluetooth.device_name.c_str());
222220
M5_LOGI("Bluetooth_starting_state:%s", _bluetooth.starting_state ? "true":"false");
223221
M5_LOGI("Bluetooth_start_volume:%d", _bluetooth.start_volume);
@@ -235,16 +233,17 @@ void StackchanSystemConfig::printAllParameters() {
235233
M5_LOGI("SecretConfigFileSize: %d", _secret_config_filesize);
236234
M5_LOGI("ExtendConfigFileName: %s", _extend_config_filename.c_str());
237235
M5_LOGI("ExtendConfigFileSize: %d", _extend_config_filesize);
236+
M5_LOGI("secret_config_show:%s", _secret_config_show ? "true":"false");
238237

239238
printExtParameters();
240239
}
241240

242241
void StackchanSystemConfig::printSecretParameters() {
243242
M5_LOGI("wifi_ssid: %s", _secret_config.wifi_info.ssid.c_str());
244243
M5_LOGI("wifi_passws: %s", _secret_config.wifi_info.password.c_str());
245-
M5_LOGI("apikey_stt: %s", _secret_config.apikey.stt.c_str());
246-
M5_LOGI("apikey_aiservice: %s", _secret_config.apikey.aiservice.c_str());
247-
M5_LOGI("apikey_tts: %s", _secret_config.apikey.tts.c_str());
244+
M5_LOGI("apikey_stt: %s", _secret_config.api_key.stt.c_str());
245+
M5_LOGI("apikey_aiservice: %s", _secret_config.api_key.ai_service.c_str());
246+
M5_LOGI("apikey_tts: %s", _secret_config.api_key.tts.c_str());
248247
}
249248
void StackchanSystemConfig::loadExtendConfig(fs::FS& fs, const char* filename, uint32_t yaml_size) { };
250249
void StackchanSystemConfig::setExtendSettings(DynamicJsonDocument doc) { if ( _extend_config_filename == "" ) return; };

‎src/Stackchan_system_config.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ class StackchanSystemConfig {
7272
String _secret_config_filename; // 個人情報の設定値を定義したファイル
7373
uint32_t _secret_config_filesize; // 個人情報設定ファイルのサイズ
7474
secret_config_s _secret_config; // 個人情報の構造体
75-
bool _secret_info_show; // 個人情報をログに出すかどうか
75+
bool _secret_config_show; // 個人情報をログに出すかどうか
7676
void setDefaultParameters();
7777
void setSystemConfig(DynamicJsonDocument doc);
7878

7979
void loadSecretConfig(fs::FS& fs, const char* yaml_filename, uint32_t yaml_size);
80-
void setSecretSettings(DynamicJsonDocument doc);
80+
void setSecretConfig(DynamicJsonDocument doc);
8181
void printSecretParameters(void);
8282
public:
8383
StackchanSystemConfig();
@@ -90,7 +90,7 @@ class StackchanSystemConfig {
9090
servo_interval_s* getServoInterval(AvatarMode avatar_mode) { return &_servo_interval[avatar_mode]; }
9191
bluetooth_s* getBluetoothSetting() { return &_bluetooth; }
9292
wifi_s* getWiFiSetting() { return &_secret_config.wifi_info; }
93-
api_keys_s getAPISetting() { return &_secret_config.api_key; }
93+
api_keys_s* getAPISetting() { return &_secret_config.api_key; }
9494
secret_config_s* getSecretSetting() { return &_secret_config; }
9595
String* getLyric(uint8_t no) { return &_lyrics[no]; }
9696
uint8_t getLyrics_num() { return _lyrics_num; }

0 commit comments

Comments
 (0)