Skip to content

Commit b11b36a

Browse files
Heltec-Aaron-LeeHeltec-Aaron-Lee
committed
update boards' name
1 parent b4fe97c commit b11b36a

File tree

8 files changed

+146
-26
lines changed

8 files changed

+146
-26
lines changed

‎boards.txt

+81-7
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ menu.LORAWAN_RGB=LORAWAN_RGB
99
menu.LORAWAN_DebugLevel=LoRaWan Debug Level
1010
##############################################################
1111

12-
CubeCell-Board.name=CubeCell-Board
12+
CubeCell-Board.name=CubeCell-Board（HTCC-AB01）
1313

1414
CubeCell-Board.upload.tool=CubeCellflash
1515
CubeCell-Board.upload.maximum_size=131072
@@ -86,7 +86,7 @@ CubeCell-Board.menu.LORAWAN_DebugLevel.2=Freq && DIO
8686
CubeCell-Board.menu.LORAWAN_DebugLevel.2.build.LORAWAN_DebugLevel=2
8787
##############################################################
8888

89-
CubeCell-Capsule.name=CubeCell-Capsule
89+
CubeCell-Capsule.name=CubeCell-Capsule（HTCC-AC0X）
9090

9191
CubeCell-Capsule.upload.tool=CubeCellflash
9292
CubeCell-Capsule.upload.maximum_size=131072
@@ -164,7 +164,7 @@ CubeCell-Capsule.menu.LORAWAN_DebugLevel.2=Freq && DIO
164164
CubeCell-Capsule.menu.LORAWAN_DebugLevel.2.build.LORAWAN_DebugLevel=2
165165
##############################################################
166166

167-
CubeCell-Module.name=CubeCell-Module
167+
CubeCell-Module.name=CubeCell-Module（HTCC-AM01）
168168

169169
CubeCell-Module.upload.tool=CubeCellflash
170170
CubeCell-Module.upload.maximum_size=131072
@@ -240,7 +240,7 @@ CubeCell-Module.menu.LORAWAN_DebugLevel.2.build.LORAWAN_DebugLevel=2
240240

241241
###############################
242242

243-
CubeCell-BoardPlus.name=CubeCell-BoardPlus
243+
CubeCell-BoardPlus.name=CubeCell-Board Plus（HTCC-AB02）
244244

245245
CubeCell-BoardPlus.upload.tool=CubeCellflash
246246
CubeCell-BoardPlus.upload.maximum_size=131072
@@ -317,7 +317,7 @@ CubeCell-BoardPlus.menu.LORAWAN_DebugLevel.2=Freq && DIO
317317
CubeCell-BoardPlus.menu.LORAWAN_DebugLevel.2.build.LORAWAN_DebugLevel=2
318318
##############################################################
319319

320-
CubeCell-GPS.name=CubeCell-GPS
320+
CubeCell-GPS.name=CubeCell-GPS（HTCC-AB02S）
321321

322322
CubeCell-GPS.upload.tool=CubeCellflash
323323
CubeCell-GPS.upload.maximum_size=131072
@@ -395,7 +395,7 @@ CubeCell-GPS.menu.LORAWAN_DebugLevel.2=Freq && DIO
395395
CubeCell-GPS.menu.LORAWAN_DebugLevel.2.build.LORAWAN_DebugLevel=2
396396
##############################################################
397397

398-
CubeCell-ModulePlus.name=CubeCell-ModulePlus
398+
CubeCell-ModulePlus.name=CubeCell-Module Plus（HTCC-AM02）
399399

