fix a ton of syntax errors, not all of them though

LCobeaga · Jun 17, 2017 · 1b4fa17 · 1b4fa17
1 parent 059b042
commit 1b4fa17
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 36 deletions.
diff --git a/SmartBlaster/SmartBlaster.cpp b/SmartBlaster/SmartBlaster.cpp
@@ -1,6 +1,11 @@
 #include "Arduino.h"
 #include "SmartBlaster.h"
 
+#include <Adafruit_GFX.h>
+#include <Adafruit_SSD1306.h>
+
+#include <Button.h>
+
 
 SmartBlaster::SmartBlaster (bool modes[], uint8_t IOPins[], uint8_t magSizes[]) {
 	_lastVoltageCheckTime = 0;
@@ -16,8 +21,8 @@ SmartBlaster::SmartBlaster (bool modes[], uint8_t IOPins[], uint8_t magSizes[])
     IR_MAP_TRIP_VAL = 95;
     DART_LEGNTH_FEET = 0.2362208333;
 
-    R1 = 100000.0 
-    R2 = 10000.0
+    R1 = 100000.0;
+    R2 = 10000.0;
 
 	initModes(modes).initIOPins(IOPins).initButtons().initMagSizes();
 }
@@ -54,7 +59,7 @@ SmartBlaster& SmartBlaster::initButtons (void) {
 	if (!_isIRGate) {
 		Button _ammoCountingButton(_AMMO_COUNTING_INPUT_PIN, false, false, 20);
 	} else {
-		_ammoCountingButton = 0;
+		_ammoCountingButton = null;
 	}
 
 	Button _magInsertionDetectionButton(_MAG_INSERTION_DETECTION_PIN, false, false, 20);
@@ -64,67 +69,67 @@ SmartBlaster& SmartBlaster::initButtons (void) {
 	if (_isSelectFire) {
 		Button _selectFireToggleButton(_TOGGLE_SELECT_FIRE_INPUT_PIN, false, false, 20);
 	} else {
-		_selectFireToggleButton = 0;
+		_selectFireToggleButton = null;
 	}
 
 
 	return *this;
 }
 
-SmartBlaster& SmartBlaster::initMagSizes(int magSizes[]) {
+SmartBlaster& SmartBlaster::initMagSizes(uint8_t magSizes[]) {
 	for (int i = 0; i < ((sizeof(magSizes)/sizeof(_magSizes[0])) - 1), i++) {
 		_magSizeArr[i] = magSizes[i];
 	}
     _currentMagSize = 0;
     _maxAmmo = _magSizeArr[_currentMagSize];
-    _curretAmmo = _maxAmmo;
+    _currentAmmo = _maxAmmo;
 
 	return *this;
 }
 
 Adafruit_SSD1306 SmartBlaster::setDisplay(Adafruit_SSD1306 displayArg) {
-	display = displayArg;
+	_display = displayArg;
 
-	return display;
+	return _display;
 }
 
-Adafruit_SSD1306 SmartBlaster::setDisplay() {
-	return display;
+Adafruit_SSD1306 SmartBlaster::getDisplay() {
+	return _display;
 }
 
 void SmartBlaster::displayValues (void) {
 	//display ammo
-	display.clearDisplay(); //clear the display, so the stuff that was here before is no longer here
-	display.setTextSize(6);  //set the size of the text
-	display.setTextColor(WHITE);    //set the color of text text
+	_display.clearDisplay(); //clear the display, so the stuff that was here before is no longer here
+	_display.setTextSize(6);  //set the size of the text
+	_display.setTextColor(WHITE);    //set the color of text text
 	//tell the display where to draw the text
-	display.setCursor( (SCREEN_WIDTH/2) - ((_ammoToPrint.length()*2) * 9) , (SCREEN_HEIGHT/2) - 30 );  //center text
-	display.print(_ammoToPrint);    //print the text
+	_display.setCursor( (SCREEN_WIDTH/2) - ((_ammoToPrint.length()*2) * 9) , (SCREEN_HEIGHT/2) - 30 );  //center text
+	_display.print(_ammoToPrint);    //print the text
 
-	display.setTextSize(1);
+	_display.setTextSize(1);
 
 	//display chrono values
 	if (_isChrono) {
-		display.setCursor(0, 50);  
-		display.print(_chronoToPrint);
+		_display.setCursor(0, 50);  
+		_display.print(_chronoToPrint);
 	}
 
 	//display voltage values
 	if (_isVoltmeter) {
-		display.setCursor(60, 50);
-		display.print(_voltageToPrint);
+		_display.setCursor(60, 50);
+		_display.print(_voltageToPrint);
 	}
 
 	//display fire mode
 	if (_isSelectFire) {
-		display.setCursor(80, 50);  
-		display.print(_firingModeToPrint);
+		_display.setCursor(80, 50);  
+		_display.print(_firingModeToPrint);
 	}	
 
-	display.display(); //display the text
+	_display.display(); //display the text
 }
 
-void SmartBlaster::initDisplayVoltage (Double voltage) {
+void SmartBlaster::initDisplayVoltage (double voltage) {
 	_voltageToPrint = (String)voltage + " v";
 	displayValues();
 }
@@ -157,14 +162,14 @@ void SmartBlaster::initDisplayChronoReadings (double fps) {
 
 void SmartBlaster::initDisplayFireMode(void) {
 	//print text based on mode: 0 == S == Safety, 1 == SS == Single Shot, 2 == 3B == 3 Round Burst, 3 == A == Automatic
-	if (fireMode == 0) {
-	    _modeToPrint = "S";
-	} else if (fireMode == 1) {
-	    _modeToPrint = "SS";
-	} else if (fireMode == 2) {
-	    _modeToPrint = "3B";
-	} else if (fireMode == 3) {
-	    _modeToPrint = "A";
+	if (_fireMode == 0) {
+	    _firingModeToPrint = "S";
+	} else if (_fireMode == 1) {
+	    _firingModeToPrint = "SS";
+	} else if (_fireMode == 2) {
+	    _firingModeToPrint = "3B";
+	} else if (_fireMode == 3) {
+	    _firingModeToPrint = "A";
 	}	
 
 	displayValues();

diff --git a/SmartBlaster/SmartBlaster.h b/SmartBlaster/SmartBlaster.h
@@ -8,6 +8,9 @@
 
 #include <Button.h>
 
+#define SCREEN_WIDTH 128
+#define SCREEN_HEIGHT 64
+
 //stuff to help keep track of magazine stuff
 //
 //
@@ -88,7 +91,7 @@ class SmartBlaster {
         uint8_t _lastAmmo;
         uint8_t _fireMode;  //0 = safe = SF, 1 = semi-automatic = SA, 2 = 3 round burst = 3b, 3 = fully automatic = AM
 
-        Adafruit_SSD1306 display;
+        Adafruit_SSD1306 _display;
 
     //methods
     public:
@@ -102,8 +105,8 @@ class SmartBlaster {
         SmartBlaster& initMagSizes(uint8_t[]);
 
         //getter and setter for display
-        void setDisplay(Adafruit_SSD1306);
-        Adafruit_SSD1306 getDisplay ();
+        Adafruit_SSD1306 setDisplay(Adafruit_SSD1306);
+        Adafruit_SSD1306 getDisplay();
 
         //display stuff
         void displayValues();

diff --git a/examples/ammoCounter/ammoCounter.ino b/examples/ammoCounter/ammoCounter.ino
@@ -2,6 +2,12 @@
 #include <Adafruit_GFX.h>
 #include <Adafruit_SSD1306.h>
 
+#define SCREEN_WIDTH 128
+#define SCREEN_HEIGHT 64
+
+#define OLED_RESET 4
+Adafruit_SSD1306 display(OLED_RESET);
+
 //button library
 #include <Button.h>
 
@@ -10,7 +16,7 @@
 
 
 void setup() {
-
+    display.begin(SSD1306_SWITCHCAPVCC, 0x3C);
 }
 
 void loop() {