Merge of Public repo [release-candidate] Head.

iwahdan88 · iwahdan88 · commit 0b6307f9b604 · 2019-01-19T14:25:06.000+01:00
diff --git a/esp32/mods/modlora.c b/esp32/mods/modlora.c
@@ -2296,7 +2296,7 @@ STATIC mp_obj_t lora_cli(mp_obj_t self_in, mp_obj_t data) {
             mp_hal_delay_ms(300);
             timeout -= 300;
         }
-        
+
         if (meshCliOutputDone) {
             // micropy needs to output meshCliOutput string in size of meshCliOutputLen
             mp_obj_t res = mp_obj_new_str(meshCliOutput, meshCliOutputLen);
diff --git a/esp32/mods/modlte.c b/esp32/mods/modlte.c
@@ -630,6 +630,10 @@ STATIC mp_obj_t lte_attach(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t
         if (!lte_push_at_command("AT+CFUN=1", LTE_RX_TIMEOUT_MAX_MS)) {
             nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
         }
+        else
+        {
+            lte_push_at_command("AT!=\"setlpm airplane=1 enable=1\"", LTE_RX_TIMEOUT_MAX_MS);
+        }
     }
     return mp_const_none;
 }

Original file line number	Diff line number	Diff line change
`@@ -2296,7 +2296,7 @@ STATIC mp_obj_t lora_cli(mp_obj_t self_in, mp_obj_t data) {`
`2296`	`2296`	`mp_hal_delay_ms(300);`
`2297`	`2297`	`timeout -= 300;`
`2298`	`2298`	`}`
`2299`		`-`
	`2299`	`+`
`2300`	`2300`	`if (meshCliOutputDone) {`
`2301`	`2301`	`// micropy needs to output meshCliOutput string in size of meshCliOutputLen`
`2302`	`2302`	`mp_obj_t res = mp_obj_new_str(meshCliOutput, meshCliOutputLen);`
Original file line number	Diff line number	Diff line change
`@@ -630,6 +630,10 @@ STATIC mp_obj_t lte_attach(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t`
`630`	`630`	`if (!lte_push_at_command("AT+CFUN=1", LTE_RX_TIMEOUT_MAX_MS)) {`
`631`	`631`	`nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));`
`632`	`632`	`}`
	`633`	`+ else`
	`634`	`+ {`
	`635`	`+ lte_push_at_command("AT!=\"setlpm airplane=1 enable=1\"", LTE_RX_TIMEOUT_MAX_MS);`
	`636`	`+ }`
`633`	`637`	`}`
`634`	`638`	`return mp_const_none;`
`635`	`639`	`}`