Explorar o código

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

QMK Bot %!s(int64=2) %!d(string=hai) anos
pai
achega
c67dc8ab16

+ 1 - 1
platforms/arm_atsam/hardware_id.c

@@ -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;
 }
 }

+ 1 - 1
platforms/avr/hardware_id.c

@@ -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);

+ 1 - 1
platforms/chibios/hardware_id.c

@@ -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...