Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

close serial port #8

Merged
merged 1 commit into from
Jan 10, 2025
Merged

close serial port #8

merged 1 commit into from
Jan 10, 2025

Conversation

builderjer
Copy link
Member

@builderjer builderjer commented Jan 10, 2025

Summary by CodeRabbit

  • Bug Fixes
    • Improved serial connection error handling by ensuring proper closing of serial ports in all scenarios.

Copy link
Contributor

coderabbitai bot commented Jan 10, 2025

Walkthrough

The pull request focuses on improving error handling in the is_mark_1() function within the ovos_i2c_detection/__init__.py file. The changes introduce additional ser.close() calls to ensure proper closure of the serial connection in different exit scenarios of the function. This modification aims to prevent potential resource leaks by explicitly closing the serial port connection after its use.

Changes

File Change Summary
ovos_i2c_detection/__init__.py Added ser.close() calls within and after the while loop in is_mark_1() function to ensure serial connection is properly closed

Poem

🐰 A Rabbit's Ode to Serial Connections 🔌

Loops and ports, a tricky dance,
Close the serial with a glance,
No resource left behind to roam,
Clean connections find their home,
Bytes flow free, no leaks in sight! 🚀

Finishing Touches

  • 📝 Generate Docstrings (Beta)

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@builderjer builderjer merged commit 687e891 into dev Jan 10, 2025
2 of 4 checks passed
@builderjer builderjer deleted the feat/mk1 branch January 10, 2025 13:32
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🔭 Outside diff range comments (1)
ovos_i2c_detection/__init__.py (1)

Line range hint 70-74: Ensure serial port is closed in all code paths.

The serial port is not closed in the exception handler, which could lead to resource leaks.

Consider using a context manager pattern for better resource handling:

     if is_wm8960():
-        try:
-            ser = serial.Serial("/dev/serial0", 9600, timeout=3)
-            ser.write(b'system.version')
-            while True:
-                is_mk1 = ser.readline().decode().rstrip()
-                if is_mk1 and "Command" in is_mk1:
-                    ser.close()
-                    # This is a Mark 1
-                    return True
-                break
-            ser.close()
-            return False
-        except:
-            return False
+        with serial.Serial("/dev/serial0", 9600, timeout=3) as ser:
+            try:
+                ser.write(b'system.version')
+                # Read single response
+                is_mk1 = ser.readline().decode().rstrip()
+                return bool(is_mk1 and "Command" in is_mk1)
+            except:
+                return False

This approach:

  1. Uses context manager to automatically close the port
  2. Simplifies the logic by removing redundant loop
  3. Handles port closure in all scenarios including exceptions
  4. Maintains the same functionality
🧰 Tools
🪛 Ruff (0.8.2)

72-72: Do not use bare except

(E722)

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 0f52a7a and f123e8d.

📒 Files selected for processing (1)
  • ovos_i2c_detection/__init__.py (1 hunks)

Comment on lines +66 to 69
ser.close()
# This is a Mark 1
return True
break
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix unreachable code after return statement.

The break statement after the return True is unreachable. The while loop can be simplified since it only needs to read once.

Apply this diff to fix the logic:

-            while True:
+            # Read single response
+            is_mk1 = ser.readline().decode().rstrip()
+            if is_mk1 and "Command" in is_mk1:
+                ser.close()
+                # This is a Mark 1
+                return True
-                is_mk1 = ser.readline().decode().rstrip()
-                if is_mk1 and "Command" in is_mk1:
-                    ser.close()
-                    # This is a Mark 1
-                    return True
-                break
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
ser.close()
# This is a Mark 1
return True
break
# Read single response
is_mk1 = ser.readline().decode().rstrip()
if is_mk1 and "Command" in is_mk1:
ser.close()
# This is a Mark 1
return True

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant