Skip to content

Commit

Permalink
UI pages added + a lot of changes
Browse files Browse the repository at this point in the history
  • Loading branch information
SMotlaq committed Aug 2, 2022
1 parent cd3d315 commit 49a0756
Show file tree
Hide file tree
Showing 117 changed files with 5,984 additions and 2,921 deletions.
1 change: 1 addition & 0 deletions open-watch-firmware/my_watch_software/Inc/stm32f0xx_it.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ void DMA1_Channel4_5_IRQHandler(void);
void ADC1_IRQHandler(void);
void TIM6_IRQHandler(void);
void TIM14_IRQHandler(void);
void TIM16_IRQHandler(void);
/* USER CODE BEGIN EFP */

/* USER CODE END EFP */
Expand Down
2 changes: 2 additions & 0 deletions open-watch-firmware/my_watch_software/Inc/tim.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ extern TIM_HandleTypeDef htim3;
extern TIM_HandleTypeDef htim6;
extern TIM_HandleTypeDef htim14;
extern TIM_HandleTypeDef htim15;
extern TIM_HandleTypeDef htim16;

/* USER CODE BEGIN Private defines */

Expand All @@ -47,6 +48,7 @@ void MX_TIM3_Init(void);
void MX_TIM6_Init(void);
void MX_TIM14_Init(void);
void MX_TIM15_Init(void);
void MX_TIM16_Init(void);

void HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim);

Expand Down
156 changes: 69 additions & 87 deletions open-watch-firmware/my_watch_software/MDK-ARM/my_watch_software.uvguix.ASUS
View file

Large diffs are not rendered by default.

114 changes: 59 additions & 55 deletions open-watch-firmware/my_watch_software/MDK-ARM/my_watch_software.uvoptx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,92 +158,72 @@
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
<ItemText>voltage</ItemText>
<ItemText>RxBuffer,0x0A</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
<ItemText>RxBuffer</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
<ItemText>CurrentDate,0x0A</ItemText>
</Ww>
<Ww>
<count>4</count>
<count>3</count>
<WinNumber>1</WinNumber>
<ItemText>CurrentTime,0x0A</ItemText>
</Ww>
<Ww>
<count>5</count>
<count>4</count>
<WinNumber>1</WinNumber>
<ItemText>myGyroRaw,0x0A</ItemText>
</Ww>
<Ww>
<count>6</count>
<count>5</count>
<WinNumber>1</WinNumber>
<ItemText>myAccelRaw,0x0A</ItemText>
</Ww>
<Ww>
<count>7</count>
<count>6</count>
<WinNumber>1</WinNumber>
<ItemText>_spo2,0x0A</ItemText>
</Ww>
<Ww>
<count>8</count>
<count>7</count>
<WinNumber>1</WinNumber>
<ItemText>heartReat,0x0A</ItemText>
</Ww>
<Ww>
<count>9</count>
<count>8</count>
<WinNumber>1</WinNumber>
<ItemText>unreadSampleCount,0x0A</ItemText>
</Ww>
<Ww>
<count>10</count>
<count>9</count>
<WinNumber>1</WinNumber>
<ItemText>_sampleBuff,0x0A</ItemText>
</Ww>
<Ww>
<count>11</count>
<count>10</count>
<WinNumber>1</WinNumber>
<ItemText>debug,0x0A</ItemText>
</Ww>
<Ww>
<count>12</count>
<count>11</count>
<WinNumber>1</WinNumber>
<ItemText>\\my_watch_software\../Src/main.c\KAccel,0x0A</ItemText>
</Ww>
<Ww>
<count>13</count>
<count>12</count>
<WinNumber>1</WinNumber>
<ItemText>KGyro,0x0A</ItemText>
</Ww>
<Ww>
<count>14</count>
<count>13</count>
<WinNumber>1</WinNumber>
<ItemText>adcVals,0x0A</ItemText>
</Ww>
<Ww>
<count>15</count>
<WinNumber>1</WinNumber>
<ItemText>buf</ItemText>
</Ww>
<Ww>
<count>16</count>
<WinNumber>1</WinNumber>
<ItemText>sys,0x0A</ItemText>
</Ww>
<Ww>
<count>17</count>
<WinNumber>1</WinNumber>
<ItemText>x_alloc,0x0A</ItemText>
</Ww>
<Ww>
<count>18</count>
<count>14</count>
<WinNumber>1</WinNumber>
<ItemText>y_alloc,0x0A</ItemText>
<ItemText>sys,0x10</ItemText>
</Ww>
</WatchWindow1>
<Tracepoint>
Expand Down Expand Up @@ -556,6 +536,30 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>20</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\MyDrivers\Pages\pages.c</PathWithFileName>
<FilenameWithoutPath>pages.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>21</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\MyDrivers\XFer\xfer.c</PathWithFileName>
<FilenameWithoutPath>xfer.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group>

