ctdo
/
bunti
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Test mit Geräten wo der letzte Kanal 512 ist. 

Format des loggings angepasst.
This commit is contained in:
Lucas Pleß 2012-03-03 02:48:02 +01:00
parent 1cb2d64324
commit 7d2ab0dd44
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bunti_server/src/main/java/de/ctdo/bunti/dao/BuntiDevicesDAOImpl.java
View File

@ -29,6 +29,8 @@ public class BuntiDevicesDAOImpl implements BuntiDevicesDAO {
devices.add(new Par56Spot(deviceID++, 16, "Par56 Lampe 4")); devices.add(new Par56Spot(deviceID++, 16, "Par56 Lampe 4"));
devices.add(new Strobe1500(deviceID++, 21, "Stroboskop 1")); devices.add(new Strobe1500(deviceID++, 21, "Stroboskop 1"));
devices.add(new Par56Spot(deviceID++, 508, "Par56 Lampe 5"));
} }

8
bunti_server/src/main/java/de/ctdo/bunti/web/TestController.java
View File

@ -77,7 +77,13 @@ public class TestController {
options.put("green", 78); options.put("green", 78);
options.put("blue", 255); options.put("blue", 255);
buntiController.setDevice(3, options); buntiController.setDevice(3, options);
options.put("red", 55);
options.put("green", 44);
options.put("blue", 66);
options.put("mode", 22);
options.put("speed", 255);
buntiController.setDevice(5, options);
ModelAndView mav = new ModelAndView("hello.jsp"); ModelAndView mav = new ModelAndView("hello.jsp");

6
bunti_server/src/main/resources/log4j.properties
View File

@ -4,14 +4,12 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
# Print the date in ISO 8601 format # Print the date in ISO 8601 format
log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n #log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %c: %m
log4j.appender.R=org.apache.log4j.RollingFileAppender log4j.appender.R=org.apache.log4j.RollingFileAppender
log4j.appender.R.File=application.log log4j.appender.R.File=application.log
log4j.appender.R.MaxFileSize=100KB log4j.appender.R.MaxFileSize=100KB
# Keep one backup file
log4j.appender.R.MaxBackupIndex=1 log4j.appender.R.MaxBackupIndex=1
log4j.appender.R.layout=org.apache.log4j.PatternLayout log4j.appender.R.layout=org.apache.log4j.PatternLayout
log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n