diff --git a/.gitignore b/.gitignore index e9d7050..05d4d29 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ - -# Created by https://www.gitignore.io/api/c,c++,cmake,python -# Edit at https://www.gitignore.io/?templates=c,c++,cmake,python +# Created by https://www.gitignore.io/api/c,c++,cmake,python,vim +# Edit at https://www.gitignore.io/?templates=c,c++,cmake,python,vim ### C ### # Prerequisites @@ -196,7 +195,28 @@ dmypy.json # Pyre type checker .pyre/ -# End of https://www.gitignore.io/api/c,c++,cmake,python + +### Vim ### +# Swap +[._]*.s[a-v][a-z] +[._]*.sw[a-p] +[._]s[a-rt-v][a-z] +[._]ss[a-gi-z] +[._]sw[a-p] + +# Session +Session.vim +Sessionx.vim + +# Temporary +.netrwhist +*~ +# Auto-generated tag files +tags +# Persistent undo +[._]*.un~ + +# End of https://www.gitignore.io/api/c,c++,cmake,python,vim testcode/ build/ diff --git a/mp-s7-src/main.cc b/mp-s7-src/main.cc index 1bef969..50f0c9b 100644 --- a/mp-s7-src/main.cc +++ b/mp-s7-src/main.cc @@ -59,8 +59,8 @@ int main() retro::InitConsole(); - std::string out = "Hello, world.\nEnter \"exit\" to quit.\n"; - retro::Console::currentInstance->write(out.data(), out.size()); + //std::string out = "Hello, world.\nEnter \"exit\" to quit.\n"; + //retro::Console::currentInstance->write(out.data(), out.size()); pyexec_event_repl_init(); for (;;) { @@ -70,6 +70,7 @@ int main() } } + /* std::string in; do { @@ -77,7 +78,7 @@ int main() out = "You Entered: " + in; retro::Console::currentInstance->write(out.data(), out.size()); } while(in != "exit\n"); - + */ mp_deinit(); return 0; @@ -93,3 +94,17 @@ extern "C" void gc_collect(void) { gc_collect_end(); gc_dump_info(); } + +// Receive single character +int mp_hal_stdin_rx_chr(void) { + unsigned char c = 0; + return c; +} + +// Send string of given length +void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) { + //int r = write(1, str, len); + retro::Console::currentInstance->write(str, len); + //(void)r; +} + diff --git a/mp-s7-src/stringio.cc b/mp-s7-src/stringio.cc index 920faa7..9645fd4 100644 --- a/mp-s7-src/stringio.cc +++ b/mp-s7-src/stringio.cc @@ -1,5 +1,3 @@ -//#include "retro/Console.h" - extern "C" { #include #include "py/mpconfig.h" @@ -7,16 +5,3 @@ extern "C" { extern "C" int mp_hal_stdin_rx_chr(void); extern "C" void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len); - -// Receive single character -int mp_hal_stdin_rx_chr(void) { - unsigned char c = 0; - return c; -} - -// Send string of given length -void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) { - //int r = write(1, str, len); - //retro::Console::currentInstance->write(str, len); - //(void)r; -}