Skip to content
This repository has been archived by the owner on Nov 16, 2023. It is now read-only.

Commit

Permalink
Merge pull request #443 from microsoft/develop
Browse files Browse the repository at this point in the history
sync to master
  • Loading branch information
saraclay committed Aug 20, 2019
2 parents 106abac + 773b964 commit 765c77f
Show file tree
Hide file tree
Showing 14 changed files with 88 additions and 103 deletions.
1 change: 1 addition & 0 deletions Samples/Azure/ReadMe.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ languages:
products:
- windows
description: Test out different Azure samples.
---

# IoT Azure Samples

Expand Down
18 changes: 9 additions & 9 deletions Samples/CognitiveServicesExample/CS/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ You will need your device's IP address when connecting to it remotely.

Note that we call the app CogntiveServicesExample. You can name it something different, but you will have to adjust sample code that references CognitiveServicesExample as well.

<img src="../../Resources/images/CognitiveServicesExample/new_project.png">
![New project](../../../Resources/images/CognitiveServicesExample/new_project.png)

If this is the first project you create, Visual Studio will likely prompt you to enable [developer mode for Windows 10](https://msdn.microsoft.com/library/windows/apps/xaml/dn706236.aspx)

<img src="../../Resources/images/CognitiveServicesExample/add_reference.png">
![Add reference](../../../Resources/images/CognitiveServicesExample/add_reference.png)


## Add a reference to the Windows IoT extension SDK
Expand Down Expand Up @@ -91,7 +91,7 @@ To view the entire UI, change the dropdown in the top left corner from '5\" Phon

In the UI mock up, double click on the "Detect Emotions" button. You will see a "Click="button_Clicked" added into the button in your XAML code. You will also be redirected to the .xaml.cs file with a new function called "button_Clicked()" created for you. This function will handle the Cognitive Services calls after a user presses the button.

<img src="../../Resources/images/CognitiveServicesExample/event_handler1.png">
![Event handler](../../../Resources/images/CognitiveServicesExample/event_handler1.png)

## Get the Emotion API Key
___
Expand All @@ -101,7 +101,7 @@ ___

You should now see two API keys available for use for 30 days.

<img src="../../Resources/images/CognitiveServicesExample/cogserv_signup.png">
![Sign up](../../../Resources/images/CognitiveServicesExample/cogserv_signup.png)

2. Azure Subscription

Expand All @@ -110,7 +110,7 @@ ___
After it deploys, click on the **"Show access keys..."** link under the "Essentials" window to see your access keys.


<img src="../../Resources/images/CognitiveServicesExample/azure_cogserv_create.png">
![Create](../../../Resources/images/CognitiveServicesExample/azure_cogserv_create.png)


## Add the C# Code
Expand Down Expand Up @@ -403,7 +403,7 @@ The fourth method places a rectangle around each face detected in the image. Sin

Download the face rectangle and add it to your Assets folder within your project

<img src="../../Resources/images/CognitiveServicesExample/add_rectangle.png">
![Add rectangle](../../../Resources/images/CognitiveServicesExample/add_rectangle.png)

## Build and Test your app locally
___
Expand All @@ -413,7 +413,7 @@ ___

Change the URL for a different image, or just click "Detect Emotion" to run the Emotion Recognizer with the default image. After a few seconds, the results should appear in your app window as expected: the image with rectangles on it on the left and more detailed emotion output for each face on the right.

<img src="../../Resources/images/CognitiveServicesExample/running_app.png">
![Running app](../../../Resources/images/CognitiveServicesExample/running_app.png)


In this case, the order is based on depth: **faces closer to the front will be first, and faces farther away will be last in the list.**
Expand All @@ -430,15 +430,15 @@ ___

2. At this point, Visual Studio will present the 'Remote Connections' dialog. Put the IP address or name of your IoT Core device (in this example, we're using 'my-device') and select **Universal (Unencrypted Protocol)** for Authentication Mode. Click **Select**.

<img src="../../Resources/images/CognitiveServicesExample/remote_connection.png">
![Remote connection](../../../Resources/images/CognitiveServicesExample/remote_connection.png)

> Couple of notes:
>
> 1. You can use the IP address instead of the IoT Core device name.
>
> 2. You can verify and/or modify these values navigating to the project properties (select 'Properties' in the Solution Explorer) and choose the 'Debug' tab on the left:
>
> <img src="../../Resources/images/CognitiveServicesExample/cs-debug-project-properties.png">
![Debug project](../../../Resources/images/CognitiveServicesExample/cs-debug-project-properties.png)

3. Now you're ready to deploy to the remote IoT Core device. Press F5 (or select **Debug \| Start Debugging**) to start debugging our app. You should see the app come up in IoT Core device screen, and you should be able to perform the same functions you did locally. To stop the app, press on the 'Stop Debugging' button (or select Debug \| Stop Debugging).

Expand Down
18 changes: 9 additions & 9 deletions Samples/CognitiveServicesExample/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ You will need your device's IP address when connecting to it remotely.

Note that we call the app CogntiveServicesExample. You can name it something different, but you will have to adjust sample code that references CognitiveServicesExample as well.

<img src="../../Resources/images/CognitiveServicesExample/new_project.png">
![New project](../../Resources/images/CognitiveServicesExample/new_project.png)

If this is the first project you create, Visual Studio will likely prompt you to enable [developer mode for Windows 10](https://msdn.microsoft.com/library/windows/apps/xaml/dn706236.aspx)

<img src="../../Resources/images/CognitiveServicesExample/add_reference.png">
![Add reference](../../Resources/images/CognitiveServicesExample/add_reference.png)


## Add a reference to the Windows IoT extension SDK
Expand Down Expand Up @@ -101,7 +101,7 @@ To view the entire UI, change the dropdown in the top left corner from '5\" Phon

In the UI mock up, double click on the "Detect Emotions" button. You will see a "Click="button_Clicked" added into the button in your XAML code. You will also be redirected to the .xaml.cs file with a new function called "button_Clicked()" created for you. This function will handle the Cognitive Services calls after a user presses the button.

<img src="../../Resources/images/CognitiveServicesExample/event_handler1.png">
![Event handler](../../Resources/images/CognitiveServicesExample/event_handler1.png)

## Get the Emotion API Key
___
Expand All @@ -111,7 +111,7 @@ ___

You should now see two API keys available for use for 30 days.

<img src="../../Resources/images/CognitiveServicesExample/cogserv_signup.png">
![Sign up](../../Resources/images/CognitiveServicesExample/cogserv_signup.png)

2. Azure Subscription

Expand All @@ -120,7 +120,7 @@ ___
After it deploys, click on the **"Show access keys..."** link under the "Essentials" window to see your access keys.


<img src="../../Resources/images/CognitiveServicesExample/azure_cogserv_create.png">
![Create](../../Resources/images/CognitiveServicesExample/azure_cogserv_create.png)


## Add the C# Code
Expand Down Expand Up @@ -413,7 +413,7 @@ The fourth method places a rectangle around each face detected in the image. Sin

Download the face rectangle and add it to your Assets folder within your project

<img src="../../Resources/images/CognitiveServicesExample/add_rectangle.png">
![Add rectangle](../../Resources/images/CognitiveServicesExample/add_rectangle.png)

## Build and Test your app locally
___
Expand All @@ -423,7 +423,7 @@ ___

Change the URL for a different image, or just click "Detect Emotion" to run the Emotion Recognizer with the default image. After a few seconds, the results should appear in your app window as expected: the image with rectangles on it on the left and more detailed emotion output for each face on the right.

<img src="../../Resources/images/CognitiveServicesExample/running_app.png">
![Running app](../../Resources/images/CognitiveServicesExample/running_app.png)


In this case, the order is based on depth: **faces closer to the front will be first, and faces farther away will be last in the list.**
Expand All @@ -440,15 +440,15 @@ ___

2. At this point, Visual Studio will present the 'Remote Connections' dialog. Put the IP address or name of your IoT Core device (in this example, we're using 'my-device') and select **Universal (Unencrypted Protocol)** for Authentication Mode. Click **Select**.

<img src="../../Resources/images/CognitiveServicesExample/remote_connection.png">
![Remote connection](../../Resources/images/CognitiveServicesExample/remote_connection.png)

> Couple of notes:
>
> 1. You can use the IP address instead of the IoT Core device name.
>
> 2. You can verify and/or modify these values navigating to the project properties (select 'Properties' in the Solution Explorer) and choose the 'Debug' tab on the left:
>
> <img src="../../Resources/images/CognitiveServicesExample/cs-debug-project-properties.png">
![Debug project](../../Resources/images/CognitiveServicesExample/cs-debug-project-properties.png)

3. Now you're ready to deploy to the remote IoT Core device. Press F5 (or select **Debug \| Start Debugging**) to start debugging our app. You should see the app come up in IoT Core device screen, and you should be able to perform the same functions you did locally. To stop the app, press on the 'Stop Debugging' button (or select Debug \| Stop Debugging).

Expand Down
2 changes: 1 addition & 1 deletion Samples/CustomDeviceAccessor/CPP/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ The security identifier "AC" identifies all application packages, and will grant

Launch the app and launch process explorer. Open the properties dialog box for the process in process explorer and go to the Security tab. There you will see all of the security identifiers associated with the process's token. The SID with the AppContainer flag set is the app-specific SID.

![Process Explorer](../../Resources/images/DeviceIoControlUwp-AppContainerSid.png)
![Process Explorer](../../../Resources/images/DeviceIoControlUwp-AppContainerSid.png)

You can replace "AC" with this SID in the above SDDL to generate an SDDL that grants access to that specific application only. For example, the following SDDL would grant access only to the application shown above:

Expand Down
23 changes: 10 additions & 13 deletions Samples/DigitalSign/CS/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

This sample showcases a Digital Sign UWP running on Windows IoT Core. Here we will demonstrate how the app receives content in different multimedia forms - e.g. video, audio, image, slideshow - from an XML file stored online and displays this content to the user. The digital sign in this sample is interactive and allows web browsing as well as allowing for touch input.

This is a headed sample. To better understand what headed mode is and how to configure your device to be headed, follow the instructions [here](/Docs/HeadlessMode).

### Prerequisites

* Device running Windows IoT Core build 10240 or greater.
Expand All @@ -18,51 +16,51 @@ You can find the source code for this sample by downloading a zip of all of our

Make a copy of the DigitalSignageUAP folder on your disk and open the project from Visual Studio.

Make sure you set the 'Remote Debugging' setting to point to your Windows IoT device. Go back to the basic 'Hello World' [sample](/Samples/HelloWorld) if you need guidance.
Make sure you set the 'Remote Debugging' setting to point to your Windows IoT device.

## Deploy your app

If you're building for Minnowboard Max, select `x86` in the architecture dropdown. If you're building for Raspberry Pi 2 or 3, select `ARM`.

When everything is set up, you should be able to press F5 from Visual Studio. The Digital Signage app will deploy and start on the Windows IoT device, and you should see the main view page as displayed below:

<img src="../../../Resources/images/DigitalSignage/DigitalSignage1.png" height="400">
![Signage](../../../Resources/images/DigitalSignage/DigitalSignage1.png)

### Slideshow

The app's slideshow can be likened to a screensaver which displays while the app is idle and ends upon user input.

1. From the Main page, click (or tap, if your monitor is touch-enabled) "Play Slideshow".

<img src="../../../Resources/images/DigitalSignage/DigitalSign_slideshow.png" height="400">
![Slideshow](../../../Resources/images/DigitalSignage/DigitalSign_slideshow.png)

2. Slideshow begins - various content is displayed, including ads and screensaver visuals with audio.

<img src="../../../Resources/images/DigitalSignage/DigitalSign_horses.png" height="400">
![Horses](../../../Resources/images/DigitalSignage/DigitalSign_horses.png)

3. End the slideshow by either a) moving your mouse, b) pressing any key or c) tap anywhere on the screen. The main page will return to the screen.

### Web Browser

1. From the Main page, click (or tap, if your monitor is touch-enabled) "Internet Explorer".

<img src="../../../Resources/images/DigitalSignage/DigitalSign_web.png" height="400">
![Web](../../../Resources/images/DigitalSignage/DigitalSign_web.png)

2. Tap or click the Address Bar at the top of the page.

3. Type "www.microsoft.com" into the address bar using either the physical or on-screen keyboard.

When using the on-screen keyboard, you may click characters with your mouse or tap to type if your monitor is touch-enabled.

<img src="../../../Resources/images/DigitalSignage/DigitalSign_keyboard2.png" height="400">
![Keyboard](../../../Resources/images/DigitalSignage/DigitalSign_keyboard2.png)

4. Click or tap the "Go" button. This navigates the browser to the Microsoft home page

<img src="../../../Resources/images/DigitalSignage/DigitalSign_microsoft.png" height="400">
![Microsoft sign](../../../Resources/images/DigitalSignage/DigitalSign_microsoft.png)

5. Navigate to other pages in the browser or return to the main screen by tapping or clicking the "Home" icon on the screen

<img src="../../../Resources/images/DigitalSignage/DigitalSign_home.png" height="400">
![Home for sign](../../../Resources/images/DigitalSignage/DigitalSign_home.png)

## Exploring the Code

Expand Down Expand Up @@ -188,9 +186,8 @@ In the DisplayNext() method, we traverse through our list of media files obtaine

1. From the Main page, click (or tap, if your monitor is touch-enabled) "Settings".

<img src="../../../Resources/images/DigitalSignage/DigitalSign_settings.png" height="400">
![Settings](../../../Resources/images/DigitalSignage/DigitalSign_settings.png)

2. Using the physical keyboard or touch screen, you may specify a new config file to read from at the location you specify.

<img src="../../../Resources/images/DigitalSignage/DigitalSign_settings1.png" height="400">

![Additional settings](../../../Resources/images/DigitalSignage/DigitalSign_settings1.png)
18 changes: 9 additions & 9 deletions Samples/DigitalSign/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,43 +34,43 @@ If you're building for Minnowboard Max, select `x86` in the architecture dropdow

When everything is set up, you should be able to press F5 from Visual Studio. The Digital Signage app will deploy and start on the Windows IoT device, and you should see the main view page as displayed below:

<img src="../../Resources/images/DigitalSignage/DigitalSignage1.png" height="400">
![Signage](../../Resources/images/DigitalSignage/DigitalSignage1.png)

### Slideshow

The app's slideshow can be likened to a screensaver which displays while the app is idle and ends upon user input.

1. From the Main page, click (or tap, if your monitor is touch-enabled) "Play Slideshow".

<img src="../../Resources/images/DigitalSignage/DigitalSign_slideshow.png" height="400">
![Slideshow](../../Resources/images/DigitalSignage/DigitalSign_slideshow.png)

2. Slideshow begins - various content is displayed, including ads and screensaver visuals with audio.

<img src="../../Resources/images/DigitalSignage/DigitalSign_horses.png" height="400">
![Horses](../../Resources/images/DigitalSignage/DigitalSign_horses.png)

3. End the slideshow by either a) moving your mouse, b) pressing any key or c) tap anywhere on the screen. The main page will return to the screen.

