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.

Sign up for GitHub

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

Jump to bottom

add RPi4 to bluetooth and WiFi functions; add CM1,CM3(+) support #861

Merged
merged 15 commits into from
May 28, 2020
Merged

add RPi4 to bluetooth and WiFi functions; add CM1,CM3(+) support #861

merged 15 commits into from
May 28, 2020

Conversation

mstormi
Copy link
Contributor

@mstormi mstormi commented May 1, 2020 •
edited
Loading

Add industrial board versions
Add Pi4 to BT and WiFi functions in use for Pi3

Fixes #665

Signed-off-by: Markus Storm [email protected]

@mstormi mstormi mentioned this pull request May 1, 2020
Closed
@mstormi
Copy link
Contributor Author

mstormi commented May 1, 2020

@ecdye could you validate if Bluetooth and menu option 35 work with this patch on a RPi4?
Settting clonebranch=AddCM3 in /etc/openhabian.conf should clone my repo when you start openhabian-config

@mstormi mstormi added this to the Refinement and Refocus milestone May 1, 2020
@holgerfriedrich
Copy link
Member

Just curious: why do we want to support the CM boards? Did we get a request for those?
I don't know how close those are to the corresponding PI....

@mstormi
Copy link
Contributor Author

mstormi commented May 1, 2020 •
edited
Loading

Just curious: why do we want to support the CM boards? Did we get a request for those?

#665
I sorta agree with the reasoning there that they're "real" RPis, too, and supporting them might help in propagating openHAB(ian) into the world of "professional" home automation.
And it's a quick win.

I don't know how close those are to the corresponding PI....

I also had to lookup that stuff. They do not have BT, WiFi, Ethernet but the rest should be the same.
I've added a travis test case but I don't think we need to do any special coding or testing beyond what gets in with this PR.

@mstormi mstormi requested a review from holgerfriedrich May 1, 2020 23:06
@holgerfriedrich
Copy link
Member

Before I start a review here - did somebody check if bt/wlan config stuff works on Pi4?

@mstormi
Copy link
Contributor Author

mstormi commented May 1, 2020

Before I start a review here - did somebody check if bt/wlan config stuff works on Pi4?

not me, I don't have any. That's why I asked @ecdye as he offered to do Pi4 tests recently.

@ecdye
Copy link
Member

ecdye commented May 2, 2020 •
edited
Loading

Yes, both Bluetooth and WiFi appear to be working. @mstormi
But, option 35 does not appear to be working, I think it is because it is a rpi3 specific option. Possibly change the option to rpi4 for rpi4's and it might work.

@mstormi
Copy link
Contributor Author

mstormi commented May 2, 2020 •
edited
Loading

option 35 does not appear to be working, I think it is because it is a rpi3 specific option

@ecdye Please fetch my latest repo and retry.
That now was option 2, right ? Do options 1 and 3 work ?
I also added added an option disable-wifi - does that work for your Pi4?
See /boot/overlays/README on your box
I've removed Pi4 changes where not applicable and created #863 for tracking option 35.

@ecdye
Copy link
Member

ecdye commented May 2, 2020 •
edited
Loading

Yes it would appear that everything is now working, but when Wifi is disabled the LAN is not being re-enabled.

Also the menu is messed up. its size needs to be fixed

@mstormi
Copy link
Contributor Author

mstormi commented May 2, 2020

Yes it would appear that everything is now working, but when Wifi is disabled the LAN is not being re-enabled.

Hmm, do you know why LAN is disabled?
IMHO if it is then switching WiFi should not change anything about that.
It's not a toggle switch between LAN and WiFi but just WiFi on/off.

Fixed the menu.

@mstormi
Copy link
Contributor Author

mstormi commented May 2, 2020

@holgerfriedrich ready for review now I'd think

@ecdye
Copy link
Member

ecdye commented May 2, 2020

@mstormi seems to be fixed now, I think my router just didn't like all of the switching and DHCP took a bit to catch up

holgerfriedrich
holgerfriedrich suggested changes May 3, 2020
View reviewed changes
@mstormi mstormi changed the title Add CM1,CM3(+); add RPi4 to bluetooth and WiFi functions add RPi4 to bluetooth and WiFi functions; add CM1,CM3(+) support May 3, 2020
holgerfriedrich
holgerfriedrich reviewed May 6, 2020
View reviewed changes
@mstormi
Copy link
Contributor Author

