summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorAlex Evans <aevans@midjourney.com>2023-07-25 18:19:55 +0100
committerAlex Evans <aevans@midjourney.com>2023-07-25 18:19:55 +0100
commit8c6b1fb23721084a0f063d1274f18785b01e95dc (patch)
tree27ab34d6ebc4f7e7c64c182bf84e5338d6844804 /sw
parentf3882c4f04d475126b074c31c8fbee9b81949668 (diff)
downloadplinky-8c6b1fb23721084a0f063d1274f18785b01e95dc.tar.gz
add python script for bundling bootloader and main app; also fix compile errors in new ide version
Diffstat (limited to 'sw')
-rwxr-xr-xsw/Core/Src/plinky.c2
-rwxr-xr-xsw/Core/Src/sysmem.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/Core/Src/plinky.c b/sw/Core/Src/plinky.c
index 5427162..49cb95f 100755
--- a/sw/Core/Src/plinky.c
+++ b/sw/Core/Src/plinky.c
@@ -2908,7 +2908,7 @@ void HAL_UART_ErrorCallback(UART_HandleTypeDef* huart) {
HAL_UART_Receive_DMA(&huart3, uartbuf, sizeof(uartbuf));
}
-
+typedef unsigned int uint;
u8 midisendbuf[16+16];
uint midisendhead,midisendtail;
bool usb_midi_write(const uint8_t packet[4]);
diff --git a/sw/Core/Src/sysmem.c b/sw/Core/Src/sysmem.c
index 4665417..d97ae4b 100755
--- a/sw/Core/Src/sysmem.c
+++ b/sw/Core/Src/sysmem.c
@@ -24,7 +24,7 @@
/* Includes */
#include <errno.h>
#include <stdio.h>
-
+#include <sys/types.h>
/* Variables */
extern int errno;
register char * stack_ptr asm("sp");