400400
CubeCell-ModulePlus.upload.tool=CubeCellflash
401401
CubeCell-ModulePlus.upload.maximum_size=131072
@@ -467,4 +467,78 @@ CubeCell-ModulePlus.menu.LORAWAN_DebugLevel.0.build.LORAWAN_DebugLevel=0
467467
CubeCell-ModulePlus.menu.LORAWAN_DebugLevel.1=Freq
468468
CubeCell-ModulePlus.menu.LORAWAN_DebugLevel.1.build.LORAWAN_DebugLevel=1
469469
CubeCell-ModulePlus.menu.LORAWAN_DebugLevel.2=Freq && DIO
470-
CubeCell-ModulePlus.menu.LORAWAN_DebugLevel.2.build.LORAWAN_DebugLevel=2
470+
CubeCell-ModulePlus.menu.LORAWAN_DebugLevel.2.build.LORAWAN_DebugLevel=2
471+
###############################
472+
CubeCell-1/2AA.name=CubeCell-1/2AA Node（HTCC-AB02A）
473+
474+
CubeCell-1/2AA.upload.tool=CubeCellflash
475+
CubeCell-1/2AA.upload.maximum_size=131072
476+
CubeCell-1/2AA.upload.maximum_data_size=131072
477+
CubeCell-1/2AA.upload.wait_for_upload_port=true
478+
479+
CubeCell-1/2AA.build.board=CubeCell_HalfAA
480+
CubeCell-1/2AA.build.core=asr650x
481+
CubeCell-1/2AA.build.variant=CubeCell-HalfAA
482+
483+
CubeCell-1/2AA.menu.LORAWAN_REGION.923AS=REGION_AS923
484+
CubeCell-1/2AA.menu.LORAWAN_REGION.923AS.build.band=REGION_AS923
485+
CubeCell-1/2AA.menu.LORAWAN_REGION.915AU=REGION_AU915
486+
CubeCell-1/2AA.menu.LORAWAN_REGION.915AU.build.band=REGION_AU915
487+
CubeCell-1/2AA.menu.LORAWAN_REGION.470CN=REGION_CN470
488+
CubeCell-1/2AA.menu.LORAWAN_REGION.470CN.build.band=REGION_CN470
489+
CubeCell-1/2AA.menu.LORAWAN_REGION.779CN=REGION_CN779
490+
CubeCell-1/2AA.menu.LORAWAN_REGION.779CN.build.band=REGION_CN779
491+
CubeCell-1/2AA.menu.LORAWAN_REGION.433EU=REGION_EU433
492+
CubeCell-1/2AA.menu.LORAWAN_REGION.433EU.build.band=REGION_EU433
493+
CubeCell-1/2AA.menu.LORAWAN_REGION.868EU=REGION_EU868
494+
CubeCell-1/2AA.menu.LORAWAN_REGION.868EU.build.band=REGION_EU868
495+
CubeCell-1/2AA.menu.LORAWAN_REGION.920KR=REGION_KR920
496+
CubeCell-1/2AA.menu.LORAWAN_REGION.920KR.build.band=REGION_KR920
497+
CubeCell-1/2AA.menu.LORAWAN_REGION.865IN=REGION_IN865
498+
CubeCell-1/2AA.menu.LORAWAN_REGION.865IN.build.band=REGION_IN865
499+
CubeCell-1/2AA.menu.LORAWAN_REGION.915US=REGION_US915
500+
CubeCell-1/2AA.menu.LORAWAN_REGION.915US.build.band=REGION_US915
501+
CubeCell-1/2AA.menu.LORAWAN_REGION.915_HYBRID=REGION_US915_HYBRID
502+
CubeCell-1/2AA.menu.LORAWAN_REGION.915_HYBRID.build.band=REGION_US915_HYBRID
503+
504+
CubeCell-1/2AA.menu.LORAWAN_CLASS.0=CLASS_A
505+
CubeCell-1/2AA.menu.LORAWAN_CLASS.0.build.LORAWAN_CLASS=CLASS_A
506+
##CubeCell-GPS.menu.LORAWAN_CLASS.1=CLASS_B
507+
##CubeCell-GPS.menu.LORAWAN_CLASS.1.build.LORAWAN_CLASS=CLASS_B
508+
CubeCell-1/2AA.menu.LORAWAN_CLASS.2=CLASS_C
509+
CubeCell-1/2AA.menu.LORAWAN_CLASS.2.build.LORAWAN_CLASS=CLASS_C
510+
511+
CubeCell-1/2AA.menu.LORAWAN_NETMODE.0=OTAA
512+
CubeCell-1/2AA.menu.LORAWAN_NETMODE.0.build.LORAWAN_NETMODE=true
513+
CubeCell-1/2AA.menu.LORAWAN_NETMODE.1=ABP
514+
CubeCell-1/2AA.menu.LORAWAN_NETMODE.1.build.LORAWAN_NETMODE=false
515+
516+
CubeCell-1/2AA.menu.LORAWAN_ADR.0=ON
517+
CubeCell-1/2AA.menu.LORAWAN_ADR.0.build.LORAWAN_ADR=true
518+
CubeCell-1/2AA.menu.LORAWAN_ADR.1=OFF
519+
CubeCell-1/2AA.menu.LORAWAN_ADR.1.build.LORAWAN_ADR=false
520+
521+
CubeCell-1/2AA.menu.LORAWAN_UPLINKMODE.0=CONFIRMED
522+
CubeCell-1/2AA.menu.LORAWAN_UPLINKMODE.0.build.LORAWAN_UPLINKMODE=true
523+
CubeCell-1/2AA.menu.LORAWAN_UPLINKMODE.1=UNCONFIRMED
524+
CubeCell-1/2AA.menu.LORAWAN_UPLINKMODE.1.build.LORAWAN_UPLINKMODE=false
525+
526+
CubeCell-1/2AA.menu.LORAWAN_Net_Reserve.0=OFF
527+
CubeCell-1/2AA.menu.LORAWAN_Net_Reserve.0.build.LORAWAN_Net_Reserve=false
528+
CubeCell-1/2AA.menu.LORAWAN_Net_Reserve.1=ON
529+
CubeCell-1/2AA.menu.LORAWAN_Net_Reserve.1.build.LORAWAN_Net_Reserve=true
530+
531+
CubeCell-1/2AA.menu.LORAWAN_AT_SUPPORT.0=ON
532+
CubeCell-1/2AA.menu.LORAWAN_AT_SUPPORT.0.build.LORAWAN_AT_SUPPORT=1
533+
CubeCell-1/2AA.menu.LORAWAN_AT_SUPPORT.1=OFF
534+
CubeCell-1/2AA.menu.LORAWAN_AT_SUPPORT.1.build.LORAWAN_AT_SUPPORT=0
535+
536+
CubeCell-1/2AA.menu.LORAWAN_RGB.0=DEACTIVE
537+
CubeCell-1/2AA.menu.LORAWAN_RGB.0.build.RGB=0
538+
539+
CubeCell-1/2AA.menu.LORAWAN_DebugLevel.0=None
540+
CubeCell-1/2AA.menu.LORAWAN_DebugLevel.0.build.LORAWAN_DebugLevel=0
541+
CubeCell-1/2AA.menu.LORAWAN_DebugLevel.1=Freq
542+
CubeCell-1/2AA.menu.LORAWAN_DebugLevel.1.build.LORAWAN_DebugLevel=1
543+
CubeCell-1/2AA.menu.LORAWAN_DebugLevel.2=Freq && DIO
544+
CubeCell-1/2AA.menu.LORAWAN_DebugLevel.2.build.LORAWAN_DebugLevel=2

