me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev

Browse Source
This commit is contained in:
discip
2024-11-08 00:09:04 +01:00
committed by GitHub
parent b036da9dcc a0a779faba
commit 35fd2f545f
61 changed files with 1178 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/Core/BSP/Pinecil/BSP.cpp
View File

@@ -5,6 +5,7 @@
#include "I2C_Wrapper.hpp"
#include "IRQ.h"
#include "Pins.h"
#include "Settings.h"
#include "Setup.h"
#include "TipThermoModel.h"
#include "configuration.h"
@@ -93,7 +94,13 @@ void setBuzzer(bool on) {}
uint8_t preStartChecks() { return 1; }
uint64_t getDeviceID() { return dbg_id_get(); }
uint8_t getTipResistanceX10() { return TIP_RESISTANCE; }
uint8_t getTipResistanceX10() {
uint8_t user_selected_tip = getUserSelectedTipResistance();
if (user_selected_tip == 0) {
return TIP_RESISTANCE; // Auto mode
}
return user_selected_tip;
}
bool isTipShorted() { return false; }
uint8_t preStartChecksDone() { return 1; }

2
source/Core/BSP/Pinecil/configuration.h
View File

@@ -1,6 +1,5 @@
#ifndef CONFIGURATION_H_
#define CONFIGURATION_H_
#include "Settings.h"
#include <stdint.h>
/**
* Configuration.h
@@ -156,6 +155,7 @@
#define POW_QC_20V 1
#define ENABLE_QC2 1
#define MAG_SLEEP_SUPPORT 1
#define TIPTYPE_T12 1 // Can manually pick a T12 tip
#define TEMP_TMP36
#define ACCEL_BMA
#define ACCEL_SC7