Skip to content

v1.16.23 #368

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
nitin710 merged 18 commits into from
Jul 28, 2026
Merged

v1.16.23 #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
18a7f86
Feat slide player (#337)
nitin710 Mar 29, 2026
b4fb7f9
Added README for the slidePlayer
nitin710 Mar 29, 2026
9f75fae
Added updated description of the CI workflows used to build and creat…
nitin710 Mar 29, 2026
627b05a
init commit for feature background in oscilloscope
nitin710 Mar 30, 2026
36a3bc5
changing background to white
nitin710 Mar 31, 2026
a585682
double buffer fix for newer version of c++
nitin710 Mar 31, 2026
79e9abb
Feat/ci dependency tracking (#343)
nitin710 Apr 1, 2026
14a78dd
version bumped to v1.16.1
nitin710 Apr 1, 2026
b1829e7
updates to the create-draft-release workflow
nitin710 Apr 1, 2026
c616c84
patch to the create draft release workflow
nitin710 Apr 1, 2026
60988a5
fix indentation issue
nitin710 Apr 1, 2026
7ff003d
Fix/deps namespace issues (#345)
nitin710 Apr 10, 2026
971e2b1
fixing ctest for slide player
nitin710 Apr 10, 2026
ecce919
corrected the directory where the installer puts the Slide player on …
nitin710 Apr 11, 2026
e9ae0b9
renamed slide player (#347)
nitin710 Apr 15, 2026
1556c45
Merge branch 'master' into dev
nitin710 Jul 19, 2026
557e408
updates to the slide player (#365)
connectedfuturelabs Jul 26, 2026
895ec59
Added fix to reload issue
nitin710 Jul 27, 2026
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
4 changes: 2 additions & 2 deletions .github/workflows/build-all-on-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
run: |
echo "current working directory" && pwd
cd EmotiBitSlidePlayer
xcodebuild -project EmotiBitSlidePlayer.xcodeproj -scheme Release
xcodebuild -project "EmotiBit SlidePlayer.xcodeproj" -scheme Release
upload-artifact-macos:
needs: [build-oscilloscope-macos, build-dataparser-macos, build-firmwareinstaller-macos, build-slideplayer-macos]
if: github.ref == 'refs/heads/dev'
Expand All @@ -98,7 +98,7 @@ jobs:
mv EmotiBitOscilloscope/bin/EmotiBitOscilloscope.app stageRelease/EmotiBitSoftware-macos-${{ steps.get_version.outputs.version }}
mv EmotiBitDataParser/bin/EmotiBitDataParser.app stageRelease/EmotiBitSoftware-macos-${{ steps.get_version.outputs.version }}
mv EmotiBitFirmwareInstaller/bin/EmotiBitFirmwareInstaller.app stageRelease/EmotiBitSoftware-macos-${{ steps.get_version.outputs.version }}
mv EmotiBitSlidePlayer/bin/EmotiBitSlidePlayer.app stageRelease/EmotiBitSoftware-macos-${{ steps.get_version.outputs.version }}
mv "EmotiBitSlidePlayer/bin/EmotiBit SlidePlayer.app" stageRelease/EmotiBitSoftware-macos-${{ steps.get_version.outputs.version }}
- name: copy SiLabs drivers
working-directory: ${{ vars.ADDONS_DIR }}
run: |
Expand Down
7 changes: 5 additions & 2 deletions EmotiBitSlidePlayer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,18 @@ add_executable(${PROJECT_NAME} MACOSX_BUNDLE src/main.cpp ${OF_APP_SOURCES})
of_configure_app(${PROJECT_NAME} 23)

target_include_directories(${PROJECT_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../src
${ADDON_OFXJSON_INCLUDE_DIRS}
)

set_target_properties(${PROJECT_NAME} PROPERTIES
MACOSX_BUNDLE_BUNDLE_NAME "EmotiBitSlidePlayer"
MACOSX_BUNDLE_BUNDLE_NAME "EmotiBit SlidePlayer"
OUTPUT_NAME "EmotiBit SlidePlayer"
)

# ── Copy settings + slides to app bundle Resources ────────────────────────────
set(BUNDLE_RESOURCES
"${CMAKE_CURRENT_SOURCE_DIR}/bin/${PROJECT_NAME}.app/Contents/Resources")
"${CMAKE_CURRENT_SOURCE_DIR}/bin/EmotiBit SlidePlayer.app/Contents/Resources")
add_custom_target(copy_settings ALL
COMMAND ${CMAKE_COMMAND} -E make_directory "${BUNDLE_RESOURCES}"
COMMAND ${CMAKE_COMMAND} -E copy
Expand Down Expand Up @@ -73,6 +75,7 @@ set_target_properties(slideShow_tests PROPERTIES
)

target_include_directories(slideShow_tests PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../src
${ADDON_OFXJSON_INCLUDE_DIRS}
)

Expand Down
42 changes: 26 additions & 16 deletions ...iBitSlidePlayer.xcodeproj/project.pbxproj → ...Bit SlidePlayer.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,14 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
1645F56257269CD0356320BD /* ofxJSON.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxJSON.h; path = ../../../addons/ofxJSON/src/ofxJSON.h; sourceTree = SOURCE_ROOT; };
21BDE665988474F1B1F4D302 /* jsoncpp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = jsoncpp.cpp; path = ../../../addons/ofxJSON/libs/jsoncpp/src/jsoncpp.cpp; sourceTree = SOURCE_ROOT; };
26A541233BC6F736E758F718 /* ofxJSONElement.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxJSONElement.h; path = ../../../addons/ofxJSON/src/ofxJSONElement.h; sourceTree = SOURCE_ROOT; };
2C7CF000B7B4F782C187C353 /* json.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = json.h; path = ../../../addons/ofxJSON/libs/jsoncpp/include/json/json.h; sourceTree = SOURCE_ROOT; };
61313493CDB52744E22A604D /* json-forwards.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = "json-forwards.h"; path = "../../../addons/ofxJSON/libs/jsoncpp/include/json/json-forwards.h"; sourceTree = SOURCE_ROOT; };
1645F56257269CD0356320BD /* ofxJSON.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxJSON.h; path = ../../ofxJSON/src/ofxJSON.h; sourceTree = SOURCE_ROOT; };
21BDE665988474F1B1F4D302 /* jsoncpp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = jsoncpp.cpp; path = ../../ofxJSON/libs/jsoncpp/src/jsoncpp.cpp; sourceTree = SOURCE_ROOT; };
26A541233BC6F736E758F718 /* ofxJSONElement.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxJSONElement.h; path = ../../ofxJSON/src/ofxJSONElement.h; sourceTree = SOURCE_ROOT; };
2C7CF000B7B4F782C187C353 /* json.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = json.h; path = ../../ofxJSON/libs/jsoncpp/include/json/json.h; sourceTree = SOURCE_ROOT; };
61313493CDB52744E22A604D /* json-forwards.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = "json-forwards.h"; path = "../../ofxJSON/libs/jsoncpp/include/json/json-forwards.h"; sourceTree = SOURCE_ROOT; };
8EF01BA42F7876C700BF0971 /* emotibitSlidePlayerSettings.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = emotibitSlidePlayerSettings.json; path = bin/data/emotibitSlidePlayerSettings.json; sourceTree = "<group>"; };
8EF01BA62F7876DD00BF0971 /* example_slides */ = {isa = PBXFileReference; lastKnownFileType = folder; name = example_slides; path = bin/data/example_slides; sourceTree = "<group>"; };
8EF01BA9300BFE2B00BF0971 /* ofxEmotiBitVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofxEmotiBitVersion.h; path = ../src/ofxEmotiBitVersion.h; sourceTree = "<group>"; };
E42962AC2163EDD300A6A9E2 /* ofCamera.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ofCamera.cpp; path = ../../../libs/openFrameworks/3d/ofCamera.cpp; sourceTree = SOURCE_ROOT; };
E42962AD2163EDD300A6A9E2 /* ofMesh.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ofMesh.h; path = ../../../libs/openFrameworks/3d/ofMesh.h; sourceTree = SOURCE_ROOT; };
E42962AE2163EDD300A6A9E2 /* ofNode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ofNode.h; path = ../../../libs/openFrameworks/3d/ofNode.h; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -222,13 +223,13 @@
E42963712163EDD300A6A9E2 /* ofFmodSoundPlayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ofFmodSoundPlayer.h; path = ../../../libs/openFrameworks/sound/ofFmodSoundPlayer.h; sourceTree = SOURCE_ROOT; };
E42963722163EDD300A6A9E2 /* ofSoundBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ofSoundBuffer.cpp; path = ../../../libs/openFrameworks/sound/ofSoundBuffer.cpp; sourceTree = SOURCE_ROOT; };
E42963732163EDD300A6A9E2 /* ofSoundBaseTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ofSoundBaseTypes.h; path = ../../../libs/openFrameworks/sound/ofSoundBaseTypes.h; sourceTree = SOURCE_ROOT; };
E4B69B5B0A3A1756003C02F2 /* EmotiBitSlidePlayerDebug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EmotiBitSlidePlayerDebug.app; sourceTree = BUILT_PRODUCTS_DIR; };
E4B69B5B0A3A1756003C02F2 /* EmotiBit SlidePlayerDebug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "EmotiBit SlidePlayerDebug.app"; sourceTree = BUILT_PRODUCTS_DIR; };
E4B69E1D0A3A1BDC003C02F2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = src/main.cpp; sourceTree = SOURCE_ROOT; };
E4B69E1E0A3A1BDC003C02F2 /* ofApp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofApp.cpp; path = src/ofApp.cpp; sourceTree = SOURCE_ROOT; };
E4B69E1F0A3A1BDC003C02F2 /* ofApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofApp.h; path = src/ofApp.h; sourceTree = SOURCE_ROOT; };
E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "openFrameworks-Info.plist"; sourceTree = "<group>"; };
E4EB6923138AFD0F00A09F29 /* Project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Project.xcconfig; sourceTree = "<group>"; };
F2B099E6BD1199664C48B177 /* ofxJSONElement.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxJSONElement.cpp; path = ../../../addons/ofxJSON/src/ofxJSONElement.cpp; sourceTree = SOURCE_ROOT; };
F2B099E6BD1199664C48B177 /* ofxJSONElement.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofxJSONElement.cpp; path = ../../ofxJSON/src/ofxJSONElement.cpp; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -277,6 +278,14 @@
name = local_addons;
sourceTree = "<group>";
};
8EF01BA8300BFE1400BF0971 /* ofxEmotiBIt */ = {
isa = PBXGroup;
children = (
8EF01BA9300BFE2B00BF0971 /* ofxEmotiBitVersion.h */,
);
name = ofxEmotiBIt;
sourceTree = "<group>";
};
977A836DD2C489CCC5E330FF /* jsoncpp */ = {
isa = PBXGroup;
children = (
Expand All @@ -289,6 +298,7 @@
BB4B014C10F69532006C3DED /* addons */ = {
isa = PBXGroup;
children = (
8EF01BA8300BFE1400BF0971 /* ofxEmotiBIt */,
2865DAEF86B1907A704CA70B /* ofxJSON */,
);
name = addons;
Expand Down Expand Up @@ -603,7 +613,7 @@
E42962AA2163EDD300A6A9E2 /* openFrameworks */,
BB4B014C10F69532006C3DED /* addons */,
6948EE371B920CB800B5AC1A /* local_addons */,
E4B69B5B0A3A1756003C02F2 /* EmotiBitSlidePlayerDebug.app */,
E4B69B5B0A3A1756003C02F2 /* EmotiBit SlidePlayerDebug.app */,
);
sourceTree = "<group>";
};
Expand All @@ -628,9 +638,9 @@
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
E4B69B5A0A3A1756003C02F2 /* EmotiBitSlidePlayer */ = {
E4B69B5A0A3A1756003C02F2 /* EmotiBit SlidePlayer */ = {
isa = PBXNativeTarget;
buildConfigurationList = E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "EmotiBitSlidePlayer" */;
buildConfigurationList = E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "EmotiBit SlidePlayer" */;
buildPhases = (
E42962A92163ECCD00A6A9E2 /* ShellScript */,
E4B69B580A3A1756003C02F2 /* Sources */,
Expand All @@ -644,9 +654,9 @@
);
dependencies = (
);
name = EmotiBitSlidePlayer;
name = "EmotiBit SlidePlayer";
productName = myOFApp;
productReference = E4B69B5B0A3A1756003C02F2 /* EmotiBitSlidePlayerDebug.app */;
productReference = E4B69B5B0A3A1756003C02F2 /* EmotiBit SlidePlayerDebug.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
Expand All @@ -657,7 +667,7 @@
attributes = {
LastUpgradeCheck = 0600;
};
buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "EmotiBitSlidePlayer" */;
buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "EmotiBit SlidePlayer" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
Expand All @@ -672,7 +682,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
E4B69B5A0A3A1756003C02F2 /* EmotiBitSlidePlayer */,
E4B69B5A0A3A1756003C02F2 /* EmotiBit SlidePlayer */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -964,7 +974,7 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "EmotiBitSlidePlayer" */ = {
E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "EmotiBit SlidePlayer" */ = {
isa = XCConfigurationList;
buildConfigurations = (
E4B69B4E0A3A1720003C02F2 /* Debug */,
Expand All @@ -974,7 +984,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "EmotiBitSlidePlayer" */ = {
E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "EmotiBit SlidePlayer" */ = {
isa = XCConfigurationList;
buildConfigurations = (
E4B69B600A3A1757003C02F2 /* Debug */,
Expand Down
24 changes: 12 additions & 12 deletions ...roj/xcshareddata/xcschemes/Debug.xcscheme → ...roj/xcshareddata/xcschemes/Debug.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "EmotiBitSlidePlayer.app"
BlueprintName = "EmotiBitSlidePlayer"
ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj">
BuildableName = "EmotiBit SlidePlayer.app"
BlueprintName = "EmotiBit SlidePlayer"
ReferencedContainer = "container:EmotiBit SlidePlayer.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -31,9 +31,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "EmotiBitSlidePlayer.app"
BlueprintName = "EmotiBitSlidePlayer"
ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj">
BuildableName = "EmotiBit SlidePlayer.app"
BlueprintName = "EmotiBit SlidePlayer"
ReferencedContainer = "container:EmotiBit SlidePlayer.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
Expand All @@ -54,9 +54,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "EmotiBitSlidePlayer.app"
BlueprintName = "EmotiBitSlidePlayer"
ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj">
BuildableName = "EmotiBit SlidePlayer.app"
BlueprintName = "EmotiBit SlidePlayer"
ReferencedContainer = "container:EmotiBit SlidePlayer.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
Expand All @@ -71,9 +71,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "EmotiBitSlidePlayer.app"
BlueprintName = "EmotiBitSlidePlayer"
ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj">
BuildableName = "EmotiBit SlidePlayer.app"
BlueprintName = "EmotiBit SlidePlayer"
ReferencedContainer = "container:EmotiBit SlidePlayer.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down
24 changes: 12 additions & 12 deletions ...j/xcshareddata/xcschemes/Release.xcscheme → ...j/xcshareddata/xcschemes/Release.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "EmotiBitSlidePlayer.app"
BlueprintName = "EmotiBitSlidePlayer"
ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj">
BuildableName = "EmotiBit SlidePlayer.app"
BlueprintName = "EmotiBit SlidePlayer"
ReferencedContainer = "container:EmotiBit SlidePlayer.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -31,9 +31,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "EmotiBitSlidePlayer.app"
BlueprintName = "EmotiBitSlidePlayer"
ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj">
BuildableName = "EmotiBit SlidePlayer.app"
BlueprintName = "EmotiBit SlidePlayer"
ReferencedContainer = "container:EmotiBit SlidePlayer.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
Expand All @@ -54,9 +54,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "EmotiBitSlidePlayer.app"
BlueprintName = "EmotiBitSlidePlayer"
ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj">
BuildableName = "EmotiBit SlidePlayer.app"
BlueprintName = "EmotiBit SlidePlayer"
ReferencedContainer = "container:EmotiBit SlidePlayer.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
Expand All @@ -71,9 +71,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "EmotiBitSlidePlayer.app"
BlueprintName = "EmotiBitSlidePlayer"
ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj">
BuildableName = "EmotiBit SlidePlayer.app"
BlueprintName = "EmotiBit SlidePlayer"
ReferencedContainer = "container:EmotiBit SlidePlayer.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down
Loading
Loading