Merge remote-tracking branch 'origin/develop' into xap

This commit is contained in:
QMK Bot 2024-07-05 01:22:38 +00:00
commit c67dc8ab16
3 changed files with 3 additions and 3 deletions

View File

@ -3,7 +3,7 @@
#include "hardware_id.h" #include "hardware_id.h"
hardware_id_t get_hardware_id(void) { __attribute__((weak)) hardware_id_t get_hardware_id(void) {
hardware_id_t id = {0}; hardware_id_t id = {0};
return id; return id;
} }

View File

@ -10,7 +10,7 @@
#include <avr/boot.h> #include <avr/boot.h>
#include "hardware_id.h" #include "hardware_id.h"
hardware_id_t get_hardware_id(void) { __attribute__((weak)) hardware_id_t get_hardware_id(void) {
hardware_id_t id = {0}; hardware_id_t id = {0};
for (uint8_t i = 0; i < 10; i += 1) { for (uint8_t i = 0; i < 10; i += 1) {
((uint8_t*)&id)[i] = boot_signature_byte_get(i + 0x0E); ((uint8_t*)&id)[i] = boot_signature_byte_get(i + 0x0E);

View File

@ -4,7 +4,7 @@
#include <ch.h> #include <ch.h>
#include "hardware_id.h" #include "hardware_id.h"
hardware_id_t get_hardware_id(void) { __attribute__((weak)) hardware_id_t get_hardware_id(void) {
hardware_id_t id = {0}; hardware_id_t id = {0};
#if defined(RP2040) #if defined(RP2040)
// Forward declare as including "hardware/flash.h" here causes more issues... // Forward declare as including "hardware/flash.h" here causes more issues...