Skip to content

Commit ccb37fa

Browse files
TaojunshenTaojunshen
authored
Merge pull request #297024 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 3b8c550 + 56f357b commit ccb37fa

File tree

2 files changed

+2
-66
lines changed

2 files changed

+2
-66
lines changed

‎articles/backup/scripts/geo-code-list.md

Lines changed: 1 addition & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -67,61 +67,10 @@ This sample XML provides you with an insight about the geo-codes mapped with the
6767
<GeoCodeRegionNameMap GeoCode="JIC" RegionName="Jio India Central" />
6868
<GeoCodeRegionNameMap GeoCode="JIW" RegionName="Jio India West" />
6969
<GeoCodeRegionNameMap GeoCode="QAC" RegionName="Qatar Central" />
70-
<GeoCodeRegionNameMap GeoCode="WUSR" RegionName="East US" />
71-
<GeoCodeRegionNameMap GeoCode="EUSR" RegionName="West US" />
72-
<GeoCodeRegionNameMap GeoCode="CUSR" RegionName="East US 2" />
73-
<GeoCodeRegionNameMap GeoCode="EU2R" RegionName="Central US" />
74-
<GeoCodeRegionNameMap GeoCode="NCUR" RegionName="South Central US" />
75-
<GeoCodeRegionNameMap GeoCode="SCUR" RegionName="North Central US" />
76-
<GeoCodeRegionNameMap GeoCode="NER" RegionName="West Europe" />
77-
<GeoCodeRegionNameMap GeoCode="WER" RegionName="North Europe" />
78-
<GeoCodeRegionNameMap GeoCode="EAR" RegionName="Southeast Asia" />
79-
<GeoCodeRegionNameMap GeoCode="SEAR" RegionName="East Asia" />
80-
<GeoCodeRegionNameMap GeoCode="JPER" RegionName="Japan West" />
81-
<GeoCodeRegionNameMap GeoCode="JPWR" RegionName="Japan East" />
82-
<GeoCodeRegionNameMap GeoCode="BRSR" RegionName="South Central US" />
83-
<GeoCodeRegionNameMap GeoCode="AER" RegionName="Australia Southeast" />
84-
<GeoCodeRegionNameMap GeoCode="ASER" RegionName="Australia East" />
85-
<GeoCodeRegionNameMap GeoCode="INCR" RegionName="South India" />
86-
<GeoCodeRegionNameMap GeoCode="INSR" RegionName="Central India" />
87-
<GeoCodeRegionNameMap GeoCode="CNCR" RegionName="Canada East" />
88-
<GeoCodeRegionNameMap GeoCode="CNER" RegionName="Canada Central" />
89-
<GeoCodeRegionNameMap GeoCode="WCUR" RegionName="West US 2" />
90-
<GeoCodeRegionNameMap GeoCode="WU2R" RegionName="West Central US" />
91-
<GeoCodeRegionNameMap GeoCode="UKWR" RegionName="UK South" />
92-
<GeoCodeRegionNameMap GeoCode="UKSR" RegionName="UK West" />
93-
<GeoCodeRegionNameMap GeoCode="CCYR" RegionName="East US 2 EUAP" />
94-
<GeoCodeRegionNameMap GeoCode="ECYR" RegionName="Central US EUAP" />
95-
<GeoCodeRegionNameMap GeoCode="KRSR" RegionName="Korea Central" />
96-
<GeoCodeRegionNameMap GeoCode="KRCR" RegionName="Korea South" />
97-
<GeoCodeRegionNameMap GeoCode="FRCR" RegionName="France South" />
98-
<GeoCodeRegionNameMap GeoCode="FRSR" RegionName="France Central" />
99-
<GeoCodeRegionNameMap GeoCode="ACLR" RegionName="Australia Central 2" />
100-
<GeoCodeRegionNameMap GeoCode="AC2R" RegionName="Australia Central" />
101-
<GeoCodeRegionNameMap GeoCode="UACR" RegionName="UAE North" />
102-
<GeoCodeRegionNameMap GeoCode="UANR" RegionName="UAE Central" />
103-
<GeoCodeRegionNameMap GeoCode="SANR" RegionName="South Africa West" />
104-
<GeoCodeRegionNameMap GeoCode="SAWR" RegionName="South Africa North" />
105-
<GeoCodeRegionNameMap GeoCode="INWR" RegionName="South India" />
106-
<GeoCodeRegionNameMap GeoCode="NWER" RegionName="Norway West" />
107-
<GeoCodeRegionNameMap GeoCode="NWWR" RegionName="Norway East" />
108-
<GeoCodeRegionNameMap GeoCode="SZNR" RegionName="Switzerland West" />
109-
<GeoCodeRegionNameMap GeoCode="SZWR" RegionName="Switzerland North" />
110-
<GeoCodeRegionNameMap GeoCode="GNR" RegionName="Germany West Central" />
111-
<GeoCodeRegionNameMap GeoCode="GWCR" RegionName="Germany North" />
112-
<GeoCodeRegionNameMap GeoCode="SDCR" RegionName="Sweden South" />
113-
<GeoCodeRegionNameMap GeoCode="SDSR" RegionName="Sweden Central" />
114-
<GeoCodeRegionNameMap GeoCode="BSER" RegionName="Brazil South" />
115-
<GeoCodeRegionNameMap GeoCode="WU3R" RegionName="East US" />
116-
<GeoCodeRegionNameMap GeoCode="JICR" RegionName="Jio India West" />
117-
<GeoCodeRegionNameMap GeoCode="JIWR" RegionName="Jio India Central" />
11870
<GeoCodeRegionNameMap GeoCode="PLC" RegionName="Poland Central" />
119-
<GeoCodeRegionNameMap GeoCode="MYS" RegionName="Malaysia South" />
120-
<GeoCodeRegionNameMap GeoCode="MYSR" RegionName="Japan West" />
71+
<GeoCodeRegionNameMap GeoCode="MYS" RegionName="Malaysia South" /
12172
<GeoCodeRegionNameMap GeoCode="TWN" RegionName="Taiwan North" />
12273
<GeoCodeRegionNameMap GeoCode="TWNR" RegionName="Taiwan Northwest" />
123-
<GeoCodeRegionNameMap GeoCode="TNW" RegionName="Taiwan Northwest" />
124-
<GeoCodeRegionNameMap GeoCode="TNWR" RegionName="Taiwan North" />
12574
<GeoCodeRegionNameMap GeoCode="ILC" RegionName="Israel Central" />
12675
<GeoCodeRegionNameMap GeoCode="ITN" RegionName="Italy North" />
12776
<GeoCodeRegionNameMap GeoCode="MXC" RegionName="Mexico Central" />
@@ -131,31 +80,18 @@ This sample XML provides you with an insight about the geo-codes mapped with the
13180
<GeoCodeRegionNameMap GeoCode="MYW" RegionName="Malaysia West" />
13281
<GeoCodeRegionNameMap GeoCode="IDC" RegionName="Indonesia Central" />
13382
<GeoCodeRegionNameMap GeoCode="USE" RegionName="Southeast US" />
134-
<GeoCodeRegionNameMap GeoCode="USER" RegionName="West US 3" />
135-
<GeoCodeRegionNameMap GeoCode="TST" RegionName="UK South" />
13683
<GeoCodeRegionNameMap GeoCode="UGV" RegionName="USGov Virginia" />
13784
<GeoCodeRegionNameMap GeoCode="UGA" RegionName="USGov Arizona" />
13885
<GeoCodeRegionNameMap GeoCode="UGT" RegionName="USGov Texas" />
13986
<GeoCodeRegionNameMap GeoCode="UDC" RegionName="USDoD Central" />
14087
<GeoCodeRegionNameMap GeoCode="UDE" RegionName="USDoD East" />
141-
<GeoCodeRegionNameMap GeoCode="UGVR" RegionName="USGov Texas" />
142-
<GeoCodeRegionNameMap GeoCode="UGIR" RegionName="USGov Virginia" />
143-
<GeoCodeRegionNameMap GeoCode="UGAR" RegionName="USGov Texas" />
144-
<GeoCodeRegionNameMap GeoCode="UGTR" RegionName="USGov Arizona" />
145-
<GeoCodeRegionNameMap GeoCode="UDCR" RegionName="USDoD East" />
146-
<GeoCodeRegionNameMap GeoCode="UDER" RegionName="USDoD Central" />
14788
<GeoCodeRegionNameMap GeoCode="BJB" RegionName="China North" />
14889
<GeoCodeRegionNameMap GeoCode="SHA" RegionName="China East" />
14990
<GeoCodeRegionNameMap GeoCode="BJB2" RegionName="China North 2" />
15091
<GeoCodeRegionNameMap GeoCode="SHA2" RegionName="China East 2" />
15192
<GeoCodeRegionNameMap GeoCode="BJB3" RegionName="China North 3" />
15293
<GeoCodeRegionNameMap GeoCode="SHA3" RegionName="China East 3" />
153-
<GeoCodeRegionNameMap GeoCode="BJBR" RegionName="China East" />
154-
<GeoCodeRegionNameMap GeoCode="SHAR" RegionName="China North" />
15594
<GeoCodeRegionNameMap GeoCode="BJ2R" RegionName="China East 2" />
156-
<GeoCodeRegionNameMap GeoCode="SH2R" RegionName="China North 2" />
157-
<GeoCodeRegionNameMap GeoCode="BJ3R" RegionName="China East 3" />
158-
<GeoCodeRegionNameMap GeoCode="SH3R" RegionName="China North 3" />
15995
</GeoCodeList>
16096

