Merge pull request #2 from JoeSc/modifications

Add git ignore and Fix issue with program command
panStamp · Dec 4, 2015 · 0789338 · 0789338
2 parents 24acf10 + 803e3b3
commit 0789338
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+*.pyc
diff --git a/swapdmt-cmd/swapmanager.py b/swapdmt-cmd/swapmanager.py
@@ -266,20 +266,23 @@ def dispatch_command(self, command):
                     else:
                         # Program node
                         if command[2] == "program":
-                            # Create progress bar    
-                            self.progress = AnimatedProgressBar(end=self.hexfile.nbof_data_lines, width=50)
-                            # Save address of node being programmed
-                            self.prog_address = addr
-                            # Transmit product code
-                            self.transmit_product_code()
-
-                            # Put node in upgrade mode
-                            val = SwapValue(SwapState.UPGRADE, 1)
-                            if mote.cmdRegisterWack(SwapRegId.ID_SYSTEM_STATE, val):
-                                print "Node now in programming mode"
-                            elif self.hexfile_line == 0:
-                                print "Unable to put node in progamming mode"
-                                self.prog_address = None
+                            if (self.hexfile == None):
+                                print "Please set a hexfile before running \"program\""
+                            else:
+                                # Create progress bar
+                                self.progress = AnimatedProgressBar(end=self.hexfile.nbof_data_lines, width=50)
+                                # Save address of node being programmed
+                                self.prog_address = addr
+                                # Transmit product code
+                                self.transmit_product_code()
+
+                                # Put node in upgrade mode
+                                val = SwapValue(SwapState.UPGRADE, 1)
+                                if mote.cmdRegisterWack(SwapRegId.ID_SYSTEM_STATE, val):
+                                    print "Node now in programming mode"
+                                elif self.hexfile_line == 0:
+                                    print "Unable to put node in progamming mode"
+                                    self.prog_address = None
                         # Restart node (if not sleeping)
                         elif command[2] == "restart":
                             if mote.restart():