Skip to content

Improved oref0-setup #1244

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

Merged
scottleibrand merged 26 commits into from
Apr 16, 2019
Merged

Improved oref0-setup #1244

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f386204
Fix for x12 status check
cluckj Feb 11, 2019
1fd6451
Spacing
cluckj Feb 11, 2019
ead101a
Merge pull request #28 from openaps/dev
cluckj Mar 9, 2019
4191ff7
Remove workarounds for missing x12 settings
cluckj Mar 9, 2019
36463ed
Remove workarounds for missing x12 settings
cluckj Mar 9, 2019
35908e6
Spacing...
cluckj Mar 9, 2019
d11ef5c
Merge pull request #29 from openaps/dev
cluckj Mar 11, 2019
bd5a619
Improving automation of hardware setups, support for more kinds of Go…
cluckj Mar 12, 2019
f7341ef
Update installer options, deprecate MDT, conflict changes with #1176
cluckj Mar 14, 2019
3247975
Merge pull request #30 from openaps/dev
cluckj Mar 14, 2019
59cf674
Deprecate G4-upload and G4-local-only, setup readability
cluckj Mar 14, 2019
a331f1b
Bugfixes, cleanup, and deprecate mmeowlink...
cluckj Mar 14, 2019
b438d18
Refactor interactive setup...
cluckj Mar 14, 2019
47d47f0
Refactor, can ensure building from source for certain setups without …
cluckj Mar 14, 2019
1b1434e
Better support for custom radiotags and diy radios
cluckj Mar 14, 2019
2f4cd78
Comments, and activate SPI only on the Pi
cluckj Mar 14, 2019
474a8e2
Typo...
cluckj Mar 14, 2019
58d78b8
Restore mmeowlink
cluckj Mar 14, 2019
de3c5e0
Merge pull request #31 from openaps/dev
cluckj Mar 17, 2019
95a3634
Missing quotation marks
cluckj Mar 18, 2019
1ac9448
Move updating jq earlier in the install script
cluckj Mar 21, 2019
958ade7
Merge pull request #33 from cluckj/patch-6
cluckj Mar 28, 2019
0e00b8f
Merge branch 'dev' of https://github.com/openaps/oref0 into openaps-dev
cluckj Apr 15, 2019
d750500
Merge branch 'openaps-dev' into updated-setup
cluckj Apr 15, 2019
6edd7d6
Revert to original repo, and do the config change with sed
cluckj Apr 15, 2019
c2a8763
Additional comments, remove redundant jq installs
cluckj Apr 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Better support for custom radiotags and diy radios
  • Loading branch information
@cluckj
cluckj committed Mar 14, 2019
commit 1b1434eea23bacfe0ab8d26b289482fe0388d5f3
25 changes: 12 additions & 13 deletions bin/oref0-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ if [[ -z "$DIR" || -z "$serial" ]]; then
2) echocolor "Configuring for SPI-connected TI stick. "; ttyport=/dev/spidev0.0; hardwaretype=386-spi;;
3)
prompt_and_validate ttyport "What is your TTY port? (/dev/ttySOMETHING)" validate_ttyport
echocolor "Ok, we'll try TTY $ttyport then. "; echocolor "You will need to build Go binaries from source. "; buildgofromsource=true;;
echocolor "Ok, we'll try TTY $ttyport then. "; echocolor "You will need to build Go binaries from source. "; buildgofromsource=true; hardwaretype=diy;;
*) echocolor "Yay! Configuring for Edison with Explorer Board. "; ttyport=/dev/spidev5.1; hardware-type=edison-explorer;;
esac
elif is_pi; then
Expand All @@ -369,7 +369,7 @@ if [[ -z "$DIR" || -z "$serial" ]]; then
4) echocolor "Configuring for SPI-connected TI stick. "; ttyport=/dev/spidev0.0; hardwaretype=arm-spi;;
5)
prompt_and_validate ttyport "What is your TTY port? (/dev/ttySOMETHING)" validate_ttyport
echocolor "Ok, we'll try TTY $ttyport then. "; echocolor "You will need to build Go binaries from source. "; buildgofromsource=true;;
echocolor "Ok, we'll try TTY $ttyport then. "; echocolor "You will need to build Go binaries from source. "; buildgofromsource=true; hardwaretype=diy;;
*) echocolor "Configuring Explorer Board HAT. "; ttyport=/dev/spidev0.0; hardwaretype=explorer-hat;;
esac
else
Expand Down Expand Up @@ -403,16 +403,15 @@ if [[ -z "$DIR" || -z "$serial" ]]; then
echo "2) cc1101"
echo "3) RFM69HCW on /dev/spidev0.0 (walrus)"
echo "4) RFM69HCW on /dev/spidev0.1 (radiofruit bonnet)"
echo "5) Enter radiotags manually"
read -p "Please enter the number for your radio configuration: [1] " -r
if [[ $REPLY =~ ^[2]$ ]]; then
radiotags="cc1101"
elif [[ $REPLY =~ ^[3]$ ]]; then
radiotags="rfm69 walrus"
elif [[ $REPLY =~ ^[4]$ ]]; then
radiotags="rfm69"
else
radiotags="cc111x"
fi
case $REPLY in
2) radiotags="cc1101";;
3) radiotags="rfm69 walrus";;
4) radiotags="rfm69";;
5) read -p "Enter your radiotags: " -r; radiotags=$REPLY;;
*) radiotags="cc111x";;
esac
echo "Building Go pump binaries from source with " + "$radiotags" + " tags."
else
echo "Downloading latest precompiled Go pump binaries."
Expand Down Expand Up @@ -1286,6 +1285,7 @@ if prompt_yn "" N; then
if [[ "$hardwaretype" =~ "explorer-hat" || "$hardwaretype" =~ "arm-spi" ]]; then arch=arm-spi
elif [[ "$hardwaretype" =~ "radiofruit" || "$hardwaretype" =~ "rfm69hcw" ]]; then arch=arm-rfm69
elif [[ "$hardwaretype" =~ "edison-explorer" || "$hardwaretype" =~ "386-spi" ]]; then arch=386-spi
elif [[ "$hardwaretype" =~ "diy" ]]; then gobuildfromsource=true #make sure binaries aren't downloaded for DIY rigs
else arch=386-spi
fi
#TODO: Support non-spidev tty ports (TI stick over UART)
Expand Down Expand Up @@ -1394,8 +1394,7 @@ if prompt_yn "" N; then
fi # from 'read -p "Continue? y/[N] " -r' after interactive setup is complete

# Start cron back up in case the user doesn't decide to reboot
#TURN THIS BACK ON BEFORE MAKING A COMMIT
#service cron start
service cron start

if [ -e /tmp/reboot-required ]; then
read -p "Reboot required. Press enter to reboot or Ctrl-C to cancel"
Expand Down