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

Fixes related to auxillary #1939

Merged
merged 3 commits into from
Mar 12, 2021
Merged

Fixes related to auxillary #1939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a6ac56
Fixes related to auxillary
FrankElias77 Mar 9, 2021
4d0948e
Deprecated message update
FrankElias77 Mar 10, 2021
6480d19
Comment review
FrankElias77 Mar 10, 2021
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
9 changes: 7 additions & 2 deletions SmartDeviceLink/public/SDLStaticIconName.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,14 @@ extern SDLStaticIconName const SDLStaticIconNameAudiobookEpisode;
extern SDLStaticIconName const SDLStaticIconNameAudiobookNarrator;

/**
* Static icon auxillary audio
* Static icon auxiliary audio
*/
extern SDLStaticIconName const SDLStaticIconNameAuxillaryAudio;
extern SDLStaticIconName const SDLStaticIconNameAuxillaryAudio __deprecated_msg("Use SDLStaticIconNameAuxiliaryAudio instead");

/**
* Static icon auxiliary audio
*/
extern SDLStaticIconName const SDLStaticIconNameAuxiliaryAudio;

/**
* Static icon back / return
Expand Down
1 change: 1 addition & 0 deletions SmartDeviceLink/public/SDLStaticIconName.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
SDLStaticIconName const SDLStaticIconNameAudiobookEpisode = @"0x83";
SDLStaticIconName const SDLStaticIconNameAudiobookNarrator = @"0x82";
SDLStaticIconName const SDLStaticIconNameAuxillaryAudio = @"0x45";
SDLStaticIconName const SDLStaticIconNameAuxiliaryAudio = @"0x45";
SDLStaticIconName const SDLStaticIconNameBack = @"0x86";
SDLStaticIconName const SDLStaticIconNameBatteryCapacity0Of5 = @"0xF7";
SDLStaticIconName const SDLStaticIconNameBatteryCapacity1Of5 = @"0xF8";
Expand Down
4 changes: 4 additions & 0 deletions SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLStaticIconNameSpec.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@
expect(SDLStaticIconNameAudioMute).to(equal(@"0x12"));
expect(SDLStaticIconNameAudiobookEpisode).to(equal(@"0x83"));
expect(SDLStaticIconNameAudiobookNarrator).to(equal(@"0x82"));
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
expect(SDLStaticIconNameAuxillaryAudio).to(equal(@"0x45"));
#pragma clang diagnostic pop
expect(SDLStaticIconNameAuxiliaryAudio).to(equal(@"0x45"));
expect(SDLStaticIconNameBack).to(equal(@"0x86"));
expect(SDLStaticIconNameBatteryCapacity0Of5).to(equal(@"0xF7"));
expect(SDLStaticIconNameBatteryCapacity1Of5).to(equal(@"0xF8"));
Expand Down