m3x1m0m
/
UppSense2017
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Fixed conversion bug. Adjusted reading setting adc

software_develop
elamre 7 years ago
parent
9e1c6a5940
commit
8ad16673ff
24 changed files with 207 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 151
      software/Basic_Blink/.cproject
  2. 28
      software/Basic_Blink/.project
  3. 0
      software/Basic_Blink/Makefile
  4. 0
      software/Basic_Blink/app/adc.h
  5. 12
      software/Basic_Blink/app/ads101x.cpp
  6. 0
      software/Basic_Blink/app/ads101x.h
  7. 31
      software/Basic_Blink/app/application.cpp
  8. 0
      software/Basic_Blink/app/dac101c085.cpp
  9. 0
      software/Basic_Blink/app/dac101c085.h
  10. 0
      software/Basic_Blink/app/double_buffer.h
  11. 0
      software/Basic_Blink/app/sensor.h
  12. 0
      software/Basic_Blink/app/sensor_hub.cpp
  13. 0
      software/Basic_Blink/app/sensor_hub.h
  14. 0
      software/Basic_Blink/app/sensor_settings.h
  15. 0
      software/Basic_Blink/app/temperature.h
  16. 1
      software/Basic_Blink/app/web_interface.cpp
  17. 0
      software/Basic_Blink/app/web_interface.h
  18. 0
      software/Basic_Blink/files/bootstrap.min.css.gz
  19. 0
      software/Basic_Blink/files/config.html
  20. 0
      software/Basic_Blink/files/config.js
  21. 0
      software/Basic_Blink/files/index.html
  22. 0
      software/Basic_Blink/files/index.js
  23. 0
      software/Basic_Blink/files/jquery-2.1.4.min.js.gz
  24. 0
      software/Basic_Blink/include/user_config.h

151
software/Basic_Blink/.cproject
View File

@ -0,0 +1,151 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147" moduleId="org.eclipse.cdt.core.settings" name="Sming">
<externalSettings/>
<extensions>
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147" name="Sming" parent="org.eclipse.cdt.build.core.emptycfg">
<folderInfo id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463" name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.cross.base.1164554300" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base">
<option id="cdt.managedbuild.option.gnu.cross.prefix.521205673" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix"/>
<option id="cdt.managedbuild.option.gnu.cross.path.393887888" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path"/>
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.712123812" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
<builder id="cdt.managedbuild.builder.gnu.cross.2110485170" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.builder.gnu.cross"/>
<tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.1168221903" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
<option id="gnu.c.compiler.option.include.paths.357494572" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${SMING_HOME}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/system/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/Libraries&quot;"/>
<listOptionValue builtIn="false" value="&quot;${ESP_HOME}/sdk/include&quot;"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.313321806" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
<tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1999763015" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
<option id="gnu.cpp.compiler.option.include.paths.611746109" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${SMING_HOME}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/system/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/Libraries&quot;"/>
<listOptionValue builtIn="false" value="&quot;${ESP_HOME}/sdk/include&quot;"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1330530366" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
<tool id="cdt.managedbuild.tool.gnu.cross.c.linker.65193859" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"/>
<tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.1795850540" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker">
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.364843833" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
</inputType>
</tool>
<tool id="cdt.managedbuild.tool.gnu.cross.archiver.525412186" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
<tool id="cdt.managedbuild.tool.gnu.cross.assembler.587940548" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
<option id="gnu.both.asm.option.include.paths.1067006329" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${SMING_HOME}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/system/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/Libraries&quot;"/>
<listOptionValue builtIn="false" value="&quot;${ESP_HOME}/sdk/include&quot;"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.651581712" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool>
</toolChain>
</folderInfo>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="Basic_Blink.null.1347473968" name="Basic_Blink"/>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="refreshScope" versionNumber="2">
<configuration configurationName="Sming">
<resource resourceType="PROJECT" workspacePath="/Basic_Blink"/>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
<buildTargets>
<target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
<buildTarget>all</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="clean" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
<buildTarget>clean</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="flash" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
<buildTarget>flash</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="flashonefile" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
<buildTarget>flashonefile</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="flashinit" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
<buildTarget>flashinit</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="flashboot" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
<buildTarget>flashboot</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="rebuild" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
<buildTarget>rebuild</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
</buildTargets>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.c.compiler.mingw.base.2032390008;cdt.managedbuild.tool.gnu.c.compiler.input.1700912488">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.cross.c.compiler.1168221903;cdt.managedbuild.tool.gnu.c.compiler.input.313321806">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1999763015;cdt.managedbuild.tool.gnu.cpp.compiler.input.1330530366">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.454898447;cdt.managedbuild.tool.gnu.cpp.compiler.input.501261625">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
</storageModule>
</cproject>

28
software/Basic_Blink/.project
View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Basic_Blink</name>
<comment></comment>
<projects>
<project>SmingFramework</project>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.cdt.core.ccnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
</natures>
</projectDescription>

0
software/Makefile → software/Basic_Blink/Makefile
View File

0
software/app/adc.h → software/Basic_Blink/app/adc.h
View File

12
software/app/ads101x.cpp → software/Basic_Blink/app/ads101x.cpp
View File