<Group>
Expand All @@ -566,7 +570,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>20</FileNumber>
<FileNumber>22</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -578,7 +582,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>21</FileNumber>
<FileNumber>23</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -590,7 +594,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>22</FileNumber>
<FileNumber>24</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -602,7 +606,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>23</FileNumber>
<FileNumber>25</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -614,7 +618,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>24</FileNumber>
<FileNumber>26</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -626,7 +630,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>25</FileNumber>
<FileNumber>27</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -638,7 +642,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>26</FileNumber>
<FileNumber>28</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -650,7 +654,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>27</FileNumber>
<FileNumber>29</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -662,7 +666,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>28</FileNumber>
<FileNumber>30</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -674,7 +678,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>29</FileNumber>
<FileNumber>31</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -686,7 +690,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>30</FileNumber>
<FileNumber>32</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -698,7 +702,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>31</FileNumber>
<FileNumber>33</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -710,7 +714,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>32</FileNumber>
<FileNumber>34</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -722,7 +726,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>33</FileNumber>
<FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -734,7 +738,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>34</FileNumber>
<FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -746,7 +750,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>35</FileNumber>
<FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -758,7 +762,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>36</FileNumber>
<FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -770,7 +774,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>37</FileNumber>
<FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -782,7 +786,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>38</FileNumber>
<FileNumber>40</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -794,7 +798,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>39</FileNumber>
<FileNumber>41</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -806,7 +810,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>40</FileNumber>
<FileNumber>42</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand Down
12 changes: 11 additions & 1 deletion open-watch-firmware/my_watch_software/MDK-ARM/my_watch_software.uvprojx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@
<MiscControls></MiscControls>
<Define>USE_HAL_DRIVER,STM32F030x8</Define>
<Undefine></Undefine>
<IncludePath>../Inc; ../Drivers/STM32F0xx_HAL_Driver/Inc; ../Drivers/STM32F0xx_HAL_Driver/Inc/Legacy; ../Drivers/CMSIS/Device/ST/STM32F0xx/Include; ../Drivers/CMSIS/Include; ..\MyDrivers; ..\MyDrivers\MPU; ..\MyDrivers\MAX30102; ..\MyDrivers\KalmanFilter; ..\MyDrivers\System; ..\MyDrivers\Display</IncludePath>
<IncludePath>../Inc; ../Drivers/STM32F0xx_HAL_Driver/Inc; ../Drivers/STM32F0xx_HAL_Driver/Inc/Legacy; ../Drivers/CMSIS/Device/ST/STM32F0xx/Include; ../Drivers/CMSIS/Include; ..\MyDrivers; ..\MyDrivers\MPU; ..\MyDrivers\MAX30102; ..\MyDrivers\KalmanFilter; ..\MyDrivers\System; ..\MyDrivers\Display; ..\MyDrivers\Pages; ..\MyDrivers\XFer</IncludePath>
</VariousControls>
</Cads>
<Aads>
Expand Down Expand Up @@ -493,6 +493,16 @@
<FileType>1</FileType>
<FilePath>..\MyDrivers\Display\ssd1306.c</FilePath>
</File>
<File>
<FileName>pages.c</FileName>
<FileType>1</FileType>
<FilePath>..\MyDrivers\Pages\pages.c</FilePath>
</File>
<File>
<FileName>xfer.c</FileName>
<FileType>1</FileType>
<FilePath>..\MyDrivers\XFer\xfer.c</FilePath>
</File>
</Files>
</Group>
<Group>
Expand Down
Binary file modified open-watch-firmware/my_watch_software/MDK-ARM/my_watch_software/adc.crf
View file
Binary file not shown.
Binary file modified open-watch-firmware/my_watch_software/MDK-ARM/my_watch_software/adc.o
View file
Binary file not shown.
Binary file modified open-watch-firmware/my_watch_software/MDK-ARM/my_watch_software/dma.crf
View file
Binary file not shown.
Binary file modified open-watch-firmware/my_watch_software/MDK-ARM/my_watch_software/dma.o
View file
Binary file not shown.
Binary file modified open-watch-firmware/my_watch_software/MDK-ARM/my_watch_software/fonts.crf
View file
Binary file not shown.
Binary file modified open-watch-firmware/my_watch_software/MDK-ARM/my_watch_software/fonts.o
View file
Binary file not shown.
Binary file modified open-watch-firmware/my_watch_software/MDK-ARM/my_watch_software/gpio.crf
View file
Binary file not shown.
Binary file modified open-watch-firmware/my_watch_software/MDK-ARM/my_watch_software/gpio.o
View file
Binary file not shown.
Binary file modified open-watch-firmware/my_watch_software/MDK-ARM/my_watch_software/i2c.crf
View file
Binary file not shown.
Binary file modified open-watch-firmware/my_watch_software/MDK-ARM/my_watch_software/i2c.o
View file
Binary file not shown.
Binary file modified open-watch-firmware/my_watch_software/MDK-ARM/my_watch_software/kalman.crf
View file
Binary file not shown.
1 change: 0 additions & 1 deletion open-watch-firmware/my_watch_software/MDK-ARM/my_watch_software/kalman.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ my_watch_software\kalman.o: ../Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_hal_ti
my_watch_software\kalman.o: ../Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_hal_uart.h
my_watch_software\kalman.o: ../Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_hal_uart_ex.h
my_watch_software\kalman.o: ../Inc/tim.h
my_watch_software\kalman.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\math.h
Binary file modified open-watch-firmware/my_watch_software/MDK-ARM/my_watch_software/kalman.o
View file
Binary file not shown.
Binary file modified open-watch-firmware/my_watch_software/MDK-ARM/my_watch_software/main.crf
View file
Binary file not shown.
Loading

0 comments on commit 49a0756

Please sign in to comment.