Skip to content

Commit

Permalink
Merge branch 'js_uart_serial' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
xMasterX committed Feb 13, 2024
2 parents 3a84724 + 0f7411d commit 19fe8e8
Show file tree
Hide file tree
Showing 4 changed files with 155 additions and 122 deletions.
6 changes: 3 additions & 3 deletions applications/system/js_app/application.fam
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ App(
)

App(
appid="js_uart",
appid="js_serial",
apptype=FlipperAppType.PLUGIN,
entry_point="js_uart_ep",
entry_point="js_serial_ep",
requires=["js_app"],
sources=["modules/js_uart.c"],
sources=["modules/js_serial.c"],
)
22 changes: 11 additions & 11 deletions applications/system/js_app/examples/apps/Scripts/bad_uart.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
let uart = require("uart");
uart.setup(115200);
let serial = require("serial");
serial.setup("lpuart", 115200);

// uart.write("\n");
uart.write([0x0a]);
let console_resp = uart.expect("# ", 1000);
// serial.write("\n");
serial.write([0x0a]);
let console_resp = serial.expect("# ", 1000);
if (console_resp === undefined) {
print("No CLI response");
} else {
uart.write("uci\n");
let uci_state = uart.expect([": not found", "Usage: "]);
serial.write("uci\n");
let uci_state = serial.expect([": not found", "Usage: "]);
if (uci_state === 1) {
uart.expect("# ");
uart.write("uci show wireless\n");
uart.expect(".key=");
print("key:", uart.readln());
serial.expect("# ");
serial.write("uci show wireless\n");
serial.expect(".key=");
print("key:", serial.readln());
} else {
print("uci cmd not found");
}
Expand Down
8 changes: 4 additions & 4 deletions applications/system/js_app/examples/apps/Scripts/uart_echo.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
let uart = require("uart");
uart.setup(115200);
let serial = require("serial");
serial.setup("usart", 230400);

while (1) {
let rx_data = uart.readBytes(1, 0);
let rx_data = serial.readBytes(1, 0);
if (rx_data !== undefined) {
uart.write(rx_data);
serial.write(rx_data);
let data_view = Uint8Array(rx_data);
print("0x" + to_hex_string(data_view[0]));
}
Expand Down
Loading

0 comments on commit 19fe8e8

Please sign in to comment.