16197
```

‎articles/iot/concepts-iot-device-selection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ Following is a comparison table of SBCs in alphabetical order. This list isn't i
181181
| [Raspberry Pi 4, Model B](https://aka.ms/IotDeviceList/RpiModelB) | ~$30 - $80 | Home automation; Robotics; Autonomous vehicles; Control systems; Field science | Raspberry Pi OS, Raspbian, Ubuntu 20.04/21.04, RISC OS, Windows 10 IoT, more | 1.5 GHz CPU, 500 MHz GPU | 64-bit Broadcom BCM2711 (quad-core Cortex-A72), VideoCore VI GPU | 2GB/4GB/8GB LPDDR4 RAM, SD Card (not included) | 2 x USB 3 ports, 1 x MIPI DSI display port, 1 x MIPI CSI camera port, 4-pole stereo audio and composite video port, Power over Ethernet (requires HAT) | 26 x Digital, 4 x PWM | 2 micro-HDMI composite, MPI DSI | WiFi, Bluetooth | √ | 5 V | 1. [Send data to IoT Hub](https://www.hackster.io/jenfoxbot/how-to-send-see-data-from-a-raspberry-pi-to-azure-iot-hub-908924), 2. [Monitor plants with Azure IoT](https://github.com/microsoft/IoT-For-Beginners/tree/main/2-farm/lessons/4-migrate-your-plant-to-the-cloud)| [BeagleBone Black Wireless (~$50 - $60)](https://www.beagleboard.org/boards/beaglebone-black-wireless) |
182182
| [NVIDIA Jetson 2 GB Nano Dev Kit](https://aka.ms/IotDeviceList/NVIDIAJetson) | ~$50 - $100 | AI/ML; Autonomous vehicles | Ubuntu-based JetPack | 1.43 GHz CPU, 921 MHz GPU | 64-bit NVIDIA CPU (quad-core Cortex-A57), 128-CUDA-core Maxwell GPU coprocessor | 2GB/4GB LPDDR4 RAM | 472 GFLOPS for AI Perf, 1 x MIPI CSI-2 connector | 28 x Digital, 2 x PWM | HDMI, DP (4 GB only) | Gigabit Ethernet, 802.11ac WiFi | √ | 5 V | [Deepstream integration with Azure IoT Central](https://www.hackster.io/pjdecarlo/nvidia-deepstream-integration-with-azure-iot-central-d9f834) | [BeagleBone AI (~$110 - $120)](https://aka.ms/IotDeviceList/BeagleBoneAI) |
183183
| [Raspberry Pi Zero W2](https://aka.ms/IotDeviceList/RpiZeroW) | ~$15 - $20 | Home automation; ML; Vehicle modifications; Field Science | Raspberry Pi OS, Raspbian, Ubuntu 20.04/21.04, RISC OS, Windows 10 IoT, more | 1 GHz CPU, 400 MHz GPU | 64-bit Broadcom BCM2837 (quad-core Cortez-A53), VideoCore IV GPU | 512 MB LPDDR2 RAM, SD Card (not included) | 1 x CSI-2 Camera connector | 26 x Digital, 4 x PWM | Mini-HDMI | WiFi, Bluetooth | - | 5 V | [Send and visualize data to Azure IoT Hub](https://www.hackster.io/jenfoxbot/how-to-send-see-data-from-a-raspberry-pi-to-azure-iot-hub-908924) | [Onion Omega2+ (~$10 - $15)](https://onion.io/Omega2/) |
184-
| [DFRobot LattePanda](https://aka.ms/IotDeviceList/DFRobotLattePanda) | ~$100 - $160 | Home automation; Hyperscale cloud connectivity; AI/ML | Windows 10, Ubuntu 16.04, OpenSuSE 15 | 1.92 GHz | 64-bit Intel Z8350 (quad-core x86-64), Atmega32u4 coprocessor | 2 GB DDR3L RAM, 32 GB eMMC/4GB DDR3L RAM, 64-GB eMMC | - | 6 x Digital (20 x via Atmega32u4), 6 x PWM, 12 x ADC | HDMI, MIPI DSI | WiFi, Bluetooth | √ | 5 V | 1. [Getting started with Microsoft Azure](https://www.hackster.io/45361/dfrobot-lattepanda-with-microsoft-azure-getting-started-0ae8fb), 2. [Home Monitoring System with Azure](https://www.hackster.io/JiongShi/home-monitoring-system-based-on-lattepanda-zigbee-and-azure-ce4e03)| [Seeed Odyssey X86J4125800 (~$210 - $230)](https://aka.ms/IotDeviceList/SeeedOdyssey) |
184+
| [DFRobot LattePanda](https://aka.ms/IotDeviceList/DFRobotLattePanda) | ~$100 - $160 | Home automation; Hyperscale cloud connectivity; AI/ML | Windows 10, Ubuntu 16.04, openSUSE 15 | 1.92 GHz | 64-bit Intel Z8350 (quad-core x86-64), Atmega32u4 coprocessor | 2 GB DDR3L RAM, 32 GB eMMC/4GB DDR3L RAM, 64-GB eMMC | - | 6 x Digital (20 x via Atmega32u4), 6 x PWM, 12 x ADC | HDMI, MIPI DSI | WiFi, Bluetooth | √ | 5 V | 1. [Getting started with Microsoft Azure](https://www.hackster.io/45361/dfrobot-lattepanda-with-microsoft-azure-getting-started-0ae8fb), 2. [Home Monitoring System with Azure](https://www.hackster.io/JiongShi/home-monitoring-system-based-on-lattepanda-zigbee-and-azure-ce4e03)| [Seeed Odyssey X86J4125800 (~$210 - $230)](https://aka.ms/IotDeviceList/SeeedOdyssey) |
185185

186186
## Questions? Requests?
187187

0 commit comments

Comments
 (0)