fix merge

submodules/eps.py

@@ -21,8 +21,11 @@ def pin_on(device_name):
             logger.error("Pin is already ON.")  # FIXME should say pin_on was successful, not pin was already on
             return True
         else:  # FIXME s how if pin_on was unsuccessful in turning on the device
-            logger.debug("Pin communication successful. \
-            Pin is now ON.")
+            if get_PDM_status(device_name) == 1:  # PDM is ON
+                logger.error("Pin is already ON.")
+            else:
+                logger.debug("Pin communication successful. \
+                Pin is now ON.")
 
 
 def reboot_device(device_name, sleeptime):
@@ -43,7 +46,7 @@ def pin_off(device_name):
             Pin is now OFF.")
 
 
-def get_pdm_status(device_name):
+def get_PDM_status(device_name):
     with SMBusWrapper(1) as bus:
         PDM_val = [epsdict[device_name]]
         bus.write_i2c_block_data(address, 0x0E, PDM_val)

submodules/gps.py

@@ -106,6 +106,7 @@ def getsinglegps():
             return gpsdata
         else:
             return None #FIXME MAYBE CHANGE TO ACTUAL VAL
+
     # end pseudo
 
 
@@ -312,6 +313,7 @@ def get_points(period):
         telemetry_send(error_packet) #FIXME A PACKET THAT SHOWS THAT THE EPS WAS UNABLE TO TURN ON THE GPS
 
 
+
 def get_cache():
     return cache
 
@@ -380,6 +382,7 @@ def telemetry_send(gps_packet):
     packet += base64.b64encode(struct.pack('d', t)).decode("UTF-8")
     packet += base64.b64encode(struct.pack('fff', float(lat),
                                            float(lon), float(alt))).decode("UTF-8")
+
     telemetry.enqueue_submodule_packet(packet)
 
 
@@ -437,6 +440,7 @@ def enter_normal_mode():
     if not is_simulate('gps'):
         pass
     eps.pin_on("gps") #TODO: BE ABLE TO FORCE EPS TO TURN ON GPS?
+
     start_loop()