Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions Firmware/project_1/.cproject
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,13 @@
</option>
<option id="gnu.cpp.compiler.option.other.other.884456293" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -fno-builtin -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions" valueType="string"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.1323900660" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;C:\Users\user\ElecOnboarding25\Firmware\common\api&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\Users\user\ElecOnboarding25\Firmware\common\hal&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/zephyr-common}&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\Users\user\ElecOnboarding25\Firmware\mbed\libraries\mbed\api&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\Users\user\ElecOnboarding25\Firmware\mbed\libraries\mbed\hal&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\Users\user\ElecOnboarding25\Firmware\mbed\libraries\mbed\targets\cmsis&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\Users\user\ElecOnboarding25\Firmware\mbed\libraries\mbed\targets\hal\TARGET_NXP\TARGET_LPC15XX&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/common}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/mbed}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
Expand All @@ -58,7 +64,7 @@
<option id="com.crt.advproject.cpp.exe.debug.option.debugging.level.1742978064" name="Debug Level" superClass="com.crt.advproject.cpp.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
<option id="com.crt.advproject.cpp.lto.1459636381" name="Enable Link-time optimization (-flto)" superClass="com.crt.advproject.cpp.lto" useByScannerDiscovery="false" value="false" valueType="boolean"/>
<option id="gnu.cpp.compiler.option.dialect.std.957685890" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.c++11" valueType="enumerated"/>
<option id="com.crt.advproject.cpp.fpu.1238902965" superClass="com.crt.advproject.cpp.fpu" useByScannerDiscovery="true"/>
<option id="com.crt.advproject.cpp.fpu.1238902965" name="Floating point" superClass="com.crt.advproject.cpp.fpu" useByScannerDiscovery="true"/>
<inputType id="com.crt.advproject.compiler.cpp.input.1719952555" superClass="com.crt.advproject.compiler.cpp.input"/>
</tool>
<tool id="com.crt.advproject.gcc.exe.debug.1636949736" name="MCU C Compiler" superClass="com.crt.advproject.gcc.exe.debug">
Expand Down Expand Up @@ -139,16 +145,17 @@
<option id="com.crt.advproject.link.cpp.scriptdir.1498085647" name="Script path" superClass="com.crt.advproject.link.cpp.scriptdir" useByScannerDiscovery="false" value="&quot;../../mbed/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC15XX/TOOLCHAIN_GCC_CR&quot;" valueType="string"/>
<option id="com.crt.advproject.link.memory.heapAndStack.cpp.452712881" name="Heap and Stack options" superClass="com.crt.advproject.link.memory.heapAndStack.cpp" useByScannerDiscovery="false" value="&amp;Heap:Default;Post Data;Default&amp;Stack:Default;End;Default" valueType="string"/>
<option defaultValue="com.crt.advproject.heapAndStack.lpcXpressoStyle.cpp" id="com.crt.advproject.link.memory.heapAndStack.style.cpp.147936526" name="Heap and Stack placement" superClass="com.crt.advproject.link.memory.heapAndStack.style.cpp" useByScannerDiscovery="false" valueType="enumerated"/>
<option id="com.crt.advproject.link.memory.load.image.cpp.1854760230" superClass="com.crt.advproject.link.memory.load.image.cpp" value="" valueType="string"/>
<option id="com.crt.advproject.link.memory.data.cpp.326173730" superClass="com.crt.advproject.link.memory.data.cpp" value="" valueType="string"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.crt.advproject.link.memory.sections.cpp.50157822" superClass="com.crt.advproject.link.memory.sections.cpp" valueType="stringList"/>
<option id="com.crt.advproject.link.memory.load.image.cpp.1854760230" name="Plain load image" superClass="com.crt.advproject.link.memory.load.image.cpp" value="" valueType="string"/>
<option id="com.crt.advproject.link.memory.data.cpp.326173730" name="Global data placement" superClass="com.crt.advproject.link.memory.data.cpp" value="" valueType="string"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.crt.advproject.link.memory.sections.cpp.50157822" name="Extra linker script input sections" superClass="com.crt.advproject.link.memory.sections.cpp" valueType="stringList"/>
<option id="com.crt.advproject.link.cpp.multicore.master.1781209573" name="Multicore master" superClass="com.crt.advproject.link.cpp.multicore.master"/>
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.2135286474" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
</inputType>
</tool>
<tool id="com.crt.advproject.link.exe.debug.2053687927" name="MCU Linker" superClass="com.crt.advproject.link.exe.debug">
<option id="com.crt.advproject.link.gcc.hdrlib.968714536" superClass="com.crt.advproject.link.gcc.hdrlib"/>
<option id="com.crt.advproject.link.gcc.hdrlib.968714536" name="Library" superClass="com.crt.advproject.link.gcc.hdrlib"/>
</tool>
<tool id="com.crt.advproject.tool.debug.debug.311288347" name="MCU Debugger" superClass="com.crt.advproject.tool.debug.debug"/>
</toolChain>
Expand Down Expand Up @@ -315,9 +322,9 @@
<option id="com.crt.advproject.link.cpp.scriptdir.447416386" name="Script path" superClass="com.crt.advproject.link.cpp.scriptdir" useByScannerDiscovery="false" value="&quot;../../../mbed/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC15XX/TOOLCHAIN_GCC_CR&quot;" valueType="string"/>
<option id="com.crt.advproject.link.memory.heapAndStack.cpp.546543967" name="Heap and Stack options" superClass="com.crt.advproject.link.memory.heapAndStack.cpp" useByScannerDiscovery="false" value="&amp;Heap:Default;Post Data;Default&amp;Stack:Default;End;Default" valueType="string"/>
<option defaultValue="com.crt.advproject.heapAndStack.lpcXpressoStyle.cpp" id="com.crt.advproject.link.memory.heapAndStack.style.cpp.2040185193" name="Heap and Stack placement" superClass="com.crt.advproject.link.memory.heapAndStack.style.cpp" useByScannerDiscovery="false" value="com.crt.advproject.heapAndStack.lpcXpressoStyle.cpp" valueType="enumerated"/>
<option id="com.crt.advproject.link.memory.load.image.cpp.1568014525" superClass="com.crt.advproject.link.memory.load.image.cpp" value="" valueType="string"/>
<option id="com.crt.advproject.link.memory.data.cpp.38645937" superClass="com.crt.advproject.link.memory.data.cpp" value="" valueType="string"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.crt.advproject.link.memory.sections.cpp.222837621" superClass="com.crt.advproject.link.memory.sections.cpp" valueType="stringList"/>
<option id="com.crt.advproject.link.memory.load.image.cpp.1568014525" name="Plain load image" superClass="com.crt.advproject.link.memory.load.image.cpp" value="" valueType="string"/>
<option id="com.crt.advproject.link.memory.data.cpp.38645937" name="Global data placement" superClass="com.crt.advproject.link.memory.data.cpp" value="" valueType="string"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.crt.advproject.link.memory.sections.cpp.222837621" name="Extra linker script input sections" superClass="com.crt.advproject.link.memory.sections.cpp" valueType="stringList"/>
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.107853358" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
Expand Down Expand Up @@ -479,9 +486,9 @@
<option id="com.crt.advproject.link.cpp.scriptdir.1162936692" name="Script path" superClass="com.crt.advproject.link.cpp.scriptdir" useByScannerDiscovery="false" value="&quot;../../../mbed/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC15XX/TOOLCHAIN_GCC_CR&quot;" valueType="string"/>
<option id="com.crt.advproject.link.memory.heapAndStack.cpp.977802609" name="Heap and Stack options" superClass="com.crt.advproject.link.memory.heapAndStack.cpp" useByScannerDiscovery="false" value="&amp;Heap:Default;Post Data;Default&amp;Stack:Default;End;Default" valueType="string"/>
<option defaultValue="com.crt.advproject.heapAndStack.lpcXpressoStyle.cpp" id="com.crt.advproject.link.memory.heapAndStack.style.cpp.638080685" name="Heap and Stack placement" superClass="com.crt.advproject.link.memory.heapAndStack.style.cpp" useByScannerDiscovery="false" value="com.crt.advproject.heapAndStack.lpcXpressoStyle.cpp" valueType="enumerated"/>
<option id="com.crt.advproject.link.memory.load.image.cpp.729192296" superClass="com.crt.advproject.link.memory.load.image.cpp" value="" valueType="string"/>
<option id="com.crt.advproject.link.memory.data.cpp.2146811847" superClass="com.crt.advproject.link.memory.data.cpp" value="" valueType="string"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.crt.advproject.link.memory.sections.cpp.561111747" superClass="com.crt.advproject.link.memory.sections.cpp" valueType="stringList"/>
<option id="com.crt.advproject.link.memory.load.image.cpp.729192296" name="Plain load image" superClass="com.crt.advproject.link.memory.load.image.cpp" value="" valueType="string"/>
<option id="com.crt.advproject.link.memory.data.cpp.2146811847" name="Global data placement" superClass="com.crt.advproject.link.memory.data.cpp" value="" valueType="string"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.crt.advproject.link.memory.sections.cpp.561111747" name="Extra linker script input sections" superClass="com.crt.advproject.link.memory.sections.cpp" valueType="stringList"/>
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1469305398" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
Expand Down Expand Up @@ -592,4 +599,5 @@
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.crt.advproject.GCCManagedMakePerProjectProfile"/>
</scannerConfigBuildInfo>
</storageModule>
<storageModule moduleId="openCmsis"/>
</cproject>
5 changes: 3 additions & 2 deletions Firmware/project_1/inc/pins.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
#define P_LED3 P0_6
#define P_LED4 P0_7
// PROJECT 1 - You can define a pin macro here

