fixed some extraneous spaces

scale.py

@@ -26,10 +26,10 @@ def readadc(self,adcnum, clockpin, mosipin, misopin, cspin):
  if ((adcnum > 7) or (adcnum < 0)):
  return -1
  GPIO.output(cspin, True)
- 
+
  GPIO.output(clockpin, False) # start clock low
  GPIO.output(cspin, False) # bring CS low
- 
+
  commandout = adcnum
  commandout |= 0x18 # start bit + single-ended bit
  commandout <<= 3 # we only need to send 5 bits here
@@ -41,7 +41,7 @@ def readadc(self,adcnum, clockpin, mosipin, misopin, cspin):
  commandout <<= 1
  GPIO.output(clockpin, True)
  GPIO.output(clockpin, False)
- 
+
  adcout = 0
  # read in one empty bit, one null bit and 10 ADC bits
  for i in range(12):
@@ -50,16 +50,16 @@ def readadc(self,adcnum, clockpin, mosipin, misopin, cspin):
  adcout <<= 1
  if (GPIO.input(misopin)):
  adcout |= 0x1
- 
+
  GPIO.output(cspin, True)
- 
+
  adcout >>= 1 # first bit is 'null' so drop it
  return adcout
- 
+
  def initialize(self):
- 
+
  configFile = './scaleConfig.yaml'
- 
+
  parser = argparse.ArgumentParser()
  parser.add_argument ("-d", "--debug", type=int, choices=[0,1],
  nargs='?', const=1,
@@ -68,12 +68,12 @@ def initialize(self):
  parser.add_argument("-c","--config", action="store", dest="configFile",
  help="specify a configuration file")
  args = parser.parse_args()
- 
+
  if args.configFile:
  configFile = args.configFile
- 
+
  cfg = scaleConfig.readConfig(configFile)
- 
+
  if args.debug == None:
  DEBUG = cfg['raspberryPiConfig']['debug']
  else:
@@ -83,9 +83,9 @@ def initialize(self):
  else:
  logging.basicConfig(filename="scale.log",level=logging.DEBUG,
  format='%(asctime)s %(message)s')
- 
+
  logging.debug("Initializing.")
- 
+
  try:
  f = open(cfg['raspberryPiConfig']['plotlyCredsFile'])
  args.plotlyConfig = yaml.safe_load(f)
@@ -94,20 +94,20 @@ def initialize(self):
  logging.error("I couldn't open the file %s to read the plot.ly settings, so I can't make a plot and am giving up. I am %s/%s",
  cfg['raspberryPiConfig']['plotlyCredsFile'], os.path.abspath(os.path.dirname(sys.argv[0])),sys.argv[0])
  exit (1)
- 
+
  if not cfg['raspberryPiConfig']['alertChannels']:
  cfg['raspberryPiConfig']['alertChannels'] = ''
  if not cfg['raspberryPiConfig']['updateChannels']:
  cfg['raspberryPiConfig']['updateChannels'] = ''
- 
+
  import time
  import os
  import RPi.GPIO as GPIO
- 
+
  global GPIO
  GPIO.setmode(GPIO.BCM)
  GPIO.setwarnings(False) # to stop the "This channel is already in use" warning
- 
+
  # change these as desired - they're the pins connected from the
  # SPI port on the ADC to the Cobbler
  # ADCPort Cobbler
@@ -120,23 +120,23 @@ def initialize(self):
  # https://learn.adafruit.com/
  # reading-a-analog-in-and-controlling-audio-volume-with-the-raspberry-pi/
  # connecting-the-cobbler-to-a-mcp3008
- 
+
  # set up the SPI interface pins
  GPIO.setup(args.SPIMOSI, GPIO.OUT)
  GPIO.setup(args.SPIMISO, GPIO.IN)
  GPIO.setup(args.SPICLK, GPIO.OUT)
  GPIO.setup(args.SPICS, GPIO.OUT)
- 
+
  # FSR connected to adc #0
  args.fsr_adc = cfg['raspberryPiConfig']['adcPortWithFSR']
- 
+
  # to keep from being jittery we'll only change when the FSR has moved
  # more than this many 'counts'
  args.tolerance = cfg['raspberryPiConfig']['tolerance']
- 
+
  # not ideal, but at least it's just in one place now
  args.logString = '{0} {1}\tfsr: {2:4d}\tlast_value: {3:4d}\tchange: {4:4d}\tbeans: {5}'
- 
+
  # If we will need Twitter credentials, read them now
  #
  if 'twitter' in cfg['raspberryPiConfig']['alertChannels'] or 'twitter' in cfg['raspberryPiConfig']['updateChannels']:
@@ -150,23 +150,23 @@ def initialize(self):
  cfg['twitterConfiguration']['twitterCredsFile'],
  os.path.abspath(os.path.dirname(sys.argv[0])),
  sys.argv[0])
