Menu
▾
▴
[ggc-cvs] SF.net SVN: ggc:[1368] trunk
|
From: <and...@us...> - 2015-10-06 18:08:16
|
Revision: 1368
http://sourceforge.net/p/ggc/code/1368
Author: andyrozman
Date: 2015-10-06 18:08:14 +0000 (Tue, 06 Oct 2015)
Log Message:
-----------
- minor changes
- ggc support - maven repository
Modified Paths:
--------------
trunk/ggc-help/docs/HelpSupportInGGC.doc
trunk/ggc-help/pom.xml
trunk/ggc-master-pom/pom.xml
trunk/ggc-plugin_base/src/ggc/plugin/data/enums/PlugInExceptionType.java
trunk/ggc-pump/src/ggc/pump/data/defs/PumpDeviceDefinition.java
trunk/ggc-pump/src/ggc/pump/data/util/PumpBasalManager.java
trunk/web_page/inc_news.inc
Added Paths:
-----------
trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/enums/
trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/enums/MinimedDeviceType.java
trunk/ggc-support/developers/
Property Changed:
----------------
trunk/
Index: trunk
===================================================================
--- trunk 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk 2015-10-06 18:08:14 UTC (rev 1368)
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
## -1 +1,7 ##
trash
+
+ggc-device-minimed-old
+
+ggc-device-minimed-decode
+
+ggc-device-minimed
Modified: trunk/ggc-help/docs/HelpSupportInGGC.doc
===================================================================
(Binary files differ)
Modified: trunk/ggc-help/pom.xml
===================================================================
--- trunk/ggc-help/pom.xml 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/ggc-help/pom.xml 2015-10-06 18:08:14 UTC (rev 1368)
@@ -1,55 +1,48 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- <relativePath>../ggc-master-pom/pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../ggc-master-pom/pom.xml</relativePath>
+ </parent>
- <name>GGC Help Project</name>
+ <name>GGC Help Project</name>
- <artifactId>ggc-help</artifactId>
- <version>${ggc-help.version}</version>
+ <artifactId>ggc-help</artifactId>
+ <version>${ggc-help.version}</version>
- <build>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- <sourceDirectory>src/main/java</sourceDirectory>
- <scriptSourceDirectory>src/main/resources</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
- </build>
+ <build>
+ <directory>target</directory>
+ <outputDirectory>target/classes</outputDirectory>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <testOutputDirectory>target/test-classes</testOutputDirectory>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <scriptSourceDirectory>src/main/resources</scriptSourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+ </build>
- <dependencies>
- <dependency>
- <groupId>com.atech-software</groupId>
- <artifactId>atech-tools</artifactId>
- </dependency>
-
-
- <dependency>
- <groupId>javax.help</groupId>
- <artifactId>javahelp</artifactId>
- </dependency>
-
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>javax.help</groupId>
+ <artifactId>javahelp</artifactId>
+ </dependency>
+ </dependencies>
</project>
Modified: trunk/ggc-master-pom/pom.xml
===================================================================
--- trunk/ggc-master-pom/pom.xml 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/ggc-master-pom/pom.xml 2015-10-06 18:08:14 UTC (rev 1368)
@@ -178,6 +178,17 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
<version>${hibernate.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+
+ </exclusions>
</dependency>
<dependency>
@@ -324,27 +335,60 @@
<version>${nrjavaserial-j15.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons-collections.version}</version>
+ </dependency>
+
+ <!-- slf4j API -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <!--
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ -->
+
+ <!-- slf4j over log4j -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <!-- Commons logging over slf4j -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
<properties>
- <!-- Modules versions -->
- <ggc-core.version>0.6.0-SNAPSHOT</ggc-core.version>
- <ggc-plugin-base.version>0.7.2-SNAPSHOT</ggc-plugin-base.version>
- <ggc-meter-tool.version>2.2.0-SNAPSHOT</ggc-meter-tool.version>
- <ggc-pump-tool.version>1.5.1-SNAPSHOT</ggc-pump-tool.version>
- <ggc-cgms-tool.version>1.3.2-SNAPSHOT</ggc-cgms-tool.version>
- <ggc-nutri-tool.version>1.3.5-SNAPSHOT</ggc-nutri-tool.version>
-
- <ggc-desktop.version>0.6.0-SNAPSHOT</ggc-desktop.version>
+ <!-- GGC Modules versions -->
+ <ggc-core.version>0.6.1-SNAPSHOT</ggc-core.version>
+ <ggc-plugin-base.version>1.0.1-SNAPSHOT</ggc-plugin-base.version>
+ <ggc-meter-tool.version>2.3.0-SNAPSHOT</ggc-meter-tool.version>
+ <ggc-pump-tool.version>1.6.0-SNAPSHOT</ggc-pump-tool.version>
+ <ggc-cgms-tool.version>1.3.3-SNAPSHOT</ggc-cgms-tool.version>
+ <ggc-nutri-tool.version>1.3.6-SNAPSHOT</ggc-nutri-tool.version>
+ <ggc-desktop.version>0.6.1-SNAPSHOT</ggc-desktop.version>
<ggc-help.version>0.2-SNAPSHOT</ggc-help.version>
<!-- NON MAVEN -->
<ggc-little.version>0.2.4-SNAPSHOT</ggc-little.version>
<!-- Dependencies versions -->
- <libusb4jwo.version>0.2</libusb4jwo.version>
<ibm-compapi.version>1.3</ibm-compapi.version>
<skinlf.version>6.7</skinlf.version>
<log4j.version>1.2.16</log4j.version>
@@ -359,23 +403,28 @@
<commons-lang.version>2.6</commons-lang.version>
<javahelp.version>2.0.05</javahelp.version>
- <!-- NEW THIS VERSION -->
+ <!-- NEW THIS VERSION 0.6 -->
<icepdf-core.version>5.0.7</icepdf-core.version>
<icepdf-viewer.version>5.0.7</icepdf-viewer.version>
<jaxen.version>1.1.6</jaxen.version>
<!-- NEW VERSION IN THIS VERSION -->
- <atech-tools.version>0.7.12-SNAPSHOT</atech-tools.version>
+ <atech-tools.version>0.7.13-SNAPSHOT</atech-tools.version>
<jna-j15.version>4.1.0</jna-j15.version>
<hid4java-j15.version>0.3.1</hid4java-j15.version>
<nrjavaserial-j15.version>3.9.3.1</nrjavaserial-j15.version>
+ <commons-collections.version>3.2.1</commons-collections.version>
+ <slf4j.version>1.7.12</slf4j.version>
+ <!-- Changed: CGMS, Core, Meter -->
+
+
<!-- Removed -->
<jna.version>4.1.0-GGC</jna.version>
<nrjavaserial.version>3.9.3-GGC</nrjavaserial.version>
+ <libusb4jwo.version>0.2</libusb4jwo.version>
-
<maven.compiler.source>1.5</maven.compiler.source>
<maven.compiler.target>1.5</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: trunk/ggc-plugin_base/src/ggc/plugin/data/enums/PlugInExceptionType.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/data/enums/PlugInExceptionType.java 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/ggc-plugin_base/src/ggc/plugin/data/enums/PlugInExceptionType.java 2015-10-06 18:08:14 UTC (rev 1368)
@@ -48,6 +48,8 @@
TimeoutReadingData("Timeout reading data from device."), //
DeviceErrorWritingToDevice("EXC_RECEIVER_ERROR_WRITING"), //
DeviceNotFound("Device not found."), //
+ ErrorWithDeviceCommunication("Error when communicating with device. Exception: %s"), //
+ ErrorWithDeviceCommunicationDescription("Error when communicating with device [%s]. Exception: %s"), //
// Communication Port
CommunicationPortClosed("Communication Port is closed."), //
Added: trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/enums/MinimedDeviceType.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/enums/MinimedDeviceType.java (rev 0)
+++ trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/enums/MinimedDeviceType.java 2015-10-06 18:08:14 UTC (rev 1368)
@@ -0,0 +1,93 @@
+package ggc.plugin.device.impl.minimed.enums;
+
+public enum MinimedDeviceType
+{
+ Unknown_Device, //
+
+ Minimed_508_508c, //
+ Minimed_511, //
+ Minimed_512_712, //
+ Minimed_515_715, //
+ Minimed_522_722, //
+ Minimed_523_723, //
+ Minimed_553_753_Revel, //
+ Minimed_554_754_Veo, //
+ Minimed_640G,
+
+ Minimed_512andHigher(Minimed_512_712, Minimed_515_715, Minimed_522_722, Minimed_523_723, Minimed_553_753_Revel,
+ Minimed_554_754_Veo, Minimed_640G), //
+
+ Minimed_515andHigher(Minimed_515_715, Minimed_522_722, Minimed_523_723, Minimed_553_753_Revel, Minimed_554_754_Veo,
+ Minimed_640G), //
+ Minimed_522andHigher(Minimed_522_722, Minimed_523_723, Minimed_553_753_Revel, Minimed_554_754_Veo, Minimed_640G), //
+ Minimed_523andHigher(Minimed_523_723, Minimed_553_753_Revel, Minimed_554_754_Veo, Minimed_640G), //
+
+ Minimed_553andHigher(Minimed_553_753_Revel, Minimed_554_754_Veo, Minimed_640G), //
+ Minimed_554andHigher(Minimed_554_754_Veo, Minimed_640G), //
+
+ All;
+
+ // static HashMap<String, MinimedDeviceType> deviceTypeToPumpModelMap =
+ // null;
+ private boolean isFamily;
+ private MinimedDeviceType[] familyMembers = null;
+
+ static
+ {
+ // deviceTypeToPumpModelMap = new HashMap<String, MinimedDeviceType>();
+ //
+ // for (MinimedDeviceType adt : values())
+ // {
+ // if ((!adt.isFamily()) &&
+ // (!deviceTypeToPumpModelMap.containsKey(adt.pumpModel)))
+ // {
+ // deviceTypeToPumpModelMap.put(adt.pumpModel, adt);
+ // }
+ // }
+ }
+
+
+ private MinimedDeviceType()
+ {
+ this.isFamily = false;
+ }
+
+
+ private MinimedDeviceType(MinimedDeviceType... familyMembers)
+ {
+ this.familyMembers = familyMembers;
+ this.isFamily = true;
+ }
+
+
+ public static boolean isSameDevice(MinimedDeviceType deviceWeCheck, MinimedDeviceType deviceSources)
+ {
+ if (deviceSources.isFamily)
+ {
+ for (MinimedDeviceType mdt : deviceSources.familyMembers)
+ {
+ if (mdt == deviceWeCheck)
+ return true;
+ }
+ }
+ else
+ {
+ return (deviceWeCheck == deviceSources);
+ }
+
+ return false;
+ }
+
+
+ public boolean isFamily()
+ {
+ return isFamily;
+ }
+
+
+ public MinimedDeviceType[] getFamilyMembers()
+ {
+ return familyMembers;
+ }
+
+}
Property changes on: trunk/ggc-plugin_base/src/ggc/plugin/device/impl/minimed/enums/MinimedDeviceType.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: trunk/ggc-pump/src/ggc/pump/data/defs/PumpDeviceDefinition.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/defs/PumpDeviceDefinition.java 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/ggc-pump/src/ggc/pump/data/defs/PumpDeviceDefinition.java 2015-10-06 18:08:14 UTC (rev 1368)
@@ -8,6 +8,7 @@
import ggc.plugin.data.enums.DevicePortParameterType;
import ggc.plugin.data.enums.DeviceProgressStatus;
import ggc.plugin.device.impl.animas.enums.AnimasDeviceType;
+import ggc.plugin.device.impl.minimed.enums.MinimedDeviceType;
import ggc.plugin.device.v2.DeviceDefinition;
import ggc.plugin.manager.DeviceImplementationStatus;
import ggc.plugin.protocol.DeviceConnectionProtocol;
@@ -52,27 +53,52 @@
DeviceHandlerType.InsuletOmnipodHandler, DevicePortParameterType.NoParameters,
DeviceConnectionProtocol.FileImport, DeviceProgressStatus.Special, "", 0.1f, 0.05f),
- // Minimed_508_508c(10001, "name", "pic", "instruction", null, ), //
- // Minimed_508c, //
- // Minimed_511, //
- // Minimed_512_712, //
- // // Minimed_712, // 513,
- // // 514
- // Minimed_515_715, //
- // // Minimed_715, //
- // Minimed_522_722, //
- // // Minimed_722, //
- // Minimed_523_723, //
- // // Minimed_723, //
- //
- // Minimed_553_753_Revel, //
- // // Minimed_753, //
- // Minimed_554_754_Veo, //
- // // Minimed_754, //
- // // Minimed_Veo, //
- //
- // Minimed_640G,
+ // Minimed (not done yet)
+ Minimed_508_508c(10001, "name", "pic", "instruction", MinimedDeviceType.Minimed_508_508c,
+ DeviceImplementationStatus.NotPlanned, DeviceCompanyDefinition.Minimed,
+ DeviceHandlerType.MinimedPumpHandler, DevicePortParameterType.PackedParameters,
+ DeviceConnectionProtocol.Serial_USBBridge, DeviceProgressStatus.Special, "", 0.1f, 0.1f), //
+ Minimed_511(10003, "name", "pic", "instruction", MinimedDeviceType.Minimed_511,
+ DeviceImplementationStatus.NotPlanned, DeviceCompanyDefinition.Minimed,
+ DeviceHandlerType.MinimedPumpHandler, DevicePortParameterType.PackedParameters,
+ DeviceConnectionProtocol.Serial_USBBridge, DeviceProgressStatus.Special, "", 0.1f, 0.1f), //
+
+ Minimed_512_712(10004, "name", "pic", "instruction", MinimedDeviceType.Minimed_512_712,
+ DeviceImplementationStatus.NotPlanned, DeviceCompanyDefinition.Minimed,
+ DeviceHandlerType.MinimedPumpHandler, DevicePortParameterType.PackedParameters,
+ DeviceConnectionProtocol.Serial_USBBridge, DeviceProgressStatus.Special, "", 0.1f, 0.1f), //
+
+ Minimed_515_715(10005, "name", "pic", "instruction", MinimedDeviceType.Minimed_515_715,
+ DeviceImplementationStatus.NotPlanned, DeviceCompanyDefinition.Minimed,
+ DeviceHandlerType.MinimedPumpHandler, DevicePortParameterType.PackedParameters,
+ DeviceConnectionProtocol.Serial_USBBridge, DeviceProgressStatus.Special, "", 0.1f, 0.1f), //
+
+ Minimed_522_722(10006, "name", "pic", "instruction", MinimedDeviceType.Minimed_522_722,
+ DeviceImplementationStatus.NotPlanned, DeviceCompanyDefinition.Minimed,
+ DeviceHandlerType.MinimedPumpHandler, DevicePortParameterType.PackedParameters,
+ DeviceConnectionProtocol.Serial_USBBridge, DeviceProgressStatus.Special, "", 0.1f, 0.1f), //
+
+ Minimed_523_723(10007, "name", "pic", "instruction", MinimedDeviceType.Minimed_523_723,
+ DeviceImplementationStatus.NotPlanned, DeviceCompanyDefinition.Minimed,
+ DeviceHandlerType.MinimedPumpHandler, DevicePortParameterType.PackedParameters,
+ DeviceConnectionProtocol.Serial_USBBridge, DeviceProgressStatus.Special, "", 0.1f, 0.1f), //
+
+ Minimed_553_753_Revel(10008, "name", "pic", "instruction", MinimedDeviceType.Minimed_553_753_Revel,
+ DeviceImplementationStatus.NotPlanned, DeviceCompanyDefinition.Minimed,
+ DeviceHandlerType.MinimedPumpHandler, DevicePortParameterType.PackedParameters,
+ DeviceConnectionProtocol.Serial_USBBridge, DeviceProgressStatus.Special, "", 0.1f, 0.1f), //
+
+ Minimed_554_754_Veo(10009, "name", "pic", "instruction", MinimedDeviceType.Minimed_554_754_Veo,
+ DeviceImplementationStatus.NotPlanned, DeviceCompanyDefinition.Minimed,
+ DeviceHandlerType.MinimedPumpHandler, DevicePortParameterType.PackedParameters,
+ DeviceConnectionProtocol.Serial_USBBridge, DeviceProgressStatus.Special, "", 0.1f, 0.1f), //
+
+ Minimed_640G(10010, "name", "pic", "instruction", MinimedDeviceType.Minimed_640G,
+ DeviceImplementationStatus.NotPlanned, DeviceCompanyDefinition.Minimed,
+ DeviceHandlerType.MinimedPumpHandler, DevicePortParameterType.PackedParameters,
+ DeviceConnectionProtocol.Serial_USBBridge, DeviceProgressStatus.Special, "", 0.1f, 0.1f),
+
;
static List<DeviceDefinition> allDevices;
Modified: trunk/ggc-pump/src/ggc/pump/data/util/PumpBasalManager.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/util/PumpBasalManager.java 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/ggc-pump/src/ggc/pump/data/util/PumpBasalManager.java 2015-10-06 18:08:14 UTC (rev 1368)
@@ -113,7 +113,8 @@
public Map<String, BasalRatesDayDTO> getBasalRatesForRange(GregorianCalendar from, GregorianCalendar to)
{
- LOG.debug("Get BasalRates For Range: {} - {}", from, to);
+ LOG.debug("Get BasalRates For Range: {} - {}", DataAccessPump.getGregorianCalendarAsDateString(from),
+ DataAccessPump.getGregorianCalendarAsDateString(to));
List<PumpValuesEntry> data = this.dataAccess.getDb().getRangePumpBasalValues(from, to);
return prepareBasalRates(data, from, to);
Modified: trunk/web_page/inc_news.inc
===================================================================
--- trunk/web_page/inc_news.inc 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/web_page/inc_news.inc 2015-10-06 18:08:14 UTC (rev 1368)
@@ -6,6 +6,37 @@
<table cellpadding="3" cellspacing="0" align="center" width="100%" summary="" class="container">
<tr class="newsheader">
<td width="150">2014-08-01</td>
+<td>Release 0.6.1</td>
+</tr>
+<tr>
+<td colspan="2">
+You are probably wondering if everything is OK, since new release is already here... And here comes
+the explanation... I planned new release at end of year (I usually try to make 2 releases in year, but
+mostly it happens that there is only one), so I made plan for features and I divided them into simple and hard
+tasks... Simple are tasks that are now in this release, this includes several bug fixes, basal statistics, fixed graphs
+for pump (now we have finally all data displayed... sorry no CGMS in Pump Daily Graph for now) and finally
+implementation of Contour (and Contour Next) meter, which is our first USB Hid Meter supported (this was also main
+reason for this release). <br>
+Now because of this release, it might happen that next release won't be at end of this year, but sometime in
+start of next year (probably february). My plan for this (0.7) release is to prepare support for Minimed Pump. While
+ there are some other tasks to be done, this is my main goal for next release, so when I have this support ready
+ (for ComLink cable and CareLink USB device and for start support will be done only for Pump part, so sorry no
+ CGMS data yet (coming in next release)) you can expect next release. If this is ready by end of year, then you
+ will get release by then, if I encounter some additional problems, then next release will be little later (with help
+ of decoding-carelink project (thanks Ben West) I managed to decode most of data, so everything that I need to do
+ is incorporate this results, with my current Minimed implementation. I hope this to be done in next few weeks
+ (perhaps months)).
+</tr>
+</table>
+
+<br><br>
+
+
+
+
+<table cellpadding="3" cellspacing="0" align="center" width="100%" summary="" class="container">
+<tr class="newsheader">
+<td width="150">2014-08-01</td>
<td>Release 0.6</td>
</tr>
<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
