Skip to content

Commit c5e4bce

Browse files
author
Jonathan
committed
change master to main in code
1 parent 5e0e961 commit c5e4bce

25 files changed

+26
-26
lines changed

‎.github/workflows/test_docs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ jobs:
3737
- name: Build AirSim Documentation
3838
run: ./build_docs.sh
3939

40-
# Only on commits to 'master' branch
40+
# Only on commits to 'main' branch
4141
- name: Deploy
4242
uses: peaceiris/actions-gh-pages@v3
43-
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
43+
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
4444
with:
4545
github_token: ${{ secrets.GITHUB_TOKEN }}
4646
publish_dir: ./build_docs

‎AirLib/include/common/AirSimSettings.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ namespace airlib
471471

472472
Settings& settings_json = Settings::singleton();
473473
//write some settings_json in new file otherwise the string "null" is written if all settings_json are empty
474-
settings_json.setString("SeeDocsAt", "https://github.com/Microsoft/AirSim/blob/master/docs/settings.md");
474+
settings_json.setString("SeeDocsAt", "https://github.com/Microsoft/AirSim/blob/main/docs/settings.md");
475475
settings_json.setDouble("SettingsVersion", 1.2);
476476

477477
std::string settings_filename = Settings::getUserDirectoryFullPath("settings.json");

