Skip to content
Merged
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Changelog
All notable changes to this project will be documented in this file.

## Release 2.6.1

### Bugfix
- Legacy bindings of ValueDisplay elements within UI did not work if deployed with VS Code AppSpace SDK
- UI differs if deployed via Appstudio or VS Code AppSpace SDK
- Fullscreen icon of iFrame was visible

## Release 2.6.0

### New features
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,5 @@

.myCustomButton_CSK_Module_PowerManager {
border-radius: 30px;
padding-right: 0px;
padding: 11px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
<layout-row id="RowLayout8">
<layout-column id="ColumnLayout9" style="align-items: stretch">
<layout-row id="RowLayout14" style="align-items: baseline">
<davinci-value-display id="VD_Title" class="myCustomLabel_CSK_Module_PowerManager"
value="Power Manager">
</davinci-value-display>
<h1 id="Heading_Title" class="myCustomLabel_CSK_Module_PowerManager">
Power Manager
</h1>
<davinci-value-display id="VD_Version">
<crown-edpws-binding property="value" name="CSK_PowerManager/OnNewStatusModuleVersion"
update-on-resume>
</crown-edpws-binding>
<crown-on property="value" crown-event="CSK_PowerManager/OnNewStatusModuleVersion">
</crown-on>
</davinci-value-display>
</layout-row>
</layout-column>
Expand Down Expand Up @@ -64,9 +63,10 @@
style="justify-content: center; align-items: center">
<davinci-button id="B_LoadConfig"
class="myCustomButton_CSK_Module_PowerManager"
type="outline" icon-position="append"
title="Load configured parameters from CSK_PersistentData module."
icon="action/history">
type="outline"
title="Load configured parameters from CSK_PersistentData module.">
<davinci-icon icon="action/history">
</davinci-icon>
<span></span>
<crown-edpws-binding property="disabled"
name="CSK_PowerManager/OnPersistentDataModuleAvailable"
Expand All @@ -80,9 +80,10 @@
</davinci-button>
<davinci-button id="B_SaveConfig"
class="myCustomButton_CSK_Module_PowerManager"
type="outline" icon-position="append"
title="Save current configured parameters of this module within CSK_PersistentData module."
icon="content/save">
type="outline"
title="Save current configured parameters of this module within CSK_PersistentData module.">
<davinci-icon icon="content/save">
</davinci-icon>
<span></span>
<crown-set event="submit"
crown-function="CSK_PowerManager/sendParameters"
Expand Down Expand Up @@ -193,8 +194,8 @@
<layout-row id="RowLayout2" style="justify-content: flex-end">
<davinci-button id="B_ChangeStatus"
class="myCustomButton_CSK_Module_PowerManager" type="outline"
icon-position="append" title="Set status for all ports"
icon="action/power_settings_new">
title="Set status for all ports">
<davinci-icon icon="action/power_settings_new"></davinci-icon>
<span></span>
<crown-binding event="submit" name="CSK_PowerManager/setAllStatus"
auto-commit>
Expand Down
8 changes: 8 additions & 0 deletions CSK_Module_PowerManager/pages/src/converter.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
export function changeStyle(theme) {
const style: HTMLStyleElement = document.createElement('style');
style.id ='blub'

const toggleSW = document.querySelectorAll("davinci-toggle-switch")
toggleSW.forEach((userItem) => {
const shadowToggle = userItem.shadowRoot
const finalToggleSW = shadowToggle?.querySelector('div')
finalToggleSW?.classList.add('hasIcon')
});

if (theme == 'CSK_Style'){
var headerToolbar = `.sopasjs-ui-header-toolbar-wrapper { background-color: #FFFFFF; }`
var uiHeader = `.sopasjs-ui-header>.app-logo { margin-right:0px; }`
Expand Down
10 changes: 7 additions & 3 deletions CSK_Module_PowerManager/pages/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
document.addEventListener('sopasjs-ready', () => {
const page_1 = document.querySelector('div.sopasjs-ui-navbar-wrapper > div > ul > li:nth-child(3) > a > i');
page_1.classList.remove('fa-file');
page_1.classList.add('fa-bolt');
const page_1 = document.querySelector('div.sopasjs-ui-navbar-wrapper > div > ul > li:nth-child(3) > a > i');
page_1.classList.remove('fa-file');
page_1.classList.add('fa-bolt');

const page_FirstLabel = document.querySelector('div.sopasjs-ui-navbar-wrapper > div > ul > li:nth-child(2)');
const page_App = document.querySelector('div.sopasjs-ui-navbar-wrapper > div > ul > li:nth-child(4)');
Expand All @@ -12,6 +12,10 @@ page_1.classList.add('fa-bolt');
page_Setup.remove();

setTimeout(() => {
const element = document.querySelector("div.sjs-wrapper > div > div.sjs-fullscreen-toggle")
if(element) {
element.parentElement.removeChild(element)
}
document.title = 'CSK_Module_PowerManager'
}, 500);
})
2 changes: 1 addition & 1 deletion CSK_Module_PowerManager/project.mf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Typically the feature of this module is used like this: +
</serves>
</crown>
<meta key="author">SICK AG</meta>
<meta key="version">2.6.0</meta>
<meta key="version">2.6.1</meta>
<meta key="priority">low</meta>
<meta key="copy-protected">false</meta>
<meta key="read-protected">false</meta>
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ Tested on

|Device|Firmware|Module version|
|--|--|--|
|SICK AppEngine|v1.7.0|v2.6.0|
|SIM1012|v2.4.2|v2.6.1|
|SIM1012|v2.4.2|v2.6.0|
|SIM1012|v2.2.0|<v2.6.0|
|SICK AppEngine|v1.7.0|v2.6.0|

This module is part of the SICK AppSpace Coding Starter Kit developing approach.
It is programmed in an object oriented way. Some of these modules use kind of "classes" in Lua to make it possible to reuse code / classes in other projects.
Expand Down
10 changes: 5 additions & 5 deletions docu/CSK_Module_PowerManager.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="generator" content="Asciidoctor 2.0.12">
<meta name="author" content="SICK AG">
<title>Documentation - CSK_Module_PowerManager 2.6.0</title>
<title>Documentation - CSK_Module_PowerManager 2.6.1</title>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<style>
/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
Expand Down Expand Up @@ -615,10 +615,10 @@
</head>
<body class="article toc2 toc-left">
<div id="header">
<h1>Documentation - CSK_Module_PowerManager 2.6.0</h1>
<h1>Documentation - CSK_Module_PowerManager 2.6.1</h1>
<div class="details">
<span id="author" class="author">SICK AG</span><br>
<span id="revnumber">version 2.6.0,</span>
<span id="revnumber">version 2.6.1,</span>
<span id="revdate">2024-08-14</span>
</div>
<div id="toc" class="toc2">
Expand Down Expand Up @@ -691,7 +691,7 @@ <h2 id="_document_metadata">Document metadata</h2>
</tr>
<tr>
<th class="tableblock halign-left valign-top"><p class="tableblock">Version</p></th>
<td class="tableblock halign-left valign-top"><p class="tableblock">2.6.0</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">2.6.1</p></td>
</tr>
<tr>
<th class="tableblock halign-left valign-top"><p class="tableblock">Date</p></th>
Expand Down Expand Up @@ -1894,7 +1894,7 @@ <h6 id="_sample_auto_generated_24">Sample (auto-generated)</h6>
</div>
<div id="footer">
<div id="footer-text">
Version 2.6.0<br>
Version 2.6.1<br>
Last updated 2024-08-14 17:13:23 +0200
</div>
</div>
Expand Down