Solved merge conflict.

software/app/application.cpp

@@ -2,19 +2,13 @@
 #include <SmingCore/SmingCore.h>
 #include <SmingCore/HardwareSerial.h>
 #include "ads101x.h"
-#include "defines.h"
+#include <hardware.h>
 #include "excitation_light.h"
 #include "sensor_hub.h"
 #include "sensor_settings.h"
 #include "double_buffer.h"
 #include "web_interface.h"
 #include <stdint.h>
-#define LED_PIN 2 // GPIO2
-
-static const int HUB_PERIOD = 5;
-static const int ADC_TIMEBASE = 250;
-static const int ADC_PERIOD = 5;
-//static const uint8_t ADC_ADDRESS = 0x48;
 
 using namespace rijnfel;
 
@@ -40,11 +34,6 @@ void SettingsTest() {
 	Serial.printf("Settings: %d\n\r", adc.GetSettings());
 }
 
-void GenerateRectangle()
-{
-	mylight.RectangleUpdate();	
-}
-
 void AdcTest() {
 	channel++;
 	if (channel > 3) {
@@ -83,7 +72,6 @@ void init() {
 
 	//WDT.enable(false);
 	pinMode(LED_PIN, OUTPUT);
-	digitalWrite(LED_PIN, 1);
 	adc.SetMux(ads::eInputMux::AIN_0);
 	adc.SetSampleSpeed(ads::eSampleSpeed::SPS_3300);
 	adc.SetGain(ads::eGainAmplifier::FSR_4_096);
@@ -101,13 +89,11 @@ void init() {
 	 WifiAccessPoint.config("Sensus", "", AUTH_OPEN, false, 3);*/
 	cWebInterface::GetInstance()->Start();
 
-	procTimer.initializeMs(HUB_PERIOD, updateSensorHub).start();
+	//procTimer.initializeMs(HUB_PERIOD, updateSensorHub).start();
 	//procTimer.initializeMs(1000, AdcTest).start();
-	//procTimer.initializeMs(5000, SettingsTest).start();
-	mylight.SetCurrent(1000);
-	//mylight.DeactivateLED();
-	//procTimer.initializeUs(2500, GenerateRectangle).start();
-
+	procTimer.initializeMs(5000, SettingsTest).start();
+	mylight.SetCurrent(5000);
+	mylight.RectangleUpdate();	
 }
 
 void STADisconnect(String ssid, uint8_t ssid_len, uint8_t bssid[6],

software/app/web_interface.cpp

@@ -69,10 +69,15 @@ void cWebInterface::OnRefresh(HttpRequest &request, HttpResponse &response) {
 	JsonObjectStream* stream = new JsonObjectStream();
 	JsonObject& json = stream->getRoot();
 
-	json["adc_0"] = m_adc_value[0];
-	json["adc_1"] = m_adc_value[1];
-	json["adc_2"] = m_adc_value[2];
+	json["adc_1"] = m_adc_value[0];
+	json["adc_2"] = m_adc_value[1];
+#ifdef REV_1
 	json["adc_3"] = m_adc_value[3];
+	json["adc_4"] = m_adc_value[2];
+#else
+	json["adc_3"] = m_adc_value[2];
+	json["adc_4"] = m_adc_value[3];
+#endif
 
 	response.sendJsonObject(stream);
 }

software/files/index.html

@@ -35,10 +35,10 @@
 				<div class="col-xs-10 col-md-5">
 					<div class="panel panel-default">
 						<div class="panel-heading">
-							<h3 class="panel-title">Channel 0</h3>
+							<h3 class="panel-title">Channel 1</h3>
 						</div>
 						<div class="panel-body">
-							<h1 id="adc_0" class="text-center main">{adc_0}</h1>
+							<h1 id="adc_0" class="text-center main">{adc_1}</h1>
 						</div>
 					</div>
 				</div>
@@ -47,10 +47,10 @@
 				<div class="col-xs-10 col-md-5">
 					<div class="panel panel-default">
 						<div class="panel-heading">
-							<h3 class="panel-title">Channel 1</h3>
+							<h3 class="panel-title">Channel 2</h3>
 						</div>
 						<div class="panel-body">
-							<h1 id="adc_1" class="text-center main">{adc_1}</h1>
+							<h1 id="adc_1" class="text-center main">{adc_2}</h1>
 						</div>
 					</div>
 				</div>
@@ -61,10 +61,10 @@
 				<div class="col-xs-10 col-md-5">
 					<div class="panel panel-default">
 						<div class="panel-heading">
-							<h3 class="panel-title">Channel 2</h3>
+							<h3 class="panel-title">Channel 3</h3>
 						</div>
 						<div class="panel-body">
-							<h1 id="adc_2" class="text-center main">{adc_2}</h1>
+							<h1 id="adc_2" class="text-center main">{adc_3}</h1>
 						</div>
 					</div>
 				</div>
@@ -73,10 +73,10 @@
 				<div class="col-xs-10 col-md-5">
 					<div class="panel panel-default">
 						<div class="panel-heading">
-							<h3 class="panel-title">Channel 3</h3>
+							<h3 class="panel-title">Channel 4</h3>
 						</div>
 						<div class="panel-body">
-							<h1 id="adc_3" class="text-center main">{adc_3}</h1>
+							<h1 id="adc_3" class="text-center main">{adc_4}</h1>
 						</div>
 					</div>
 				</div>

software/app/hardware.h → software/include/hardware.h

@@ -11,6 +11,8 @@
 #ifndef APP_HARDWARE_H_
 #define APP_HARDWARE_H_
 
+#define REV_1
+
 //-------------------------------------I2C ADRESSES---------------------------------------------------------------------------
 static const uint8_t ADC_ADDRESS = 0x49;
 static const uint8_t DAC1_ADDRESS = 0xE;
@@ -20,4 +22,10 @@ static const uint16_t CURR_MAX_UAMP = 10000; // 10 mA max.
 static const uint16_t VREF_DAC = 3300; // in mV
 static const uint16_t RESOLUTION_DAC = 1024;
 
+static const int HUB_PERIOD = 5;
+static const int ADC_TIMEBASE = 250;
+static const int ADC_PERIOD = 5;
+
+#define LED_PIN 2 // GPIO2
+
 #endif /* APP_HARDWARE_H_ */