Skip to content
This repository was archived by the owner on Apr 25, 2023. It is now read-only.

Commit ed9fe1f

Browse files
author
Arthur Ma
authored
Merge pull request #680 from Microsoft/release-1.2.2
* Update 'config device connection string' task name in IoT Hub examples (#667) * fixed an issue and remove unused code (#664) fixed an issue and remove unused code * Update devkit sdk to 1.2.2 (#670)
2 parents 4881284 + ced7127 commit ed9fe1f

File tree

9 files changed

+24
-23
lines changed

9 files changed

+24
-23
lines changed

‎AZ3166/jenkins/DevKitTestTool/Program.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -512,16 +512,19 @@ private static bool RunProcess(string exeFileName, string exeArgument, out strin
512512
try
513513
{
514514
ProcessStartInfo psi = new ProcessStartInfo();
515-
//psi.Verb = "runas";
516515
psi.FileName = exeFileName;
517516
psi.Arguments = exeArgument;
518517
psi.UseShellExecute = false;
519518
psi.RedirectStandardError = true;
520519
psi.RedirectStandardOutput = true;
521520

522521
proc = Process.Start(psi);
523-
int timeout = Constants.Timeout;
522+
proc.OutputDataReceived += (sender, e) => { Console.WriteLine(e.Data); };
523+
proc.ErrorDataReceived += (sender, e) => { Console.WriteLine(e.Data); };
524+
proc.BeginErrorReadLine();
525+
proc.BeginOutputReadLine();
524526

527+
int timeout = Constants.Timeout;
525528
while (timeout >= 0 && !proc.HasExited)
526529
{
527530
proc.WaitForExit(1000); // wait for 1 seconds

‎AZ3166/src/cores/arduino/system/SystemVersion.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#define DEVKIT_MAJOR_VERSION 1
99
#define DEVKIT_MINOR_VERSION 2
10-
#define DEVKIT_PATCH_VERSION 1
10+
#define DEVKIT_PATCH_VERSION 2
1111

1212

1313
#ifdef __cplusplus

‎AZ3166/src/libraries/AudioV2/src/AudioClassV2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class AudioClass {
5858
void format(unsigned int sampleRate = DEFAULT_SAMPLE_RATE, unsigned short sampleBitLength = DEFAULT_BITS_PER_SAMPLE);
5959
// Stop audio data transmition.
6060
void stop();
61-
// Get status of the audio driver. Please use this API to query whether the playing/recoding process is completed.
61+
// Get status of the audio driver. Please use this API to query whether the playing/recording process is completed.
6262
int getAudioState();
6363

6464
// Callback scenario methods :

‎AZ3166/src/libraries/AzureIoT/examples/DevKitTranslator/.vscode/tasks.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
"taskName": "config-device-connection",
115115
"command": "node",
116116
"windows": {
117-
"args": ["\"${env:USERPROFILE}\\azure-board-cli\\out\\cli.js\"", "config_device_connection", ".bin"],
117+
"args": ["\"${env:USERPROFILE}\\azure-board-cli\\out\\cli.js\"", "config_device_connection_string", ".bin"],
118118
"options": {
119119
"shell": {
120120
"executable": "cmd.exe",
@@ -123,10 +123,10 @@
123123
}
124124
},
125125
"linux": {
126-
"args": ["\"$HOME/azure-board-cli/out/cli.js\"", "config_device_connection", ".bin"]
126+
"args": ["\"$HOME/azure-board-cli/out/cli.js\"", "config_device_connection_string", ".bin"]
127127
},
128128
"osx": {
129-
"args": ["\"/Users/$USER/azure-board-cli/out/cli.js\"", "config_device_connection", ".bin"]
129+
"args": ["\"/Users/$USER/azure-board-cli/out/cli.js\"", "config_device_connection_string", ".bin"]
130130
},
131131
"type": "shell",
132132
"presentation": {

‎AZ3166/src/libraries/AzureIoT/examples/DoorMonitor/.vscode/tasks.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"taskName": "config-device-connection",
9090
"command": "node",
9191
"windows": {
92-
"args": ["\"${env:USERPROFILE}\\azure-board-cli\\out\\cli.js\"", "config_device_connection", ".bin"],
92+
"args": ["\"${env:USERPROFILE}\\azure-board-cli\\out\\cli.js\"", "config_device_connection_string", ".bin"],
9393
"options": {
9494
"shell": {
9595
"executable": "cmd.exe",
@@ -98,10 +98,10 @@
9898
}
9999
},
100100
"linux": {
101-
"args": ["\"$HOME/azure-board-cli/out/cli.js\"", "config_device_connection", ".bin"]
101+
"args": ["\"$HOME/azure-board-cli/out/cli.js\"", "config_device_connection_string", ".bin"]
102102
},
103103
"osx": {
104-
"args": ["\"/Users/$USER/azure-board-cli/out/cli.js\"", "config_device_connection", ".bin"]
104+
"args": ["\"/Users/$USER/azure-board-cli/out/cli.js\"", "config_device_connection_string", ".bin"]
105105
},
106106
"type": "shell",
107107
"presentation": {

‎AZ3166/src/libraries/AzureIoT/examples/GetStarted/.vscode/tasks.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"taskName": "config-device-connection",
9090
"command": "node",
9191
"windows": {
92-
"args": ["\"${env:USERPROFILE}\\azure-board-cli\\out\\cli.js\"", "config_device_connection", ".bin"],
92+
"args": ["\"${env:USERPROFILE}\\azure-board-cli\\out\\cli.js\"", "config_device_connection_string", ".bin"],
9393
"options": {
9494
"shell": {
9595
"executable": "cmd.exe",
@@ -98,10 +98,10 @@
9898
}
9999
},
100100
"linux": {
101-
"args": ["\"$HOME/azure-board-cli/out/cli.js\"", "config_device_connection", ".bin"]
101+
"args": ["\"$HOME/azure-board-cli/out/cli.js\"", "config_device_connection_string", ".bin"]
102102
},
103103
"osx": {
104-
"args": ["\"/Users/$USER/azure-board-cli/out/cli.js\"", "config_device_connection", ".bin"]
104+
"args": ["\"/Users/$USER/azure-board-cli/out/cli.js\"", "config_device_connection_string", ".bin"]
105105
},
106106
"type": "shell",
107107
"presentation": {

‎AZ3166/src/libraries/AzureIoT/examples/RemoteMonitoring/.vscode/tasks.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"taskName": "config-device-connection",
6565
"command": "node",
6666
"windows": {
67-
"args": ["\"${env:USERPROFILE}\\azure-board-cli\\out\\cli.js\"", "config_device_connection", ".bin"],
67+
"args": ["\"${env:USERPROFILE}\\azure-board-cli\\out\\cli.js\"", "config_device_connection_string", ".bin"],
6868
"options": {
6969
"shell": {
7070
"executable": "cmd.exe",
@@ -73,10 +73,10 @@
7373
}
7474
},
7575
"linux": {
76-
"args": ["\"$HOME/azure-board-cli/out/cli.js\"", "config_device_connection", ".bin"]
76+
"args": ["\"$HOME/azure-board-cli/out/cli.js\"", "config_device_connection_string", ".bin"]
7777
},
7878
"osx": {
79-
"args": ["\"/Users/$USER/azure-board-cli/out/cli.js\"", "config_device_connection", ".bin"]
79+
"args": ["\"/Users/$USER/azure-board-cli/out/cli.js\"", "config_device_connection_string", ".bin"]
8080
},
8181
"type": "shell",
8282
"presentation": {

‎AZ3166/src/libraries/AzureIoT/examples/ShakeShake/.vscode/tasks.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
"taskName": "config-device-connection",
115115
"command": "node",
116116
"windows": {
117-
"args": ["\"${env:USERPROFILE}\\azure-board-cli\\out\\cli.js\"", "config_device_connection", ".bin"],
117+
"args": ["\"${env:USERPROFILE}\\azure-board-cli\\out\\cli.js\"", "config_device_connection_string", ".bin"],
118118
"options": {
119119
"shell": {
120120
"executable": "cmd.exe",
@@ -123,10 +123,10 @@
123123
}
124124
},
125125
"linux": {
126-
"args": ["\"$HOME/azure-board-cli/out/cli.js\"", "config_device_connection", ".bin"]
126+
"args": ["\"$HOME/azure-board-cli/out/cli.js\"", "config_device_connection_string", ".bin"]
127127
},
128128
"osx": {
129-
"args": ["\"/Users/$USER/azure-board-cli/out/cli.js\"", "config_device_connection", ".bin"]
129+
"args": ["\"/Users/$USER/azure-board-cli/out/cli.js\"", "config_device_connection_string", ".bin"]
130130
},
131131
"type": "shell",
132132
"presentation": {

‎AZ3166/tests/UnitTest/ArduinoLanguageTest/ArduinoLanguageTest.ino

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,7 @@ test(digital_io)
7070

7171
test(serial_print)
7272
{
73-
int incomingByte = 0;
74-
int x =0;
75-
char readVal[3];
73+
int x =0;
7674

7775
Serial.print("No Format");
7876
Serial.print("\t");
@@ -367,7 +365,7 @@ test(math_sqrt)
367365

368366
test(trigonometry)
369367
{
370-
int data[9]={PI, PI/2,PI/3, PI/4, 0, -PI/2,-PI/3, -PI/4, -PI};
368+
double data[9]={PI, PI/2,PI/3, PI/4, 0, -PI/2,-PI/3, -PI/4, -PI};
371369

372370
for(int i=0; i<9; ++i)
373371
{

0 commit comments

Comments
 (0)