openlcb-svn-commits

[Openlcb-svn-commits] SF.net SVN: openlcb:[4211] trunk/prototypes/java/src/org/openlcb/ LoaderClient.java

[<br...@us...>]

Revision: 4211
          http://sourceforge.net/p/openlcb/svn/4211
Author:   bracz
Date:     2016-07-14 17:31:15 +0000 (Thu, 14 Jul 2016)
Log Message:
-----------
Fixes termination condition of datagram based loader client.

Modified Paths:
--------------
    trunk/prototypes/java/src/org/openlcb/LoaderClient.java

Modified: trunk/prototypes/java/src/org/openlcb/LoaderClient.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/LoaderClient.java	2016-07-14 17:30:56 UTC (rev 4210)
+++ trunk/prototypes/java/src/org/openlcb/LoaderClient.java	2016-07-14 17:31:15 UTC (rev 4211)
@@ -287,8 +287,8 @@
                                     //System.out.println("Reply mcs.request McsWriteMemo handleWriteReply: "+code);
                 if(nextIndex<content.length) sendDGNext();
                 else {
-                    //sendUnfreeze();
-                    //state = State.SUCCESS;
+                    sendUnfreeze();
+                    state = State.SUCCESS;
                 }
             }
         });
@@ -305,12 +305,7 @@
             replyCount++;
             float p = 100.0F * replyCount / expectedTransactions;
             feedback.onProgress(p);
-            if( p > 100.0F*(expectedTransactions-1)/expectedTransactions ) state=state.UNFREEEZE;
         }
-        if(state == State.UNFREEEZE && msg.getSourceNodeID().equals(dest)) {
-            sendUnfreeze();
-            state = State.SUCCESS;
-        }
     }
     
     void sendUnfreeze() {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openlcb-svn-commits] SF.net SVN: openlcb:[4218] trunk/prototypes/java/src/org/openlcb/ LoaderClient.java

[<br...@us...>]

Revision: 4218
          http://sourceforge.net/p/openlcb/svn/4218
Author:   bracz
Date:     2016-10-23 18:37:45 +0000 (Sun, 23 Oct 2016)
Log Message:
-----------
Treats target rebooted error as OK in the unfreeze message in the loader.

Modified Paths:
--------------
    trunk/prototypes/java/src/org/openlcb/LoaderClient.java

Modified: trunk/prototypes/java/src/org/openlcb/LoaderClient.java
===================================================================
--- trunk/prototypes/java/src/org/openlcb/LoaderClient.java	2016-10-23 18:37:27 UTC (rev 4217)
+++ trunk/prototypes/java/src/org/openlcb/LoaderClient.java	2016-10-23 18:37:45 UTC (rev 4218)
@@ -325,22 +325,26 @@
     }
     
     void sendUnfreeze() {
-                                      // System.out.println("lsendUnfreeze");
         dcs.sendData(new DatagramService.DatagramServiceTransmitMemo(dest, new int[]{0x20, 0xA0, space}) {
 
             @Override
             public void handleSuccess(int flags) {
                 if (state == State.SUCCESS) {
                     feedback.onProgress((float) 100.0);
-                    feedback.onDone(0, "Download Completed");
+                    feedback.onDone(0, "");
                 } else {
-                    feedback.onDone(0,"Download Failed - "+errorString);
+                    feedback.onDone(1,"Download Failed - "+errorString);
                 }
             }
 
             @Override
             public void handleFailure(int errorCode) {
-                feedback.onDone(0,"Download Failed in UnFreeze - 0x"+Integer.toHexString(errorCode));
+                if (errorCode == DatagramRejectedMessage.DATAGRAM_REJECTED_DST_REBOOT) {
+                    // that's ok
+                    handleSuccess(0);
+                } else {
+                    feedback.onDone(errorCode, "Download Failed in UnFreeze");
+                }
             }
 
         });

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.