Merged BoxPro and Goggle Codebases

[SumolX]

In order to lessen the effort for maintaining two separate product lines we have consolidated both the BoxPro and Goggles into the hdzero-goggle codebase.

Readme has been updated and includes instructions on how to build both targets. setup.sh will automatically generate to build directories:

build_goggle
build_boxpro

Cleanup will be performed as a phased approach but in its current form I tried to make maintainability a priority for both product lines. The use of the preprocessor has been minimized as much as possible and we can leverage getTargetType() to identify which products within the codebase.

Please test this codebase as much as possible but I do believe I have ironed out all merge issues initially encountered.

[pitts-mo]

Oh so Magical, thank you. -p

[nerdCopter]

i will try to find time to test OG goggle

Total             177419290



packing app:
app.fex
app.fex.md5

packing ota:
hdzgoggle_app_ota-9.5.0-a5512e3.tar
HDZGOGGLE_RX-75.bin
HDZGOGGLE_VA-200.bin

generated out/HDZERO_GOGGLE-75-200-9.5.0-a5512e3.bin
[100%] Built target HDZGOGGLE-OTA

[pitts-mo]

OSD element "CH:--" persists when goggle is booted directly to AV in (auto scan -last, last w/AV-in). Switching to another source then back to AV in will remove the CH:-- OSD element. This does not occur on prior goggle releases.

I do not find any change that should block merge. But suggest we release note specifically calls out source page changes.

Some batch 2 HDZero Goggle items used to evaluate general user experience:
-goggle update from gui
-re-goggle update from gui (test update_goggle.sh and display of firmware version string)
-RX/AV recovery flash (test write_flashes.sh)
-HDZero source
-"analog" source (module w/ v2 goggle power control)
-HDMI in source
-AV-in source
-image brightness adjust ( from roller input )
-OSD -elements toggle DATE TIME
-power -cell average and analog RX Auto
-record w/manual, .ts, date
-auto scan -last, last
-ELRS -DVR start/stop and HDZero channel change
-WiFi AP -rtsp and ssh
-playback -browse and play ( desire ability to toggle/adjust small file size filter -some day :-) )
-focus chart
-clock -24 hour
-input -roller brightness
-Go Sleep -enter/exit while analog module is enabled (w/ v2 goggle analog bay auto power)

[pitts-mo]

Confirmed this does not occur on prior goggle releases. But it does occur on prior boxpro releases.

OSD element "CH:--" persists when goggle is booted directly to AV in (auto scan -last, last w/AV-in). Switching to another source then back to AV in will remove the CH:-- OSD element.

[SumolX]

Thank you for clarifying. I will look into this issue this weekend.

[SumolX]

However, what this does not fix is the root cause of the issue.... where using last AV_IN as source... we should not be hitting this logic. Which tells me that between main::start_running and osd::osd_channel_show we have a bug somewhere that existed in the boxpro codebase.

I would enter a new defect after we submit this PR as @pitts-mo had suggested.

[nerdCopter]

did not "deeply" test, did notice 771510e did not automatically go to my "last" input (analog). (OG goggles Nov-2023 order)

EDIT: i did not test the prior commit. i was able to get HD vs Analog via:

and did not consider trying the menu.

[SumolX]

did not "deeply" test, did notice 771510e did not automatically go to my "last" input (analog). (OG goggles Nov-2023 order)

That's strange.... the change made would have only prevented the analog RF channel from being displayed on goggles. I did test last analog on both boxpro and goggles and it was working. I will retest and see if it's an issue or not.... but I think @pitts-mo also reported that working just fine.

[pitts-mo]

Sorry, I have just tried 771510e from SD card.

It now persists the CH:-- element in analog / AV-in and I can no longer clear it by switching sources.

I have not had issue booting my goggle to last source with the recent builds in this PR when I have Auto scan set to Last, Last.

[nerdCopter]

That's strange.... the change made would have only prevented the analog RF channel from being displayed on goggles. I did test last analog on both boxpro and goggles and it was working. I will retest and see if it's an issue or not.... but I think @pitts-mo also reported that working just fine.

it may (probably) be a main mainline code. i have seen it before, but random. only tested this PR two bootups.

[SumolX]

did not "deeply" test, did notice 771510e did not automatically go to my "last" input (analog). (OG goggles Nov-2023 order)

EDIT: i did not test the prior commit. i was able to get HD vs Analog via: and did not consider trying the menu.

Thanks for the reference! I will look at it tonight!

[SumolX]

@nerdCopter just tested the toggling and it worked fine for me. You should hear a beep then a 1-2 seconds later it should switch sources. I tested against Tinyhawk 3 and my custom built tinyape.

I assigned the toggle source to double click the right function button.

Oh.... I think I get what you are trying to say. Ok then it's safe to say no issue found then.

[pitts-mo]

@nerdCopter
I will re-test boot to last source and try toggle source for the first time in the next couple days.

The only times I have boot to last not work were after updates and re-setting Auto scan page with:
Auto scan=Last
Default=Last

Recovery os.bin since HDZEROGOGGLE_Rev20240816.zip has also been problematic. If you have updated OS since then maybe consider recovering OS from 20240816 and then update the app and re-set your settings.

I will retest sources too.

[pitts-mo]

CH:-- is annoying as since 771510e it is now showing on boot of analog and you need to switch to HDZero source and back. to clear it (or disable CH: OSD element all together?)

Regardless this PR is a required step forward and so far I have not found/confirmed a bug serious enough to prevent merge.

[SumolX]

@pitts-mo, @nerdCopter Pushed up fix to properly handle when to display RF channel. At this point I am marking the PR ready.

[nerdCopter]

PEBKAC -- i only had scan set to last, not input. sorry for the added "noise" and waste of your time!

[SumolX]

PEBKAC -- i only had scan set to last, not input. sorry for the added "noise" and waste of your time!

Any input is valued and thank you for testing out the PR!