Gandalf/OctoPrint-Enclosure
1
0
Fork 0
Code Issues 156 Pull Requests 6 Actions Packages Projects Releases 28 Wiki Activity

Resolve merge conflicts for adding BME680 #441

Merged
d-buchmann merged 10 commits from master into master 2021-12-07 14:56:22 +00:00
Conversation 11 Commits 10 Files Changed 4 +135 -10
d-buchmann commented 2021-10-19 09:14:18 +01:00 (Migrated from github.com)
Copy Link

Sorry for bursting in...
Here's a mergable version of PR #253
I can't test this currently (at least not on real hw), but maybe it helps someone else at testing.

Sorry for bursting in... Here's a mergable version of PR #253 I can't test this currently (at least not on real hw), but maybe it helps someone else at testing.
thijstriemstra (Migrated from github.com) requested changes 2021-11-17 00:03:36 +00:00
thijstriemstra (Migrated from github.com) left a comment
Copy Link

can you also add the bme680 library to the dependencies in setup.py?

Also, remove any dead (e.g. commented) code.

thanks!

can you also add the bme680 library to the dependencies in `setup.py`? Also, remove any dead (e.g. commented) code. thanks!
thijstriemstra (Migrated from github.com) reviewed 2021-11-17 15:37:47 +00:00
octoprint_enclosure/__init__.py
@@ -978,45 +978,58 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, octoprint.plugin.TemplateP
def get_sensor_data(self, sensor):
thijstriemstra (Migrated from github.com) commented 2021-11-17 15:37:46 +00:00
Copy Link

the indentation for airquality = 0 is incorrect in this file (it has an extra space)

the indentation for `airquality = 0` is incorrect in this file (it has an extra space)
thijstriemstra (Migrated from github.com) reviewed 2021-11-17 16:00:47 +00:00
octoprint_enclosure/BME680.py
@@ -0,0 +1,86 @@
import bme680
thijstriemstra (Migrated from github.com) commented 2021-11-17 16:00:46 +00:00
Copy Link

the indentation for this file is not consistent and should be 4 spaces everywhere.

the indentation for this file is not consistent and should be 4 spaces everywhere.
d-buchmann (Migrated from github.com) reviewed 2021-11-17 19:33:44 +00:00
octoprint_enclosure/__init__.py
@@ -978,45 +978,58 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, octoprint.plugin.TemplateP
def get_sensor_data(self, sensor):
d-buchmann (Migrated from github.com) commented 2021-11-17 19:33:43 +00:00
Copy Link

Thanks for the review. I fixed both indent errors, hope it's all correct (I'm not all too familiar with github + haven't even run the code yet)

Thanks for the review. I fixed both indent errors, hope it's all correct (I'm not all too familiar with github + haven't even run the code yet)
thijstriemstra (Migrated from github.com) reviewed 2021-11-18 13:16:23 +00:00
octoprint_enclosure/__init__.py
@@ -978,45 +978,58 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, octoprint.plugin.TemplateP
def get_sensor_data(self, sensor):
thijstriemstra (Migrated from github.com) commented 2021-11-18 13:16:23 +00:00
Copy Link

no, i still see incorrect indentation

no, i still see incorrect indentation
d-buchmann (Migrated from github.com) reviewed 2021-11-18 14:14:51 +00:00
octoprint_enclosure/__init__.py
@@ -978,45 +978,58 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, octoprint.plugin.TemplateP
def get_sensor_data(self, sensor):
d-buchmann (Migrated from github.com) commented 2021-11-18 14:14:51 +00:00
Copy Link

Darn, those tabs :/

Darn, those tabs :/
thijstriemstra commented 2021-11-18 14:56:50 +00:00 (Migrated from github.com)
Copy Link

I think it also makes sense to use sys.executable like I did in the bme280 PR here: https://github.com/vitormhenrique/OctoPrint-Enclosure/pull/444/files#diff-a2404d7993f889e484a332d17e5f97235b6705017e48dfeefcc0161540f88272

I'll add a PR to fix this in all other code as well once this PR is merged.

I think it also makes sense to use `sys.executable` like I did in the bme280 PR here: https://github.com/vitormhenrique/OctoPrint-Enclosure/pull/444/files#diff-a2404d7993f889e484a332d17e5f97235b6705017e48dfeefcc0161540f88272 I'll add a PR to fix this in all other code as well once this PR is merged.
d-buchmann commented 2021-11-18 16:04:18 +00:00 (Migrated from github.com)
Copy Link

I'm not a python expert, but you sound like you know what you're doing so I basically just copy&pasted your code, if that's ok.

I'm not a python expert, but you sound like you know what you're doing so I basically just copy&pasted your code, if that's ok.
thijstriemstra (Migrated from github.com) approved these changes 2021-11-18 17:08:52 +00:00
thijstriemstra (Migrated from github.com) left a comment
Copy Link

thanks! looks good to me.

thanks! looks good to me.
thijstriemstra (Migrated from github.com) reviewed 2021-11-18 17:09:44 +00:00
octoprint_enclosure/BME680.py
@@ -0,0 +1,86 @@
import bme680
thijstriemstra (Migrated from github.com) commented 2021-11-18 17:09:44 +00:00
Copy Link

oh. these parentheses are not needed (same for line 75)

oh. these parentheses are not needed (same for line 75)
d-buchmann (Migrated from github.com) reviewed 2021-12-02 09:53:47 +00:00
octoprint_enclosure/BME680.py
@@ -0,0 +1,86 @@
import bme680
d-buchmann (Migrated from github.com) commented 2021-12-02 09:53:47 +00:00
Copy Link

Okay =)

Okay =)
Sign in to join this conversation.
Reviewers
No Reviewers
thijstriemstra
d-buchmann
Labels
Clear labels
bug
documentation
duplicate
enhancement
help wanted
invalid
Missing Data
Missing necessary data to troubleshoot
 question
wontfix
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
Gandalf
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Gandalf/OctoPrint-Enclosure#441
Delete Branch "master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?