#35 (#39)

* fix route errors * Update load module for indicators * install neopixel for travis * fix init pin 23 [BLE] * pass build param to travis [indicators] * install icons on travis * recompile indicators with scons * compile on bin dir * refactor import paths for indicators * fix multiple compilation errors
dride · Jul 29, 2017 · 83143dd · 83143dd
1 parent f8cf669
commit 83143dd
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ before_install:
  - sudo apt-get update
 
 install:
- - sudo apt-get install python-dev python-numpy
+ - sudo apt-get install python-dev python-numpy scons
  - pip install pyserial
 
 before_script:
@@ -16,7 +16,9 @@ before_script:
   - make -j4
   - sudo make -j4 install
   - export PYTHONPATH=$PYTHONPATH:/usr/local/lib/python2.7/site-packages:/home/travis/build/dride/Cardigan
-
+  - cd /home/travis/build/dride/Cardigan/modules/indicators/bin
+  - scons
+  - sudo python /home/travis/build/dride/Cardigan/modules/indicators/setup.py build
 python:
   - "2.7"
 

diff --git a/classes/capture.py b/classes/capture.py
@@ -1,11 +1,12 @@
 import cv2
 import numpy as np
 import time
+from config import *
 
 from classes.gps import GPS
 
 
-class capture(config):
+class capture():
 
 
 	rolloverMinutes = 1
@@ -29,7 +30,7 @@ def __init__(self, w, h, config):
 		# load config
 		self.config = config
 
-	def captureFrame(self, frame, config):
+	def captureFrame(self, frame):
 
 		# if the video should be flipped
 		if self.config['flip'] == True:

diff --git a/classes/forwardCollisionWarning.py b/classes/forwardCollisionWarning.py
@@ -4,7 +4,7 @@
 import math
 import time
 from config import *
-from modules.indicators.states.indicators import Indicators
+from modules.indicators.python.states.indicators import Indicators
 
 
 class forwardCollisionWarning(object):

diff --git a/classes/laneDepartureWarning.py b/classes/laneDepartureWarning.py
@@ -5,7 +5,7 @@
 from classes.sound import sound
 import time
 from config import *
-from modules.indicators.states.indicators import Indicators
+from modules.indicators.python.states.indicators import Indicators
 
 
 class laneDepartureWarning(object):

diff --git a/daemons/bluetooth/initPin.py b/daemons/bluetooth/initPin.py
@@ -2,5 +2,5 @@
 
 GPIO.setmode(GPIO.BCM)
 
-GPIO.setup(4, GPIO.IN, pull_up_down=GPIO.PUD_UP)
+GPIO.setup(23, GPIO.IN, pull_up_down=GPIO.PUD_UP)
 
diff --git a/mainPi.py b/mainPi.py
@@ -8,7 +8,7 @@
 from config import *
 from classes.sound import sound
 
-from modules.indicators.states.indicators import Indicators
+from modules.indicators.python.states.indicators import Indicators
 
 def run_program():
 	# initialize the camera and grab a reference to the raw camera capture

diff --git a/modules/indicators b/modules/indicators
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,5 +2,5 @@

		GPIO.setmode(GPIO.BCM)

		GPIO.setup(4, GPIO.IN, pull_up_down=GPIO.PUD_UP)
		GPIO.setup(23, GPIO.IN, pull_up_down=GPIO.PUD_UP)
+24 −0		LICENSE
+162 −11		README.md
+63 −0		SConscript
+68 −0		SConstruct
+65 −0		clk.h
+78 −0		dma.c
+126 −0		dma.h
+108 −0		gpio.h
+83 −0		linux.py
+292 −0		mailbox.c
+46 −0		mailbox.h
+419 −0		main.c
+127 −0		pcm.c
+158 −0		pcm.h
+112 −0		pwm.c
+122 −0		pwm.h
+9 −0		python/.gitignore
+21 −0		python/README.md
+0 −0		python/ez_setup.py
+0 −0		python/neopixel.py
+0 −0		python/rpi_ws281x.i
+0 −0		python/setup.py
+0 −0		python/states/__init__.py
+0 −0		python/states/adas.py
+0 −3		python/states/carAheadRed.py
+0 −0		python/states/indicators.py
+0 −0		python/states/leftLaneDeparture.py
+1 −1		python/states/loading.py
+1 −1		python/states/rightLaneDeparture.py
+0 −0		python/states/talking.py
+0 −3		python/states/wakeWord.py
+366 −0		rpihw.c
+50 −0		rpihw.h
+0 −69		states/black.py
+1 −0		version
+71 −0		version.py
+1,227 −0		ws2811.c
+129 −0		ws2811.h