Ollo/Wordclock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kai did magic

Browse Source
This commit is contained in:
C3MA 2018-01-12 20:38:35 +01:00
parent a83600281d
commit 78a9027ad7
6 changed files with 341 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
simulation/.classpath
View File

@ -4,6 +4,5 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="libs/luaj-jme-3.0.1.jar" sourcepath="libs/luaj-3.0.1/src"/>
<classpathentry kind="lib" path="libs/luaj-jse-3.0.1.jar"/>
<classpathentry kind="lib" path="libs/luaj-sources-3.0.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

2
simulation/src/de/c3ma/ollo/LuaSimulation.java
View File

@ -9,5 +9,5 @@ package de.c3ma.ollo;
*/
public interface LuaSimulation {
public void reboottriggered();
public void rebootTriggered();
}

16
simulation/src/de/c3ma/ollo/WS2812Simulation.java
View File

@ -5,6 +5,7 @@ import java.io.IOException;
import java.nio.file.Files;
import javax.management.RuntimeErrorException;
import javax.swing.SwingUtilities;
import org.luaj.vm2.Globals;
import org.luaj.vm2.LuaValue;
@ -54,7 +55,6 @@ public class WS2812Simulation implements LuaSimulation {
File tempDir = new File(tempFile.getParent() + File.separator + "Nodemcu" + System.currentTimeMillis());
tempDir.mkdir();
System.out.println("[Nodemcu] Directory is " + tempDir.getAbsolutePath());
// Copy all files into the temporary folder
@ -73,7 +73,9 @@ public class WS2812Simulation implements LuaSimulation {
}
public static void main(String[] args) {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
if (args.length == 0) {
printUsage();
return;
@ -93,8 +95,8 @@ public class WS2812Simulation implements LuaSimulation {
File additionalFile = new File(args[2]);
if (additionalFile.exists() && (simu.doFile != null)) {
Files.copy(additionalFile.toPath(),
new File(simu.doFile.getWorkingDirectory() + File.separator + additionalFile.getName()).toPath());
Files.copy(additionalFile.toPath(), new File(simu.doFile.getWorkingDirectory()
+ File.separator + additionalFile.getName()).toPath());
System.out.println("Integrate " + additionalFile.getName() + " into simulation");
} else {
System.err.println("Script " + args[2] + " cannot be found");
@ -112,6 +114,8 @@ public class WS2812Simulation implements LuaSimulation {
}
}
});
}
private void setWS2812Layout(File file) {
if (file.exists()) {
@ -128,7 +132,7 @@ public class WS2812Simulation implements LuaSimulation {
}
@Override
public void reboottriggered() {
public void rebootTriggered() {
System.out.println("=================== Reboot in Simulation -> call it again =================");
this.espTmr.stopAllTimer();
try {
@ -144,7 +148,7 @@ public class WS2812Simulation implements LuaSimulation {
}
private void callScript(String filename) {
this.scriptName=filename;
this.scriptName = filename;
if ((espFile != null) && (espFile.getFileInWorkingDir(filename) != null)) {
LuaValue chunk = globals.loadfile(espFile.getFileInWorkingDir(filename).getAbsolutePath());

2
simulation/src/de/c3ma/ollo/mockup/ESP8266Node.java
View File

@ -67,7 +67,7 @@ public class ESP8266Node extends TwoArgFunction {
@Override
public LuaValue call() {
System.out.println("[Node] Restart");
nodemcuSimu.reboottriggered();
nodemcuSimu.rebootTriggered();
return LuaValue.valueOf(false);
}

23
simulation/src/de/c3ma/ollo/mockup/ESP8266Ws2812.java
View File

@ -2,6 +2,9 @@ package de.c3ma.ollo.mockup;
import java.io.File;
import javax.swing.SwingUtilities;
import org.luaj.vm2.LuaString;
import org.luaj.vm2.LuaTable;
import org.luaj.vm2.LuaValue;
import org.luaj.vm2.lib.OneArgFunction;
@ -15,6 +18,7 @@ import de.c3ma.ollo.mockup.ui.WS2812Layout;
* creator: ollo<br />
* project: WS2812Emulation<br />
* $Id: $<br />
*
* @author ollo<br />
*/
public class ESP8266Ws2812 extends TwoArgFunction {
@ -47,21 +51,28 @@ public class ESP8266Ws2812 extends TwoArgFunction {
@Override
public LuaValue call(LuaValue arg) {
if (arg.isstring()) {
int length = arg.checkstring().rawlen();
LuaString jstring = arg.checkstring();
int length = jstring.rawlen();
if ((length % 3) == 0) {
byte[] array = arg.toString().getBytes();
for (int i = 0; i < length; i+=3) {
byte[] array = jstring.m_bytes;
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
for (int i = 0; i < length; i += 3) {
if (ESP8266Ws2812.layout != null) {
ESP8266Ws2812.layout.updateLED(i/3, array[i+0], array[i+1], array[i+2]);
int r = array[i + 0]+(Byte.MIN_VALUE*-1);
int g = array[i + 1]+(Byte.MIN_VALUE*-1);
int b = array[i + 2]+(Byte.MIN_VALUE*-1);
ESP8266Ws2812.layout.updateLED(i / 3, r, g, b);
}
}
}
});
}
if (ESP8266Ws2812.layout == null) {
System.out.println("[WS2812] write length:" + length);
} else {
/*ESP8266Ws2812.layout.update(ESP8266Ws2812.layout.getGraphics());*/
ESP8266Ws2812.layout.repaint();
}
}
return LuaValue.valueOf(true);

60
simulation/src/de/c3ma/ollo/mockup/ui/WS2812Layout.java
View File

@ -10,6 +10,7 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import javax.swing.BorderFactory;
@ -17,12 +18,14 @@ import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
/**
* created at 02.01.2018 - 12:57:02<br />
* creator: ollo<br />
* project: WS2812Emulation<br />
* $Id: $<br />
*
* @author ollo<br />
*/
public class WS2812Layout extends JFrame {
@ -80,10 +83,8 @@ public class WS2812Layout extends JFrame {
JPanel ledPanel = new JPanel();
ledPanel.setLayout(new GridLayout(this.mRow, this.mColumn, 10, 10));
for (int i = 0; i < this.mRow; i++)
{
for (int j = 0; j < this.mColumn; j++)
{
for (int i = 0; i < this.mRow; i++) {
for (int j = 0; j < this.mColumn; j++) {
if (this.mElements[i][j] != null) {
ledPanel.add(this.mElements[i][j]);
}
@ -92,17 +93,14 @@ public class WS2812Layout extends JFrame {
contentPane.add(ledPanel, BorderLayout.CENTER);
JButton button = new JButton("Do something");
button.setActionCommand("Do something");
button.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent ae)
{
button.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ae) {
JButton but = (JButton) ae.getSource();
//FIXME some clever logic
// FIXME some clever logic
}
});
contentPane.add(button, BorderLayout.SOUTH);
setContentPane(contentPane);
pack();
setLocationByPlatform(true);
@ -111,13 +109,12 @@ public class WS2812Layout extends JFrame {
private void parse() {
this.mElements = new Element[this.mRow][this.mColumn];
int row=0;
int row = 0;
for (String line : this.mLines) {
for (int i = 0; i < line.length(); i++) {
char c = line.charAt(i);
if ((('A' <= c) && (c <= 'Z')) ||
(('0' <= c) && (c <= '9')) ||
(c == 'Ä') || (c == 'Ö') || (c == 'Ü')) {
if ((('A' <= c) && (c <= 'Z')) || (('0' <= c) && (c <= '9')) || (c == 'Ä') || (c == 'Ö')
|| (c == 'Ü')) {
this.mElements[row][i] = new Element(c);
} else {
this.mElements[row][i] = new Element();
@ -135,7 +132,7 @@ public class WS2812Layout extends JFrame {
*/
private static final long serialVersionUID = -3933903441113933637L;
private boolean noText=false;
private boolean noText = false;
/**
* Draw a simple rect
@ -148,21 +145,23 @@ public class WS2812Layout extends JFrame {
/**
* Draw a character
* @param character to show
*
* @param character
* to show
*/
public Element(char character) {
super(""+character);
super("" + character);
setFont(new Font("Dialog", Font.BOLD, 24));
setHorizontalAlignment(CENTER);
//FIXME: Background color is not updated:
// FIXME: Background color is not updated:
this.setBackground(Color.BLACK);
}
public void setColor(int red, int green, int blue) {
this.setForeground(new Color(red, green, blue));
//FIXME changing the color is not working
// FIXME changing the color is not working
this.repaint();
System.out.println( this.toString());
System.out.println(this.toString());
}
@Override
@ -173,22 +172,21 @@ public class WS2812Layout extends JFrame {
} else {
sb.append("" + this.getText());
}
sb.append("|" + Integer.toHexString(this.getForeground().getRed()) +
" " + Integer.toHexString(this.getForeground().getGreen()) +
" " + Integer.toHexString(this.getForeground().getBlue()));
sb.append("|" + Integer.toHexString(this.getForeground().getRed()) + " "
+ Integer.toHexString(this.getForeground().getGreen()) + " "
+ Integer.toHexString(this.getForeground().getBlue()));
return sb.toString();
}
}
public void updateLED(int index, byte red, byte green, byte blue) {
if (this.mElements != null) {
int i = (index / this.mColumn);
int j = (index % this.mColumn);
if ((i < this.mElements.length) &&
(j < this.mElements[i].length) &&
(this.mElements[i][j] != null)) {
this.mElements[i][j].setColor(red, green, blue);
public void updateLED(int index, int r, int g, int b) {
if (mElements != null) {
int i = (index / mColumn);
int j = (index % mColumn);
if ((i < mElements.length) && (j < mElements[i].length) && (mElements[i][j] != null)) {
Element curlbl = mElements[i][j];
curlbl.setColor(r, g, b);
}
}
}