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 discip-patch-1

Browse Source
This commit is contained in:
discip
2023-03-26 00:48:41 +01:00
committed by GitHub
parent d8b6fac176 070064e59e
commit 744dd6b898
5 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,7 +137,7 @@
#define MAX_TEMP_C 350 // Max soldering temp selectable °C
#define MAX_TEMP_F 660 // Max soldering temp selectable °F
#define MIN_TEMP_C 10 // Min soldering temp selectable °C
#define MIN_TEMP_F 60 // Min soldering temp selectable °F
#define MIN_TEMP_F 50 // Min soldering temp selectable °F
#define MIN_BOOST_TEMP_C 150 // The min settable temp for boost mode °C
#define MIN_BOOST_TEMP_F 300 // The min settable temp for boost mode °F
#define NO_DISPLAY_ROTATE // Disable OLED rotation by accel

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

@@ -141,7 +141,7 @@
#define MAX_TEMP_C 450 // Max soldering temp selectable °C
#define MAX_TEMP_F 850 // Max soldering temp selectable °F
#define MIN_TEMP_C 10 // Min soldering temp selectable °C
#define MIN_TEMP_F 60 // Min soldering temp selectable °F
#define MIN_TEMP_F 50 // Min soldering temp selectable °F
#define MIN_BOOST_TEMP_C 250 // The min settable temp for boost mode °C
#define MIN_BOOST_TEMP_F 480 // The min settable temp for boost mode °F

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

@@ -132,7 +132,7 @@
#define MAX_TEMP_C 450 // Max soldering temp selectable °C
#define MAX_TEMP_F 850 // Max soldering temp selectable °F
#define MIN_TEMP_C 10 // Min soldering temp selectable °C
#define MIN_TEMP_F 60 // Min soldering temp selectable °F
#define MIN_TEMP_F 50 // Min soldering temp selectable °F
#define MIN_BOOST_TEMP_C 250 // The min settable temp for boost mode °C
#define MIN_BOOST_TEMP_F 480 // The min settable temp for boost mode °F

7
source/Core/BSP/Pinecilv2/ble_handlers.cpp
View File

@@ -27,6 +27,7 @@
#include "ble_handlers.h"
#include "pd.h"
#include "power.hpp"
#include "../../version.h"
#if POW_PD
#include "USBPD.h"
#include "pd.h"
@@ -176,9 +177,9 @@ int ble_char_read_bulk_value_callback(struct bt_conn *conn, const struct bt_gatt
// TODO: Need to store non-encoded version
break;
case 3:
// Build
// TODO: Need to store non-encoded version
break;
// FW Version
memcpy(buf, &BUILD_VERSION, sizeof(BUILD_VERSION) - 1);
return sizeof(BUILD_VERSION) - 1;
case 4:
// Device unique id
{