Merge remote-tracking branch 'origin/cht8305_20220127' into pack_v2

Application/app/sox/state.c

@@ -3,6 +3,7 @@
 #include "bsp/cs1180.h"
 #include "bsp/uart.h"
 #include "bsp/mcu_power_sleep.h"
+#include "bsp/cht8305.h"
 #include "app/sox/measure.h"
 #include "app/sox/measure_task.h"
 #include "libs/shark_task.h"
@@ -59,7 +60,8 @@ static void log_no_hall_time(void){
 
 void bms_state_init(void){
 	set_log_level(MOD_STATE, L_debug);
-	state_debug("BMS System Starting......\n");	
+	state_debug("BMS System Starting......\n");
+	cht8305_reset();
 	_bms_state.cell_index_of_max_vol = 0xff;
 	_bms_state.bms_addr = 0x30;
 	measure_task_init(_current_notify, _voltage_notify, _temperature_notify);

Application/bsp/bsp.c

@@ -5,6 +5,7 @@
 #include "bsp/shark_rtc.h"
 #include "bsp/clock.h"
 #include "bsp/fmc_flash.h"
+#include "bsp/cht8305.h"
 #include "libs/logger.h"
 #include "libs/shark_task.h"
 #include "version.h"
@@ -47,6 +48,7 @@ void bsp_init(void){
 	shark_uart_init(SHARK_UART1);
 #endif
 	AT24CXX_Init();
+	cht8305_init();
 	AUX_VOL_OPEN(0);
 	gpio_key_init();
 	DIANOCTIC_LED(1);

Application/bsp/cht8305.c

@@ -0,0 +1,69 @@
+#include "cht8305.h"
+#include "libs/shark_task.h"
+#include "libs/logger.h"
+static int i2c_read(u8 reg, u16 *data);
+static int i2c_write(u8 reg, u16 data);
+
+static bool _ready = false;
+static int _init_count = 0;
+void cht8305_init(void) {
+	u16 data;
+	if (i2c_read(ID_Reg, &data) == 2) {
+		if (data == CHT8305_ID) {
+			if (i2c_write(Config_Reg, 0x1000) >= 0) {
+				_ready = true;
+			}
+		}
+	}
+}
+
+bool cht8305_ready(void) {
+	return _ready;
+}
+
+void cht8305_reset(void) {
+	if (_ready) {
+		state_debug("cht8305 ready\n");
+	}else {
+		state_debug("cht8305 not ready reinit\n");
+		cht8305_init();
+	}
+	u16 data = 0x8000; //reset
+	i2c_write(Config_Reg, data);
+	i2c_read(Config_Reg, &data);
+	state_debug("data = 0x%x\n", data);	
+}
+
+u8 cht8305_get_humidity(void){
+	if (!_ready) {
+		_init_count ++;
+		if (_init_count <= 20) {
+			cht8305_init();
+		}
+		return 0xFF;
+	}
+	u16 data = 0;
+	if (i2c_read(Humi_Reg, &data) == 2) {
+		u32 data32 = data << 10;
+		u32 humidity = 100 * data32/((1<<16) - 1) >> 10;
+		return (u8) humidity;
+	}
+	return 0xFF;
+}
+
+
+static int i2c_read(u8 reg, u16 *data) {
+	u8 reg_value[2] = {0x00, 0x00};
+	int ret = gd32_i2c_read_nbytes(0, CHT8305_I2C_ADDR, reg, reg_value, 2);
+	if (ret == 2) {
+		*data = ((reg_value[0] << 8)&0xFF00) | reg_value[1];
+	}
+	return ret;
+}
+
+static int i2c_write(u8 reg, u16 data) {
+	u8 reg_value[2];
+	reg_value[0] = (data>>8) & 0xFF;
+	reg_value[1] = data & 0xFF;
+	return gd32_i2c_write_nbytes(0, CHT8305_I2C_ADDR, reg, reg_value, 2);
+}

Application/bsp/cht8305.h

@@ -0,0 +1,22 @@
+#ifndef _CHT8305_H__
+#define _CHT8305_H__
+
+#include "bsp/shark_bsp.h"
+#include "bsp/i2c.h"
+#include "libs/shark_types.h"
+
+#define CHT8305_I2C_ADDR 0x80
+
+#define Temp_Reg 0x00
+#define Humi_Reg 0x01
+#define Config_Reg 0x02
+#define ID_Reg 0xFE
+
+#define CHT8305_ID 0x5959
+
+void cht8305_init(void);
+void cht8305_reset(void);
+bool cht8305_ready(void);
+u8 cht8305_get_humidity(void);
+
+#endif /* _CHT8305_H__ */

Application/bsp/mcu_power_sleep.c

@@ -7,6 +7,7 @@
 #include "bsp/i2c.h"
 #include "bsp/shark_rtc.h"
 #include "bsp/AT24CXX.h"
+#include "bsp/cht8305.h"
 #include "app/sox/iostate.h"
 #include "bsp/gd32_adc.h"
 
@@ -126,6 +127,7 @@ static void post_deepsleep(void){
 	shark_uart_init(SHARK_UART1);
 #endif
 	AT24CXX_Init();
+	cht8305_reset();
 	shark_rtc_set_backup(0xFB);
 	wdog_set_timeout(4);
 	shark_rtc_set_backup(0xFC);

Project/SP700.uvoptx

@@ -140,7 +140,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>JL2CM3</Key>
-          <Name>-U20080643 -O78 -S2 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO7 -FD20000000 -FC1000 -FN1 -FF0GD32F3x0.FLM -FS08000000 -FL010000 -FP0($$Device:GD32F330C8$Flash\GD32F3x0.FLM)</Name>
+          <Name>-U81480416 -O78 -S2 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO7 -FD20000000 -FC1000 -FN1 -FF0GD32F3x0.FLM -FS08000000 -FL010000 -FP0($$Device:GD32F330C8$Flash\GD32F3x0.FLM)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -620,6 +620,18 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\Application\bsp\cht8305.c</PathWithFileName>
+      <FilenameWithoutPath>cht8305.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
   <Group>
@@ -630,7 +642,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>4</GroupNumber>
-      <FileNumber>33</FileNumber>
+      <FileNumber>34</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -642,7 +654,7 @@
     </File>
     <File>
       <GroupNumber>4</GroupNumber>
-      <FileNumber>34</FileNumber>
+      <FileNumber>35</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -654,7 +666,7 @@
     </File>
     <File>
       <GroupNumber>4</GroupNumber>
-      <FileNumber>35</FileNumber>
+      <FileNumber>36</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -666,7 +678,7 @@
     </File>
     <File>
       <GroupNumber>4</GroupNumber>
-      <FileNumber>36</FileNumber>
+      <FileNumber>37</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -678,7 +690,7 @@
     </File>
     <File>
       <GroupNumber>4</GroupNumber>
-      <FileNumber>37</FileNumber>
+      <FileNumber>38</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -698,7 +710,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>38</FileNumber>
+      <FileNumber>39</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -710,7 +722,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>39</FileNumber>
+      <FileNumber>40</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -722,7 +734,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>40</FileNumber>
+      <FileNumber>41</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -734,7 +746,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>41</FileNumber>
+      <FileNumber>42</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -746,7 +758,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>42</FileNumber>
+      <FileNumber>43</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -758,7 +770,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>43</FileNumber>
+      <FileNumber>44</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -770,7 +782,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>44</FileNumber>
+      <FileNumber>45</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -782,7 +794,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>45</FileNumber>
+      <FileNumber>46</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -794,7 +806,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>46</FileNumber>
+      <FileNumber>47</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -806,7 +818,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>47</FileNumber>
+      <FileNumber>48</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -818,7 +830,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>48</FileNumber>
+      <FileNumber>49</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -830,7 +842,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>49</FileNumber>
+      <FileNumber>50</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -842,7 +854,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>50</FileNumber>
+      <FileNumber>51</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -854,7 +866,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>51</FileNumber>
+      <FileNumber>52</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -866,7 +878,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>52</FileNumber>
+      <FileNumber>53</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -878,7 +890,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>53</FileNumber>
+      <FileNumber>54</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -890,7 +902,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>54</FileNumber>
+      <FileNumber>55</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -902,7 +914,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>55</FileNumber>
+      <FileNumber>56</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -914,7 +926,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>56</FileNumber>
+      <FileNumber>57</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -926,7 +938,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>57</FileNumber>
+      <FileNumber>58</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -938,7 +950,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>58</FileNumber>
+      <FileNumber>59</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -950,7 +962,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>59</FileNumber>
+      <FileNumber>60</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -962,7 +974,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>60</FileNumber>
+      <FileNumber>61</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -982,7 +994,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>61</FileNumber>
+      <FileNumber>62</FileNumber>
       <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -994,7 +1006,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>62</FileNumber>
+      <FileNumber>63</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>

Project/SP700.uvprojx

@@ -553,6 +553,11 @@
               <FileType>1</FileType>
               <FilePath>..\Application\bsp\fmc_flash.c</FilePath>
             </File>
+            <File>
+              <FileName>cht8305.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Application\bsp\cht8305.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>