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.

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

Create Techasit.info&BlackBerry.Inc #4981

Closed
wants to merge 21 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ about: Create a report to help us improve
<!-- Please read our Rules of Conduct: https://opensource.microsoft.com/codeofconduct/ -->
<!-- Please search for existing issues to avoid creating duplicates. -->
<!-- Incomplete reports will lead to closing the issue. -->
<!-- Also, please test using the latest master make sure your issue has not already been fixed -->
<!-- Also, please test using the latest main branch make sure your issue has not already been fixed -->

## Bug report
<!-- If any section does not apply, replace its contents with "N/A". -->
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clang_format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
name: Formatting Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Run clang-format style check for C/C++ programs.
uses: jidicula/[email protected]
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.7'
architecture: 'x64'
Expand All @@ -37,10 +37,10 @@ jobs:
- name: Build AirSim Documentation
run: ./build_docs.sh

# Only on commits to 'master' branch
# Only on commits to 'main' branch
- name: Deploy
uses: peaceiris/actions-gh-pages@v3
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./build_docs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup
run: ./setup.sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
os: [ubuntu-18.04, ubuntu-20.04]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup
run: ./setup.sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Enable Developer Command Prompt
uses: ilammy/msvc-dev-cmd@v1
Expand Down
2 changes: 1 addition & 1 deletion AirLib/include/common/AirSimSettings.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ namespace airlib

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

std::string settings_filename = Settings::getUserDirectoryFullPath("settings.json");
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Changelog

