diff --git a/software/app/application.cpp b/software/app/application.cpp index 3d0318b..8c3354d 100644 --- a/software/app/application.cpp +++ b/software/app/application.cpp @@ -135,7 +135,7 @@ void init() { } cWebInterface::GetInstance()->StartServer(); - mylight.SetCurrent(500); + mylight.SetCurrent(5000); mylight.RectangleUpdate(); } diff --git a/software/app/web_interface.cpp b/software/app/web_interface.cpp index b33a0d3..8906ce0 100644 --- a/software/app/web_interface.cpp +++ b/software/app/web_interface.cpp @@ -126,8 +126,8 @@ void cWebInterface::OnRefresh(HttpRequest & i_request, HttpResponse & i_response json["adc_3"] = m_adcAverageVal[3]; json["adc_4"] = m_adcAverageVal[2]; #else - json["adc_3"] = m_adc_value_average[2]; - json["adc_4"] = m_adc_value_average[3]; + json["adc_3"] = m_adcAverageVal[2]; + json["adc_4"] = m_adcAverageVal[3]; #endif i_response.sendJsonObject(stream); } diff --git a/software/include/hardware.h b/software/include/hardware.h index 9a323ca..ee16067 100644 --- a/software/include/hardware.h +++ b/software/include/hardware.h @@ -13,11 +13,26 @@ #include -#define REV_1 +#define REV_2 + +#define SMING_RELEASE +#ifdef DEBUG_VERBOSE_LEVEL + #undef DEBUG_VERBOSE_LEVEL +#endif +#define DEBUG_VERBOSE_LEVEL WARN //-------------------------------------I2C ADRESSES--------------------------------------------------------------------------- +#ifdef REV_1 static const uint8_t ADC_ADDRESS = 0x49; static const uint8_t DAC1_ADDRESS = 0xE; +#define DUMMY_ADC +#endif +#ifdef REV_2 +static const uint8_t ADC_ADDRESS = 0x49; +static const uint8_t DAC2_ADDRESS = 0x78; +static const uint8_t DAC1_ADDRESS = 0x09; +static const uint8_t TEMP_ADDRESS = 0x12; +#endif static const uint16_t R_SENSE = 100; // 100 Ohm sensing resistor static const uint16_t CURR_MAX_UAMP = 10000; // 10 mA max.