‎Examples/DataCollection/DataCollectorSGM_settings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings.md",
2+
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings.md",
33
"SettingsVersion": 1.2,
44
"SimMode": "ComputerVision",
55
"CameraDefaults": {

‎Examples/DepthNav/DepthNav_settings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings.md",
2+
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings.md",
33
"SettingsVersion": 1.2,
44
"SimMode": "ComputerVision",
55
"CameraDefaults": {

‎PythonClient/computer_vision/cv_capture.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# In settings.json first activate computer vision mode:
2-
# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
2+
# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode
33

44
import setup_path
55
import airsim

‎PythonClient/computer_vision/cv_mode.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# In settings.json first activate computer vision mode:
2-
# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
2+
# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode
33

44
import setup_path
55
import airsim

‎PythonClient/computer_vision/cv_navigate.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
# In settings.json first activate computer vision mode:
3-
# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
3+
# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode
44

55
import setup_path
66
import airsim

‎PythonClient/computer_vision/getpos.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# In settings.json first activate computer vision mode:
2-
# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
2+
# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode
33

44
import setup_path
55
import airsim

‎PythonClient/computer_vision/ground_truth.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# In settings.json first activate computer vision mode:
2-
# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
2+
# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode
33

44
import setup_path
55
import airsim

‎PythonClient/computer_vision/objects.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# In settings.json first activate computer vision mode:
2-
# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
2+
# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode
33

44
import setup_path
55
import airsim

‎PythonClient/computer_vision/segmentation.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# In settings.json first activate computer vision mode:
2-
# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
2+
# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode
33

44
import airsim
55
import cv2

‎PythonClient/multirotor/multi_agent_drone.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# Use below in settings.json with Blocks environment
1010
"""
1111
{
12-
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings.md",
12+
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings.md",
1313
"SettingsVersion": 1.2,
1414
"SimMode": "Multirotor",
1515
"ClockSpeed": 1,

‎PythonClient/multirotor/opencv_show.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# In settings.json first activate computer vision mode:
2-
# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
2+
# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode
33

44
import setup_path
55
import airsim

‎PythonClient/multirotor/sensorframe_lidar_pointcloud.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Sample settings.json used for this script:
44
'''
55
{
6-
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings_json.md",
6+
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings_json.md",
77
"SettingsVersion": 1.2,
88
99
"SimMode": "Multirotor",

‎PythonClient/multirotor/vehicleframe_lidar_pointcloud.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Sample settings.json used for this script:
44
'''
55
{
6-
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings_json.md",
6+
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings_json.md",
77
"SettingsVersion": 1.2,
88
99
"SimMode": "Multirotor",

‎Unity/UnityDemo/Assets/AirSimAssets/Scripts/InitializeAirSim.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ private static bool CreateSettingsFileWithDefaultValues(string fileName)
9090
else
9191
Directory.CreateDirectory(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "AirSim"));
9292

93-
string content = "{\n \"SimMode\" : \"\", \n \"SettingsVersion\" : 1.2, \n \"SeeDocsAt\" : \"https://github.com/Microsoft/AirSim/blob/master/docs/settings.md\"\n}";
93+
string content = "{\n \"SimMode\" : \"\", \n \"SettingsVersion\" : 1.2, \n \"SeeDocsAt\" : \"https://github.com/Microsoft/AirSim/blob/main/docs/settings.md\"\n}";
9494
//settings file created at Documents\AirSim with name "setting.json".
9595
StreamWriter writer = new StreamWriter(File.Open(fileName, FileMode.OpenOrCreate, FileAccess.Write));
9696
writer.WriteLine(content);

‎azure/app/settings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings_json.md",
2+
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings_json.md",
33
"SettingsVersion": 1.2,
44
"SimMode": "Multirotor",
55
"ClockSpeed": 1.0,

‎azure/azure-env-creation/vm-arm-template.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"metadata": {
4040
"description": "Location of the setup script"
4141
},
42-
"defaultValue": "https://raw.githubusercontent.com/microsoft/airsim/master/azure/azure-env-creation"
42+
"defaultValue": "https://raw.githubusercontent.com/microsoft/airsim/main/azure/azure-env-creation"
4343
},
4444
"ScriptFileName": {
4545
"type": "string",

‎build.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if "%VisualStudioVersion%" lss "17.0" (
1717
echo(
1818
echo Hello there! We just upgraded AirSim to Unreal Engine 4.27 and Visual Studio 2022.
1919
echo Here are few easy steps for upgrade so everything is new and shiny:
20-
echo https://github.com/Microsoft/AirSim/blob/master/docs/unreal_upgrade.md
20+
echo https://github.com/Microsoft/AirSim/blob/main/docs/unreal_upgrade.md
2121
goto :buildfailed_nomsg
2222
)
2323

‎docker/settings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings_json.md",
2+
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings_json.md",
33
"SettingsVersion": 1.2,
44
"SimMode": "Multirotor",
55
"ClockSpeed": 1.0,

‎ros/src/airsim_tutorial_pkgs/scripts/multi_drone_json_creator.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def __init__(self, sim_mode="Multirotor"):
2828
self.data = {}
2929

3030
def add_minimal(self):
31-
self.data["SeeDocsAt"] = "https://github.com/Microsoft/AirSim/blob/master/docs/settings.md"
31+
self.data["SeeDocsAt"] = "https://github.com/Microsoft/AirSim/blob/main/docs/settings.md"
3232
self.data["SettingsVersion"] = 1.2
3333
self.data["SimMode"] = self.sim_mode #"Multirotor"
3434
self.data["ClockSpeed"] = 1

‎ros/src/airsim_tutorial_pkgs/settings/car.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings.md",
2+
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings.md",
33
"SettingsVersion": 1.2,
44
"SimMode": "Car",
55
"ViewMode": "SpringArmChase",

‎ros/src/airsim_tutorial_pkgs/settings/front_stereo_and_center_mono.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings.md",
2+
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings.md",
33
"SettingsVersion": 1.2,
44
"SimMode": "Multirotor",
55
"ViewMode": "SpringArmChase",

‎ros/src/airsim_tutorial_pkgs/settings/twenty_five_drones.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"ClockSpeed": 1,
3-
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings.md",
3+
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings.md",
44
"SettingsVersion": 1.2,
55
"SimMode": "Multirotor",
66
"Vehicles": {

‎ros/src/airsim_tutorial_pkgs/settings/two_drones_camera_lidar_imu.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"ClockSpeed": 1,
3-
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings.md",
3+
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings.md",
44
"SettingsVersion": 1.2,
55
"SimMode": "Multirotor",
66
"Vehicles": {

0 commit comments

Comments
 (0)