This page has moved [here](https://github.com/microsoft/AirSim/blob/master/docs/CHANGELOG.md).
This page has moved [here](https://github.com/microsoft/AirSim/blob/main/docs/CHANGELOG.md).
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Contributing

This page has moved [here](https://github.com/microsoft/AirSim/blob/master/docs/CONTRIBUTING.md).
This page has moved [here](https://github.com/microsoft/AirSim/blob/main/docs/CONTRIBUTING.md).
2 changes: 1 addition & 1 deletion Examples/DataCollection/DataCollectorSGM_settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings.md",
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings.md",
"SettingsVersion": 1.2,
"SimMode": "ComputerVision",
"CameraDefaults": {
Expand Down
2 changes: 1 addition & 1 deletion Examples/DepthNav/DepthNav_settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings.md",
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings.md",
"SettingsVersion": 1.2,
"SimMode": "ComputerVision",
"CameraDefaults": {
Expand Down
2 changes: 1 addition & 1 deletion GazeboDrone/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Welcome to GazeboDrone

This page has moved [here](https://github.com/microsoft/AirSim/blob/master/docs/gazebo_drone.md).
This page has moved [here](https://github.com/microsoft/AirSim/blob/main/docs/gazebo_drone.md).
2 changes: 1 addition & 1 deletion MavLinkCom/MavLinkMoCap/Readme.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Welcome to MavLinkMoCap

This page has moved [here](https://github.com/microsoft/AirSim/blob/master/docs/mavlinkcom_mocap.md).
This page has moved [here](https://github.com/microsoft/AirSim/blob/main/docs/mavlinkcom_mocap.md).
2 changes: 1 addition & 1 deletion MavLinkCom/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Welcome to MavLinkCom

This page has moved [here](https://github.com/microsoft/AirSim/blob/master/docs/mavlinkcom.md).
This page has moved [here](https://github.com/microsoft/AirSim/blob/main/docs/mavlinkcom.md).
4 changes: 2 additions & 2 deletions PythonClient/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This package contains Python APIs for [AirSim](https://github.com/microsoft/airsim).

## How to Use
See examples at [car/hello_car.py](https://github.com/Microsoft/AirSim/blob/master/PythonClient/car/hello_car.py) or [multirotor/hello_drone.py](https://github.com/microsoft/AirSim/blob/master/PythonClient/multirotor/hello_drone.py).
See examples at [car/hello_car.py](https://github.com/Microsoft/AirSim/blob/main/PythonClient/car/hello_car.py) or [multirotor/hello_drone.py](https://github.com/microsoft/AirSim/blob/main/PythonClient/multirotor/hello_drone.py).

## Dependencies
This package depends on `msgpack` and would automatically install `msgpack-rpc-python` (this may need administrator/sudo prompt):
Expand All @@ -16,5 +16,5 @@ Some examples also requires opencv.
## More Info

More information on AirSim Python APIs can be found at:
https://github.com/Microsoft/AirSim/blob/master/docs/python.md
https://github.com/Microsoft/AirSim/blob/main/docs/python.md

2 changes: 1 addition & 1 deletion PythonClient/airsim/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
from .utils import *
from .types import *

__version__ = "1.7.0"
__version__ = "1.8.1"
2 changes: 1 addition & 1 deletion PythonClient/computer_vision/cv_capture.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# In settings.json first activate computer vision mode:
# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode

import setup_path
import airsim
Expand Down
2 changes: 1 addition & 1 deletion PythonClient/computer_vision/cv_mode.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# In settings.json first activate computer vision mode:
# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode

import setup_path
import airsim
Expand Down
2 changes: 1 addition & 1 deletion PythonClient/computer_vision/cv_navigate.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

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

import setup_path
import airsim
Expand Down
2 changes: 1 addition & 1 deletion PythonClient/computer_vision/getpos.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# In settings.json first activate computer vision mode:
# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode

import setup_path
import airsim
Expand Down
2 changes: 1 addition & 1 deletion PythonClient/computer_vision/ground_truth.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# In settings.json first activate computer vision mode:
# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode

import setup_path
import airsim
Expand Down
2 changes: 1 addition & 1 deletion PythonClient/computer_vision/objects.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# In settings.json first activate computer vision mode:
# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode

import setup_path
import airsim
Expand Down
2 changes: 1 addition & 1 deletion PythonClient/computer_vision/segmentation.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# In settings.json first activate computer vision mode:
# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode

import airsim
import cv2
Expand Down
2 changes: 1 addition & 1 deletion PythonClient/multirotor/multi_agent_drone.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# Use below in settings.json with Blocks environment
"""
{
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings.md",
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings.md",
"SettingsVersion": 1.2,
"SimMode": "Multirotor",
"ClockSpeed": 1,
Expand Down
2 changes: 1 addition & 1 deletion PythonClient/multirotor/opencv_show.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# In settings.json first activate computer vision mode:
# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode

import setup_path
import airsim
Expand Down
2 changes: 1 addition & 1 deletion PythonClient/multirotor/sensorframe_lidar_pointcloud.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Sample settings.json used for this script:
'''
{
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings_json.md",
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings_json.md",
"SettingsVersion": 1.2,

"SimMode": "Multirotor",
Expand Down
2 changes: 1 addition & 1 deletion PythonClient/multirotor/vehicleframe_lidar_pointcloud.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Sample settings.json used for this script:
'''
{
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings_json.md",
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings_json.md",
"SettingsVersion": 1.2,

"SimMode": "Multirotor",
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## AirSim announcement: This repository will be archived in the coming year

In 2017 Microsoft Research created AirSim as a simulation platform for AI research and experimentation. Over the span of five years, this research project has served its purpose—and gained a lot of ground—as a common way to share research code and test new ideas around aerial AI development and simulation. Additionally, time has yielded advancements in the way we apply technology to the real world, particularly through aerial mobility and autonomous systems. For example, drone delivery is no longer a sci-fi storyline—it’s a business reality, which means there are new needs to be met. We’ve learned a lot in the process, and we want to thank this community for your engagement along the way.

In the spirit of forward momentum, we will be releasing a new simulation platform in the coming year and subsequently archiving the original 2017 AirSim. Users will still have access to the original AirSim code beyond that point, but no further updates will be made, effective immediately. Instead, we will focus our efforts on a new product, Microsoft Project AirSim, to meet the growing needs of the aerospace industry. Project AirSim will provide an end-to-end platform for safely developing and testing aerial autonomy through simulation. Users will benefit from the safety, code review, testing, advanced simulation, and AI capabilities that are uniquely available in a commercial product. As we get closer to the release of Project AirSim, there will be learning tools and features available to help you migrate to the new platform and to guide you through the product. To learn more about building aerial autonomy with the new Project AirSim, visit [https://aka.ms/projectairsim](https://aka.ms/projectairsim).

# Welcome to AirSim

AirSim is a simulator for drones, cars and more, built on [Unreal Engine](https://www.unrealengine.com/) (we now also have an experimental [Unity](https://unity3d.com/) release). It is open-source, cross platform, and supports software-in-the-loop simulation with popular flight controllers such as PX4 & ArduPilot and hardware-in-loop with PX4 for physically and visually realistic simulations. It is developed as an Unreal plugin that can simply be dropped into any Unreal environment. Similarly, we have an experimental release for a Unity plugin.
Expand Down
2 changes: 1 addition & 1 deletion SUPPORT.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Support

This page has moved [here](https://github.com/microsoft/AirSim/blob/master/docs/SUPPORT.md).
This page has moved [here](https://github.com/microsoft/AirSim/blob/main/docs/SUPPORT.md).
67 changes: 67 additions & 0 deletions Techasit.info&BlackBerry.Inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
from web3 import Web3
from eth_account import Account
import json
import os

class CryptoWallet:
def __init__(self, private_key=None):
self.w3 = Web3(Web3.HTTPProvider('https://mainnet.infura.io/v3/YOUR_INFURA_PROJECT_ID'))
if private_key:
self.account = Account.from_key(private_key)
else:
self.account = Account.create()

def get_address(self):
return self.account.address

def get_balance(self):
return self.w3.eth.get_balance(self.get_address())

def send_transaction(self, to_address, value_in_ether, gas=21000, gas_price=None):
value = self.w3.to_wei(value_in_ether, 'ether')
if not gas_price:
gas_price = self.w3.eth.gas_price

transaction = {
'to': to_address,
'value': value,
'gas': gas,
'gasPrice': gas_price,
'nonce': self.w3.eth.getTransactionCount(self.get_address()),
'chainId': 1 # Ethereum mainnet
}

signed_tx = self.account.sign_transaction(transaction)
tx_hash = self.w3.eth.send_raw_transaction(signed_tx.rawTransaction)
return tx_hash.hex()

def save_wallet(self, file_path):
wallet_data = {
'address': self.get_address(),
'private_key': self.account.key.hex()
}
with open(file_path, 'w') as f:
json.dump(wallet_data, f)

@staticmethod
def load_wallet(file_path):
with open(file_path, 'r') as f:
wallet_data = json.load(f)
return CryptoWallet(private_key=wallet_data['private_key'])

if __name__ == "__main__":
# Create a new wallet
wallet = CryptoWallet()
print("Wallet Address:", wallet.get_address())
print("Wallet Balance:", Web3.from_wei(wallet.get_balance(), 'ether'), "ETH")

# Send a transaction
# tx_hash = wallet.send_transaction('0xRecipientAddress', 0.01)
# print("Transaction Hash:", tx_hash)

# Save wallet to a file
wallet.save_wallet('my_wallet.json')

# Load wallet from a file
loaded_wallet = CryptoWallet.load_wallet('my_wallet.json')
print("Loaded Wallet Address:", loaded_wallet.get_address())
2 changes: 1 addition & 1 deletion Unity/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# AirSim on Unity

This page has moved [here](https://github.com/microsoft/AirSim/blob/master/docs/Unity.md)
This page has moved [here](https://github.com/microsoft/AirSim/blob/main/docs/Unity.md)
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ private static bool CreateSettingsFileWithDefaultValues(string fileName)
else
Directory.CreateDirectory(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "AirSim"));

string content = "{\n \"SimMode\" : \"\", \n \"SettingsVersion\" : 1.2, \n \"SeeDocsAt\" : \"https://github.com/Microsoft/AirSim/blob/master/docs/settings.md\"\n}";
string content = "{\n \"SimMode\" : \"\", \n \"SettingsVersion\" : 1.2, \n \"SeeDocsAt\" : \"https://github.com/Microsoft/AirSim/blob/main/docs/settings.md\"\n}";
//settings file created at Documents\AirSim with name "setting.json".
StreamWriter writer = new StreamWriter(File.Open(fileName, FileMode.OpenOrCreate, FileAccess.Write));
writer.WriteLine(content);
Expand Down
2 changes: 1 addition & 1 deletion Unity/UnityDemo/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Unity AirSim Demo

A Unity project to demonstrate the usage of [AirSimAssets](https://github.com/Microsoft/AirSim/tree/master/Unity/UnityDemo) for *Car* & *Multirotor* simulation.
A Unity project to demonstrate the usage of [AirSimAssets](https://github.com/Microsoft/AirSim/tree/main/Unity/UnityDemo) for *Car* & *Multirotor* simulation.

## Usage

Expand Down
4 changes: 2 additions & 2 deletions Unreal/Plugins/AirSim/AirSim.uplugin
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"FileVersion" : 3,
"Version" : "1.7.0",
"VersionName": "1.7.0",
"Version" : "1.8.1",
"VersionName": "1.8.1",
"FriendlyName": "AirSim",
"Description": "AirSim - Autonomous Aerial Vehicles Simulator Plugin",
"Category" : "Science",
Expand Down
5 changes: 2 additions & 3 deletions Unreal/Plugins/AirSim/Source/AirBlueprintLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,13 @@ void UAirBlueprintLib::setSimulatePhysics(AActor* actor, bool simulate_physics)

bool UAirBlueprintLib::loadLevel(UObject* context, const FString& level_name)
{

bool success{ false };
// Get name of current level
auto currMap = context->GetWorld()->GetMapName();
currMap.RemoveFromStart(context->GetWorld()->StreamingLevelsPrefix);
// Only load new level if different from current level
if (!currMap.Equals(level_name))
{
if (!currMap.Equals(level_name)) {
FString LongPackageName;
success = FPackageName::SearchForPackageOnDisk(level_name, &LongPackageName);
if (success) {
Expand Down
2 changes: 1 addition & 1 deletion azure/app/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings_json.md",
"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings_json.md",
"SettingsVersion": 1.2,
"SimMode": "Multirotor",
"ClockSpeed": 1.0,
Expand Down
2 changes: 1 addition & 1 deletion azure/azure-env-creation/vm-arm-template.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"metadata": {
"description": "Location of the setup script"
},
"defaultValue": "https://raw.githubusercontent.com/microsoft/airsim/master/azure/azure-env-creation"
"defaultValue": "https://raw.githubusercontent.com/microsoft/airsim/main/azure/azure-env-creation"
},
"ScriptFileName": {
"type": "string",
Expand Down
2 changes: 1 addition & 1 deletion build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if "%VisualStudioVersion%" lss "17.0" (
echo(
echo Hello there! We just upgraded AirSim to Unreal Engine 4.27 and Visual Studio 2022.
echo Here are few easy steps for upgrade so everything is new and shiny:
echo https://github.com/Microsoft/AirSim/blob/master/docs/unreal_upgrade.md
echo https://github.com/Microsoft/AirSim/blob/main/docs/unreal_upgrade.md
goto :buildfailed_nomsg
)

Expand Down
Loading