Skip to content

Commit d25c2b2

Browse files
authored
Merge pull request #481 from HyperloopUPV-H8/feature/fw-171
FW[171] ADC resolution
2 parents 4296d37 + 8637445 commit d25c2b2

2 files changed

Lines changed: 2 additions & 0 deletions

File tree

Inc/HALALMock/Models/PinModel/Pin.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ struct __attribute__((packed)) DualPWM_MockPin{
116116
struct __attribute__((packed)) ADC_MockPin{
117117
uint16_t value;
118118
bool is_on;
119+
ADC::ADCResolution resolution;
119120
} ;
120121
struct __attribute__((packed)) EXTIPin_MockPin{
121122
uint32_t priority;

Src/HALALMock/Services/ADC/ADC.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ void ADC::start() {
4949
Pin pin = pin_it->second;
5050
EmulatedPin& emulated_pin = SharedMemory::get_pin(pin);
5151
active_emulated_instances[id] = &emulated_pin;
52+
active_emulated_instances[id]->PinData.adc.resolution=instance.resolution;
5253
}
5354
}
5455

0 commit comments

Comments
 (0)