-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Changed Battery Measurement to use it's own state in statemachine
- Changed the VCC measurement to used 2.048V instead of 1.024V as 1.024 is not enough to be used for ADC reference - Changed ifdef in spi.h file (had wrong flag which was copied from another file) - Now show battery measurement when booted - States is again being shown in Click 7Seg Display - Battery Voltage is also written to 7Seg Display when measure (one decimal) - Daily numbers of 256s counts changed to be more accurate to 24 hours
- Loading branch information
1 parent
1eb6986
commit 3263f1f
Showing
7 changed files
with
206 additions
and
205 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,93 +1,84 @@ | ||
| /* Microchip Technology Inc. and its subsidiaries. You may use this software | ||
| * and any derivatives exclusively with Microchip products. | ||
| * | ||
| * THIS SOFTWARE IS SUPPLIED BY MICROCHIP "AS IS". NO WARRANTIES, WHETHER | ||
| * EXPRESS, IMPLIED OR STATUTORY, APPLY TO THIS SOFTWARE, INCLUDING ANY IMPLIED | ||
| * WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY, AND FITNESS FOR A | ||
| * PARTICULAR PURPOSE, OR ITS INTERACTION WITH MICROCHIP PRODUCTS, COMBINATION | ||
| * WITH ANY OTHER PRODUCTS, OR USE IN ANY APPLICATION. | ||
| * | ||
| * IN NO EVENT WILL MICROCHIP BE LIABLE FOR ANY INDIRECT, SPECIAL, PUNITIVE, | ||
| * INCIDENTAL OR CONSEQUENTIAL LOSS, DAMAGE, COST OR EXPENSE OF ANY KIND | ||
| * WHATSOEVER RELATED TO THE SOFTWARE, HOWEVER CAUSED, EVEN IF MICROCHIP HAS | ||
| * BEEN ADVISED OF THE POSSIBILITY OR THE DAMAGES ARE FORESEEABLE. TO THE | ||
| * FULLEST EXTENT ALLOWED BY LAW, MICROCHIP'S TOTAL LIABILITY ON ALL CLAIMS | ||
| * IN ANY WAY RELATED TO THIS SOFTWARE WILL NOT EXCEED THE AMOUNT OF FEES, IF | ||
| * ANY, THAT YOU HAVE PAID DIRECTLY TO MICROCHIP FOR THIS SOFTWARE. | ||
| * | ||
| * MICROCHIP PROVIDES THIS SOFTWARE CONDITIONALLY UPON YOUR ACCEPTANCE OF THESE | ||
| * TERMS. | ||
| */ | ||
|
|
||
| /* | ||
| * File: | ||
| * Author: | ||
| * Comments: | ||
| * Revision history: | ||
| */ | ||
|
|
||
| // This is a guard condition so that contents of this file are not included | ||
| // more than once. | ||
| #ifndef XC_CLICK_7SEG_H | ||
| #define XC_CLICK_7SEG_H | ||
|
|
||
| #include <xc.h> // include processor files - each processor file is guarded. | ||
|
|
||
| // TODO Insert appropriate #include <> | ||
|
|
||
| // TODO Insert C++ class definitions if appropriate | ||
|
|
||
| // TODO Insert declarations | ||
|
|
||
| // Comment a function and leverage automatic documentation with slash star star | ||
| /** | ||
| <p><b>Function prototype:</b></p> | ||
| <p><b>Summary:</b></p> | ||
| <p><b>Description:</b></p> | ||
| <p><b>Precondition:</b></p> | ||
| <p><b>Parameters:</b></p> | ||
| <p><b>Returns:</b></p> | ||
| <p><b>Example:</b></p> | ||
| <code> | ||
| </code> | ||
| <p><b>Remarks:</b></p> | ||
| */ | ||
| // TODO Insert declarations or function prototypes (right here) to leverage | ||
| // live documentation | ||
|
|
||
|
|
||
| extern const unsigned char C7SEG_CHAR_TABLE[51]; | ||
|
|
||
| extern void int2bcd(int number, char comma); | ||
| extern void Click_reset(void); | ||
| extern void Click_latch_data(void); | ||
| extern void watch_dog_incrementing_timer(void); | ||
|
|
||
| #ifdef __cplusplus | ||
| extern "C" { | ||
| #endif /* __cplusplus */ | ||
| // TODO If C++ is being used, regular C code needs function names to have C | ||
| // linkage so the functions can be used by the c code. | ||
|
|
||
| #ifdef __cplusplus | ||
| } | ||
| #endif /* __cplusplus */ | ||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
| #endif /* XC_HEADER_TEMPLATE_H */ | ||
|
|
||
|
|
||
|
|
||
| /* Microchip Technology Inc. and its subsidiaries. You may use this software | ||
| * and any derivatives exclusively with Microchip products. | ||
| * | ||
| * THIS SOFTWARE IS SUPPLIED BY MICROCHIP "AS IS". NO WARRANTIES, WHETHER | ||
| * EXPRESS, IMPLIED OR STATUTORY, APPLY TO THIS SOFTWARE, INCLUDING ANY IMPLIED | ||
| * WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY, AND FITNESS FOR A | ||
| * PARTICULAR PURPOSE, OR ITS INTERACTION WITH MICROCHIP PRODUCTS, COMBINATION | ||
| * WITH ANY OTHER PRODUCTS, OR USE IN ANY APPLICATION. | ||
| * | ||
| * IN NO EVENT WILL MICROCHIP BE LIABLE FOR ANY INDIRECT, SPECIAL, PUNITIVE, | ||
| * INCIDENTAL OR CONSEQUENTIAL LOSS, DAMAGE, COST OR EXPENSE OF ANY KIND | ||
| * WHATSOEVER RELATED TO THE SOFTWARE, HOWEVER CAUSED, EVEN IF MICROCHIP HAS | ||
| * BEEN ADVISED OF THE POSSIBILITY OR THE DAMAGES ARE FORESEEABLE. TO THE | ||
| * FULLEST EXTENT ALLOWED BY LAW, MICROCHIP'S TOTAL LIABILITY ON ALL CLAIMS | ||
| * IN ANY WAY RELATED TO THIS SOFTWARE WILL NOT EXCEED THE AMOUNT OF FEES, IF | ||
| * ANY, THAT YOU HAVE PAID DIRECTLY TO MICROCHIP FOR THIS SOFTWARE. | ||
| * | ||
| * MICROCHIP PROVIDES THIS SOFTWARE CONDITIONALLY UPON YOUR ACCEPTANCE OF THESE | ||
| * TERMS. | ||
| */ | ||
|
|
||
| /* | ||
| * File: | ||
| * Author: | ||
| * Comments: | ||
| * Revision history: | ||
| */ | ||
|
|
||
| // This is a guard condition so that contents of this file are not included | ||
| // more than once. | ||
| #ifndef XC_CLICK_7SEG_H | ||
| #define XC_CLICK_7SEG_H | ||
|
|
||
| #include <xc.h> // include processor files - each processor file is guarded. | ||
|
|
||
| // TODO Insert appropriate #include <> | ||
|
|
||
| // TODO Insert C++ class definitions if appropriate | ||
|
|
||
| // TODO Insert declarations | ||
|
|
||
| // Comment a function and leverage automatic documentation with slash star star | ||
| /** | ||
| <p><b>Function prototype:</b></p> | ||
| <p><b>Summary:</b></p> | ||
| <p><b>Description:</b></p> | ||
| <p><b>Precondition:</b></p> | ||
| <p><b>Parameters:</b></p> | ||
| <p><b>Returns:</b></p> | ||
| <p><b>Example:</b></p> | ||
| <code> | ||
| </code> | ||
| <p><b>Remarks:</b></p> | ||
| */ | ||
| // TODO Insert declarations or function prototypes (right here) to leverage | ||
| // live documentation | ||
|
|
||
| extern const unsigned char C7SEG_CHAR_TABLE[51]; | ||
|
|
||
| extern void int2bcd(int number, char comma); | ||
| extern void Click_reset(void); | ||
| extern void Click_latch_data(void); | ||
| extern void watch_dog_incrementing_timer(void); | ||
|
|
||
| #ifdef __cplusplus | ||
| extern "C" { | ||
| #endif /* __cplusplus */ | ||
| // TODO If C++ is being used, regular C code needs function names to have C | ||
| // linkage so the functions can be used by the c code. | ||
|
|
||
| #ifdef __cplusplus | ||
| } | ||
| #endif /* __cplusplus */ | ||
|
|
||
| #endif /* XC_CLICK_7SEG_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.