@ -107,11 +107,15 @@ uint16_t cADS101x::GetSettings(void) {
Wire.requestFrom((int) m_address, 2); //16 bits
settings = Wire.read() << 8;
settings |= Wire.read();
int result = Wire.endTransmission();
if (result != 0) {
Serial.printf("Error sample i2c: %d \n\r", result);
}
return settings;
}
ads_voltage_t cADS101x::ConvertSample(ads_sample_t & sample) {
//Raw sample is in (parts of) millivolts, go to micro to remove fractions
ads_voltage_t returnType = (sample.rawSample >> 4) * 1000; //Multiply for extra precision
ads_voltage_t returnType = (sample.rawSample >> 4); //Multiply for extra precision
switch (sample.gain) {
case eGainAmplifier::FSR_0_256:
//one lsb is 0.125 mv = 125 uv
@ -138,7 +142,7 @@ ads_voltage_t cADS101x::ConvertSample(ads_sample_t & sample) {
returnType *= 3000;
break;
}
return returnType;
return returnType/1000;
}
ads_sample_t cADS101x::RawSample(void) {
@ -151,6 +155,10 @@ ads_sample_t cADS101x::RawSample(void) {
Wire.requestFrom((int) m_address, 2); //16 bits
sample.rawSample = Wire.read() << 8;
sample.rawSample |= Wire.read();
int result = Wire.endTransmission();
if (result != 0) {
Serial.printf("Error sample i2c: %d \n\r", result);
}
sample.gain = m_gain;
sample.mux = m_mux;
m_latestSample = sample;

0
software/app/ads101x.h → software/Basic_Blink/app/ads101x.h
View File

31
software/app/application.cpp → software/Basic_Blink/app/application.cpp
View File

@ -2,7 +2,6 @@
#include <SmingCore/SmingCore.h>
#include <SmingCore/HardwareSerial.h>
#include "ads101x.h"
#include "dac101c085.h"
#include "sensor_hub.h"
#include "sensor_settings.h"
#include "double_buffer.h"
@ -14,7 +13,6 @@ 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;
static const uint8_t DAC_ADDRESS = 0x0C;
using namespace rijnfel;
@ -24,11 +22,20 @@ void STAGotIP(IPAddress ip, IPAddress mask, IPAddress gateway);
Timer procTimer;
ads::cADS101x adc(0, ADC_ADDRESS);
dac::cDAC101C085 mydac(1, DAC_ADDRESS);
uint8_t channel = 0;
cSensorHub hub(HUB_PERIOD);
int test = 0;
void SettingsTest() {
channel++;
if (channel > 3) {
channel = 0;
cWebInterface::GetInstance()->PrintValues();
}
adc.SetMux(static_cast<ads::eInputMux>(ads::eInputMux::AIN_0 + channel));
Serial.printf("Settings: %d\n\r", adc.GetSettings());
}
void updateSensorHub() {
hub.Update();
}
@ -46,15 +53,18 @@ void adcCallback(cDoubleBuffer<ads::ads_sample_t> & buffer) {
void init() {
spiffs_mount();
Serial.begin(460800);
system_update_cpu_freq(SYS_CPU_160MHZ);
wifi_set_sleep_type(NONE_SLEEP_T);
//scl, sda
Wire.pins(4, 5);
Wire.begin();
//SET higher CPU freq & disable wifi sleep
system_update_cpu_freq(SYS_CPU_160MHZ);
wifi_set_sleep_type(NONE_SLEEP_T);
//WDT.enable(false);
pinMode(LED_PIN, OUTPUT);
adc.SetMux(ads::eInputMux::AIN_0);
adc.SetSampleSpeed(ads::eSampleSpeed::SPS_3300);
adc.SetGain(ads::eGainAmplifier::FSR_4_096);
hub.SetAdc(&adc);
cSensorSettings<ads::ads_sample_t> * adcSettings;
@ -69,13 +79,8 @@ void init() {
cWebInterface::GetInstance()->Start();
procTimer.initializeMs(HUB_PERIOD, updateSensorHub).start();
mydac.checkDev();
Serial.print("Write DAC reg: ");
Serial.print(mydac.changeSettings(dac::eOpMode::NORMAL, 1023));
Serial.println("");
Serial.print("Read out DAC regs: ");
Serial.print(mydac.ReadSettings());
Serial.println("");
//procTimer.initializeMs(5000, SettingsTest).start();
}
void STADisconnect(String ssid, uint8_t ssid_len, uint8_t bssid[6],

0
software/app/dac101c085.cpp → software/Basic_Blink/app/dac101c085.cpp
View File

0
software/app/dac101c085.h → software/Basic_Blink/app/dac101c085.h
View File

0
software/app/double_buffer.h → software/Basic_Blink/app/double_buffer.h
View File

0
software/app/sensor.h → software/Basic_Blink/app/sensor.h
View File

0
software/app/sensor_hub.cpp → software/Basic_Blink/app/sensor_hub.cpp
View File

0
software/app/sensor_hub.h → software/Basic_Blink/app/sensor_hub.h
View File

0
software/app/sensor_settings.h → software/Basic_Blink/app/sensor_settings.h
View File

0
software/app/temperature.h → software/Basic_Blink/app/temperature.h
View File

1
software/app/web_interface.cpp → software/Basic_Blink/app/web_interface.cpp
View File

@ -90,7 +90,6 @@ void cWebInterface::UpdateAdc(cADC<ads::ads_sample_t, int32_t> & adc,
for (int i = 0; i < size; i++) {
average += buf[i].rawSample;
}
if (size != 0) {
average /= size;
}

0
software/app/web_interface.h → software/Basic_Blink/app/web_interface.h
View File

0
software/files/bootstrap.min.css.gz → software/Basic_Blink/files/bootstrap.min.css.gz
View File

0
software/files/config.html → software/Basic_Blink/files/config.html
View File

0
software/files/config.js → software/Basic_Blink/files/config.js
View File

0
software/files/index.html → software/Basic_Blink/files/index.html
View File

0
software/files/index.js → software/Basic_Blink/files/index.js
View File

0
software/files/jquery-2.1.4.min.js.gz → software/Basic_Blink/files/jquery-2.1.4.min.js.gz
View File

0
software/include/user_config.h → software/Basic_Blink/include/user_config.h
View File

Write Preview
Loading…
Cancel
Save