mstormi commented May 7, 2020

done with your review?

@mstormi
Copy link
Contributor Author

mstormi commented May 10, 2020

done with your review?

@holgerfriedrich are you done reviewgin ?
Still says "changes requested" but is there anything left this is targeting ?

@holgerfriedrich
Copy link
Member

@mstormi not yet, sorry. This is the next one on my list...

@mstormi mstormi force-pushed the AddCM3 branch 2 times, most recently from b707462 to 69c3ad6 Compare May 18, 2020 10:58
@mstormi mstormi mentioned this pull request May 22, 2020
Closed
@mstormi mstormi mentioned this pull request May 25, 2020
Closed
@mstormi mstormi requested a review from holgerfriedrich May 25, 2020 18:19
mstormi added 8 commits May 27, 2020 10:50
@mstormi
don't treat uarts on Pi4 like on Pi3
9941964 
Signed-off-by: Markus Storm <[email protected]>
@mstormi
add disable-wifi to option 35
e9134ef 
Signed-off-by: Markus Storm <[email protected]>
@mstormi
move WiFi enable/disable to wifi_setup() option 36
c425bf5 
Signed-off-by: Markus Storm <[email protected]>
@mstormi
safeguard comments from being replaced in /boot/config.txt
af42215 
Signed-off-by: Markus Storm <[email protected]>
@mstormi
allow for hw=cm1,cm3,cm3+ in helpers
ab9731b 
Signed-off-by: Markus Storm <[email protected]>
@mstormi
changes on review
fdfbd5e 
Signed-off-by: Markus Storm <[email protected]>
@mstormi
reminder: BT and HATs to use serial are mutex
df8f27a 
Signed-off-by: Markus Storm <[email protected]>
@mstormi
very minor docs changes [skip ci]
e3bfee7 
Signed-off-by: Markus Storm <[email protected]>
holgerfriedrich
holgerfriedrich reviewed May 27, 2020
View reviewed changes
mstormi added 2 commits May 27, 2020 23:06
@mstormi
Copy link
Contributor Author

mstormi commented May 27, 2020

Dunno why Github does not offer me a comment field for that last item wifi.bash#L17 but it's now fixed, too.

@mstormi
Copy link
Contributor Author

mstormi commented May 28, 2020

@holgerfriedrich are you done with this review? I believe I fixed all open issues.

holgerfriedrich
holgerfriedrich reviewed May 28, 2020
View reviewed changes
Copy link
Member

@holgerfriedrich holgerfriedrich left a comment

Choose a reason for hiding this comment

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

Last review from my side. Feel free to merge once you have adressed the comments.

@mstormi mstormi merged commit a22619f into openhab:master May 28, 2020
@mstormi
Copy link
Contributor Author

mstormi commented May 28, 2020 •
edited
Loading

did this vanish again somehow?

what do you mean, did what vanish ? Another ^[[:space:]]* ? Will add.