‎cores/asr650x/board/src/asr_board.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -463,11 +463,12 @@ void boardInitMcu( void )
463463
SpiInit();
464464
Asr_Timer_Init();
465465
RtcInit();
466-
466+
#if defined(CubeCell_Board)||defined(CubeCell_Capsule)||defined(CubeCell_BoardPlus)||defined(CubeCell_GPS)||defined(CubeCell_HalfAA)
467467
pinMode(Vext,OUTPUT);
468468
digitalWrite(Vext,HIGH);
469469
pinMode(VBAT_ADC_CTL,OUTPUT);
470470
digitalWrite(VBAT_ADC_CTL,HIGH);
471+
#endif
471472
SX126xIoInit();
472473
delay(10);
473474
SX126xReset();

‎libraries/Basics/examples/ADC_battery/ADC_battery.ino

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
#include "Arduino.h"
2-
2+
#include "LoRaWan_APP.h"
33

44
void setup() {
55
// put your setup code here, to run once:
66
Serial.begin(115200);
77
}
88

9-
uint16_t voltage;
10-
119
void loop() {
1210
// put your main code here, to run repeatedly:
13-
pinMode(VBAT_ADC_CTL,OUTPUT);
14-
digitalWrite(VBAT_ADC_CTL,LOW);
15-
uint16_t voltage=analogRead(ADC)*2;
16-
digitalWrite(VBAT_ADC_CTL,HIGH);
17-
Serial.print(millis());
18-
Serial.print(" ");
11+
uint16_t voltage = getBatteryVoltage();
1912
Serial.println(voltage);
2013
delay(1000);
21-
}
14+
}

‎libraries/LoRa/src/LoRaWan_APP.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,14 @@ void turnOffRGB(void)
244244
/* get the BatteryVoltage in mV. */
245245
uint16_t getBatteryVoltage(void)
246246
{
247+
#if defined(CubeCell_Board)||defined(CubeCell_Capsule)||defined(CubeCell_BoardPlus)||defined(CubeCell_GPS)||defined(CubeCell_HalfAA)
247248
pinMode(VBAT_ADC_CTL,OUTPUT);
248249
digitalWrite(VBAT_ADC_CTL,LOW);
249250
uint16_t volt=analogRead(ADC)*2;
250251
digitalWrite(VBAT_ADC_CTL,HIGH);
252+
#else
253+
uint16_t volt=analogRead(ADC)*2;
254+
#endif
251255
return volt;
252256
}
253257

