Skip to content

MarlinHAL 2.0.9.3 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
p3p merged 1 commit into from
Dec 27, 2021
Merged

MarlinHAL 2.0.9.3 #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions src/MarlinSimulator/marlin_hal_impl/HAL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,35 +48,35 @@ int freeMemory() {
// ADC
// ------------------------

void HAL_adc_init() {
void MarlinHAL::adc_init() {

}

void HAL_adc_enable_channel(const uint8_t ch) {
void MarlinHAL::adc_enable(const uint8_t ch) {

}

uint8_t active_ch = 0;
void HAL_adc_start_conversion(const uint8_t ch) {
uint8_t MarlinHAL::active_ch = 0;
void MarlinHAL::adc_start(const uint8_t ch) {
active_ch = ch;
}

bool HAL_adc_finished() {
bool MarlinHAL::adc_ready() {
return true;
}

uint16_t HAL_adc_get_result() {
uint16_t MarlinHAL::adc_value() {
pin_t pin = analogInputToDigitalPin(active_ch);
if (!VALID_PIN(pin)) return 0;
uint16_t data = ((Gpio::get(pin) >> 2) & 0x3FF);
return data; // return 10bit value as Marlin expects
}

void HAL_pwm_init() {
void MarlinHAL::pwm_init() {

}

void HAL_reboot() { /* Reset the application state and GPIO */ }
void MarlinHAL::reboot() { /* Reset the application state and GPIO */ }

// Maple Compatibility
volatile uint32_t systick_uptime_millis = 0;
Expand Down