Skip to content

Commit 5f856c9

Browse files
committed
Merge branch 'main' into upgraded_lib_api
2 parents d59026f + ed4e465 commit 5f856c9

File tree

195 files changed

+2468
-586
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

195 files changed

+2468
-586
lines changed

Taskfile.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ vars:
88
GOLANGCI_LINT_VERSION: v2.4.0
99
GOIMPORTS_VERSION: v0.29.0
1010
DPRINT_VERSION: 0.48.0
11-
EXAMPLE_VERSION: "0.5.1"
12-
RUNNER_VERSION: "0.5.0"
11+
EXAMPLE_VERSION: "0.6.0"
12+
RUNNER_VERSION: "0.6.1"
1313
VERSION: # if version is not passed we hack the semver by encoding the commit as pre-release
1414
sh: echo "${VERSION:-0.0.0-$(git rev-parse --short HEAD)}"
1515

adbd.Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM debian:trixie
22

33
RUN apt-get update \
4-
&& apt-get install -y --no-install-recommends adbd file ssh sudo \
4+
&& apt-get install -y --no-install-recommends adbd file ssh sudo netcat-traditional \
55
&& apt-get clean \
66
&& rm -rf /var/lib/apt/lists/*
77

@@ -10,7 +10,9 @@ RUN useradd -m --create-home --shell /bin/bash --user-group --groups sudo arduin
1010
mkdir /home/arduino/ArduinoApps && \
1111
chown -R arduino:arduino /home/arduino/ArduinoApps
1212

13+
ADD scripts/pong-server.sh /usr/local/bin/pong-server.sh
14+
1315
WORKDIR /home/arduino
1416
EXPOSE 22
1517

16-
CMD ["/bin/sh", "-c", "/usr/sbin/sshd -D & su arduino -c adbd"]
18+
CMD ["/bin/sh", "-c", "/usr/sbin/sshd -D & su arduino -c adbd & pong-server.sh"]

cmd/arduino-app-cli/app/app.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ func NewAppCmd(cfg config.Configuration) *cobra.Command {
3838
appCmd.AddCommand(newRestartCmd(cfg))
3939
appCmd.AddCommand(newLogsCmd(cfg))
4040
appCmd.AddCommand(newListCmd(cfg))
41-
appCmd.AddCommand(newMonitorCmd(cfg))
4241
appCmd.AddCommand(newCacheCleanCmd(cfg))
4342

4443
return appCmd

cmd/arduino-app-cli/main.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
"github.com/arduino/arduino-app-cli/cmd/arduino-app-cli/config"
3131
"github.com/arduino/arduino-app-cli/cmd/arduino-app-cli/daemon"
3232
"github.com/arduino/arduino-app-cli/cmd/arduino-app-cli/internal/servicelocator"
33+
"github.com/arduino/arduino-app-cli/cmd/arduino-app-cli/monitor"
3334
"github.com/arduino/arduino-app-cli/cmd/arduino-app-cli/properties"
3435
"github.com/arduino/arduino-app-cli/cmd/arduino-app-cli/system"
3536
"github.com/arduino/arduino-app-cli/cmd/arduino-app-cli/version"
@@ -78,6 +79,7 @@ func run(configuration cfg.Configuration) error {
7879
config.NewConfigCmd(configuration),
7980
system.NewSystemCmd(configuration),
8081
version.NewVersionCmd(Version),
82+
monitor.NewMonitorCmd(),
8183
)
8284

8385
ctx := context.Background()
Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,51 @@
1313
// Arduino software without disclosing the source code of your own applications.
1414
// To purchase a commercial license, send an email to license@arduino.cc.
1515

16-
package app
16+
package monitor
1717

1818
import (
19+
"io"
20+
"os"
21+
1922
"github.com/spf13/cobra"
2023

21-
"github.com/arduino/arduino-app-cli/cmd/arduino-app-cli/completion"
22-
"github.com/arduino/arduino-app-cli/internal/orchestrator/config"
24+
"github.com/arduino/arduino-app-cli/cmd/feedback"
25+
"github.com/arduino/arduino-app-cli/internal/monitor"
2326
)
2427

25-
func newMonitorCmd(cfg config.Configuration) *cobra.Command {
28+
func NewMonitorCmd() *cobra.Command {
2629
return &cobra.Command{
2730
Use: "monitor",
28-
Short: "Monitor the Arduino app",
31+
Short: "Attach to the microcontroller serial monitor",
2932
RunE: func(cmd *cobra.Command, args []string) error {
30-
panic("not implemented")
33+
stdout, _, err := feedback.DirectStreams()
34+
if err != nil {
35+
return err
36+
}
37+
start, err := monitor.NewMonitorHandler(&combinedReadWrite{r: os.Stdin, w: stdout}) // nolint:forbidigo
38+
if err != nil {
39+
return err
40+
}
41+
go start()
42+
<-cmd.Context().Done()
43+
return nil
3144
},
32-
ValidArgsFunction: completion.ApplicationNames(cfg),
3345
}
3446
}
47+
48+
type combinedReadWrite struct {
49+
r io.Reader
50+
w io.Writer
51+
}
52+
53+
func (crw *combinedReadWrite) Read(p []byte) (n int, err error) {
54+
return crw.r.Read(p)
55+
}
56+
57+
func (crw *combinedReadWrite) Write(p []byte) (n int, err error) {
58+
return crw.w.Write(p)
59+
}
60+
61+
func (crw *combinedReadWrite) Close() error {
62+
return nil
63+
}

debian/arduino-app-cli/home/arduino/.local/share/arduino-app-cli/assets/0.5.0/api-docs/arduino/app_bricks/cloud_llm/API.md

Lines changed: 0 additions & 107 deletions
This file was deleted.

debian/arduino-app-cli/home/arduino/.local/share/arduino-app-cli/assets/0.5.0/api-docs/arduino/app_bricks/air_quality_monitoring/API.md renamed to debian/arduino-app-cli/home/arduino/.local/share/arduino-app-cli/assets/0.6.1/api-docs/arduino/app_bricks/air_quality_monitoring/API.md

File renamed without changes.

debian/arduino-app-cli/home/arduino/.local/share/arduino-app-cli/assets/0.5.0/api-docs/arduino/app_bricks/arduino_cloud/API.md renamed to debian/arduino-app-cli/home/arduino/.local/share/arduino-app-cli/assets/0.6.1/api-docs/arduino/app_bricks/arduino_cloud/API.md

File renamed without changes.

debian/arduino-app-cli/home/arduino/.local/share/arduino-app-cli/assets/0.5.0/api-docs/arduino/app_bricks/audio_classification/API.md renamed to debian/arduino-app-cli/home/arduino/.local/share/arduino-app-cli/assets/0.6.1/api-docs/arduino/app_bricks/audio_classification/API.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Stop real-time audio classification.
6767

6868
Terminates audio capture and releases any associated resources.
6969

70-
#### `classify_from_file(audio_path: str, confidence: int)`
70+
#### `classify_from_file(audio_path: str, confidence: float)`
7171

7272
Classify audio content from a WAV file.
7373

@@ -80,9 +80,8 @@ Supported sample widths:
8080
##### Parameters
8181

8282
- **audio_path** (*str*): Path to the `.wav` audio file to classify.
83-
- **confidence** (*int*) (optional): Confidence threshold (01). If None,
84-
the default confidence level specified during initialization
85-
will be applied.
83+
- **confidence** (*float*) (optional): Minimum confidence threshold (0.01.0) required
84+
for a detection to be considered valid. Defaults to 0.8 (80%).
8685

8786
##### Returns
8887

debian/arduino-app-cli/home/arduino/.local/share/arduino-app-cli/assets/0.5.0/api-docs/arduino/app_bricks/camera_code_detection/API.md renamed to debian/arduino-app-cli/home/arduino/.local/share/arduino-app-cli/assets/0.6.1/api-docs/arduino/app_bricks/camera_code_detection/API.md

File renamed without changes.

0 commit comments

Comments
 (0)