‎libraries/LoRa/src/LoRaWan_APP.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class LoRaWanClass{
7070
#endif
7171
};
7272

73-
73+
extern "C" uint16_t getBatteryVoltage(void);
7474
extern "C" bool SendFrame( void );
7575
extern "C" void turnOnRGB(uint32_t color,uint32_t time);
7676
extern "C" void turnOffRGB(void);

‎variants/CubeCell-HalfAA/pins_arduino.h

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
#define MCU_PINS \
7+
P0_0 = 0, P0_1, P0_2, P0_3, P0_4, P0_5, P0_6, P0_7, \
8+
P1_0 , P1_1, P1_2, P1_3, P1_4, P1_5, P1_6, P1_7, \
9+
P2_0 , P2_1, P2_2, P2_3, P2_4, P2_5, P2_6, P2_7, \
10+
P3_0 , P3_1, P3_2, P3_3, P3_4, P3_5, P3_6, P3_7, \
11+
P4_0 , P4_1, P4_2, P4_3, P4_4, P4_5, P4_6, P4_7, \
12+
P5_0 , P5_1, P5_2, P5_3, P5_4, P5_5, P5_6, P5_7, \
13+
P6_0 , P6_1, P6_2, P6_3, P6_4, P6_5, P6_6, P6_7, \
14+
P7_0 , P7_1, P7_2, P7_3, P7_4, P7_5, P7_6, P7_7
15+
16+
typedef enum
17+
{
18+
MCU_PINS,
19+
NC = (int)0xFFFFFFFF
20+
}PinNames;
21+
22+
#define UART_RX P3_0
23+
#define UART_TX P3_1
24+
#define UART_RX1 UART_RX
25+
#define UART_TX1 UART_TX
26+
#define UART_RX2 P4_4
27+
#define UART_TX2 P4_5
28+
#define Vext P3_2
29+
#define VBAT_ADC_CTL P3_3
30+
#define USER_KEY P3_3
31+
#define SDA P0_1
32+
#define SCL P0_0
33+
#define PWM1 P6_2
34+
#define PWM2 P6_4
35+
#define ADC1 P2_0
36+
#define ADC ADC1
37+
#define ADC2 P2_1
38+
#define ADC3 P2_2
39+
#define GPIO1 P6_1
40+
#define GPIO2 P6_2
41+
#define GPIO3 P6_3
42+
#define GPIO4 P6_4
43+
#define GPIO5 P3_4
44+
#define GPIO6 P3_6
45+
#define GPIO7 P3_7
46+
#define GPIO8 P7_0
47+
#define GPIO9 P7_1
48+
#define GPIO10 P7_2
49+
#define GPIO11 P0_2
50+
#define GPIO12 P0_3
51+
#define GPIO13 P0_6
52+
#define GPIO14 P0_7
53+
54+
#endif /* Pins_Arduino_h */

‎variants/CubeCell-Module/pins_arduino.h

-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ typedef enum
2121

2222
#define UART_RX P3_0
2323
#define UART_TX P3_1
24-
#define Vext P3_2 //gpio6
25-
#define VBAT_ADC_CTL P3_3 //gpio7
2624
#define USER_KEY P3_3
2725
#define GPIO0 P0_2
2826
#define GPIO1 P6_1
@@ -37,6 +35,5 @@ typedef enum
3735
#define ADC P2_3
3836
#define PWM1 P6_2 //gpio2
3937
#define PWM2 P6_4 //gpio3
40-
#define RGB P0_7 //gpio4
4138

4239
#endif /* Pins_Arduino_h */

‎variants/CubeCell-ModulePlus/pins_arduino.h

+1-4
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,9 @@ typedef enum
2525
#define UART_TX1 UART_TX
2626
#define UART_RX2 P4_4
2727
#define UART_TX2 P4_5
28-
#define Vext P3_2
29-
#define VBAT_ADC_CTL P3_3
3028
#define USER_KEY P3_3
3129
#define SDA P0_1
3230
#define SCL P0_0
33-
#define RGB P0_6 //GPIO13
3431
#define PWM1 P6_2
3532
#define PWM2 P6_4
3633
#define ADC1 P2_0
@@ -49,7 +46,7 @@ typedef enum
4946
#define GPIO10 P7_2
5047
#define GPIO11 P0_2
5148
#define GPIO12 P0_3
52-
#define GPIO13 P0_6 //RGB
49+
#define GPIO13 P0_6
5350
#define GPIO14 P0_7
5451

5552
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)