Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Accelerometer to master #3

Merged
merged 4 commits into from
Jan 16, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Dividing and float issues look like they are fixed, I will need to br…
…ing the other branches over at some point and make an examples folder or something
  • Loading branch information
ctjet committed Jan 16, 2021
commit 13d113d81399190a53f92d5f5ef7c63ad8649b7b
2 changes: 1 addition & 1 deletion .vscode/.cortex-debug.peripherals.state.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[]
[{"node":"ADC","expanded":true,"format":0},{"node":"BLUE_CTRL","expanded":true,"format":0}]
2 changes: 1 addition & 1 deletion .vscode/.cortex-debug.registers.state.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[]
[{"node":"control","expanded":true}]
6 changes: 4 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
"version": "0.2.0",
"configurations": [
{
"name": "Debug (OpenOCD)",
"cwd": "${workspaceRoot}",
"name": "Debug (OpenOCD)",
//Comment prelaunch task to disable building before upload
"preLaunchTask": "Make",
"cwd": "${workspaceRoot}",
"executable": "./bin/blink.elf",
"request": "launch",
"type": "cortex-debug",
Expand Down
7,021 changes: 1,129 additions & 5,892 deletions BLE_Beacon.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ RM = rm -rf
DEFINES = -DBLUENRG1_DEVICE -DDEBUG -DHS_SPEED_XTAL=HS_SPEED_XTAL_16MHZ -DLS_SOURCE=LS_SOURCE_INTERNAL_RO -DSMPS_INDUCTOR=SMPS_INDUCTOR_4_7uH -DUSER_BUTTON=BUTTON_1 -Dmcpu=cortexm0

#GCC FLAGS
CFLAGS = -mthumb -mcpu=cortex-m0 $(DEFINES) -specs=nano.specs#-specs=nano.specs
CFLAGS = -mthumb -mcpu=cortex-m0 $(DEFINES) -specs=nano.specs -mfloat-abi=soft#-specs=nano.specs
CFLAGS += -MD -std=c99 -c -fdata-sections -ffunction-sections -Og -fdata-sections -g -fstack-usage -Wall

ASFLAGS = -Wall -ggdb -mthumb
Expand All @@ -60,7 +60,7 @@ SFLAGS = -mthumb -mcpu=cortex-m0 -g -Wa,--no-warn -x assembler-with-cpp # -spec
# LDFLAGS = -T$(LD_SCRIPT) -g -mthumb -nostartfiles -mcpu=cortex-m0 -Wl,--gc-sections -Wl,--defsym=malloc_getpagesize_P=0x80 -nodefaultlibs -static -L./assembly -Wl,--start-group -lc -lm -Wl,--end-group -lbluenrg1_stack -lcrypto -specs=nano.specs
# BETTER LDFLAGS = -T$(LD_SCRIPT) -g -nostartfiles --gc-sections --defsym=malloc_getpagesize_P=0x80 -static -L./assembly -nodefaultlibs "-Map=BLE_Beacon.map" --cref --start-group -lc -lgcc -lm --end-group -lbluenrg1_stack -lcrypto #-specs=nano.specs
# LDFLAGS = -T$(LD_SCRIPT) -g --gc-sections --defsym=malloc_getpagesize_P=0x80 -L./assembly -nodefaultlibs "-Map=BLE_Beacon.map" --cref --start-group -lc -lgcc -lm --end-group -lbluenrg1_stack -lcrypto
LDFLAGS = -T$(LD_SCRIPT) -mthumb -specs=nano.specs -nostartfiles -mcpu=cortex-m0 -Wl,--gc-sections -Wl,--defsym=malloc_getpagesize_P=0x80 -nodefaultlibs "-Wl,-Map=BLE_Beacon.map" -static -Wl,--cref -static -L./assembly -Wl,--start-group -lc -lm -Wl,--end-group -lbluenrg1_stack -lcrypto
LDFLAGS = -T$(LD_SCRIPT) -mthumb -mfloat-abi=soft -specs=nano.specs -nostartfiles -mcpu=cortex-m0 -Wl,--gc-sections -Wl,--defsym=malloc_getpagesize_P=0x80 -nodefaultlibs "-Wl,-Map=BLE_Beacon.map" -static -Wl,--cref -static -L./assembly -Wl,--start-group -lc -lm -Wl,--end-group -lbluenrg1_stack -lcrypto



Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file modified bin/blink.elf
Binary file not shown.
29 changes: 14 additions & 15 deletions inc/BlueNRG1_conf.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/**
******************************************************************************
* @file UART/Interrupt/BlueNRG1_conf.h
* @author MEMS Application Team
* @file SPI/Master_w_Sensor/BlueNRG1_conf.h
* @author RF Application Team
* @version V1.0.0
* @date September-2014
* @date September-2015
* @brief Library configuration file.
******************************************************************************
* @attention
Expand All @@ -15,7 +15,7 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
*
* <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>
* <h2><center>&copy; COPYRIGHT 2015 STMicroelectronics</center></h2>
******************************************************************************
*/

Expand All @@ -26,24 +26,23 @@
/* Includes ------------------------------------------------------------------*/
/* Uncomment/Comment the line below to enable/disable peripheral header file inclusion */

#include "BlueNRG1_adc.h"
#include "BlueNRG1_dma.h"
#include "BlueNRG1_flash.h"
#include "BlueNRG1_gpio.h"
#include "BlueNRG1_dma.h"
/*#include "BlueNRG1_i2c.h"*/
/*#include "BlueNRG1_watchdog.h"*/
/*#include "BlueNRG1_spi.h"*/
#include "BlueNRG1_uart.h"
/*#include "BlueNRG1_mft.h"*/
/*#include "BlueNRG1_rtc.h"*/
#include "BlueNRG1_dma.h"
#include "BlueNRG1_i2c.h"
#include "BlueNRG1_mft.h"
#include "BlueNRG1_rtc.h"
#include "BlueNRG1_spi.h"
#include "BlueNRG1_sysCtrl.h"
#include "misc.h" /* High level functions for NVIC and SysTick (add-on to CMSIS functions) */
#include "BlueNRG1_uart.h"
#include "BlueNRG1_wdg.h"
#include "misc.h"

/* Exported types ------------------------------------------------------------*/
/* Exported constants --------------------------------------------------------*/
/* Uncomment the line below to expanse the "assert_param" macro in the
Standard Peripheral Library drivers code */
/* #define USE_FULL_ASSERT 1 */

/* Exported macro ------------------------------------------------------------*/
#ifdef USE_FULL_ASSERT
Expand All @@ -64,4 +63,4 @@

#endif /* BlueNRG1_CONF_H */

/******************* (C) COPYRIGHT 2014 STMicroelectronics *****END OF FILE****/
/******************* (C) COPYRIGHT 2015 STMicroelectronics *****END OF FILE****/
18 changes: 6 additions & 12 deletions inc/BlueNRG1_it.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/**
******************************************************************************
* @file GPIO/IOToggle//BlueNRG1_it.h
* @author MEMS Application Team
* @file SPI/Master_w_Sensor/BlueNRG1_it.h
* @author RF Application Team
* @version V1.0.0
* @date September-2014
* @date September-2015
* @brief This file contains the headers of the interrupt handlers.
******************************************************************************
* @attention
Expand All @@ -24,20 +24,14 @@
#define BlueNRG1_IT_H

/* Includes ------------------------------------------------------------------*/
#include "bluenrg_x_device.h"

/* Exported types ------------------------------------------------------------*/
/* Exported constants --------------------------------------------------------*/
/* Exported defines --------------------------------------------------------*/
/* Exported variables --------------------------------------------------------*/
/* Exported macro ------------------------------------------------------------*/
/* Exported functions ------------------------------------------------------- */

void NMI_Handler(void);
void HardFault_Handler(void);
void SVC_Handler(void);
void PendSV_Handler(void);
void SysTick_Handler(void);


#endif /* BlueNRG1_IT_H */

/******************* (C) COPYRIGHT 2014 STMicroelectronics *****END OF FILE****/
/******************* (C) COPYRIGHT 2015 STMicroelectronics *****END OF FILE****/
Loading