Skip to content

Commit

Permalink
Merge branch 'release/2020.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
sfeilmeier committed Jan 31, 2020
2 parents 4197b9a + 0f1fc8f commit e31d628
Show file tree
Hide file tree
Showing 62 changed files with 4,198 additions and 2,361 deletions.
Binary file modified .gradle-wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion .gradle-wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ matrix:
local-dir: build/www

- language: node_js
node_js:
- 10
node_js: lts/*
script:
- ./gradlew buildUiForEdge --continue

Binary file modified doc/modules/ROOT/assets/images/eclipse-bnd-file-build.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/modules/ROOT/assets/images/eclipse-edgeapp-bndrun.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/modules/ROOT/assets/images/eclipse-osgi-build-path.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 38 additions & 1 deletion doc/modules/ROOT/pages/coreconcepts.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,44 @@ This chapter describes some of the core concepts and commonly used terms in Open

OpenEMS Edge is using the https://en.wikipedia.org/wiki/OSGi[OSGi icon:external-link[]] platform to provide a completely modular and dynamic service oriented system.

Logical groups of source code are put into one OSGi Bundle. Every directory in the source code root directory starting with 'io.openems.*' is a bundle.
Logical groups of source code are put into one OSGi Bundle. Every directory in the source code root directory starting with `io.openems.*`` is a bundle.

More bundle naming conventions are:

* Bundle names ending with `*.common` are for common code that is shared by multiple components. Examples are:
`io.openems.common`::
for common code between Edge and Backend, like helper utils, JSON-RPC definitions and Abstract Worker implementations
`io.openems.backend.common`::
for common code within Backend.
`io.openems.edge.common`::
for common code within Edge.
`io.openems.edge.controller.api.common`::
for common code used by API Controllers
`...`::

* Bundle names ending with `*.api` are for xref:#_nature[Natures and APIs]. Examples are:
`io.openems.edge.controller.api`::
for xref:edge/controller.adoc[Controllers]
`io.openems.edge.scheduler.api`::
for xref:edge/scheduler.adoc[Schedulers]
`...`::

* Bundle names ending with `*.core` are for shared and helper OSGi services. Examples are:
`io.openems.edge.core`:::
for central singleton services:
*ComponentManager*::
handles access to OpenEMS Components and Channels
*Cycle*::
is responsible for the process xref:edge/architecture.adoc#_cycle[Cycle]
*Host*::
for accessing the host and operating system
*Meta*::
for some Meta information like the version of the running OpenEMS Edge
*Sum*::
for summing the values of the entire energy system, all meters, energy storage systems and so on.

`io.openems.edge.ess.core`:::
for the central *EssPower* service, that distributes power requirements to different energy storage systems

== OpenEMS Component

Expand Down
Loading

0 comments on commit e31d628

Please sign in to comment.