- 
+
  cfg['raspberryPiConfig']['alertChannels'].remove('twitter')
  cfg['raspberryPiConfig']['updateChannels'].remove('twitter')
- 
+
  oTime = cfg['raspberryPiConfig']['updateTime']
- 
+
  while cfg['raspberryPiConfig']['updateTime'] % cfg['raspberryPiConfig']['checkTime']:
  cfg['raspberryPiConfig']['updateTime'] += 1
- 
+
  if oTime != cfg['raspberryPiConfig']['updateTime']:
  logging.debug ("\"updateTime\" changed from %s to %s so it would divide evenly by \"checkTime\".",
  oTime, cfg['raspberryPiConfig']['updateTime'])
- 
+
  # This totally isn't a clock, it's a counter. But we use it sort of
  # like a clock.
  args.scaleClock = 0
- 
+
  # Python shelves let us keep some state between runs; in this case, we
  # are keeping the state of the alerts we have generated, so we don't
  # re-send emails or tweets if one has already been sent for a given
@@ -175,24 +175,24 @@ def initialize(self):
  for alert in cfg['raspberryPiConfig']['alertChannels']:
  if alert not in args.alertState:
  args.alertState[alert] = 0
- 
+
  logging.debug ("Ready.")
  return args,cfg
- 
+
  def mainLoop(self,args,cfg):
- 
+
  last_read = 0
  import time
- 
+
  while True:
- 
+
  # read the analog pin
  fsr = self.readadc(args.fsr_adc, args.SPICLK, args.SPIMOSI, args.SPIMISO, args.SPICS)
  # how much has it changed since the last read?
  fsr_change = (fsr - last_read)
- 
+
  currentTime = str(datetime.datetime.now()).split('.')[0]
- 
+
  if fsr_change > cfg['raspberryPiConfig']['maxChange'] and ( abs(fsr_change) > args.tolerance ):
  last_read = fsr
  beans = int((fsr/1024.)*100)
@@ -203,12 +203,12 @@ def mainLoop(self,args,cfg):
  beans,
  args.plotlyConfig['username'],
  args.plotlyConfig['apikey'])
- 
+
  # I think we only need to check the alert status after
  # changes, within tolerance and maxChange
  scaleAlerts.processLowBeanAlerts (fsr, args.alertState, cfg, currentTime)
- 
- 
+
+
  if args.scaleClock % cfg['raspberryPiConfig']['updateTime'] == 0:
  last_read = fsr
  beans = int((fsr/1024.)*100)
@@ -224,27 +224,27 @@ def mainLoop(self,args,cfg):
  hashTags=" ".join(["#"+m for m in cfg['twitterConfiguration']['twitterUpdateHashtags']])
  tweet = cfg['twitterConfiguration']['twitterUpdateMessage']+" "+ hashTags
  tweet = tweet.format(beans,currentTime)
- 
+
  scaleTwitter.tweetStatus(cfg['twitterConfiguration']['twitterCredsFile'],
  tweet)
- 
+
  if 'email' in cfg['raspberryPiConfig']['updateChannels']:
  subject = cfg['emailConfiguration']['emailUpdateSubject']
  body = cfg['emailConfiguration']['emailUpdateMessage'].format(beans)
- 
+
  scaleEmail.sendEmail (cfg['emailConfiguration']['smtpServer'],
  cfg['emailConfiguration']['gmailCredsFile'],
  cfg['emailConfiguration']['fromAddr'],
  cfg['emailConfiguration']['toAddr'],
  subject, body)
- 
+
  args.scaleClock += cfg['raspberryPiConfig']['checkTime']
- 
+
  time.sleep(cfg['raspberryPiConfig']['checkTime'])
  def run(self):
  args,cfg = self.initialize()
  self.mainLoop(args,cfg)
- 
+
 if __name__ == "__main__":
  import yaml
  import shelve