![](/media/cache/img/default_profile.jpg.50x50_q85.jpg)
Battery and SDcard
Dependencies: mbed PowerControl SDFileSystem
Fork of HeptaBattery_SDFilesystem by
Revision 2:43c8e1979d08, committed 2016-12-13
- Comitter:
- MEXT1
- Date:
- Tue Dec 13 10:51:59 2016 +0000
- Parent:
- 1:39fee2519a16
- Commit message:
- Battery and SDcard
Changed in this revision
hepta_sat/HeptaBattery.cpp | Show annotated file Show diff for this revision Revisions of this file |
hepta_sat/HeptaBattery.h | Show annotated file Show diff for this revision Revisions of this file |
--- a/hepta_sat/HeptaBattery.cpp Tue Dec 13 07:23:38 2016 +0000 +++ b/hepta_sat/HeptaBattery.cpp Tue Dec 13 10:51:59 2016 +0000 @@ -11,7 +11,7 @@ { *bt = (_bat.read()*1.431*3.3); } -void HeptaBattery::vol_u16(char* bt_u16, int *dsize) +void HeptaBattery::vol_u16(char* bt_u16) { unsigned short bt_datas; char bt1[8]={0x00},bt2[8]={0x00}; @@ -20,7 +20,6 @@ sprintf( bt2, "%02X", (bt_datas) & 0xFF); bt_u16[0]=bt1[0]; bt_u16[1]=bt1[1]; bt_u16[2]=bt2[0]; bt_u16[3]=bt2[1]; - *dsize = 4; } void HeptaBattery::chargecontrol(int state, int *save_flag) {
--- a/hepta_sat/HeptaBattery.h Tue Dec 13 07:23:38 2016 +0000 +++ b/hepta_sat/HeptaBattery.h Tue Dec 13 10:51:59 2016 +0000 @@ -12,7 +12,7 @@ PinName reg_st ); void vol(float* bt); - void vol_u16(char* bt_u16, int *dsize); + void vol_u16(char* bt_u16); void chargecontrol(int state, int *save_flag); private: