mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-09-02 10:53:01 +02:00
Code Issues Releases Wiki Activity

Fixed last tree builder bug.

Browse Source
This commit is contained in:
Stefan de Bruijn
2021-06-04 23:23:31 +02:00
parent d316af61ab
commit 4b1e4aec7b
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Grbl_Esp32/src/Configuration/ParserHandler.h
View File

@@ -50,6 +50,7 @@ namespace Configuration {
_parser.enter(); _parser.enter();
for (; !_parser.isEndSection(); _parser.moveNext()) { for (; !_parser.isEndSection(); _parser.moveNext()) {
value->handle(*this); value->handle(*this);
_previousIsLeave = false;
} }
_parser.leave(); _parser.leave();
_previousIsLeave = true; _previousIsLeave = true;
@@ -112,5 +113,10 @@ namespace Configuration {
} }
HandlerType handlerType() override { return HandlerType::Parser; } HandlerType handlerType() override { return HandlerType::Parser; }
void moveNext() {
_previousIsLeave = false;
_parser.moveNext();
}
}; };
} }

2
Grbl_Esp32/src/MachineConfig.cpp
View File

@@ -544,7 +544,7 @@ bool MachineConfig::load(const char* filename) {
Configuration::Parser parser(input->begin(), input->end()); Configuration::Parser parser(input->begin(), input->end());
Configuration::ParserHandler handler(parser); Configuration::ParserHandler handler(parser);
for (; !parser.isEndSection(); parser.moveNext()) { for (; !parser.isEndSection(); handler.moveNext()) {
log_info("Parsing key " << parser.key().str()); log_info("Parsing key " << parser.key().str());
config->handle(handler); config->handle(handler);
} }

2
Grbl_Esp32/test/Configuration/YamlTreeBuilder.cpp
View File

@@ -55,7 +55,7 @@ namespace Configuration {
ParserHandler handler(p); ParserHandler handler(p);
test.handle(handler); test.handle(handler);
for (; !p.isEndSection(); p.moveNext()) { for (; !p.isEndSection(); handler.moveNext()) {
test.handle(handler); test.handle(handler);
} }
} }