Mercurial > hg > beaglert
changeset 329:9a2a5f14b587 prerelease
Updated build_pd_heavy to work with the latest makefile.
| author | Giulio Moro <giuliomoro@yahoo.it> |
|---|---|
| date | Sat, 04 Jun 2016 14:10:45 +0100 |
| parents | abd7795dad5d |
| children | 276a8517da13 |
| files | scripts/build_pd_heavy.sh scripts/hvresources/render.cpp |
| diffstat | 2 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/build_pd_heavy.sh Fri Jun 03 17:15:56 2016 +0100 +++ b/scripts/build_pd_heavy.sh Sat Jun 04 14:10:45 2016 +0100 @@ -150,6 +150,7 @@ BBB_PROJECT_FOLDER=$BBB_PROJECT_HOME"/"$BBB_PROJECT_NAME #make sure there is no trailing slash here BBB_NETWORK_TARGET_FOLDER=$BBB_ADDRESS:$BBB_PROJECT_FOLDER + echo rsync -c -rv --exclude 'HvContext*' "$projectpath"/ "$BBB_NETWORK_TARGET_FOLDER"; rsync -c -rv --exclude 'HvContext*' "$projectpath"/ "$BBB_NETWORK_TARGET_FOLDER"; # rsync -c -rv "$projectpath"/ "$BBB_ADDRESS":"$BBB_BELA_HOME"/source; @@ -171,27 +172,26 @@ # remove old executable and heavy context .o/.d files ssh $BBB_ADDRESS "rm -rf "$BBB_PROJECT_FOLDER/$BBB_PROJECT_NAME; SCREEN_NAME=BeagleRT - KILL_RUNNING_PROCESS="bash -c 'kill -s 2 \`pidof BeagleRT\` 2>/dev/null; screen -r $SCREEN_NAME -X quit 2>/dev/null; sleep 0.5; exit 0'" #always returns true - # Make new BeagleRT executable and run + # Make new BeagleRT execut/able and run # It does not look very nice that we type the same things over and over # but that is because each line is an ssh session in its own right + MAKE_COMMAND="make stop -C $BBB_BELA_HOME PROJECT='$BBB_PROJECT_NAME' CL='$COMMAND_ARGS'" if [ $RUN_PROJECT -eq 0 ] then echo "Building project..." - ssh $BBB_ADDRESS "make all -C $BBB_BELA_HOME PROJECT=$BBB_PROJECT_NAME" + ssh $BBB_ADDRESS "$MAKE_COMMAND" else echo "Building and running project..." if [ $RUN_WITHOUT_SCREEN -eq 1 ] then - ssh -t $BBB_ADDRESS "make all -C $BBB_BELA_HOME PROJECT=$BBB_PROJECT_NAME && $KILL_RUNNING_PROCESS && $BBB_PROJECT_FOLDER/$BBB_PROJECT_NAME $COMMAND_ARGS" + ssh -t $BBB_ADDRESS "$MAKE_COMMAND run" elif [ $RUN_IN_FOREGROUND -eq 1 ] then # Run in screen without detaching - ssh -t $BBB_ADDRESS "make all -C $BBB_BELA_HOME PROJECT=$BBB_PROJECT_NAME&& $KILL_RUNNING_PROCESS && screen -S $SCREEN_NAME $BBB_PROJECT_FOLDER/$BBB_PROJECT_NAME $COMMAND_ARGS" + ssh -t $BBB_ADDRESS "$MAKE_COMMAND runscreenfg" else # Run in screen and detach - ssh $BBB_ADDRESS "make all -C $BBB_BELA_HOME PROJECT=$BBB_PROJECT_NAME && $KILL_RUNNING_PROCESS && screen -dmS $SCREEN_NAME $BBB_PROJECT_FOLDER/$BBB_PROJECT_NAME $COMMAND_ARGS" - + ssh -t $BBB_ADDRESS "$MAKE_COMMAND runscreen" fi fi } #checkUploadBuildRun
--- a/scripts/hvresources/render.cpp Fri Jun 03 17:15:56 2016 +0100 +++ b/scripts/hvresources/render.cpp Sat Jun 04 14:10:45 2016 +0100 @@ -11,7 +11,7 @@ * */ -#include <BeagleRT.h> +#include <Bela.h> #include <Midi.h> #include <cmath> #include "../include/Utilities.h" @@ -54,7 +54,7 @@ */ Midi midi; -bool setup(BeagleRTContext *context, void *userData) { +bool setup(BelaContext *context, void *userData) { /* HEAVY */ @@ -87,7 +87,7 @@ } -void render(BeagleRTContext *context, void *userData) +void render(BelaContext *context, void *userData) { // De-interleave the data @@ -174,7 +174,7 @@ } -void cleanup(BeagleRTContext *context, void *userData) +void cleanup(BelaContext *context, void *userData) { hv_bbb_free(gHeavyContext);