### Web Browser

1. From the Main page, click (or tap, if your monitor is touch-enabled) "Internet Explorer".

<img src="../../Resources/images/DigitalSignage/DigitalSign_web.png" height="400">
![Web](../../Resources/images/DigitalSignage/DigitalSign_web.png)

2. Tap or click the Address Bar at the top of the page.

3. Type "www.microsoft.com" into the address bar using either the physical or on-screen keyboard.

When using the on-screen keyboard, you may click characters with your mouse or tap to type if your monitor is touch-enabled.

<img src="../../Resources/images/DigitalSignage/DigitalSign_keyboard2.png" height="400">
![Keyboard](../../Resources/images/DigitalSignage/DigitalSign_keyboard2.png)

4. Click or tap the "Go" button. This navigates the browser to the Microsoft home page

<img src="../../Resources/images/DigitalSignage/DigitalSign_microsoft.png" height="400">
![Microsoft sign](../../Resources/images/DigitalSignage/DigitalSign_microsoft.png)

5. Navigate to other pages in the browser or return to the main screen by tapping or clicking the "Home" icon on the screen

<img src="../../Resources/images/DigitalSignage/DigitalSign_home.png" height="400">
![Home for sign](../../Resources/images/DigitalSignage/DigitalSign_home.png)

## Exploring the Code

Expand Down Expand Up @@ -196,9 +196,9 @@ In the DisplayNext() method, we traverse through our list of media files obtaine

1. From the Main page, click (or tap, if your monitor is touch-enabled) "Settings".

<img src="../../Resources/images/DigitalSignage/DigitalSign_settings.png" height="400">
![Settings](../../Resources/images/DigitalSignage/DigitalSign_settings.png)

2. Using the physical keyboard or touch screen, you may specify a new config file to read from at the location you specify.

<img src="../../Resources/images/DigitalSignage/DigitalSign_settings1.png" height="400">
![Additional settings](../../Resources/images/DigitalSignage/DigitalSign_settings1.png)

Loading

0 comments on commit 765c77f

Please sign in to comment.