Fix code review remarks, merge develop, revert some merge errors

2021-04-13 22:28:02 +02:00
parent 04f2ec2352
commit 86f1c69f26
49 changed files with 359 additions and 219 deletions
@@ -140,7 +140,7 @@ void get_common_options(uint32_t execmask) {
  }

  if (do_forms) {
-    set_softmodem_optmask(SOFTMODEM_DOFORMS_BIT);
+    set_softmodem_optmask(SOFTMODEM_DOSCOPE_BIT);
  }

  if(parallel_config != NULL) set_parallel_conf(parallel_config);