mstormi added a commit that referenced this pull request May 30, 2020
@mstormi @holgerfriedrich @ecdye
Initialize stable branch to current master (#934)
de4f975 
* Enhanced and more verbose testing in Travis (#859)
* ZRAM tests to work if on ARM but lxc
* cond_echo cmd in tryUntil()
* restrict container to 1G for RPi3
* dont allow for failure of BATS tests
* add warning 64bit on aarch64 is NOT supposed to work; check if OH downgrades to 32bit
* reduce to a single shellcheck run (else builds succeed when there's no error in the last run)
* increased verbosity on test cases

Signed-off-by: Markus Storm <[email protected]>

* Grafana/InfluxDB installation enhancements (#860)
* Timeouts for service start #760
* Grafana admin password length is enforced #562
* Local installation of InfluxDB now also patches existing installations
* Password reset for existing Grafana and local InfluxDB installations
* In interactive mode, display a warning if less than 1GB RAM is detected

Signed-off-by: Holger Friedrich <[email protected]>

* Setting timezone based on IP geolocation now uses python3, fixes #862 (#864)
* Switched installation of tzupdate to python3, as py2 is no longer supported
  cdown/tzupdate#34

Signed-off-by: Holger Friedrich <[email protected]>

* Use Zulu API v1 when upgrading Java (#848)
Additionally, to clarify what Java version this will install, when
available, the API will prefer downloading a JRE. However, when a JRE is
not available it will use a JDK instead. However, when JDK's are
installed only the essential binaries are linked to update-alternatives
so extra JDK related software is unlinked (i.e. javac).

At the moment, Azul appears to only provide JDK builds for ARM platforms
and so, as such, ARM platforms are most often the ones to not get a JRE
installed and the resulting installation tends to be a bit larger (~100
MB).

One minor inconvenience is that with the current Azul API it does not
allow explicitly choosing builds without the JavaFX additional binaries.
So at times, the Java version installed will have extra JavaFX binaries.
This is usually seen when the architecture being installed is x86 based.

Fixes #714
Fixes #723
See Also #629

Signed-off-by: Ethan Dye <[email protected]>

* Refuse to install 64-bit JDK on 32-bit OS

armv8 builds in theory should work on the RPi3+/RPi4, however the
current Raspbian kernel uses a armv7l base which works because armv8 is
backwards compatible. However, this has the effect of making the builds
targeting aarch64 provided by Azul unable to work on the RPi3+/RPi4. On
the other hand, this is not a huge issue as the use of 64-bit Java on
low-memory boards brings few benefits and mostly issues.

Additionally, this adds checking for other platforms to ensure that the
OS is actually 64-bit before trying to install a 64-bit JDK. If the OS
is not actually 64-bit the installer defaults to installing a 32-bit
JDK.

Signed-off-by: Ethan Dye <[email protected]>

* fix nginx install (#867)

* add missing #REDIR to nginx.conf template

Signed-off-by: Markus Storm <[email protected]>

* fix install webif port in docs (#873)

Signed-off-by: Markus Storm <[email protected]>

* hotfix to download aarch32hf instead of sf on multiple returns in Azul REST API (#877)

Signed-off-by: Markus Storm <[email protected]>

* point to new openHABian debug guide

* point to new debug guide

* Remove python2 from openHABian (#876)

* replace all occurences of python and python-pip by python3 equivalent
* fixes #875 (compatibility with Ubuntu 20.04)
* timezone setting: added python3-setuptools before installing tzupdate
* java installer: show version after install

Signed-off-by: Holger Friedrich <[email protected]>

* Run apt-get update on startup in background (#724)

* move apt-get update to background on openhabian-config start, catch up in menu selections

Signed-off-by: Markus Storm <[email protected]>

* add intermediate output when selecting a menu option while apt-get update hasnt finished (#880)

Signed-off-by: Markus Storm <[email protected]>

* Use Markdown in LICENSE and update copyright year (#847)

Co-authored-by: Thomas Dietrich <[email protected]>

Signed-off-by: Ethan Dye <[email protected]>

* Remove setting gnuio options on serial ports (#883)

* Remove setting gnuio options on serial

Signed-off-by: Markus Storm <[email protected]>

* allow for disabling IPv6 in openhabian.conf (#888)

* allow for ipv6=disable in openhabian.conf

Signed-off-by: Markus Storm <[email protected]>

* allow for ipv6=disable in openhabian.conf (#891)

Signed-off-by: Markus Storm <[email protected]>

* installation of additional bluetooth packages on RPi (#898)

* python3-bluez not installed on stretch based installations, fixes #893
* additional bluetooth packages are now installed also on RPi4

Signed-off-by: Holger Friedrich <[email protected]>

* Fix bluetooth package installation

Signed-off-by: Holger Friedrich <[email protected]>

* return instead of exit if installing non existent BT packages fails (#903)

Signed-off-by: Markus Storm <[email protected]>

* add hw,hwarch,release parameters (#901)

* add hw, hwarch, release parameters to "fake" HW, OS

Signed-off-by: Markus Storm <[email protected]>

* added missing calls to apt-get update after adding repositories. (#911)

Fixes grafana install issue, #906.

Signed-off-by: Holger Friedrich <[email protected]>

* Add openhab-cli backup/restore to menu 50 (#910)

* added openhab-cli backup/restore implementation to 50 menu

Signed-off-by: Markus Storm <[email protected]>

* run Docker in foreground in BATS testing stage (#918)

* run Docker in foreground in BATS testing stage to get to see output in Travis builds
* allow for dev and BATS testing stages to fail while BATS tests still fail

Signed-off-by: Markus Storm <[email protected]>

* CORS fix (#830)

* fix CORS (#528)

Signed-off-by: Markus Storm <[email protected]>

* Grafana installation fixed (#915)

* wait for Grafana service to setup grafana.db before using grafana-cli to avoid side effects, fixes #914
* adapted bats test to check connection to InfluxDB, to store settings in Grafana, to validate connection and settings file grafana.db

Signed-off-by: Holger Friedrich <[email protected]>

* Grafana installation fixed (#925)

* race condition due to db migration during installer run, #921

Signed-off-by: Holger Friedrich <[email protected]>

* add RPi4 to bluetooth and WiFi functions; add CM1,CM3(+) support (#861)

* Add CM1,CM3(+) to supported models so now we support all RPis
* add RPi4 to bluetooth and WiFi functions
* add disable-wifi to option 36

Signed-off-by: Markus Storm <[email protected]>

* another instance of safe grep'ing (#929)

* fix another safe grep instance

Signed-off-by: Markus Storm <[email protected]>

* Insert missing semi-colons

Signed-off-by: Ethan Dye <[email protected]>

* Fixes in preparation of upcoming changes (#932)

* Fixes in preparation of upcoming changes

Signed-off-by: Ethan Dye <[email protected]>

* replace fstab by explicit systemd mount units to ensure proper order (#807)

* Replace fstab by explicit systemd units to ensure right mount order (#807)
  To ensure ZRAM and Samba properly work together on sharing
  /srv/openhab2-*, we need to change the order of mounts.
  As this cannot be done in fstab, I removed them and setup separate
  systemd mount units instead.

* change Samba shares
  Include logs, exclude /srv overview share, remove Samba defaults like printers

Signed-off-by: Markus Storm <[email protected]>

* intro stable branch (#882)

* introduce stable branch (#882)
* renamed mode parameter to debugmode; new values are off/on/maximum
* Add popup announcement function
* add docs/NEWSLOG.md

Signed-off-by: Markus Storm <[email protected]>

Co-authored-by: Holger Friedrich <[email protected]>
Co-authored-by: Ethan Dye <[email protected]>
Co-authored-by: Holger Friedrich <[email protected]>
mstormi added a commit to mstormi/openhabian that referenced this pull request May 30, 2020
@mstormi
add RPi4 to bluetooth and WiFi functions; add CM1,CM3(+) support (ope…
7a3a0f6 
…nhab#861)

* Add CM1,CM3(+) to supported models so now we support all RPis
* add RPi4 to bluetooth and WiFi functions
* add disable-wifi to option 36

Signed-off-by: Markus Storm <[email protected]>
mstormi added a commit to mstormi/openhabian that referenced this pull request May 31, 2020
@mstormi
add RPi4 to bluetooth and WiFi functions; add CM1,CM3(+) support (ope…
a3d8303 
…nhab#861)

* Add CM1,CM3(+) to supported models so now we support all RPis
* add RPi4 to bluetooth and WiFi functions
* add disable-wifi to option 36

Signed-off-by: Markus Storm <[email protected]>
mstormi added a commit to mstormi/openhabian that referenced this pull request Jun 10, 2020
@mstormi
add RPi4 to bluetooth and WiFi functions; add CM1,CM3(+) support (ope…
866470c 
…nhab#861)

* Add CM1,CM3(+) to supported models so now we support all RPis
* add RPi4 to bluetooth and WiFi functions
* add disable-wifi to option 36

Signed-off-by: Markus Storm <[email protected]>
mstormi added a commit to mstormi/openhabian that referenced this pull request Jun 10, 2020
@mstormi
add RPi4 to bluetooth and WiFi functions; add CM1,CM3(+) support (ope…
8878285 
…nhab#861)

* Add CM1,CM3(+) to supported models so now we support all RPis
* add RPi4 to bluetooth and WiFi functions
* add disable-wifi to option 36

Signed-off-by: Markus Storm <[email protected]>
@mstormi mstormi mentioned this pull request Jun 17, 2020
Closed
@mstormi mstormi mentioned this pull request Jul 16, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@holgerfriedrich holgerfriedrich holgerfriedrich approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Refinement and Refocus
Development

Successfully merging this pull request may close these issues.

User openhabian not created due to failure to detect RPi model
3 participants
@mstormi @holgerfriedrich @ecdye