Skip to content

Commit

Permalink
Merge commit 'd89dcd4f82820b4444397f921214fed3c4752342' into feature/…
Browse files Browse the repository at this point in the history
…sdlmanager

* commit 'd89dcd4f82820b4444397f921214fed3c4752342':
  Add generated files and update the library and example apps
  updating .eslintrc
  applying changes requested in review
  handle exeption in xsd
  resolving issue with GenericResponseResponce
  Trailing spaces not allowed in RpcCreator
  updating auto-tests
  adding RpcCreator.js: year in Copyright
  adding RpcCreator processing
  Minor fix of customization spec
  Added `Custom mapping` section into README.md
  improve manual mapping
  Fixed typo 'decription'->'description'
  minor chnages after code review
  align with rpc_spec
  align changes from parser rpc_spec
  refactoring according to comments in pull/202
  Pointed `lib/rpc_spec` submodule to the personal fork for testing purposes
  #2 [SDL-0234] Proxy Library RPC Generation

# Conflicts:
#	lib/js/dist/SDL.js
#	lib/node/dist/index.js
#	rollup.config.js
  • Loading branch information
Nick Schwab committed Jan 31, 2020
2 parents 4675e85 + d89dcd4 commit 76ccd90
Show file tree
Hide file tree
Showing 394 changed files with 77,447 additions and 8,858 deletions.
4 changes: 2 additions & 2 deletions .eslintrc
Expand Up @@ -40,7 +40,7 @@
"curly": [ "error" ],
"dot-notation": [ "error" ],
"eqeqeq": [ "error" ],
"id-length": [ "error" ],
"id-length": [ "error", { "exceptions": ["x", "y", "c"] } ],
"indent": [
"error",
4,
Expand All @@ -53,7 +53,7 @@
"error",
"unix"
],
"new-cap": [ "error", {
"new-cap": [ "error", {
"newIsCapExceptions": ["tClass"]
}],
"no-case-declarations": [ "error" ],
Expand Down
8 changes: 7 additions & 1 deletion .gitignore
@@ -1,3 +1,9 @@
**/node_modules/
*.log
.env
.*env*
.idea
*__pycache__
.DS_Store
*htmlcov
*.coverage
*.pytest_cache
4 changes: 4 additions & 0 deletions .gitmodules
@@ -0,0 +1,4 @@
[submodule "lib/rpc_spec"]
path = lib/rpc_spec
url = https://github.com/smartdevicelink/rpc_spec.git
branch = master
2 changes: 1 addition & 1 deletion examples/js/hello-sdl/index.html
Expand Up @@ -84,7 +84,7 @@
}

async _onHmiStatusListener (onHmiStatus) {
const hmiLevel = onHmiStatus.getHMILevel();
const hmiLevel = onHmiStatus.getHmiLevel();

// wait for the FULL state for more functionality
if (hmiLevel === SDL.rpc.enums.HMILevel.HMI_FULL) {
Expand Down
2 changes: 1 addition & 1 deletion examples/node/hello-sdl/AppClient.js
Expand Up @@ -87,7 +87,7 @@ class AppClient {
}

async _onHmiStatusListener (onHmiStatus) {
const hmiLevel = onHmiStatus.getHMILevel();
const hmiLevel = onHmiStatus.getHmiLevel();

// wait for the FULL state for more functionality
if (hmiLevel === SDL.rpc.enums.HMILevel.HMI_FULL) {
Expand Down

0 comments on commit 76ccd90

Please sign in to comment.