McFLY/DiLight
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

tabspace fix. minor changes.

Browse Source
This commit is contained in:
Anton Mukhin
2022-11-14 08:17:59 +03:00
parent 62d2fea59f
commit f30ac4aaf2
10 changed files with 228 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
STL/Box.3mf Normal file
View File

Binary file not shown.

101
firmware/Core/Src/main.c
View File

@@ -49,7 +49,7 @@ struct FLASH_sector {
#define DEFAULT_DIST_ON 500 #define DEFAULT_DIST_ON 500
#define DEFAULT_DIST_OFF 1000 #define DEFAULT_DIST_OFF 1000
#define CONF_TOKEN 0x000A0101 //32bit token to check the configuration struct in the FLASH (000A - DiLight; rev1.1) #define CONF_TOKEN 0x000A0200 //32bit token to check the configuration struct in the FLASH (000A - DiLight; rev2.0)
#define CONF_FLASH_ADDR ((uint32_t)0x0800F800) //FLASH address of the page to save configuration to #define CONF_FLASH_ADDR ((uint32_t)0x0800F800) //FLASH address of the page to save configuration to
#define CONF_FLASH_PAGE 31 //FLASH page number (from 0 to PgCount-1) #define CONF_FLASH_PAGE 31 //FLASH page number (from 0 to PgCount-1)
@@ -79,14 +79,14 @@ union FLASH_conf {
} configuration; } configuration;
#define FLASH_CONF_SIZE 16 #define FLASH_CONF_SIZE 16
uint8_t TOF_Ready = 0; // Flag to ignore TOF IRQ before it is initialized uint8_t TOF_Ready = 0; // Flag to ignore TOF IRQ before it is initialized
uint8_t curLightLevel = 0; // Current light level (0-99) uint8_t curLightLevel = 0; // Current light level (0-99)
uint16_t curDist = 0; // Current measured distance in mm uint16_t curDist = 0; // Current measured distance in mm
uint16_t btn_ticks; // How many ticks the button is pressed (1 tick = 100ms) uint16_t btn_ticks; // How many ticks the button is pressed (1 tick = 100ms)
uint8_t needConfig = 1; // Need to configure the device uint8_t needConfig = 1; // Need to configure the device. Timers won't "react" to events
uint8_t startConfig = 0; // Flag to start configuration sequence uint8_t startConfig = 0; // Flag to start configuration sequence
int8_t dLevel = 1; // Direction of fade: -1 for fade out; 1 for fade in; int8_t dLevel = 1; // Direction of fade: -1 for fade out; 1 for fade in;
uint8_t manualOn = 0; // Flag to indicate a manual on uint8_t manualOn = 0; // Flag to indicate a manual on
/* USER CODE END PV */ /* USER CODE END PV */
@@ -100,9 +100,9 @@ static void MX_CRC_Init(void);
static void MX_TIM16_Init(void); static void MX_TIM16_Init(void);
/* USER CODE BEGIN PFP */ /* USER CODE BEGIN PFP */
void loadConfig(void); volatile void loadConfig(void); // Load configuration from the FLASH memory
void saveConfig(void); volatile void saveConfig(void); // Save configuration to the FLASH memory
void setLightLevel(uint8_t level); void setLightLevel(uint8_t level); // Set the lights level (brightness) 0 - 99
void configure(void); void configure(void);
@@ -112,7 +112,7 @@ void configure(void);
/* USER CODE BEGIN 0 */ /* USER CODE BEGIN 0 */
//load configuration from FLASH //load configuration from FLASH
void loadConfig(void) { volatile void loadConfig(void) {
uint32_t l_Address = CONF_FLASH_ADDR; uint32_t l_Address = CONF_FLASH_ADDR;
uint32_t l_Index = 0; uint32_t l_Index = 0;
@@ -123,21 +123,19 @@ void loadConfig(void) {
l_Address += 8; l_Address += 8;
} }
//Calculate a hash from the configuration
if (HAL_CRC_Calculate(&hcrc, configuration.data32, 2) != configuration.sector.checksum if (HAL_CRC_Calculate(&hcrc, configuration.data32, 2) != configuration.sector.checksum
|| configuration.config.token != CONF_TOKEN) { || configuration.config.token != CONF_TOKEN) {
//First start or configuration is corrupted //First start or configuration is corrupted
saveConfig(); //Save dafault config saveConfig(); //Save dafault config
} else { } // else successfully read the configuration
//Successfully read the configuration
}
needConfig = 0; needConfig = 0;
} }
//save configuration to FLASH //save configuration to FLASH
void saveConfig(void) { volatile void saveConfig(void) {
static FLASH_EraseInitTypeDef EraseInitStruct; static FLASH_EraseInitTypeDef EraseInitStruct;
uint32_t l_Address = CONF_FLASH_ADDR; uint32_t l_Address = CONF_FLASH_ADDR;
uint32_t l_Index = 0; uint32_t l_Index = 0;
@@ -184,7 +182,6 @@ void configure(void) {
uint8_t i; uint8_t i;
startConfig = 0; startConfig = 0;
//stopContinuous();
//Fast blink 3 times //Fast blink 3 times
needConfig = 1; needConfig = 1;
@@ -196,10 +193,7 @@ void configure(void) {
HAL_Delay(80); HAL_Delay(80);
} }
//setMeasurementTimingBudget( 230 * 1000UL ); // integrate over 230 ms per measurement
// Start measurements every 250ms
//Configure ON distance //Configure ON distance
//startContinuous(250);
needConfig = 1; needConfig = 1;
while (needConfig) { while (needConfig) {
HAL_Delay(250); HAL_Delay(250);
@@ -211,7 +205,6 @@ void configure(void) {
else setLightLevel((uint8_t)(50 - curDist * 50 / 1400)); else setLightLevel((uint8_t)(50 - curDist * 50 / 1400));
} }
configuration.config.dist_on = curDist; configuration.config.dist_on = curDist;
//stopContinuous();
//Fast blink 2 times //Fast blink 2 times
needConfig = 1; needConfig = 1;
@@ -224,7 +217,6 @@ void configure(void) {
} }
//Configure OFF distance //Configure OFF distance
//startContinuous(250);
needConfig = 1; needConfig = 1;
while (needConfig) { while (needConfig) {
HAL_Delay(250); HAL_Delay(250);
@@ -232,7 +224,6 @@ void configure(void) {
else setLightLevel((uint8_t)(50 - curDist * 50 / 1400)); else setLightLevel((uint8_t)(50 - curDist * 50 / 1400));
} }
configuration.config.dist_off = curDist; configuration.config.dist_off = curDist;
//stopContinuous();
saveConfig(); saveConfig();
@@ -246,9 +237,6 @@ void configure(void) {
HAL_Delay(80); HAL_Delay(80);
} }
//setMeasurementTimingBudget( 500 * 1000UL ); // integrate over 500 ms per measurement
// Start measurements every second
//startContinuous(1000);
needConfig = 0; needConfig = 0;
} }
@@ -288,9 +276,10 @@ int main(void)
MX_CRC_Init(); MX_CRC_Init();
MX_TIM16_Init(); MX_TIM16_Init();
/* USER CODE BEGIN 2 */ /* USER CODE BEGIN 2 */
//TIM3 - PWM timer
//TIM16 - ticks timer (10Hz - 100ms) // TIM3 - PWM timer
//TIM17 - timer for light fading // TIM16 - ticks timer (10Hz - 100ms)
// TIM17 - timer for light fading
loadConfig(); loadConfig();
@@ -314,22 +303,8 @@ int main(void)
/* Infinite loop */ /* Infinite loop */
/* USER CODE BEGIN WHILE */ /* USER CODE BEGIN WHILE */
//uint8_t t = 50;
//int8_t di = 1;
//char str[12];
while (1) while (1)
{ {
// setLightLevel(t);
// if (t == 99) di = -1;
// if (t == 0) di = 1;
// t += di;;
// HAL_Delay(10);
// HAL_Delay(900);
// //curDist = readRangeContinuousMillimeters(0);
// snprintf(str, 12, "Dist: %4d\n", curDist);
// HAL_UART_Transmit(&huart2, (uint8_t *)str, strlen(str), 100);
if (startConfig) { if (startConfig) {
configure(); configure();
} }
@@ -643,44 +618,22 @@ void setLightLevel(uint8_t level) {
TIM3->CCR1 = curLightLevel; TIM3->CCR1 = curLightLevel;
} }
//void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) {
// if (GPIO_Pin == Btn_INT_Pin) {
// if (HAL_GPIO_ReadPin(Btn_INT_GPIO_Port, Btn_INT_Pin)) {
// //rising edge interrupt
// btn_ticks = 0;
// HAL_TIM_Base_Start_IT(&htim16);
// } else {
// //falling edge interrupt
// HAL_TIM_Base_Stop_IT(&htim16);
// if (btn_ticks < 60) { //button was not held for more than 6 seconds
// //click();
// if (needConfig) {
// needConfig = 0;
// } else {
// if (curLightLevel == 99) curLightLevel = 0;
// else curLightLevel = 99;
// setLightLevel(curLightLevel);
// }
// }
// }
// }
//
//
//}
void HAL_GPIO_EXTI_Rising_Callback(uint16_t GPIO_Pin) { void HAL_GPIO_EXTI_Rising_Callback(uint16_t GPIO_Pin) {
// Start counting "ticks" when the sense-button is pressed
if (GPIO_Pin == Btn_INT_Pin) { if (GPIO_Pin == Btn_INT_Pin) {
btn_ticks = 0; btn_ticks = 0;
HAL_TIM_Base_Start_IT(&htim16); HAL_TIM_Base_Start_IT(&htim16);
} }
} }
void HAL_GPIO_EXTI_Falling_Callback(uint16_t GPIO_Pin) { void HAL_GPIO_EXTI_Falling_Callback(uint16_t GPIO_Pin) {
uint16_t dist; uint16_t dist;
// Range sensor interrupt (measurement is done)
if (TOF_Ready && GPIO_Pin == Sens_INT_Pin) { if (TOF_Ready && GPIO_Pin == Sens_INT_Pin) {
dist = readRangeContinuousMillimeters(0); dist = readRangeContinuousMillimeters(0);
if (dist < 14000) curDist = dist; if (dist < 1400) curDist = dist;
else curDist = 1400; else curDist = 1400;
if (!needConfig && !manualOn) { if (!needConfig && !manualOn) {
if (curDist <= configuration.config.dist_on && curLightLevel < 90) { if (curDist <= configuration.config.dist_on && curLightLevel < 90) {
@@ -696,10 +649,11 @@ void HAL_GPIO_EXTI_Falling_Callback(uint16_t GPIO_Pin) {
} }
} }
// The sense-button is released
if (GPIO_Pin == Btn_INT_Pin) { if (GPIO_Pin == Btn_INT_Pin) {
HAL_TIM_Base_Stop_IT(&htim16); HAL_TIM_Base_Stop_IT(&htim16);
if (btn_ticks < 60) { //button was not held for more than 6 seconds if (btn_ticks < 60) {
//click(); // Button was not held for more than 6 seconds
if (needConfig) { if (needConfig) {
needConfig = 0; needConfig = 0;
} else { } else {
@@ -730,6 +684,7 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) {
} }
} }
// Fade-in / fade-out animation
if(htim->Instance == TIM17) { //check if the interrupt comes from TIM17 if(htim->Instance == TIM17) { //check if the interrupt comes from TIM17
curLightLevel += dLevel; curLightLevel += dLevel;
setLightLevel(curLightLevel); setLightLevel(curLightLevel);

BIN
firmware/Debug/Core/Src/main.o
View File

Binary file not shown.

32
firmware/Debug/Core/Src/main.su
View File

@@ -1,16 +1,16 @@
../Core/Src/main.c:115:6:loadConfig 16 static ../Core/Src/main.c:115:15:loadConfig 16 static
../Core/Src/main.c:140:6:saveConfig 24 static ../Core/Src/main.c:138:15:saveConfig 24 static
../Core/Src/main.c:183:6:configure 16 static ../Core/Src/main.c:181:6:configure 16 static
../Core/Src/main.c:261:5:main 8 static ../Core/Src/main.c:249:5:main 8 static
../Core/Src/main.c:348:6:SystemClock_Config 88 static ../Core/Src/main.c:323:6:SystemClock_Config 88 static
../Core/Src/main.c:395:13:MX_CRC_Init 8 static ../Core/Src/main.c:370:13:MX_CRC_Init 8 static
../Core/Src/main.c:426:13:MX_I2C1_Init 8 static ../Core/Src/main.c:401:13:MX_I2C1_Init 8 static
../Core/Src/main.c:474:13:MX_TIM3_Init 64 static ../Core/Src/main.c:449:13:MX_TIM3_Init 64 static
../Core/Src/main.c:533:13:MX_TIM16_Init 8 static ../Core/Src/main.c:508:13:MX_TIM16_Init 8 static
../Core/Src/main.c:565:13:MX_TIM17_Init 8 static ../Core/Src/main.c:540:13:MX_TIM17_Init 8 static
../Core/Src/main.c:597:13:MX_GPIO_Init 48 static ../Core/Src/main.c:572:13:MX_GPIO_Init 48 static
../Core/Src/main.c:639:6:setLightLevel 16 static ../Core/Src/main.c:614:6:setLightLevel 16 static
../Core/Src/main.c:671:6:HAL_GPIO_EXTI_Rising_Callback 16 static ../Core/Src/main.c:621:6:HAL_GPIO_EXTI_Rising_Callback 16 static
../Core/Src/main.c:678:6:HAL_GPIO_EXTI_Falling_Callback 32 static ../Core/Src/main.c:630:6:HAL_GPIO_EXTI_Falling_Callback 32 static
../Core/Src/main.c:723:6:HAL_TIM_PeriodElapsedCallback 16 static ../Core/Src/main.c:677:6:HAL_TIM_PeriodElapsedCallback 16 static
../Core/Src/main.c:748:6:Error_Handler 8 static,ignoring_inline_asm ../Core/Src/main.c:703:6:Error_Handler 8 static,ignoring_inline_asm

BIN
firmware/Debug/DiLight.elf
View File

Binary file not shown.

285
firmware/Debug/DiLight.list
View File

@@ -27,9 +27,9 @@ Idx Name Size VMA LMA File off Algn
ALLOC ALLOC
11 .ARM.attributes 00000028 00000000 00000000 00020098 2**0 11 .ARM.attributes 00000028 00000000 00000000 00020098 2**0
CONTENTS, READONLY CONTENTS, READONLY
12 .debug_info 0001128e 00000000 00000000 000200c0 2**0 12 .debug_info 0001128d 00000000 00000000 000200c0 2**0
CONTENTS, READONLY, DEBUGGING, OCTETS CONTENTS, READONLY, DEBUGGING, OCTETS
13 .debug_abbrev 00002b70 00000000 00000000 0003134e 2**0 13 .debug_abbrev 00002b70 00000000 00000000 0003134d 2**0
CONTENTS, READONLY, DEBUGGING, OCTETS CONTENTS, READONLY, DEBUGGING, OCTETS
14 .debug_aranges 00001130 00000000 00000000 00033ec0 2**3 14 .debug_aranges 00001130 00000000 00000000 00033ec0 2**3
CONTENTS, READONLY, DEBUGGING, OCTETS CONTENTS, READONLY, DEBUGGING, OCTETS
@@ -37,13 +37,13 @@ Idx Name Size VMA LMA File off Algn
CONTENTS, READONLY, DEBUGGING, OCTETS CONTENTS, READONLY, DEBUGGING, OCTETS
16 .debug_macro 00017358 00000000 00000000 00035fe8 2**0 16 .debug_macro 00017358 00000000 00000000 00035fe8 2**0
CONTENTS, READONLY, DEBUGGING, OCTETS CONTENTS, READONLY, DEBUGGING, OCTETS
17 .debug_line 00013e4a 00000000 00000000 0004d340 2**0 17 .debug_line 00013e44 00000000 00000000 0004d340 2**0
CONTENTS, READONLY, DEBUGGING, OCTETS CONTENTS, READONLY, DEBUGGING, OCTETS
18 .debug_str 00092472 00000000 00000000 0006118a 2**0 18 .debug_str 00092472 00000000 00000000 00061184 2**0
CONTENTS, READONLY, DEBUGGING, OCTETS CONTENTS, READONLY, DEBUGGING, OCTETS
19 .comment 00000050 00000000 00000000 000f35fc 2**0 19 .comment 00000050 00000000 00000000 000f35f6 2**0
CONTENTS, READONLY CONTENTS, READONLY
20 .debug_frame 0000401c 00000000 00000000 000f364c 2**2 20 .debug_frame 0000401c 00000000 00000000 000f3648 2**2
CONTENTS, READONLY, DEBUGGING, OCTETS CONTENTS, READONLY, DEBUGGING, OCTETS
Disassembly of section .text: Disassembly of section .text:
@@ -1933,7 +1933,7 @@ Disassembly of section .text:
/* USER CODE BEGIN 0 */ /* USER CODE BEGIN 0 */
//load configuration from FLASH //load configuration from FLASH
void loadConfig(void) { volatile void loadConfig(void) {
8000f40: b580 push {r7, lr} 8000f40: b580 push {r7, lr}
8000f42: b082 sub sp, #8 8000f42: b082 sub sp, #8
8000f44: af00 add r7, sp, #0 8000f44: af00 add r7, sp, #0
@@ -1972,7 +1972,7 @@ void loadConfig(void) {
8000f74: d9ec bls.n 8000f50 <loadConfig+0x10> 8000f74: d9ec bls.n 8000f50 <loadConfig+0x10>
} }
//Calculate a hash from the configuration
if (HAL_CRC_Calculate(&hcrc, configuration.data32, 2) != configuration.sector.checksum if (HAL_CRC_Calculate(&hcrc, configuration.data32, 2) != configuration.sector.checksum
8000f76: 490d ldr r1, [pc, #52] ; (8000fac <loadConfig+0x6c>) 8000f76: 490d ldr r1, [pc, #52] ; (8000fac <loadConfig+0x6c>)
8000f78: 4b0e ldr r3, [pc, #56] ; (8000fb4 <loadConfig+0x74>) 8000f78: 4b0e ldr r3, [pc, #56] ; (8000fb4 <loadConfig+0x74>)
@@ -1994,10 +1994,8 @@ void loadConfig(void) {
saveConfig(); //Save dafault config saveConfig(); //Save dafault config
8000f96: f000 f813 bl 8000fc0 <saveConfig> 8000f96: f000 f813 bl 8000fc0 <saveConfig>
} else { } // else successfully read the configuration
//Successfully read the configuration
}
needConfig = 0; needConfig = 0;
8000f9a: 4b08 ldr r3, [pc, #32] ; (8000fbc <loadConfig+0x7c>) 8000f9a: 4b08 ldr r3, [pc, #32] ; (8000fbc <loadConfig+0x7c>)
8000f9c: 2200 movs r2, #0 8000f9c: 2200 movs r2, #0
@@ -2011,13 +2009,13 @@ void loadConfig(void) {
8000fac: 20000210 .word 0x20000210 8000fac: 20000210 .word 0x20000210
8000fb0: 0800f80f .word 0x0800f80f 8000fb0: 0800f80f .word 0x0800f80f
8000fb4: 200000b4 .word 0x200000b4 8000fb4: 200000b4 .word 0x200000b4
8000fb8: 000a0101 .word 0x000a0101 8000fb8: 000a0200 .word 0x000a0200
8000fbc: 20000000 .word 0x20000000 8000fbc: 20000000 .word 0x20000000
08000fc0 <saveConfig>: 08000fc0 <saveConfig>:
//save configuration to FLASH //save configuration to FLASH
void saveConfig(void) { volatile void saveConfig(void) {
8000fc0: b580 push {r7, lr} 8000fc0: b580 push {r7, lr}
8000fc2: b084 sub sp, #16 8000fc2: b084 sub sp, #16
8000fc4: af00 add r7, sp, #0 8000fc4: af00 add r7, sp, #0
@@ -2174,7 +2172,7 @@ void saveConfig(void) {
80010ac: 0800f800 .word 0x0800f800 80010ac: 0800f800 .word 0x0800f800
80010b0: 20000228 .word 0x20000228 80010b0: 20000228 .word 0x20000228
80010b4: 20000210 .word 0x20000210 80010b4: 20000210 .word 0x20000210
80010b8: 000a0101 .word 0x000a0101 80010b8: 000a0200 .word 0x000a0200
80010bc: 200000b4 .word 0x200000b4 80010bc: 200000b4 .word 0x200000b4
80010c0: 0800f80f .word 0x0800f80f 80010c0: 0800f80f .word 0x0800f80f
@@ -2190,7 +2188,6 @@ void configure(void) {
80010ca: 4b5b ldr r3, [pc, #364] ; (8001238 <configure+0x174>) 80010ca: 4b5b ldr r3, [pc, #364] ; (8001238 <configure+0x174>)
80010cc: 2200 movs r2, #0 80010cc: 2200 movs r2, #0
80010ce: 701a strb r2, [r3, #0] 80010ce: 701a strb r2, [r3, #0]
//stopContinuous();
//Fast blink 3 times //Fast blink 3 times
needConfig = 1; needConfig = 1;
@@ -2227,11 +2224,9 @@ void configure(void) {
8001108: 781b ldrb r3, [r3, #0] 8001108: 781b ldrb r3, [r3, #0]
800110a: 2b02 cmp r3, #2 800110a: 2b02 cmp r3, #2
800110c: d9ea bls.n 80010e4 <configure+0x20> 800110c: d9ea bls.n 80010e4 <configure+0x20>
}
//setMeasurementTimingBudget( 230 * 1000UL ); // integrate over 230 ms per measurement
// Start measurements every 250ms
//Configure ON distance //Configure ON distance
//startContinuous(250);
needConfig = 1; needConfig = 1;
800110e: 4b4b ldr r3, [pc, #300] ; (800123c <configure+0x178>) 800110e: 4b4b ldr r3, [pc, #300] ; (800123c <configure+0x178>)
8001110: 2201 movs r2, #1 8001110: 2201 movs r2, #1
@@ -2279,7 +2274,6 @@ void configure(void) {
8001156: 881a ldrh r2, [r3, #0] 8001156: 881a ldrh r2, [r3, #0]
8001158: 4b3a ldr r3, [pc, #232] ; (8001244 <configure+0x180>) 8001158: 4b3a ldr r3, [pc, #232] ; (8001244 <configure+0x180>)
800115a: 809a strh r2, [r3, #4] 800115a: 809a strh r2, [r3, #4]
//stopContinuous();
//Fast blink 2 times //Fast blink 2 times
needConfig = 1; needConfig = 1;
@@ -2319,7 +2313,6 @@ void configure(void) {
} }
//Configure OFF distance //Configure OFF distance
//startContinuous(250);
needConfig = 1; needConfig = 1;
800119a: 4b28 ldr r3, [pc, #160] ; (800123c <configure+0x178>) 800119a: 4b28 ldr r3, [pc, #160] ; (800123c <configure+0x178>)
800119c: 2201 movs r2, #1 800119c: 2201 movs r2, #1
@@ -2363,7 +2356,6 @@ void configure(void) {
80011e2: 881a ldrh r2, [r3, #0] 80011e2: 881a ldrh r2, [r3, #0]
80011e4: 4b17 ldr r3, [pc, #92] ; (8001244 <configure+0x180>) 80011e4: 4b17 ldr r3, [pc, #92] ; (8001244 <configure+0x180>)
80011e6: 80da strh r2, [r3, #6] 80011e6: 80da strh r2, [r3, #6]
//stopContinuous();
saveConfig(); saveConfig();
80011e8: f7ff feea bl 8000fc0 <saveConfig> 80011e8: f7ff feea bl 8000fc0 <saveConfig>
@@ -2405,9 +2397,6 @@ void configure(void) {
8001228: d9ea bls.n 8001200 <configure+0x13c> 8001228: d9ea bls.n 8001200 <configure+0x13c>
} }
//setMeasurementTimingBudget( 500 * 1000UL ); // integrate over 500 ms per measurement
// Start measurements every second
//startContinuous(1000);
needConfig = 0; needConfig = 0;
800122a: 4b04 ldr r3, [pc, #16] ; (800123c <configure+0x178>) 800122a: 4b04 ldr r3, [pc, #16] ; (800123c <configure+0x178>)
800122c: 2200 movs r2, #0 800122c: 2200 movs r2, #0
@@ -2462,10 +2451,10 @@ int main(void)
8001264: f000 f888 bl 8001378 <MX_CRC_Init> 8001264: f000 f888 bl 8001378 <MX_CRC_Init>
MX_TIM16_Init(); MX_TIM16_Init();
8001268: f000 f968 bl 800153c <MX_TIM16_Init> 8001268: f000 f968 bl 800153c <MX_TIM16_Init>
/* USER CODE BEGIN 2 */
//TIM3 - PWM timer // TIM3 - PWM timer
//TIM16 - ticks timer (10Hz - 100ms) // TIM16 - ticks timer (10Hz - 100ms)
//TIM17 - timer for light fading // TIM17 - timer for light fading
loadConfig(); loadConfig();
800126c: f7ff fe68 bl 8000f40 <loadConfig> 800126c: f7ff fe68 bl 8000f40 <loadConfig>
@@ -2499,11 +2488,11 @@ int main(void)
8001290: 2100 movs r1, #0 8001290: 2100 movs r1, #0
8001292: 0018 movs r0, r3 8001292: 0018 movs r0, r3
8001294: f003 f9c0 bl 8004618 <HAL_TIM_PWM_Start> 8001294: f003 f9c0 bl 8004618 <HAL_TIM_PWM_Start>
// HAL_Delay(900);
// //curDist = readRangeContinuousMillimeters(0);
// snprintf(str, 12, "Dist: %4d\n", curDist);
// HAL_UART_Transmit(&huart2, (uint8_t *)str, strlen(str), 100);
/* Infinite loop */
/* USER CODE BEGIN WHILE */
while (1)
{
if (startConfig) { if (startConfig) {
8001298: 4b07 ldr r3, [pc, #28] ; (80012b8 <main+0x70>) 8001298: 4b07 ldr r3, [pc, #28] ; (80012b8 <main+0x70>)
800129a: 781b ldrb r3, [r3, #0] 800129a: 781b ldrb r3, [r3, #0]
@@ -3320,10 +3309,6 @@ void setLightLevel(uint8_t level) {
8001720: 40000400 .word 0x40000400 8001720: 40000400 .word 0x40000400
08001724 <HAL_GPIO_EXTI_Rising_Callback>: 08001724 <HAL_GPIO_EXTI_Rising_Callback>:
// }
//
//
//}
void HAL_GPIO_EXTI_Rising_Callback(uint16_t GPIO_Pin) { void HAL_GPIO_EXTI_Rising_Callback(uint16_t GPIO_Pin) {
8001724: b580 push {r7, lr} 8001724: b580 push {r7, lr}
@@ -3332,6 +3317,7 @@ void HAL_GPIO_EXTI_Rising_Callback(uint16_t GPIO_Pin) {
800172a: 0002 movs r2, r0 800172a: 0002 movs r2, r0
800172c: 1dbb adds r3, r7, #6 800172c: 1dbb adds r3, r7, #6
800172e: 801a strh r2, [r3, #0] 800172e: 801a strh r2, [r3, #0]
// Start counting "ticks" when the sense-button is pressed
if (GPIO_Pin == Btn_INT_Pin) { if (GPIO_Pin == Btn_INT_Pin) {
8001730: 1dbb adds r3, r7, #6 8001730: 1dbb adds r3, r7, #6
8001732: 881b ldrh r3, [r3, #0] 8001732: 881b ldrh r3, [r3, #0]
@@ -3357,6 +3343,7 @@ void HAL_GPIO_EXTI_Rising_Callback(uint16_t GPIO_Pin) {
08001758 <HAL_GPIO_EXTI_Falling_Callback>: 08001758 <HAL_GPIO_EXTI_Falling_Callback>:
void HAL_GPIO_EXTI_Falling_Callback(uint16_t GPIO_Pin) { void HAL_GPIO_EXTI_Falling_Callback(uint16_t GPIO_Pin) {
8001758: b5b0 push {r4, r5, r7, lr} 8001758: b5b0 push {r4, r5, r7, lr}
800175a: b084 sub sp, #16 800175a: b084 sub sp, #16
@@ -3366,15 +3353,16 @@ void HAL_GPIO_EXTI_Falling_Callback(uint16_t GPIO_Pin) {
8001762: 801a strh r2, [r3, #0] 8001762: 801a strh r2, [r3, #0]
uint16_t dist; uint16_t dist;
// Range sensor interrupt (measurement is done)
if (TOF_Ready && GPIO_Pin == Sens_INT_Pin) { if (TOF_Ready && GPIO_Pin == Sens_INT_Pin) {
8001764: 4b3e ldr r3, [pc, #248] ; (8001860 <HAL_GPIO_EXTI_Falling_Callback+0x108>) 8001764: 4b3f ldr r3, [pc, #252] ; (8001864 <HAL_GPIO_EXTI_Falling_Callback+0x10c>)
8001766: 781b ldrb r3, [r3, #0] 8001766: 781b ldrb r3, [r3, #0]
8001768: 2b00 cmp r3, #0 8001768: 2b00 cmp r3, #0
800176a: d043 beq.n 80017f4 <HAL_GPIO_EXTI_Falling_Callback+0x9c> 800176a: d044 beq.n 80017f6 <HAL_GPIO_EXTI_Falling_Callback+0x9e>
800176c: 1dbb adds r3, r7, #6 800176c: 1dbb adds r3, r7, #6
800176e: 881b ldrh r3, [r3, #0] 800176e: 881b ldrh r3, [r3, #0]
8001770: 2b20 cmp r3, #32 8001770: 2b20 cmp r3, #32
8001772: d13f bne.n 80017f4 <HAL_GPIO_EXTI_Falling_Callback+0x9c> 8001772: d140 bne.n 80017f6 <HAL_GPIO_EXTI_Falling_Callback+0x9e>
dist = readRangeContinuousMillimeters(0); dist = readRangeContinuousMillimeters(0);
8001774: 250e movs r5, #14 8001774: 250e movs r5, #14
8001776: 197c adds r4, r7, r5 8001776: 197c adds r4, r7, r5
@@ -3382,150 +3370,152 @@ void HAL_GPIO_EXTI_Falling_Callback(uint16_t GPIO_Pin) {
800177a: f004 fd27 bl 80061cc <readRangeContinuousMillimeters> 800177a: f004 fd27 bl 80061cc <readRangeContinuousMillimeters>
800177e: 0003 movs r3, r0 800177e: 0003 movs r3, r0
8001780: 8023 strh r3, [r4, #0] 8001780: 8023 strh r3, [r4, #0]
if (dist < 14000) curDist = dist; if (dist < 1400) curDist = dist;
8001782: 0029 movs r1, r5 8001782: 0029 movs r1, r5
8001784: 187b adds r3, r7, r1 8001784: 187b adds r3, r7, r1
8001786: 881b ldrh r3, [r3, #0] 8001786: 881a ldrh r2, [r3, #0]
8001788: 4a36 ldr r2, [pc, #216] ; (8001864 <HAL_GPIO_EXTI_Falling_Callback+0x10c>) 8001788: 23af movs r3, #175 ; 0xaf
800178a: 4293 cmp r3, r2 800178a: 00db lsls r3, r3, #3
800178c: d804 bhi.n 8001798 <HAL_GPIO_EXTI_Falling_Callback+0x40> 800178c: 429a cmp r2, r3
800178e: 4b36 ldr r3, [pc, #216] ; (8001868 <HAL_GPIO_EXTI_Falling_Callback+0x110>) 800178e: d204 bcs.n 800179a <HAL_GPIO_EXTI_Falling_Callback+0x42>
8001790: 187a adds r2, r7, r1 8001790: 4b35 ldr r3, [pc, #212] ; (8001868 <HAL_GPIO_EXTI_Falling_Callback+0x110>)
8001792: 8812 ldrh r2, [r2, #0] 8001792: 187a adds r2, r7, r1
8001794: 801a strh r2, [r3, #0] 8001794: 8812 ldrh r2, [r2, #0]
8001796: e003 b.n 80017a0 <HAL_GPIO_EXTI_Falling_Callback+0x48> 8001796: 801a strh r2, [r3, #0]
8001798: e003 b.n 80017a2 <HAL_GPIO_EXTI_Falling_Callback+0x4a>
else curDist = 1400; else curDist = 1400;
8001798: 4b33 ldr r3, [pc, #204] ; (8001868 <HAL_GPIO_EXTI_Falling_Callback+0x110>) 800179a: 4b33 ldr r3, [pc, #204] ; (8001868 <HAL_GPIO_EXTI_Falling_Callback+0x110>)
800179a: 22af movs r2, #175 ; 0xaf 800179c: 22af movs r2, #175 ; 0xaf
800179c: 00d2 lsls r2, r2, #3 800179e: 00d2 lsls r2, r2, #3
800179e: 801a strh r2, [r3, #0] 80017a0: 801a strh r2, [r3, #0]
if (!needConfig && !manualOn) { if (!needConfig && !manualOn) {
80017a0: 4b32 ldr r3, [pc, #200] ; (800186c <HAL_GPIO_EXTI_Falling_Callback+0x114>) 80017a2: 4b32 ldr r3, [pc, #200] ; (800186c <HAL_GPIO_EXTI_Falling_Callback+0x114>)
80017a2: 781b ldrb r3, [r3, #0] 80017a4: 781b ldrb r3, [r3, #0]
80017a4: 2b00 cmp r3, #0 80017a6: 2b00 cmp r3, #0
80017a6: d125 bne.n 80017f4 <HAL_GPIO_EXTI_Falling_Callback+0x9c> 80017a8: d125 bne.n 80017f6 <HAL_GPIO_EXTI_Falling_Callback+0x9e>
80017a8: 4b31 ldr r3, [pc, #196] ; (8001870 <HAL_GPIO_EXTI_Falling_Callback+0x118>) 80017aa: 4b31 ldr r3, [pc, #196] ; (8001870 <HAL_GPIO_EXTI_Falling_Callback+0x118>)
80017aa: 781b ldrb r3, [r3, #0] 80017ac: 781b ldrb r3, [r3, #0]
80017ac: 2b00 cmp r3, #0 80017ae: 2b00 cmp r3, #0
80017ae: d121 bne.n 80017f4 <HAL_GPIO_EXTI_Falling_Callback+0x9c> 80017b0: d121 bne.n 80017f6 <HAL_GPIO_EXTI_Falling_Callback+0x9e>
if (curDist <= configuration.config.dist_on && curLightLevel < 90) { if (curDist <= configuration.config.dist_on && curLightLevel < 90) {
80017b0: 4b30 ldr r3, [pc, #192] ; (8001874 <HAL_GPIO_EXTI_Falling_Callback+0x11c>) 80017b2: 4b30 ldr r3, [pc, #192] ; (8001874 <HAL_GPIO_EXTI_Falling_Callback+0x11c>)
80017b2: 889a ldrh r2, [r3, #4] 80017b4: 889a ldrh r2, [r3, #4]
80017b4: 4b2c ldr r3, [pc, #176] ; (8001868 <HAL_GPIO_EXTI_Falling_Callback+0x110>) 80017b6: 4b2c ldr r3, [pc, #176] ; (8001868 <HAL_GPIO_EXTI_Falling_Callback+0x110>)
80017b6: 881b ldrh r3, [r3, #0] 80017b8: 881b ldrh r3, [r3, #0]
80017b8: 429a cmp r2, r3 80017ba: 429a cmp r2, r3
80017ba: d30a bcc.n 80017d2 <HAL_GPIO_EXTI_Falling_Callback+0x7a> 80017bc: d30a bcc.n 80017d4 <HAL_GPIO_EXTI_Falling_Callback+0x7c>
80017bc: 4b2e ldr r3, [pc, #184] ; (8001878 <HAL_GPIO_EXTI_Falling_Callback+0x120>) 80017be: 4b2e ldr r3, [pc, #184] ; (8001878 <HAL_GPIO_EXTI_Falling_Callback+0x120>)
80017be: 781b ldrb r3, [r3, #0] 80017c0: 781b ldrb r3, [r3, #0]
80017c0: 2b59 cmp r3, #89 ; 0x59 80017c2: 2b59 cmp r3, #89 ; 0x59
80017c2: d806 bhi.n 80017d2 <HAL_GPIO_EXTI_Falling_Callback+0x7a> 80017c4: d806 bhi.n 80017d4 <HAL_GPIO_EXTI_Falling_Callback+0x7c>
//Turn on the lights //Turn on the lights
dLevel = 2; dLevel = 2;
80017c4: 4b2d ldr r3, [pc, #180] ; (800187c <HAL_GPIO_EXTI_Falling_Callback+0x124>) 80017c6: 4b2d ldr r3, [pc, #180] ; (800187c <HAL_GPIO_EXTI_Falling_Callback+0x124>)
80017c6: 2202 movs r2, #2 80017c8: 2202 movs r2, #2
80017c8: 701a strb r2, [r3, #0] 80017ca: 701a strb r2, [r3, #0]
HAL_TIM_Base_Start_IT(&htim17); HAL_TIM_Base_Start_IT(&htim17);
80017ca: 4b2d ldr r3, [pc, #180] ; (8001880 <HAL_GPIO_EXTI_Falling_Callback+0x128>) 80017cc: 4b2c ldr r3, [pc, #176] ; (8001880 <HAL_GPIO_EXTI_Falling_Callback+0x128>)
80017cc: 0018 movs r0, r3 80017ce: 0018 movs r0, r3
80017ce: f002 fe41 bl 8004454 <HAL_TIM_Base_Start_IT> 80017d0: f002 fe40 bl 8004454 <HAL_TIM_Base_Start_IT>
} }
if (curDist >= configuration.config.dist_off && curLightLevel == 99) { if (curDist >= configuration.config.dist_off && curLightLevel == 99) {
80017d2: 4b28 ldr r3, [pc, #160] ; (8001874 <HAL_GPIO_EXTI_Falling_Callback+0x11c>) 80017d4: 4b27 ldr r3, [pc, #156] ; (8001874 <HAL_GPIO_EXTI_Falling_Callback+0x11c>)
80017d4: 88da ldrh r2, [r3, #6] 80017d6: 88da ldrh r2, [r3, #6]
80017d6: 4b24 ldr r3, [pc, #144] ; (8001868 <HAL_GPIO_EXTI_Falling_Callback+0x110>) 80017d8: 4b23 ldr r3, [pc, #140] ; (8001868 <HAL_GPIO_EXTI_Falling_Callback+0x110>)
80017d8: 881b ldrh r3, [r3, #0] 80017da: 881b ldrh r3, [r3, #0]
80017da: 429a cmp r2, r3 80017dc: 429a cmp r2, r3
80017dc: d80a bhi.n 80017f4 <HAL_GPIO_EXTI_Falling_Callback+0x9c> 80017de: d80a bhi.n 80017f6 <HAL_GPIO_EXTI_Falling_Callback+0x9e>
80017de: 4b26 ldr r3, [pc, #152] ; (8001878 <HAL_GPIO_EXTI_Falling_Callback+0x120>) 80017e0: 4b25 ldr r3, [pc, #148] ; (8001878 <HAL_GPIO_EXTI_Falling_Callback+0x120>)
80017e0: 781b ldrb r3, [r3, #0] 80017e2: 781b ldrb r3, [r3, #0]
80017e2: 2b63 cmp r3, #99 ; 0x63 80017e4: 2b63 cmp r3, #99 ; 0x63
80017e4: d106 bne.n 80017f4 <HAL_GPIO_EXTI_Falling_Callback+0x9c> 80017e6: d106 bne.n 80017f6 <HAL_GPIO_EXTI_Falling_Callback+0x9e>
//Turn off the lights //Turn off the lights
dLevel = -1; dLevel = -1;
80017e6: 4b25 ldr r3, [pc, #148] ; (800187c <HAL_GPIO_EXTI_Falling_Callback+0x124>) 80017e8: 4b24 ldr r3, [pc, #144] ; (800187c <HAL_GPIO_EXTI_Falling_Callback+0x124>)
80017e8: 22ff movs r2, #255 ; 0xff 80017ea: 22ff movs r2, #255 ; 0xff
80017ea: 701a strb r2, [r3, #0] 80017ec: 701a strb r2, [r3, #0]
HAL_TIM_Base_Start_IT(&htim17); HAL_TIM_Base_Start_IT(&htim17);
80017ec: 4b24 ldr r3, [pc, #144] ; (8001880 <HAL_GPIO_EXTI_Falling_Callback+0x128>) 80017ee: 4b24 ldr r3, [pc, #144] ; (8001880 <HAL_GPIO_EXTI_Falling_Callback+0x128>)
80017ee: 0018 movs r0, r3 80017f0: 0018 movs r0, r3
80017f0: f002 fe30 bl 8004454 <HAL_TIM_Base_Start_IT> 80017f2: f002 fe2f bl 8004454 <HAL_TIM_Base_Start_IT>
} }
} }
} }
// The sense-button is released
if (GPIO_Pin == Btn_INT_Pin) { if (GPIO_Pin == Btn_INT_Pin) {
80017f4: 1dbb adds r3, r7, #6 80017f6: 1dbb adds r3, r7, #6
80017f6: 881b ldrh r3, [r3, #0] 80017f8: 881b ldrh r3, [r3, #0]
80017f8: 2b01 cmp r3, #1 80017fa: 2b01 cmp r3, #1
80017fa: d12d bne.n 8001858 <HAL_GPIO_EXTI_Falling_Callback+0x100> 80017fc: d12d bne.n 800185a <HAL_GPIO_EXTI_Falling_Callback+0x102>
HAL_TIM_Base_Stop_IT(&htim16); HAL_TIM_Base_Stop_IT(&htim16);
80017fc: 4b21 ldr r3, [pc, #132] ; (8001884 <HAL_GPIO_EXTI_Falling_Callback+0x12c>) 80017fe: 4b21 ldr r3, [pc, #132] ; (8001884 <HAL_GPIO_EXTI_Falling_Callback+0x12c>)
80017fe: 0018 movs r0, r3 8001800: 0018 movs r0, r3
8001800: f002 fe7c bl 80044fc <HAL_TIM_Base_Stop_IT> 8001802: f002 fe7b bl 80044fc <HAL_TIM_Base_Stop_IT>
if (btn_ticks < 60) { //button was not held for more than 6 seconds if (btn_ticks < 60) {
8001804: 4b20 ldr r3, [pc, #128] ; (8001888 <HAL_GPIO_EXTI_Falling_Callback+0x130>) 8001806: 4b20 ldr r3, [pc, #128] ; (8001888 <HAL_GPIO_EXTI_Falling_Callback+0x130>)
8001806: 881b ldrh r3, [r3, #0] 8001808: 881b ldrh r3, [r3, #0]
8001808: 2b3b cmp r3, #59 ; 0x3b 800180a: 2b3b cmp r3, #59 ; 0x3b
800180a: d825 bhi.n 8001858 <HAL_GPIO_EXTI_Falling_Callback+0x100> 800180c: d825 bhi.n 800185a <HAL_GPIO_EXTI_Falling_Callback+0x102>
//click(); // Button was not held for more than 6 seconds
if (needConfig) { if (needConfig) {
800180c: 4b17 ldr r3, [pc, #92] ; (800186c <HAL_GPIO_EXTI_Falling_Callback+0x114>) 800180e: 4b17 ldr r3, [pc, #92] ; (800186c <HAL_GPIO_EXTI_Falling_Callback+0x114>)
800180e: 781b ldrb r3, [r3, #0] 8001810: 781b ldrb r3, [r3, #0]
8001810: 2b00 cmp r3, #0 8001812: 2b00 cmp r3, #0
8001812: d003 beq.n 800181c <HAL_GPIO_EXTI_Falling_Callback+0xc4> 8001814: d003 beq.n 800181e <HAL_GPIO_EXTI_Falling_Callback+0xc6>
needConfig = 0; needConfig = 0;
8001814: 4b15 ldr r3, [pc, #84] ; (800186c <HAL_GPIO_EXTI_Falling_Callback+0x114>) 8001816: 4b15 ldr r3, [pc, #84] ; (800186c <HAL_GPIO_EXTI_Falling_Callback+0x114>)
8001816: 2200 movs r2, #0 8001818: 2200 movs r2, #0
8001818: 701a strb r2, [r3, #0] 800181a: 701a strb r2, [r3, #0]
} }
setLightLevel(curLightLevel); setLightLevel(curLightLevel);
} }
} }
} }
} }
800181a: e01d b.n 8001858 <HAL_GPIO_EXTI_Falling_Callback+0x100> 800181c: e01d b.n 800185a <HAL_GPIO_EXTI_Falling_Callback+0x102>
if (curLightLevel < 90){ if (curLightLevel < 90){
800181c: 4b16 ldr r3, [pc, #88] ; (8001878 <HAL_GPIO_EXTI_Falling_Callback+0x120>) 800181e: 4b16 ldr r3, [pc, #88] ; (8001878 <HAL_GPIO_EXTI_Falling_Callback+0x120>)
800181e: 781b ldrb r3, [r3, #0] 8001820: 781b ldrb r3, [r3, #0]
8001820: 2b59 cmp r3, #89 ; 0x59 8001822: 2b59 cmp r3, #89 ; 0x59
8001822: d80a bhi.n 800183a <HAL_GPIO_EXTI_Falling_Callback+0xe2> 8001824: d80a bhi.n 800183c <HAL_GPIO_EXTI_Falling_Callback+0xe4>
manualOn = 1; manualOn = 1;
8001824: 4b12 ldr r3, [pc, #72] ; (8001870 <HAL_GPIO_EXTI_Falling_Callback+0x118>) 8001826: 4b12 ldr r3, [pc, #72] ; (8001870 <HAL_GPIO_EXTI_Falling_Callback+0x118>)
8001826: 2201 movs r2, #1 8001828: 2201 movs r2, #1
8001828: 701a strb r2, [r3, #0] 800182a: 701a strb r2, [r3, #0]
dLevel = 2; dLevel = 2;
800182a: 4b14 ldr r3, [pc, #80] ; (800187c <HAL_GPIO_EXTI_Falling_Callback+0x124>) 800182c: 4b13 ldr r3, [pc, #76] ; (800187c <HAL_GPIO_EXTI_Falling_Callback+0x124>)
800182c: 2202 movs r2, #2 800182e: 2202 movs r2, #2
800182e: 701a strb r2, [r3, #0] 8001830: 701a strb r2, [r3, #0]
HAL_TIM_Base_Start_IT(&htim17); HAL_TIM_Base_Start_IT(&htim17);
8001830: 4b13 ldr r3, [pc, #76] ; (8001880 <HAL_GPIO_EXTI_Falling_Callback+0x128>) 8001832: 4b13 ldr r3, [pc, #76] ; (8001880 <HAL_GPIO_EXTI_Falling_Callback+0x128>)
8001832: 0018 movs r0, r3 8001834: 0018 movs r0, r3
8001834: f002 fe0e bl 8004454 <HAL_TIM_Base_Start_IT> 8001836: f002 fe0d bl 8004454 <HAL_TIM_Base_Start_IT>
8001838: e009 b.n 800184e <HAL_GPIO_EXTI_Falling_Callback+0xf6> 800183a: e009 b.n 8001850 <HAL_GPIO_EXTI_Falling_Callback+0xf8>
manualOn = 0; manualOn = 0;
800183a: 4b0d ldr r3, [pc, #52] ; (8001870 <HAL_GPIO_EXTI_Falling_Callback+0x118>) 800183c: 4b0c ldr r3, [pc, #48] ; (8001870 <HAL_GPIO_EXTI_Falling_Callback+0x118>)
800183c: 2200 movs r2, #0 800183e: 2200 movs r2, #0
800183e: 701a strb r2, [r3, #0] 8001840: 701a strb r2, [r3, #0]
dLevel = -1; dLevel = -1;
8001840: 4b0e ldr r3, [pc, #56] ; (800187c <HAL_GPIO_EXTI_Falling_Callback+0x124>) 8001842: 4b0e ldr r3, [pc, #56] ; (800187c <HAL_GPIO_EXTI_Falling_Callback+0x124>)
8001842: 22ff movs r2, #255 ; 0xff 8001844: 22ff movs r2, #255 ; 0xff
8001844: 701a strb r2, [r3, #0] 8001846: 701a strb r2, [r3, #0]
HAL_TIM_Base_Start_IT(&htim17); HAL_TIM_Base_Start_IT(&htim17);
8001846: 4b0e ldr r3, [pc, #56] ; (8001880 <HAL_GPIO_EXTI_Falling_Callback+0x128>) 8001848: 4b0d ldr r3, [pc, #52] ; (8001880 <HAL_GPIO_EXTI_Falling_Callback+0x128>)
8001848: 0018 movs r0, r3 800184a: 0018 movs r0, r3
800184a: f002 fe03 bl 8004454 <HAL_TIM_Base_Start_IT> 800184c: f002 fe02 bl 8004454 <HAL_TIM_Base_Start_IT>
setLightLevel(curLightLevel); setLightLevel(curLightLevel);
800184e: 4b0a ldr r3, [pc, #40] ; (8001878 <HAL_GPIO_EXTI_Falling_Callback+0x120>) 8001850: 4b09 ldr r3, [pc, #36] ; (8001878 <HAL_GPIO_EXTI_Falling_Callback+0x120>)
8001850: 781b ldrb r3, [r3, #0] 8001852: 781b ldrb r3, [r3, #0]
8001852: 0018 movs r0, r3 8001854: 0018 movs r0, r3
8001854: f7ff ff48 bl 80016e8 <setLightLevel> 8001856: f7ff ff47 bl 80016e8 <setLightLevel>
} }
8001858: 46c0 nop ; (mov r8, r8) 800185a: 46c0 nop ; (mov r8, r8)
800185a: 46bd mov sp, r7 800185c: 46bd mov sp, r7
800185c: b004 add sp, #16 800185e: b004 add sp, #16
800185e: bdb0 pop {r4, r5, r7, pc} 8001860: bdb0 pop {r4, r5, r7, pc}
8001860: 20000220 .word 0x20000220 8001862: 46c0 nop ; (mov r8, r8)
8001864: 000036af .word 0x000036af 8001864: 20000220 .word 0x20000220
8001868: 20000222 .word 0x20000222 8001868: 20000222 .word 0x20000222
800186c: 20000000 .word 0x20000000 800186c: 20000000 .word 0x20000000
8001870: 20000227 .word 0x20000227 8001870: 20000227 .word 0x20000227
@@ -3574,6 +3564,7 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) {
} }
} }
// Fade-in / fade-out animation
if(htim->Instance == TIM17) { //check if the interrupt comes from TIM17 if(htim->Instance == TIM17) { //check if the interrupt comes from TIM17
80018c2: 687b ldr r3, [r7, #4] 80018c2: 687b ldr r3, [r7, #4]
80018c4: 681b ldr r3, [r3, #0] 80018c4: 681b ldr r3, [r3, #0]

84
firmware/Debug/DiLight.map
View File

@@ -4231,27 +4231,27 @@ LOAD c:/st/stm32cubeide_1.8.0/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.exte
LOAD c:/st/stm32cubeide_1.8.0/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.10.3-2021.10.win32_1.0.0.202111181127/tools/bin/../lib/gcc/arm-none-eabi/10.3.1/../../../../arm-none-eabi/lib/thumb/v6-m/nofp\libm.a LOAD c:/st/stm32cubeide_1.8.0/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.10.3-2021.10.win32_1.0.0.202111181127/tools/bin/../lib/gcc/arm-none-eabi/10.3.1/../../../../arm-none-eabi/lib/thumb/v6-m/nofp\libm.a
LOAD c:/st/stm32cubeide_1.8.0/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.10.3-2021.10.win32_1.0.0.202111181127/tools/bin/../lib/gcc/arm-none-eabi/10.3.1/thumb/v6-m/nofp\libgcc.a LOAD c:/st/stm32cubeide_1.8.0/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.10.3-2021.10.win32_1.0.0.202111181127/tools/bin/../lib/gcc/arm-none-eabi/10.3.1/thumb/v6-m/nofp\libgcc.a
.debug_info 0x0000000000000000 0x1128e .debug_info 0x0000000000000000 0x1128d
.debug_info 0x0000000000000000 0x1b31 ./Core/Src/main.o .debug_info 0x0000000000000000 0x1b30 ./Core/Src/main.o
.debug_info 0x0000000000001b31 0x1336 ./Core/Src/stm32g0xx_hal_msp.o .debug_info 0x0000000000001b30 0x1336 ./Core/Src/stm32g0xx_hal_msp.o
.debug_info 0x0000000000002e67 0x89a ./Core/Src/stm32g0xx_it.o .debug_info 0x0000000000002e66 0x89a ./Core/Src/stm32g0xx_it.o
.debug_info 0x0000000000003701 0x34d ./Core/Src/system_stm32g0xx.o .debug_info 0x0000000000003700 0x34d ./Core/Src/system_stm32g0xx.o
.debug_info 0x0000000000003a4e 0x22 ./Core/Startup/startup_stm32g031g8ux.o .debug_info 0x0000000000003a4d 0x22 ./Core/Startup/startup_stm32g031g8ux.o
.debug_info 0x0000000000003a70 0xa94 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal.o .debug_info 0x0000000000003a6f 0xa94 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal.o
.debug_info 0x0000000000004504 0x8fb ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_cortex.o .debug_info 0x0000000000004503 0x8fb ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_cortex.o
.debug_info 0x0000000000004dff 0x57f ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_crc.o .debug_info 0x0000000000004dfe 0x57f ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_crc.o
.debug_info 0x000000000000537e 0x37a ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_crc_ex.o .debug_info 0x000000000000537d 0x37a ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_crc_ex.o
.debug_info 0x00000000000056f8 0x6c0 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_flash.o .debug_info 0x00000000000056f7 0x6c0 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_flash.o
.debug_info 0x0000000000005db8 0x99c ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_flash_ex.o .debug_info 0x0000000000005db7 0x99c ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_flash_ex.o
.debug_info 0x0000000000006754 0x5d7 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_gpio.o .debug_info 0x0000000000006753 0x5d7 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_gpio.o
.debug_info 0x0000000000006d2b 0x235d ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_i2c.o .debug_info 0x0000000000006d2a 0x235d ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_i2c.o
.debug_info 0x0000000000009088 0xa7f ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_i2c_ex.o .debug_info 0x0000000000009087 0xa7f ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_i2c_ex.o
.debug_info 0x0000000000009b07 0x7b9 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_pwr_ex.o .debug_info 0x0000000000009b06 0x7b9 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_pwr_ex.o
.debug_info 0x000000000000a2c0 0xb63 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_rcc.o .debug_info 0x000000000000a2bf 0xb63 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_rcc.o
.debug_info 0x000000000000ae23 0x804 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_rcc_ex.o .debug_info 0x000000000000ae22 0x804 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_rcc_ex.o
.debug_info 0x000000000000b627 0x2e15 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_tim.o .debug_info 0x000000000000b626 0x2e15 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_tim.o
.debug_info 0x000000000000e43c 0x1a19 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_tim_ex.o .debug_info 0x000000000000e43b 0x1a19 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_tim_ex.o
.debug_info 0x000000000000fe55 0x1439 ./Drivers/vl53l0x/VL53L0X.o .debug_info 0x000000000000fe54 0x1439 ./Drivers/vl53l0x/VL53L0X.o
.debug_abbrev 0x0000000000000000 0x2b70 .debug_abbrev 0x0000000000000000 0x2b70
.debug_abbrev 0x0000000000000000 0x31f ./Core/Src/main.o .debug_abbrev 0x0000000000000000 0x31f ./Core/Src/main.o
@@ -4437,27 +4437,27 @@ LOAD c:/st/stm32cubeide_1.8.0/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.exte
.debug_macro 0x00000000000170f9 0x207 ./Drivers/vl53l0x/VL53L0X.o .debug_macro 0x00000000000170f9 0x207 ./Drivers/vl53l0x/VL53L0X.o
.debug_macro 0x0000000000017300 0x58 ./Drivers/vl53l0x/VL53L0X.o .debug_macro 0x0000000000017300 0x58 ./Drivers/vl53l0x/VL53L0X.o
.debug_line 0x0000000000000000 0x13e4a .debug_line 0x0000000000000000 0x13e44
.debug_line 0x0000000000000000 0xeb2 ./Core/Src/main.o .debug_line 0x0000000000000000 0xeac ./Core/Src/main.o
.debug_line 0x0000000000000eb2 0x870 ./Core/Src/stm32g0xx_hal_msp.o .debug_line 0x0000000000000eac 0x870 ./Core/Src/stm32g0xx_hal_msp.o
.debug_line 0x0000000000001722 0x7ee ./Core/Src/stm32g0xx_it.o .debug_line 0x000000000000171c 0x7ee ./Core/Src/stm32g0xx_it.o
.debug_line 0x0000000000001f10 0x79c ./Core/Src/system_stm32g0xx.o .debug_line 0x0000000000001f0a 0x79c ./Core/Src/system_stm32g0xx.o
.debug_line 0x00000000000026ac 0x89 ./Core/Startup/startup_stm32g031g8ux.o .debug_line 0x00000000000026a6 0x89 ./Core/Startup/startup_stm32g031g8ux.o
.debug_line 0x0000000000002735 0xaea ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal.o .debug_line 0x000000000000272f 0xaea ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal.o
.debug_line 0x000000000000321f 0xb53 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_cortex.o .debug_line 0x0000000000003219 0xb53 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_cortex.o
.debug_line 0x0000000000003d72 0xa6a ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_crc.o .debug_line 0x0000000000003d6c 0xa6a ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_crc.o
.debug_line 0x00000000000047dc 0x7de ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_crc_ex.o .debug_line 0x00000000000047d6 0x7de ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_crc_ex.o
.debug_line 0x0000000000004fba 0xa63 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_flash.o .debug_line 0x0000000000004fb4 0xa63 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_flash.o
.debug_line 0x0000000000005a1d 0xc20 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_flash_ex.o .debug_line 0x0000000000005a17 0xc20 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_flash_ex.o
.debug_line 0x000000000000663d 0xb3f ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_gpio.o .debug_line 0x0000000000006637 0xb3f ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_gpio.o
.debug_line 0x000000000000717c 0x36e5 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_i2c.o .debug_line 0x0000000000007176 0x36e5 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_i2c.o
.debug_line 0x000000000000a861 0x947 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_i2c_ex.o .debug_line 0x000000000000a85b 0x947 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_i2c_ex.o
.debug_line 0x000000000000b1a8 0xab7 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_pwr_ex.o .debug_line 0x000000000000b1a2 0xab7 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_pwr_ex.o
.debug_line 0x000000000000bc5f 0xefd ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_rcc.o .debug_line 0x000000000000bc59 0xefd ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_rcc.o
.debug_line 0x000000000000cb5c 0xc1c ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_rcc_ex.o .debug_line 0x000000000000cb56 0xc1c ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_rcc_ex.o
.debug_line 0x000000000000d778 0x3b62 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_tim.o .debug_line 0x000000000000d772 0x3b62 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_tim.o
.debug_line 0x00000000000112da 0x1c20 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_tim_ex.o .debug_line 0x00000000000112d4 0x1c20 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_tim_ex.o
.debug_line 0x0000000000012efa 0xf50 ./Drivers/vl53l0x/VL53L0X.o .debug_line 0x0000000000012ef4 0xf50 ./Drivers/vl53l0x/VL53L0X.o
.debug_str 0x0000000000000000 0x92472 .debug_str 0x0000000000000000 0x92472
.debug_str 0x0000000000000000 0x8db63 ./Core/Src/main.o .debug_str 0x0000000000000000 0x8db63 ./Core/Src/main.o

BIN
firmware/Debug/Drivers/vl53l0x/VL53L0X.o
View File

Binary file not shown.

6
firmware/Drivers/vl53l0x/VL53L0X.c
View File

@@ -9,11 +9,11 @@
//--------------------------------------------------------- //---------------------------------------------------------
// Local variables within this file (private) // Local variables within this file (private)
//--------------------------------------------------------- //---------------------------------------------------------
uint8_t g_i2cAddr = ADDRESS_DEFAULT; uint8_t g_i2cAddr = ADDRESS_DEFAULT;
uint16_t g_ioTimeout = 0; // no timeout uint16_t g_ioTimeout = 0; // no timeout
uint8_t g_isTimeout = 0; uint8_t g_isTimeout = 0;
uint16_t g_timeoutStartMs; uint16_t g_timeoutStartMs;
uint8_t g_stopVariable; // read by init and used when starting measurement; is StopVariable field of VL53L0X_DevData_t structure in API uint8_t g_stopVariable; // read by init and used when starting measurement; is StopVariable field of VL53L0X_DevData_t structure in API
uint32_t g_measTimBudUs; uint32_t g_measTimBudUs;
//--------------------------------------------------------- //---------------------------------------------------------

2
firmware/Drivers/vl53l0x/VL53L0X.h
View File

@@ -16,7 +16,7 @@
// I²C port handle // I²C port handle
#define TOF_I2C hi2c1 #define TOF_I2C hi2c1
extern I2C_HandleTypeDef TOF_I2C; extern I2C_HandleTypeDef TOF_I2C;
// Pins // Pins
#define TOF_XSHUT_PORT Sens_SHUT_GPIO_Port #define TOF_XSHUT_PORT Sens_SHUT_GPIO_Port