// PROJECT 2 DEFINE PIN OBJECT
#define P_POT P0_4
/*
* COMMON PIN OBJECT DECLARATIONS
*/
Expand All @@ -42,7 +43,7 @@ extern DigitalOut led4;
*/

// PROJECT 2 - You can declare a AnalogIn object here

extern AnalogIn pot;

/*
* BOARD SPECIFIC PIN OBJECT DECLARATIONS
Expand Down
11 changes: 9 additions & 2 deletions Firmware/project_1/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
#include "CAN/can_data.h"
#include "can_buffer.h"


static const uint32_t BLINK_MIN_US = 100000;
static const uint32_t BLINK_MAX_US = 1000000;
/*
* This is an example function. It blinks the heartbeat LED and sends
* a Heartbeat CAN Message. The message sends when the LED turns on.
Expand Down Expand Up @@ -97,10 +98,16 @@ int main() {

if(timing.tickThreshold(last_task_1_time, TASK_1_RATE_US)){
//PROJECT 1 - add code here to actually make the LED blink
led1.write(1 - led1.read());
}

//PROJECT 2 - use the potentiometer to change the blink rate

float pot_val = pot.read();
uint32_t blink_interval_us =
BLINK_MIN_US + (uint32_t)((BLINK_MAX_US - BLINK_MIN_US) * pot_val);
if (timing.tickThreshold(last_task_1_time, blink_interval_us)) {
led1.write(1 - led1.read()); // toggle
}

}

Expand Down
1 change: 1 addition & 0 deletions Firmware/project_1/src/pins.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*/

// PROJECT 2 - You can instantiate your AnalogIn object here
AnalogIn pot(P_POT);

/*
* COMMON PIN OBJECT INSTANTIATIONS
Expand Down
Loading